net-print/epson-inkjet-printer-escpr: Unify patch

Signed-off-by: Mike Pagano <mpagano@gentoo.org>

4 files changed, 2 insertions, 131 deletions

diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.8.4.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.8.4.ebuild
index 0f22fc7d8835..64af8c42cefc 100644
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.8.4.ebuild
+++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.8.4.ebuild
@@ -20,7 +20,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}/1.6.5-warnings.patch"
 	"${FILESDIR}/${PN}-1.7.7-fnocommon.patch"
-	"${FILESDIR}/${P}-1-missing-include.patch"
+	"${FILESDIR}/${PN}-1.8-missing-include.patch"
 )
 
 src_configure() {
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.8.5.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.8.5.ebuild
index 051693641546..661f5e9b014f 100644
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.8.5.ebuild
+++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.8.5.ebuild
@@ -20,7 +20,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}/1.6.5-warnings.patch"
 	"${FILESDIR}/${PN}-1.7.7-fnocommon.patch"
-	"${FILESDIR}/${P}-1-missing-include.patch"
+	"${FILESDIR}/${PN}-1.8-missing-include.patch"
 )
 
 src_configure() {
diff --git a/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.8.4-1-missing-include.patch b/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.8-missing-include.patch
index 4229d649bb26..4229d649bb26 100644
--- a/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.8.4-1-missing-include.patch
+++ b/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.8-missing-include.patch
diff --git a/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.8.5-1-missing-include.patch b/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.8.5-1-missing-include.patch
deleted file mode 100644
index 4229d649bb26..000000000000
--- a/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.8.5-1-missing-include.patch
+++ /dev/null
@@ -1,129 +0,0 @@
---- /dev/null	2024-02-07 07:14:59.428332875 -0500
-+++ b/lib/epson-escpage.h	2024-02-07 12:39:28.463235607 -0500
-@@ -0,0 +1,126 @@
-+/*__________________________________  epson-escpage.h   ________________________________*/
-+
-+/*       1         2         3         4         5         6         7         8        */
-+/*34567890123456789012345678901234567890123456789012345678901234567890123456789012345678*/
-+/*******************************************|********************************************/
-+/*
-+ *   Copyright (c) 2010  Seiko Epson Corporation                 All rights reserved.
-+ *
-+ *   Copyright protection claimed includes all forms and matters of
-+ *   copyrightable material and information now allowed by statutory or judicial
-+ *   law or hereinafter granted, including without limitation, material generated
-+ *   from the software programs which are displayed on the screen such as icons,
-+ *   screen display looks, etc.
-+ *
-+ */
-+/*******************************************|********************************************/
-+/*                                                                                      */
-+/*                            Epson ESC/Page command Functions                          */
-+/*                                                                                      */
-+/*******************************************|********************************************/
-+
-+#ifndef __EPSON_ESCPAGE_H__
-+#define __EPSON_ESCPAGE_H__
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+/*------------------------------------  Includes   -------------------------------------*/
-+/*******************************************|********************************************/
-+#include "epson-escpr-pvt.h"
-+#include "epson-escpr-media.h"
-+
-+/*------------------------------- Global Compiler Switch -------------------------------*/
-+/*******************************************|********************************************/
-+#define EPS_PAGE_RIT				(1)
-+#define EPS_PAGE_TONER_SAVE			(0)
-+#define EPS_PAGE_OUTUNIT_FACEDOWN	(1)
-+#define EPS_PAGE_LOWRES_MODE		(1)		/* OFF=0 / ON=1 */
-+#define EPS_PAGE_HT_ERR_DIFFUSION	(1)		/* Halftoning mode */
-+
-+/*-----------------------------------  Definitions  ------------------------------------*/
-+/*******************************************|********************************************/
-+#define	dim(x)	(sizeof(x) / sizeof(x[0]))
-+#define EPS_EJL_LINEMAX				(256)
-+
-+/*---------------------------  ESC/Page Media Declarations   ---------------------------*/
-+/*******************************************|********************************************/
-+typedef struct _tagEPS_PAGE_MEDIASIZE_ {
-+    EPS_INT32	id;
-+    EPS_INT32	paper_x;
-+    EPS_INT32	paper_y;
-+	EPS_INT32	print_area_x_border;
-+	EPS_INT32	print_area_y_border;
-+    const EPS_INT8 *name;
-+} EPS_PAGE_MEDIASIZE;
-+
-+/* Size 600dpi */
-+static const EPS_PAGE_MEDIASIZE pageMediaSize[] = {
-+	{ EPS_MSID_A4,		4960, 7016, 4720, 6776, "A4" },
-+	{ EPS_MSID_A3,		7016, 9920, 6776, 9680, "A3" },
-+	{ EPS_MSID_B4,		6072, 8600, 5832, 8360, "B4" },
-+	{ EPS_MSID_B5,		4300, 6072, 4060, 5832, "B5" },
-+	{ EPS_MSID_LETTER,	5100, 6600, 4860, 6360, "LT" },
-+	{ EPS_MSID_LEGAL,	5100, 8400, 4860, 8160, "LGL"},
-+	{ EPS_MSID_POSTCARD,2362, 3496, 2122, 3256, "PC" }
-+};
-+
-+/*---------------------------  Data Structure Declarations   ---------------------------*/
-+/*******************************************|********************************************/
-+/* command data buffer                */
-+typedef struct tagEPS_COMMAND_BUFFER 
-+{
-+	EPS_UINT32	size;		/* allocated buffer size */
-+	EPS_UINT32	len;		/* data size */
-+	EPS_INT8*	p;          
-+	void*		pExtent;
-+} EPS_COMMAND_BUFFER;
-+
-+/*--------------------------  Public Function Declarations   ---------------------------*/
-+/*******************************************|********************************************/
-+extern EPS_ERR_CODE pageInitJob				(const EPS_JOB_ATTRIB *pJobAttr);
-+extern EPS_ERR_CODE pageAllocBuffer			(void);
-+extern void			pageRelaseBuffer		(void);
-+extern EPS_ERR_CODE pageStartJob			(void);
-+extern EPS_ERR_CODE pageEndJob				(void);
-+extern EPS_ERR_CODE pageStartPage			(void);
-+extern EPS_ERR_CODE pageEndPage				(void);
-+extern EPS_ERR_CODE pageColorRow			(const EPS_BANDBMP*, EPS_RECT*);
-+extern EPS_ERR_CODE pageSendLeftovers		(void);
-+
-+    /*** Get Supported Media Function                                                   */
-+    /*** -------------------------------------------------------------------------------*/
-+extern EPS_ERR_CODE pageCreateMediaInfo  	(EPS_PRINTER_INN* printer, EPS_UINT8* pmString,
-+											 EPS_INT32 pmSize							);
-+extern void			pageClearSupportedMedia	(EPS_PRINTER_INN* printer					);
-+extern EPS_ERR_CODE pageGetPrintAreaInfoFromTable(const EPS_JOB_ATTRIB*,
-+                                                 EPS_UINT32*, EPS_UINT32*, EPS_LAYOUT_INFO*);
-+extern EPS_ERR_CODE pageCreatePrintAreaInfoFromTable (EPS_UINT32,EPS_PRINT_AREA_INFO*   );
-+
-+    /*** Get Printable Area                                                             */
-+    /*** -------------------------------------------------------------------------------*/
-+extern EPS_ERR_CODE pageGetPrintableArea  (EPS_JOB_ATTRIB*, EPS_UINT32*, EPS_UINT32*    );
-+
-+
-+/*-----------------------  ESC/Page Local Function Declarations   ----------------------*/
-+/*******************************************|********************************************/
-+typedef EPS_ERR_CODE	(*PAGE_CmdBuffGrow	)(EPS_COMMAND_BUFFER *pCmdBuff, EPS_INT32 addSize);
-+
-+extern EPS_ERR_CODE ejlStart	(EPS_COMMAND_BUFFER *pCmdBuff, PAGE_CmdBuffGrow pfncGrow);
-+extern EPS_ERR_CODE ejlEnd		(EPS_COMMAND_BUFFER *pCmdBuff, PAGE_CmdBuffGrow pfncGrow,
-+								 EPS_INT32 pageCount									);
-+extern EPS_ERR_CODE ejlPageEsc	(EPS_COMMAND_BUFFER *pCmdBuff, PAGE_CmdBuffGrow pfncGrow);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif  /* def __EPSON_ESCPAGE_H__ */
-+
-+/*__________________________________  epson-escpage.h   ________________________________*/
-+  
-+/*34567890123456789012345678901234567890123456789012345678901234567890123456789012345678*/
-+/*       1         2         3         4         5         6         7         8        */
-+/*******************************************|********************************************/
-+/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%|%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-+/***** End of File *** End of File *** End of File *** End of File *** End of File ******/
-+/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%|%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/