Skip to content

Commit 2b4960c

Browse files
epson-workforce-635-nx625-series: fix GCC 14 build (NixOS#378049)
2 parents 8ffa3db + 8984ab5 commit 2b4960c

File tree

3 files changed

+50
-0
lines changed

3 files changed

+50
-0
lines changed
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
diff --git a/src/raster_to_epson.c b/src/raster_to_epson.c
2+
index 6e621c8..a5ca797 100644
3+
--- a/src/raster_to_epson.c
4+
+++ b/src/raster_to_epson.c
5+
@@ -438,14 +438,14 @@ static int print_page (void)
6+
break;
7+
}
8+
9+
- if (eps_raster_print(raster_h, image_raw, pageRegion.bytesPerLine, pageRegion.width, &nraster)) {
10+
+ if (eps_raster_print(raster_h, image_raw, pageRegion.bytesPerLine, pageRegion.width, (int *) &nraster)) {
11+
error = 1;
12+
break;
13+
}
14+
}
15+
16+
// flushing page
17+
- eps_raster_print(raster_h, NULL, 0, 0, &nraster);
18+
+ eps_raster_print(raster_h, NULL, 0, 0, (int *) &nraster);
19+
20+
bAbort = (error) ? TRUE : FALSE;
21+
if (epcgEndPage (bAbort)) {
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff --git a/src/pagemanager/pagemanager.c b/src/pagemanager/pagemanager.c
2+
index 029e6d3..2881585 100644
3+
--- a/src/pagemanager/pagemanager.c
4+
+++ b/src/pagemanager/pagemanager.c
5+
@@ -23,6 +23,7 @@
6+
#include "debuglog.h"
7+
#include "memory.h"
8+
#include "raster.h"
9+
+#include "raster-helper.h"
10+
#include "pagemanager.h"
11+
12+
extern int JobCanceled;
13+
diff --git a/src/raster_to_epson.c b/src/raster_to_epson.c
14+
index 6e621c8..6eea77c 100644
15+
--- a/src/raster_to_epson.c
16+
+++ b/src/raster_to_epson.c
17+
@@ -36,6 +36,7 @@
18+
#include "raster.h"
19+
#include "memory.h"
20+
#include "raster_to_epson.h"
21+
+#include "raster-helper.h"
22+
#include "pagemanager.h"
23+
#include "filter_option.h"
24+

pkgs/by-name/ep/epson-workforce-635-nx625-series/package.nix

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ stdenv.mkDerivation rec {
4444
done
4545
'';
4646

47+
patches = [
48+
./eps_raster_print-cast.patch
49+
./include-raster-helper.patch
50+
];
51+
4752
preConfigure = ''
4853
chmod u+x configure
4954
'';

0 commit comments

Comments
 (0)