summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Klitzing2018-05-01 16:31:27 +0200
committerAndré Klitzing2018-05-01 16:31:27 +0200
commitfd8c957991b69a13ae6268d9361ede3c00ac3fb8 (patch)
tree481abf2dd86cb9e5d0f227b1a55a072fb6e6e4dd
parente5fde4b6099af7bcdaef32d47b3912727a088991 (diff)
downloadaur-fd8c957991b69a13ae6268d9361ede3c00ac3fb8.tar.gz
Add patch from bbs.archlinux.org
https://bbs.archlinux.org/viewtopic.php?id=229121&p=2
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
-rw-r--r--fixbuild.patch101
3 files changed, 108 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1a8c378f2ef..1f739893c0b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = epson-inkjet-printer-nx420
pkgdesc = Epson printer driver (ME Office 560W / Stylus NX420, SX420W, TX420W, SX425W)
pkgver = 1.0.0
- pkgrel = 8
+ pkgrel = 9
url = http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
arch = i686
arch = x86_64
@@ -10,7 +10,9 @@ pkgbase = epson-inkjet-printer-nx420
depends = cups
depends = ghostscript
source = http://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-nx420-1.0.0-1lsb3.2.src.rpm
+ source = fixbuild.patch
sha256sums = 3952d6f6cf79d846f20a6403741e4651c917f1f07d0ec55a45b466ed13d91263
+ sha256sums = 85b0493972dcb92befd2bbf8d0ce705fc6280d54d83e985e9f7d0301bb01af50
pkgname = epson-inkjet-printer-nx420
diff --git a/PKGBUILD b/PKGBUILD
index de324ac1654..6f511514a5b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,14 +4,14 @@ pkgname=epson-inkjet-printer-nx420
_pkgname_filter=epson-inkjet-printer-filter
_suffix=1lsb3.2.src.rpm
pkgver=1.0.0
-pkgrel=8
+pkgrel=9
pkgdesc="Epson printer driver (ME Office 560W / Stylus NX420, SX420W, TX420W, SX425W)"
arch=('i686' 'x86_64')
url="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
license=('LGPL' 'custom:Epson Licence Agreement')
depends=('cups' 'ghostscript')
#makedepends=('libtool' 'make' 'automake' 'autoconf')
-source=(http://download.ebz.epson.net/dsc/op/stable/SRPMS/${pkgname}-${pkgver}-${_suffix})
+source=(http://download.ebz.epson.net/dsc/op/stable/SRPMS/${pkgname}-${pkgver}-${_suffix} fixbuild.patch)
build() {
cd "$srcdir"
@@ -50,4 +50,5 @@ package() {
install -d "$pkgdir/opt/$pkgname/cups/lib/filter/"
install -m 755 src/epson_inkjet_printer_filter "$pkgdir/opt/$pkgname/cups/lib/filter/epson_inkjet_printer_filter"
}
-sha256sums=('3952d6f6cf79d846f20a6403741e4651c917f1f07d0ec55a45b466ed13d91263')
+sha256sums=('3952d6f6cf79d846f20a6403741e4651c917f1f07d0ec55a45b466ed13d91263'
+ '85b0493972dcb92befd2bbf8d0ce705fc6280d54d83e985e9f7d0301bb01af50')
diff --git a/fixbuild.patch b/fixbuild.patch
new file mode 100644
index 00000000000..c3143eaebcf
--- /dev/null
+++ b/fixbuild.patch
@@ -0,0 +1,101 @@
+diff --git a/src/pagemanager/pagemanager.c b/src/pagemanager/pagemanager.c
+index 029e6d3..3c1f450 100644
+--- a/src/pagemanager/pagemanager.c
++++ b/src/pagemanager/pagemanager.c
+@@ -22,7 +22,7 @@
+ #include "epcgdef.h"
+ #include "debuglog.h"
+ #include "memory.h"
+-#include "raster.h"
++#include "raster-helper.h"
+ #include "pagemanager.h"
+
+ extern int JobCanceled;
+@@ -45,7 +45,7 @@ fetchRaster(EpsPageManager *pageManager)
+ int error = 0;
+ int did_fetch = 0;
+ int read_bytes = 0;
+- int nraster;
++ size_t nraster;
+
+ while (error == 0 && did_fetch == 0 && JobCanceled == 0) {
+ eps_raster_fetch(privateData->raster_h, NULL, 0, 0, &status);
+@@ -212,7 +212,7 @@ int pageManagerGetPageRegion(EpsPageManager *pageManager, EpsPageRegion *pageReg
+ return EPS_OK;
+ }
+
+-int pageManagerGetRaster(EpsPageManager *pageManager, char *buf, int bufSize)
++size_t pageManagerGetRaster(EpsPageManager *pageManager, char *buf, int bufSize)
+ {
+ PageManagerPrivateData *privateData = NULL;
+ int error = EPS_OK;
+diff --git a/src/pagemanager/pagemanager.h b/src/pagemanager/pagemanager.h
+index 87fbbd5..c9743fb 100644
+--- a/src/pagemanager/pagemanager.h
++++ b/src/pagemanager/pagemanager.h
+@@ -31,7 +31,7 @@ extern "C"
+ #define EPS_ERROR -1
+ #define EPS_OK 0
+
+-typedef int (*EpsRasterSource)(char *buf, int bufSize);
++typedef size_t (*EpsRasterSource)(char *buf, int bufSize);
+
+ typedef struct {
+ EpsRasterSource rasterSource;
+@@ -47,7 +47,7 @@ typedef struct {
+ EpsPageManager* pageManagerCreate(EpsPageRegion pageRegion, EpsFilterPrintOption filterPrintOption, EpsRasterSource rasterSource);
+ void pageManagerDestroy(EpsPageManager *pageManager);
+ int pageManagerGetPageRegion(EpsPageManager *pageManager, EpsPageRegion *pageRegion);
+-int pageManagerGetRaster(EpsPageManager *pageManager, char *buf, int bufSize);
++size_t pageManagerGetRaster(EpsPageManager *pageManager, char *buf, int bufSize);
+ int pageManagerIsNextPage(EpsPageManager *pageManager);
+
+ #ifdef __cplusplus
+diff --git a/src/raster/raster.c b/src/raster/raster.c
+index 7e4946b..dd5aef6 100644
+--- a/src/raster/raster.c
++++ b/src/raster/raster.c
+@@ -218,7 +218,7 @@ eps_raster_init (RASTER * handle, EpsRasterOpt * data, EpsRasterPipeline * pipel
+
+ /* if raster_p equals NULL means that it is need to flush a page. */
+ int
+-eps_raster_print (RASTER handle, char * raster_p, int raster_bytes, int pixel_num, int * outraster)
++eps_raster_print (RASTER handle, char * raster_p, int raster_bytes, int pixel_num, size_t * outraster)
+ {
+ EpsRaster * raster = (EpsRaster *) handle;
+ EpsRasterPipeline * pipeline = NULL;
+diff --git a/src/raster/raster.h b/src/raster/raster.h
+index 9be0977..cc5054d 100644
+--- a/src/raster/raster.h
++++ b/src/raster/raster.h
+@@ -143,7 +143,7 @@ typedef enum {
+ } EpsRasterFetchStatus;
+
+ int eps_raster_init (RASTER *, EpsRasterOpt *, EpsRasterPipeline *);
+-int eps_raster_print (RASTER, char *, int, int, int *);
++int eps_raster_print (RASTER, char *, int, int, size_t *);
+ int eps_raster_fetch (RASTER, char *, int, int, EpsRasterFetchStatus *);
+ int eps_raster_free (RASTER);
+
+diff --git a/src/raster_to_epson.c b/src/raster_to_epson.c
+index 6e621c8..a0811d6 100644
+--- a/src/raster_to_epson.c
++++ b/src/raster_to_epson.c
+@@ -33,7 +33,7 @@
+ #include <cups/ppd.h>
+ #include <cups/raster.h>
+
+-#include "raster.h"
++#include "raster-helper.h"
+ #include "memory.h"
+ #include "raster_to_epson.h"
+ #include "pagemanager.h"
+@@ -75,7 +75,7 @@ static int page_no = 0;
+ static int pageHeight = 0;
+ #endif
+
+-int rasterSource(char *buf, int bufSize)
++size_t rasterSource(char *buf, int bufSize)
+ {
+ int readBytes = 0;
+ if (JobCanceled == 0) {