diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | bug_x86_64.patch | 40 |
3 files changed, 28 insertions, 24 deletions
@@ -1,7 +1,7 @@ pkgbase = epson-inkjet-printer-escpr2 pkgdesc = Epson Inkjet Printer Driver 2 (ESC/P-R) for Linux pkgver = 1.1.15 - pkgrel = 1 + pkgrel = 2 url = http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX arch = i686 arch = x86_64 @@ -16,7 +16,7 @@ pkgbase = epson-inkjet-printer-escpr2 source = https://download3.ebz.epson.net/dsc/f/03/00/11/56/43/b1a6f1193e073c4c049da9404806c61052b62419/epson-inkjet-printer-escpr2-1.1.15-1lsb3.2.src.rpm source = bug_x86_64.patch sha256sums = 2eb8f1655de4f7189ec18d94f581112e2ff00b05e64a44c24bbb0524fafdd728 - sha256sums = 44160b2ef140e97137d65c4db7a50cfe40399ab8691caaeaf43c08f758b8c545 + sha256sums = ae480931863a195fb924fc5e5ea00478b3faa6cfb1507919d462f122be7d7084 pkgname = epson-inkjet-printer-escpr2 @@ -1,6 +1,6 @@ pkgname=epson-inkjet-printer-escpr2 pkgver=1.1.15 -pkgrel=1 +pkgrel=2 pkgdesc="Epson Inkjet Printer Driver 2 (ESC/P-R) for Linux" arch=('i686' 'x86_64' 'armv6h' 'armv7h') url="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX" @@ -12,14 +12,14 @@ options=('!libtool') source=('https://download3.ebz.epson.net/dsc/f/03/00/11/56/43/b1a6f1193e073c4c049da9404806c61052b62419/epson-inkjet-printer-escpr2-1.1.15-1lsb3.2.src.rpm' 'bug_x86_64.patch') sha256sums=('2eb8f1655de4f7189ec18d94f581112e2ff00b05e64a44c24bbb0524fafdd728' - '44160b2ef140e97137d65c4db7a50cfe40399ab8691caaeaf43c08f758b8c545') + 'ae480931863a195fb924fc5e5ea00478b3faa6cfb1507919d462f122be7d7084') prepare() { - tar xvf "$pkgname-$pkgver-$pkgrel"lsb3.2.tar.gz + tar xvf "$pkgname-$pkgver"-1lsb3.2.tar.gz cd "$pkgname-$pkgver" - #patch -p1 -i "${srcdir}/bug_x86_64.patch" + patch -p1 -i "${srcdir}/bug_x86_64.patch" } build() { diff --git a/bug_x86_64.patch b/bug_x86_64.patch index 6bd009184b5b..4bab906efb64 100644 --- a/bug_x86_64.patch +++ b/bug_x86_64.patch @@ -1,8 +1,20 @@ +From 2eaf51858354107641a97bfd0fb5539a5889e925 Mon Sep 17 00:00:00 2001 +Message-Id: <2eaf51858354107641a97bfd0fb5539a5889e925.1595700971.git.maciek.borzecki@gmail.com> +From: Maciek Borzecki <maciek.borzecki@gmail.com> +Date: Sat, 25 Jul 2020 20:15:18 +0200 +Subject: [PATCH] update x86-64 patch + +Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com> +--- + src/filter.c | 13 ++++++++++--- + src/mem.c | 1 + + 2 files changed, 11 insertions(+), 3 deletions(-) + diff --git a/src/filter.c b/src/filter.c -index d13f10e..105eae9 100755 +index 6d4ce86e4993b58f25b569cf014c9237f0726785..bc64487787464803839aa883e3020b6d40f052fb 100644 --- a/src/filter.c +++ b/src/filter.c -@@ -40,6 +40,8 @@ +@@ -39,6 +39,8 @@ #include "epson-escpr-api.h" #include "epson-escpr-services.h" #include "epson-escpr-mem.h" @@ -11,7 +23,7 @@ index d13f10e..105eae9 100755 #include "err.h" #include "mem.h" -@@ -48,6 +50,11 @@ +@@ -47,6 +49,11 @@ #include "libprtX.h" #include "optBase.h" #include "linux_cmn.h" @@ -23,7 +35,7 @@ index d13f10e..105eae9 100755 #define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4) -@@ -431,7 +438,7 @@ main (int argc, char *argv[]) +@@ -430,7 +437,7 @@ main (int argc, char *argv[]) } printJob.jobStatus = EPS_STATUS_ESTABLISHED; @@ -32,7 +44,7 @@ index d13f10e..105eae9 100755 /////////////////////////////////////////////////////////////////////////////////////////////////////////// print_area_x = printJob.printableAreaWidth; -@@ -605,7 +612,7 @@ main (int argc, char *argv[]) +@@ -604,7 +611,7 @@ main (int argc, char *argv[]) memcpy(rever_buf + k*3, startpage + pos + (bandBmp.widthBytes - 6) - k*3, 3); } } @@ -41,7 +53,7 @@ index d13f10e..105eae9 100755 pos -= bandBmp.widthBytes; } -@@ -898,7 +905,7 @@ set_pips_parameter (filter_option_t *filter_opt_p, EPS_OPT *printOpt) +@@ -897,7 +904,7 @@ set_pips_parameter (filter_option_t *filter_opt_p, EPS_OPT *printOpt) /* Get number of pages */ char page_num; @@ -50,20 +62,11 @@ index d13f10e..105eae9 100755 debug_msg("total pages = %d\n", page_num); /* Others */ -@@ -949,7 +956,7 @@ EPS_INT32 print_spool_fnc(void* hParam, const EPS_UINT8* pBuf, EPS_UINT32 cbBuf) - - // fwrite (pBuf, cbBuf, 1, outfp); - -- XFIFOWrite(context, pBuf, cbBuf); -+ XFIFOWrite(context, (char *)pBuf, cbBuf); - - return 1; - } diff --git a/src/mem.c b/src/mem.c -index 4b4b118..420eaf5 100755 +index f53f2bc144c3dd5b4a6b9ed0c8bdf9fec963ef79..d6c945acbf6a493de0b921f11d700cabeb6d3ff4 100644 --- a/src/mem.c +++ b/src/mem.c -@@ -24,6 +24,7 @@ +@@ -23,6 +23,7 @@ #include <stdlib.h> #include "mem.h" @@ -72,5 +75,6 @@ index 4b4b118..420eaf5 100755 void * mem_malloc (unsigned int size, bool_t crit) -- -2.15.1 +2.27.0 + |