[arch-commits] Commit in epson-inkjet-printer-escpr/repos/community-x86_64 (4 files)
Filipe Laíns
ffy00 at archlinux.org
Sat Nov 24 18:52:53 UTC 2018
Date: Saturday, November 24, 2018 @ 18:52:52
Author: ffy00
Revision: 409634
archrelease: copy trunk to community-x86_64
Added:
epson-inkjet-printer-escpr/repos/community-x86_64/PKGBUILD
(from rev 409633, epson-inkjet-printer-escpr/trunk/PKGBUILD)
epson-inkjet-printer-escpr/repos/community-x86_64/bug_x86_64.patch
(from rev 409633, epson-inkjet-printer-escpr/trunk/bug_x86_64.patch)
Deleted:
epson-inkjet-printer-escpr/repos/community-x86_64/PKGBUILD
epson-inkjet-printer-escpr/repos/community-x86_64/bug_x86_64.patch
------------------+
PKGBUILD | 88 +++++++++++------------
bug_x86_64.patch | 198 ++++++++++++++++++++++++++---------------------------
2 files changed, 143 insertions(+), 143 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-11-24 18:52:43 UTC (rev 409633)
+++ PKGBUILD 2018-11-24 18:52:52 UTC (rev 409634)
@@ -1,44 +0,0 @@
-# Maintainer: Filipe Laíns (FFY00) <lains at archlinux.org>
-# Contributor: Hyacinthe Cartiaux <hyacinthe.cartiaux at free.fr>
-# Contributor: James An <james at jamesan.ca>
-# Contributor: Stefano Bergamini <bergs at live dot it>
-# Contributor: Heiko Baums <heiko at baums-on-web.de>
-# Contributor: Quentin Foussette <quentinf7 at gmail.com>
-# Contributor: MetaNova
-
-pkgname=epson-inkjet-printer-escpr
-pkgver=1.6.32
-pkgrel=1
-pkgdesc='Epson Inkjet Printer Driver (ESC/P-R) for Linux'
-arch=('x86_64')
-url='http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX'
-license=('GPL2')
-depends=('cups' 'ghostscript')
-source=("https://download3.ebz.epson.net/dsc/f/03/00/08/49/68/d26ae8059b62e89a2c3602b5b7caa5d57fda35c5/epson-inkjet-printer-escpr-$pkgver-1lsb3.2.tar.gz"
- 'bug_x86_64.patch')
-sha512sums=('e6b128d1e5f9353f13c74bdf812699a253597c86e1ff791bafa1c7c73b4c789be95148647ca75cbeda04f2ccd7ecd87f3016808c404e07871c27f5218b4586f2'
- 'ff4f736ec884c4d2354a83c89ee535732cb414ef0c6443bdc8ec869f889f486b242d76e143ad59d61b182231697dfe3bdf68122cb8aae873a9776ce109a07dab')
-
-prepare() {
- cd $pkgname-$pkgver
-
- patch -p1 < ../bug_x86_64.patch
-}
-
-build() {
- cd $pkgname-$pkgver
-
- ./configure \
- --prefix=/usr \
- --with-cupsfilterdir=/usr/lib/cups/filter \
- --with-cupsppddir=/usr/share/ppd
-
- make
-}
-
-package() {
- cd $pkgname-$pkgver
-
- make DESTDIR="$pkgdir" install
-}
-
Copied: epson-inkjet-printer-escpr/repos/community-x86_64/PKGBUILD (from rev 409633, epson-inkjet-printer-escpr/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-11-24 18:52:52 UTC (rev 409634)
@@ -0,0 +1,44 @@
+# Maintainer: Filipe Laíns (FFY00) <lains at archlinux.org>
+# Contributor: Hyacinthe Cartiaux <hyacinthe.cartiaux at free.fr>
+# Contributor: James An <james at jamesan.ca>
+# Contributor: Stefano Bergamini <bergs at live dot it>
+# Contributor: Heiko Baums <heiko at baums-on-web.de>
+# Contributor: Quentin Foussette <quentinf7 at gmail.com>
+# Contributor: MetaNova
+
+pkgname=epson-inkjet-printer-escpr
+pkgver=1.6.33
+pkgrel=1
+pkgdesc='Epson Inkjet Printer Driver (ESC/P-R) for Linux'
+arch=('x86_64')
+url='http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX'
+license=('GPL2')
+depends=('cups' 'ghostscript')
+source=('https://download3.ebz.epson.net/dsc/f/03/00/08/70/14/e33b7a89e843b3ac97dcab773f03fbac7769f147/epson-inkjet-printer-escpr-1.6.33-1lsb3.2.tar.gz'
+ 'bug_x86_64.patch')
+sha512sums=('b7af8c69cff0869410a3dfad3204bb908f42070fc2721e1037631d5d5da972a800e195df27ef8e62418a9b927adcbedb2dfe77a6d189d34841f20789aa41eca1'
+ 'ff4f736ec884c4d2354a83c89ee535732cb414ef0c6443bdc8ec869f889f486b242d76e143ad59d61b182231697dfe3bdf68122cb8aae873a9776ce109a07dab')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ patch -p1 < ../bug_x86_64.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ ./configure \
+ --prefix=/usr \
+ --with-cupsfilterdir=/usr/lib/cups/filter \
+ --with-cupsppddir=/usr/share/ppd
+
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+}
+
Deleted: bug_x86_64.patch
===================================================================
--- bug_x86_64.patch 2018-11-24 18:52:43 UTC (rev 409633)
+++ bug_x86_64.patch 2018-11-24 18:52:52 UTC (rev 409634)
@@ -1,99 +0,0 @@
-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)
-
Copied: epson-inkjet-printer-escpr/repos/community-x86_64/bug_x86_64.patch (from rev 409633, epson-inkjet-printer-escpr/trunk/bug_x86_64.patch)
===================================================================
--- bug_x86_64.patch (rev 0)
+++ bug_x86_64.patch 2018-11-24 18:52:52 UTC (rev 409634)
@@ -0,0 +1,99 @@
+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)
+
More information about the arch-commits
mailing list