Pkgrel bump: include stronnag's patch

3 files changed, 115 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e040e17c630c..9b4bbed93894 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Oct  6 17:35:20 UTC 2016
+# Fri Oct  7 20:17:29 UTC 2016
 pkgbase = epson-inkjet-printer-escpr
 	pkgdesc = Epson Inkjet Printer Driver (ESC/P-R) for Linux
 	pkgver = 1.6.9
-	pkgrel = 1
+	pkgrel = 2
 	url = http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
 	arch = i686
 	arch = x86_64
@@ -12,7 +12,9 @@ pkgbase = epson-inkjet-printer-escpr
 	depends = ghostscript
 	options = !libtool
 	source = https://download3.ebz.epson.net/dsc/f/03/00/05/12/61/b548695f9c41e714ea5efcd8cf9200de4cdadaff/epson-inkjet-printer-escpr-1.6.9-1lsb3.2.tar.gz
+	source = bug_x86_64.patch
 	sha256sums = e76e019e5051bfdb6cde970346cab3518c192a8dd87d05f3f3af380ed4542970
+	sha256sums = 277bc9afe581d2c434217db646e20ecfd1b6045bdcce861f2f08992ccf854084
 
 pkgname = epson-inkjet-printer-escpr
 
diff --git a/PKGBUILD b/PKGBUILD
index 14d8963c6520..f80f5a37c173 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,18 +7,28 @@
 
 pkgname=epson-inkjet-printer-escpr
 pkgver=1.6.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Epson Inkjet Printer Driver (ESC/P-R) for Linux"
 arch=('i686' 'x86_64')
 url="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
 license=('GPL2')
 depends=('cups' 'ghostscript')
 options=('!libtool')
-source=("https://download3.ebz.epson.net/dsc/f/03/00/05/12/61/b548695f9c41e714ea5efcd8cf9200de4cdadaff/epson-inkjet-printer-escpr-1.6.9-1lsb3.2.tar.gz")
-sha256sums=('e76e019e5051bfdb6cde970346cab3518c192a8dd87d05f3f3af380ed4542970')
+source=("https://download3.ebz.epson.net/dsc/f/03/00/05/12/61/b548695f9c41e714ea5efcd8cf9200de4cdadaff/epson-inkjet-printer-escpr-1.6.9-1lsb3.2.tar.gz"
+        "bug_x86_64.patch")
+sha256sums=('e76e019e5051bfdb6cde970346cab3518c192a8dd87d05f3f3af380ed4542970'
+            '277bc9afe581d2c434217db646e20ecfd1b6045bdcce861f2f08992ccf854084')
+
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  patch -p1 -i "${srcdir}/bug_x86_64.patch"
+
+}
 
 build() {
   cd "$pkgname-$pkgver"
+
   ./configure --prefix=/usr \
               --with-cupsfilterdir=/usr/lib/cups/filter \
               --with-cupsppddir=/usr/share/ppd
diff --git a/bug_x86_64.patch b/bug_x86_64.patch
new file mode 100644
index 000000000000..e4dd72d6fbcf
--- /dev/null
+++ b/bug_x86_64.patch
@@ -0,0 +1,98 @@
+diff -Naur epson-inkjet-printer-escpr-1.6.9/src/filter.c epson-inkjet-printer-escpr-1.6.9-fixed/src/filter.c
+--- epson-inkjet-printer-escpr-1.6.9/src/filter.c	2016-09-21 03:55:30.000000000 +0200
++++ epson-inkjet-printer-escpr-1.6.9-fixed/src/filter.c	2016-10-07 22:07:23.965463021 +0200
+@@ -34,6 +34,8 @@
+ #include "epson-protocol.h"
+ #include "epson-escpr-api.h"
+ #include "epson-escpr-mem.h"
++#include "epson-escpr-services.h"
++#include "epson-escpage.h"
+ 
+ #include "err.h"
+ #include "mem.h"
+@@ -42,6 +44,11 @@
+ #include "libprtX.h"
+ #include "optBase.h"
+ #include "linux_cmn.h"
++#include "xfifo.h"
++
++extern EPS_ERR_CODE SetupJobAttrib (const EPS_JOB_ATTRIB*);
++extern EPS_ERR_CODE SendStartJob ();
++extern EPS_ERR_CODE PrintBand (const EPS_UINT8*, EPS_UINT32, EPS_UINT32*);
+ 
+ #define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4)
+ 
+@@ -380,10 +387,10 @@
+ 	}else{
+ 		debug_msg("pageStartJob() success");
+ 	}
+-	
++
+ 	printJob.jobStatus = EPS_STATUS_ESTABLISHED;
+-	int printHeight = 0;
+-///////////////////////////////////////////////////////////////////////////////////////////////////////////	
++	EPS_UINT32 printHeight = 0;
++///////////////////////////////////////////////////////////////////////////////////////////////////////////
+ 
+ 	print_area_x = printJob.printableAreaWidth;
+ 	print_area_y = printJob.printableAreaHeight;
+@@ -535,7 +542,7 @@
+ 						memcpy(rever_buf + k*3, startpage + pos + (bandBmp.widthBytes - 6) - k*3, 3);
+ 					}
+ 				}
+-				PrintBand (rever_buf, bandBmp.widthBytes, &printHeight);
++				PrintBand ((const EPS_UINT8 *)rever_buf, bandBmp.widthBytes, &printHeight);
+ 				pos -= bandBmp.widthBytes;
+ 			}
+ 
+@@ -642,17 +649,17 @@
+ 						}
+ 					}
+ 				}
+-				
++
+ 				band_line_count ++;
+-				
++
+ 				if (band_line_count >= band_line)
+ 				{
+ 					printHeight = band_line_count;
+ 					PrintBand (bandBmp.bits, bandBmp.widthBytes, &printHeight);
+ #if (HAVE_PPM)
+ 					fp = fopen(ppmfilename, "a+");
+-					int i=0;	
+-					for(i=0; i<bytes_per_line/byte_par_pixel*3; i++){		
++					int i=0;
++					for(i=0; i<bytes_per_line/byte_par_pixel*3; i++){
+ 						fprintf(fp, "%u ", (unsigned char)bandBmp.Bits[i]);
+ 					}
+ 					fprintf(fp, "\n");
+@@ -831,7 +838,7 @@
+ 
+ 	/* Get number of pages */
+ 	char page_num;
+-	read (STDIN_FILENO, &page_num, 1);
++	(void)read (STDIN_FILENO, &page_num, 1);
+ 
+ 	/* Others */
+ 	jobAttr.apfAutoCorrect = EPS_APF_ACT_STANDARD;
+@@ -881,7 +888,7 @@
+ 
+ //	fwrite (pBuf, cbBuf, 1, outfp);
+ 
+-	XFIFOWrite(context, pBuf, cbBuf);
++	XFIFOWrite(context, (char *)pBuf, cbBuf);
+ 
+ 	return 1;
+ }
+diff -Naur epson-inkjet-printer-escpr-1.6.9/src/mem.c epson-inkjet-printer-escpr-1.6.9-fixed/src/mem.c
+--- epson-inkjet-printer-escpr-1.6.9/src/mem.c	2016-09-21 03:55:30.000000000 +0200
++++ epson-inkjet-printer-escpr-1.6.9-fixed/src/mem.c	2016-10-07 22:07:59.519366574 +0200
+@@ -24,6 +24,7 @@
+ 
+ #include <stdlib.h>
+ #include "mem.h"
++#include "err.h"
+ 
+ void *
+ mem_malloc (unsigned int size, bool_t crit)