Attachment 207450 Details for Bug 240550 – patch for print/epson-inkjet-printer-escpr

[patch] patch for print/epson-inkjet-printer-escpr

patch-epson-inkjet-printer-escpr-1.7.3.diff (text/plain), 14.11 KB, created by Tatsuki Makino on 2019-09-13 04:24:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tatsuki Makino

Created: 2019-09-13 04:24:23 UTC

Size: 14.11 KB

patch

obsolete

>Index: print/epson-inkjet-printer-escpr/Makefile
>===================================================================
>--- print/epson-inkjet-printer-escpr/Makefile	(revision 508908)
>+++ print/epson-inkjet-printer-escpr/Makefile	(working copy)
>@@ -1,27 +1,27 @@
> # $FreeBSD$
> 
> PORTNAME=	epson-inkjet-printer-escpr
>-PORTVERSION=	1.6.41
>+PORTVERSION=	1.7.3
> DISTVERSIONSUFFIX=	-1lsb3.2
> CATEGORIES=	print
>-MASTER_SITES=	https://download3.ebz.epson.net/dsc/f/03/00/09/33/79/927867e2774c98c0fdedb15fc7712f363fe16f41/
>+MASTER_SITES=	https://download3.ebz.epson.net/dsc/f/03/00/09/83/26/f90d0f70b33a9d7d77a2408364c47fba1ccbf943/
> 
> MAINTAINER=	tatsuki_makino@hotmail.com
> COMMENT=	Epson Inkjet Printer Driver (ESC/P-R) for Linux
> 
> LICENSE=	GPLv2+
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
> LIB_DEPENDS=	libcupsimage.so:print/cups
> 
> USES=		autoreconf dos2unix gmake libtool
>-USE_LDCONFIG=	yes
>-
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>+PORTDOCS=	AUTHORS NEWS README README.ja
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--enable-lsb
> INSTALL_TARGET=	install-strip
> SUB_FILES=	pkg-message
>-PORTDOCS=	AUTHORS COPYING NEWS README README.ja
>+USE_LDCONFIG=	yes
> 
> OPTIONS_DEFINE=	DOCS
> 
>Index: print/epson-inkjet-printer-escpr/distinfo
>===================================================================
>--- print/epson-inkjet-printer-escpr/distinfo	(revision 508908)
>+++ print/epson-inkjet-printer-escpr/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1559703600
>-SHA256 (epson-inkjet-printer-escpr-1.6.41-1lsb3.2.tar.gz) = cafbd7ec0299ccd53a0b92ab04a5f7cfee80a37a6e63119e577bcee80d27b8c6
>-SIZE (epson-inkjet-printer-escpr-1.6.41-1lsb3.2.tar.gz) = 4569692
>+TIMESTAMP = 1568343600
>+SHA256 (epson-inkjet-printer-escpr-1.7.3-1lsb3.2.tar.gz) = a810d4b474512411470931e1766e2ada2a53808270fbfb9282398e315d9b7264
>+SIZE (epson-inkjet-printer-escpr-1.7.3-1lsb3.2.tar.gz) = 4688685
>Index: print/epson-inkjet-printer-escpr/files/patch-configure.ac
>===================================================================
>--- print/epson-inkjet-printer-escpr/files/patch-configure.ac	(revision 508908)
>+++ print/epson-inkjet-printer-escpr/files/patch-configure.ac	(working copy)
>@@ -1,6 +1,6 @@
>---- configure.ac.orig	2019-04-08 05:14:01 UTC
>+--- configure.ac.orig	2019-08-28 05:40:03 UTC
> +++ configure.ac
>-@@ -58,9 +58,9 @@ AC_ARG_WITH([cupsfilterdir],
>+@@ -57,9 +57,9 @@ AC_ARG_WITH([cupsfilterdir],
>  if test "xno" = "x${with_cupsfilterdir}"; then
>     if test "xyes" = "x$have_cups_config" ; then
>        dnl `@<:@' , `@:>@' are replaced with  `[' , `]'
>@@ -12,7 +12,7 @@
>     fi
>  else
>     CUPS_FILTER_DIR="${with_cupsfilterdir}"
>-@@ -72,13 +72,11 @@ AC_ARG_WITH([cupsppddir],
>+@@ -71,13 +71,11 @@ AC_ARG_WITH([cupsppddir],
>    [],
>    [with_cupsppddir=no])
>  if test "xno" = "x${with_cupsppddir}"; then
>@@ -29,7 +29,7 @@
>     fi
>  else
>     CUPS_PPD_DIR="${with_cupsppddir}"
>-@@ -109,6 +107,16 @@ AC_ARG_WITH([internal],
>+@@ -108,6 +106,16 @@ AC_ARG_WITH([internal],
>  AC_SUBST([INTERNAL_PPD])
>  AC_SUBST([INTERNAL_PPD_OPTION])
>  
>@@ -46,7 +46,7 @@
>  dnl Checks for header files.
>  AC_HEADER_STDC
>  AC_HEADER_STAT
>-@@ -116,17 +124,23 @@ AC_HEADER_TIME
>+@@ -115,17 +123,23 @@ AC_HEADER_TIME
>  AC_STRUCT_TM
>  AC_TYPE_PID_T
>  AC_TYPE_SIZE_T
>@@ -71,7 +71,7 @@
>          signal.h \
>          stdarg.h \
>          stddef.h \
>-@@ -137,21 +151,45 @@ AC_CHECK_HEADERS([\
>+@@ -136,21 +150,45 @@ AC_CHECK_HEADERS([\
>          time.h \
>          unistd.h \
>          ])
>Index: print/epson-inkjet-printer-escpr/files/patch-lib_Makefile.am
>===================================================================
>--- print/epson-inkjet-printer-escpr/files/patch-lib_Makefile.am	(revision 508908)
>+++ print/epson-inkjet-printer-escpr/files/patch-lib_Makefile.am	(working copy)
>@@ -1,6 +1,6 @@
>---- lib/Makefile.am.orig	2017-03-24 04:35:04 UTC
>+--- lib/Makefile.am.orig	2019-07-31 06:49:48 UTC
> +++ lib/Makefile.am
>-@@ -44,7 +44,7 @@ DEFINES 		+=	-DGCOMSW_ASYNCJOB_SUPPORT
>+@@ -43,7 +43,7 @@ DEFINES 		+=	-DGCOMSW_ASYNCJOB_SUPPORT
>  DEFINES 	    +=	-DGCOMSW_RAWFILE_SUPPORT
>  
>  lib_LTLIBRARIES = libescpr.la
>@@ -9,7 +9,7 @@
>  ## Make sure these will be cleaned even when they're not built by
>  ## default.
>  CLEANFILES = libescpr.la
>-@@ -71,5 +71,5 @@ libescpr_la_SOURCES = \
>+@@ -70,5 +70,5 @@ libescpr_la_SOURCES = \
>  	epson-typedefs.h \
>  	epson-usb.c epson-usb.h
>  
>Index: print/epson-inkjet-printer-escpr/files/patch-ppd_Makefile.am
>===================================================================
>--- print/epson-inkjet-printer-escpr/files/patch-ppd_Makefile.am	(revision 508908)
>+++ print/epson-inkjet-printer-escpr/files/patch-ppd_Makefile.am	(working copy)
>@@ -1,6 +1,6 @@
>---- ppd/Makefile.am.orig	2019-05-08 06:19:49 UTC
>+--- ppd/Makefile.am.orig	2019-08-28 05:35:05 UTC
> +++ ppd/Makefile.am
>-@@ -616,8 +616,10 @@ EXTRA_DIST = $(cupsppd_DATA)
>+@@ -624,8 +624,10 @@ EXTRA_DIST = $(cupsppd_DATA)
>  
>  # LSBãã«ãç°å¢ã®å ´åã~/.rpmmacros %adjust_ppds ãæã£ã¦ããå¦çãå®æ½
>  install-data-hook:
>Index: print/epson-inkjet-printer-escpr/files/patch-src_Makefile.am
>===================================================================
>--- print/epson-inkjet-printer-escpr/files/patch-src_Makefile.am	(revision 508908)
>+++ print/epson-inkjet-printer-escpr/files/patch-src_Makefile.am	(working copy)
>@@ -1,6 +1,6 @@
>---- src/Makefile.am.orig	2017-03-24 04:35:04 UTC
>+--- src/Makefile.am.orig	2019-07-31 06:49:48 UTC
> +++ src/Makefile.am
>-@@ -28,7 +28,11 @@ cupsfilter_PROGRAMS =\
>+@@ -27,7 +27,11 @@ cupsfilter_PROGRAMS =\
>  epson_escpr_wrapper_CFLAGS =\
>  	-Wall\
>  	-DCUPS_FILTER_NAME=\"epson-escpr\" \
>Index: print/epson-inkjet-printer-escpr/files/patch-src_filter.c
>===================================================================
>--- print/epson-inkjet-printer-escpr/files/patch-src_filter.c	(revision 508908)
>+++ print/epson-inkjet-printer-escpr/files/patch-src_filter.c	(working copy)
>@@ -1,6 +1,6 @@
>---- src/filter.c.orig	2019-01-17 09:25:18 UTC
>+--- src/filter.c.orig	2019-07-31 06:49:48 UTC
> +++ src/filter.c
>-@@ -33,7 +33,10 @@
>+@@ -32,7 +32,10 @@
>  
>  #include "epson-protocol.h"
>  #include "epson-escpr-api.h"
>@@ -11,7 +11,7 @@
>  
>  #include "err.h"
>  #include "mem.h"
>-@@ -42,6 +45,7 @@
>+@@ -41,6 +44,7 @@
>  #include "libprtX.h"
>  #include "optBase.h"
>  #include "linux_cmn.h"
>@@ -19,7 +19,7 @@
>  
>  #define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4)
>  
>-@@ -381,7 +385,7 @@ main (int argc, char *argv[])
>+@@ -380,7 +384,7 @@ main (int argc, char *argv[])
>  	}
>  	
>  	printJob.jobStatus = EPS_STATUS_ESTABLISHED;
>@@ -28,7 +28,7 @@
>  ///////////////////////////////////////////////////////////////////////////////////////////////////////////	
>  
>  	print_area_x = printJob.printableAreaWidth;
>-@@ -410,7 +414,7 @@ main (int argc, char *argv[])
>+@@ -409,7 +413,7 @@ main (int argc, char *argv[])
>  	while ((read_page_no = read (STDIN_FILENO, &page_num, 1)) > 0)  // æåã« pageçªå·ãèªã¿è¾¼ã¿
>  	{
>  		long x_count, y_count;
>@@ -37,7 +37,7 @@
>  		y_count = 0;
>  		band_line_count = 0;
>  
>-@@ -498,7 +502,11 @@ main (int argc, char *argv[])
>+@@ -497,7 +501,11 @@ main (int argc, char *argv[])
>  					pagebuf+= bandBmp.widthBytes;
>  					posbuf+=bandBmp.widthBytes;
>  
>@@ -49,7 +49,7 @@
>  					bandBmp.bits += band_line_count;
>  					
>  				}
>-@@ -509,13 +517,17 @@ main (int argc, char *argv[])
>+@@ -508,13 +516,17 @@ main (int argc, char *argv[])
>  				memcpy(pagebuf, bandBmp.bits, bandBmp.widthBytes);
>  				pagebuf+= bandBmp.widthBytes;
>  				posbuf+= bandBmp.widthBytes;
>@@ -68,7 +68,7 @@
>  			for (revert = print_area_y; revert > 0; revert--)
>  			{
>  				if (3 != byte_par_pixel)
>-@@ -659,7 +671,11 @@ main (int argc, char *argv[])
>+@@ -658,7 +670,11 @@ main (int argc, char *argv[])
>  #endif
>  					debug_msg("printHeight = %d\n", printHeight);
>  					debug_msg("widthByte = %d\n", bandBmp.widthBytes);
>@@ -80,7 +80,7 @@
>  					bandBmp.bits += band_line_count;
>  				}
>  				
>-@@ -681,7 +697,11 @@ main (int argc, char *argv[])
>+@@ -680,7 +696,11 @@ main (int argc, char *argv[])
>  				fprintf(fp, "\n");
>  				fclose(fp);
>  #endif
>@@ -92,7 +92,7 @@
>  				bandBmp.bits += band_line_count;
>  			}
>  
>-@@ -880,7 +900,7 @@ EPS_INT32 print_spool_fnc(void* hParam, const EPS_UINT
>+@@ -879,7 +899,7 @@ EPS_INT32 print_spool_fnc(void* hParam, const EPS_UINT
>  
>  //	fwrite (pBuf, cbBuf, 1, outfp);
>  
>Index: print/epson-inkjet-printer-escpr/files/patch-src_mem.c
>===================================================================
>--- print/epson-inkjet-printer-escpr/files/patch-src_mem.c	(revision 508908)
>+++ print/epson-inkjet-printer-escpr/files/patch-src_mem.c	(working copy)
>@@ -1,6 +1,6 @@
>---- src/mem.c.orig	2017-03-24 04:35:04 UTC
>+--- src/mem.c.orig	2019-07-31 06:49:48 UTC
> +++ src/mem.c
>-@@ -24,6 +24,7 @@
>+@@ -23,6 +23,7 @@
>  
>  #include <stdlib.h>
>  #include "mem.h"
>Index: print/epson-inkjet-printer-escpr/files/patch-src_wrapper.c
>===================================================================
>--- print/epson-inkjet-printer-escpr/files/patch-src_wrapper.c	(revision 508908)
>+++ print/epson-inkjet-printer-escpr/files/patch-src_wrapper.c	(working copy)
>@@ -1,6 +1,6 @@
>---- src/wrapper.c.orig	2018-03-08 04:25:02 UTC
>+--- src/wrapper.c.orig	2019-07-31 06:49:48 UTC
> +++ src/wrapper.c
>-@@ -177,8 +177,8 @@ main (int argc, char *argv[])
>+@@ -176,8 +176,8 @@ main (int argc, char *argv[])
>  
>  	int total_read = 0;
>  	int total_read_cache = 0;
>Index: print/epson-inkjet-printer-escpr/pkg-descr
>===================================================================
>--- print/epson-inkjet-printer-escpr/pkg-descr	(revision 508908)
>+++ print/epson-inkjet-printer-escpr/pkg-descr	(working copy)
>@@ -1,11 +1,12 @@
>-This software is a filter program used with Common UNIX Printing
>-System (CUPS) from the Linux. This can supply the high quality print
>-with Seiko Epson Color Ink Jet Printers.
>+This software is a filter program used with the Common UNIX Printing
>+System (CUPS) on the Linux platform.
>+The software offers high quality printing with Seiko Epson color ink jet
>+printers.
> 
>-This product supports only EPSON ESC/P-R printers. This package can be
>-used for all EPSON ESC/P-R printers.
>+This product can only be used with printers that support the Epson ESC/P-R
>+language.
> 
>-For detail list of supported printer, please refer to below site:
>+Please see refer to follows for a list of supported printers.
> http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
> 
>-WWW: http://download.ebz.epson.net/dsc/search/01/search/
>+WWW: http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
>Index: print/epson-inkjet-printer-escpr/pkg-plist
>===================================================================
>--- print/epson-inkjet-printer-escpr/pkg-plist	(revision 508908)
>+++ print/epson-inkjet-printer-escpr/pkg-plist	(working copy)
>@@ -49,6 +49,7 @@
> share/cups/model/epson-inkjet-printer-escpr/Epson-EP-709A_Series-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-EP-710A_Series-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-EP-711A_Series-epson-escpr-en.ppd
>+share/cups/model/epson-inkjet-printer-escpr/Epson-EP-712A_Series-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-EP-774A-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-EP-775A_Series-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-EP-776A_Series-epson-escpr-en.ppd
>@@ -63,6 +64,7 @@
> share/cups/model/epson-inkjet-printer-escpr/Epson-EP-808A_Series-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-EP-810A_Series-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-EP-811A_Series-epson-escpr-en.ppd
>+share/cups/model/epson-inkjet-printer-escpr/Epson-EP-812A_Series-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-EP-901A-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-EP-901F-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-EP-902A-epson-escpr-en.ppd
>@@ -98,6 +100,7 @@
> share/cups/model/epson-inkjet-printer-escpr/Epson-ET-7750_Series-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-ET-M1100_Series-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-ET-M1120_Series-epson-escpr-en.ppd
>+share/cups/model/epson-inkjet-printer-escpr/Epson-EW-052A_Series-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-EW-M5071FT_Series-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-EW-M571T_Series-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-EW-M660FT_Series-epson-escpr-en.ppd
>@@ -406,6 +409,7 @@
> share/cups/model/epson-inkjet-printer-escpr/Epson-TX720_Artisan720-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-TX820_Artisan830-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-WF-100_Series-epson-escpr-en.ppd
>+share/cups/model/epson-inkjet-printer-escpr/Epson-WF-110_Series-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-WF-2510_Series-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-WF-2520_Series-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-WF-2530_Series-epson-escpr-en.ppd
>@@ -415,6 +419,7 @@
> share/cups/model/epson-inkjet-printer-escpr/Epson-WF-2660_Series-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-WF-2750_Series-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-WF-2760_Series-epson-escpr-en.ppd
>+share/cups/model/epson-inkjet-printer-escpr/Epson-WF-2810_Series-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-WF-2830_Series-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-WF-2850_Series-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-WF-3010_Series-epson-escpr-en.ppd
>@@ -513,6 +518,7 @@
> share/cups/model/epson-inkjet-printer-escpr/Epson-XP-255_257_Series-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-XP-300_Series-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-XP-302_303_305_306_Series-epson-escpr-en.ppd
>+share/cups/model/epson-inkjet-printer-escpr/Epson-XP-3100_Series-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-XP-310_Series-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-XP-312_313_315_Series-epson-escpr-en.ppd
> share/cups/model/epson-inkjet-printer-escpr/Epson-XP-320_Series-epson-escpr-en.ppd

Flags:

tatsuki_makino: maintainer-approval+

Actions: View | Diff

Attachments on bug 240550: 207450 | 207451