gentoo auto-resync : 25:08:2024 - 14:56:25

4 files changed, 129 insertions, 0 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index e1ebf751bee7..671dd0484723 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/epson-inkjet-printer-escpr/Manifest b/net-print/epson-inkjet-printer-escpr/Manifest
index 0b23214a3a27..21fbd95154fc 100644
--- a/net-print/epson-inkjet-printer-escpr/Manifest
+++ b/net-print/epson-inkjet-printer-escpr/Manifest
@@ -2,8 +2,11 @@ AUX 1.6.5-warnings.patch 1115 BLAKE2B eac889dc8f5b39bbcf633c3ff2469ba1d3e07f475a
 AUX epson-inkjet-printer-escpr-1.7.7-fnocommon.patch 309 BLAKE2B 70e10c99dcf8b5d06acd38722f419c09f994253538d88cc9621051ee58b8a9cbe203c35c279c9ef8b5f0f7cd091118a0b2ccf802e09e2996f4e6346e7927f695 SHA512 5cff64797453868d1d0540a22fd72b53d7214d2e9c574cdf635206baf71fc227147babcfe97c73193ca356ad40afa5bb7ea80107576efee138b936e052b9fb2d
 AUX epson-inkjet-printer-escpr-1.8-missing-include.patch 6575 BLAKE2B 24e0d0e2674fb74b4cfabe27a695c08f4b1a87a26ddb82956157449c09c4f0e71ca9585db3507b92902ec7deb02a41a3aa9df770820379bcd851b47f4865b8e1 SHA512 392b4713ca94fd8656d39205f61db3f5491c09a15f5dc1f1239a07928d62d243d24941893c197bc227195129e7e346c8479de234aaafbf91d64716dba395068a
 AUX epson-inkjet-printer-escpr-2-gcc14.patch 11552 BLAKE2B 2ca31fa995937129cedd93945d1f8603e76f5239ac1aec802a4c58f889d78d4b514fe42ef16608f946c7f2895650ff8a89dace11b64a1cbfef78172ed92dc966 SHA512 c40741c96b462c938d54b646dcbf04ae69c7f9b227f0dbb5cc587e46730359c717e5cf0272c729c7343b18612110153cef454d85e19d76ca7b3e94f36ca0a498
+AUX gcc-no-implicit-function-declaration-1.2.patch 2421 BLAKE2B 158c074ec7d37ee1a09b29bbee21c29da0ff2784fe25b22f64d2b199b07a8d8c90ca92477f7c284ded194c1a66bee219943b7c827bf7fb1b58227b3e7caedc3b SHA512 55533abc7b4f4cfa6c95868726721e59d187601722c0b2daa38d913f15ce9c695ae4c900274c46a770cfcdf85c46f77c724b936686a70bae34be5660c41a34aa
 DIST epson-inkjet-printer-escpr-1.8.5-1.tar.gz 5666905 BLAKE2B 549c948709993779b5615b501038fdceb6c3d6f173709b8cf99459346fff89923bdbe1babe34ee98eed4e1ebbd7a4b5962ddbc9cec9711aa15ff2056fec3d436 SHA512 4117b1efe903e4f506bbc67c45079f1d467ff6527691308734e55d32feeda3ec44b2dd85361e0243114f924eef04a91b0a5e86b5008f0a32ef323989b3d2896f
+DIST epson-inkjet-printer-escpr2-1.2.15-1.tar.gz 5560479 BLAKE2B 8180fe06df8175ec31044b0eec2a125b9567c11a827343401a07e59e8bd93e689617b9b29364374f1d6ba6d6bca320d6615f601791c59e966d3a4d63f7adbeb0 SHA512 62cd5161f65f8ca6f8c1a8bb755e06eb147d4a06b5f796a8068ed9235b3abf38e6ccb10e82bdd93fddc085b90a7f9332e024ba09679aa08490a05735c0372653
 DIST epson-inkjet-printer-escpr2-1.2.9-1.tar.gz 5367737 BLAKE2B 6868569a6bed622e2f50619a36ffb0a0f7e834fd8a794ae3bc906d971db26b0c86386c9545190ec384027d0b8e8f62ddda6cb24f1e3f60b9c535a1eeddff4332 SHA512 70ff744d42fac4c79d2994648763b0b3970ee5463a7a310a0721a63735d536cb9a0499c894289d946b30e6f564f9bf60aa61801580ab6635af211d50867921a1
+EBUILD epson-inkjet-printer-escpr-1.2.15.ebuild 985 BLAKE2B be3e9e4c4c9973124058cd95fa4b7392c220a770da4b255c9e69888264d6a9b59ad4d5aeba43d1a596f6c6b41bebb87bf2da017991bc4a4ba7ef4ccf49801b16 SHA512 a3eac5de105b129c01e95e4d73d68e05e27ce3aea6296dba73d671e2c18f940012b843e237a8f9f31dd1a715e5df2af50d5cbb218d5b65136e71049bf2ff3625
 EBUILD epson-inkjet-printer-escpr-1.2.9-r1.ebuild 881 BLAKE2B 4b4f4632e1e47c8bcf311950e35f9e400e397cb25f0ace2ef89b6c45163cdc86a81c67497e065ed95a643a1266c6796dedf16841ca21fbc078100f81cb4b9829 SHA512 0577511cedd44fd04ef6ef681e3d5cd0430a0a6626834fe19df60ac677052b5c64c4779e7e3eca9a5c2a074fcf634804d3e45f7f839a288d8a3e45da6bc1e376
 EBUILD epson-inkjet-printer-escpr-1.8.5.ebuild 1079 BLAKE2B e718ecb13d39a8bfe03f65f8adad42895b853f686ad3f3166bfe3f0735b80aa7e5c7db34c7906a1dbc2bc1f8dff61b09d304dd118d90646cec39ab96a0a55753 SHA512 6ee84e32bd3701f8aa2bd1a6bff6b49044a1b3ebbe78599e04bf9355ffee8493013fe5bc78d04cc922053c9337266b9e66250e48b83dab8f42c1e75506fd8106
 MISC metadata.xml 1890 BLAKE2B b90489bd80a2957d1a6287a727d847c1fdbdfb576f7e816b60196b7d82ac13c72fd19322202f651cdfd11b56fe09fe962230f0d2eb4f1a9565ff9ad9b9ab0c24 SHA512 8cb73e282d607a5699d4c3e4f6f6f4663153ea9a0240a5b6b73317ab7ffb8ba1d54ed00c7b6ed53045059b246f62ee841cf27cc83a56a7ed72d9b2131463bc24
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.2.15.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.2.15.ebuild
new file mode 100644
index 000000000000..f29a147b08b4
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.2.15.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}2-${PV}"
+
+DESCRIPTION="Epson Inkjet Printer Driver 2 (ESC/P-R) for Linux"
+HOMEPAGE="https://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
+SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/16/06/85/fddc1d5996d0cab4dceea35852a2e430fb124993/${MY_P}-1.tar.gz"
+S="${WORKDIR}/${MY_P}"
+LICENSE="EPSON LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~amd64"
+
+QA_FLAGS_IGNORED="/usr/lib64/libescpr2.so.1.0.0"
+
+DEPEND="net-print/cups"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	#"${FILESDIR}/gcc-no-implicit-function-declaration-${PV}.patch"
+	"${FILESDIR}/gcc-no-implicit-function-declaration-$(ver_cut 1-2 ${PV}).patch"
+)
+
+src_configure() {
+	econf \
+		--with-cupsfilterdir="${EPREFIX}/usr/libexec/cups/filter"
+		--with-cupsppddir="${EPREFIX}/usr/share/ppd"
+}
+
+src_install() {
+	default
+
+	find "${ED}/usr/lib64" -name "*.la" -delete \
+		|| die "Removal of libtool files (.la) has failed."
+}
diff --git a/net-print/epson-inkjet-printer-escpr/files/gcc-no-implicit-function-declaration-1.2.patch b/net-print/epson-inkjet-printer-escpr/files/gcc-no-implicit-function-declaration-1.2.patch
new file mode 100644
index 000000000000..ab244ddbe71b
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/files/gcc-no-implicit-function-declaration-1.2.patch
@@ -0,0 +1,89 @@
+From 70b13d5be6d9ca55c0a9ec0dd401c9401922b1b7 Mon Sep 17 00:00:00 2001
+From: Aleix Quintana Alsius <kinta@communia.org>
+Date: Fri, 31 May 2024 23:51:51 +0200
+Subject: [PATCH] reroll update x86-64 patch
+
+---
+ src/filter.c  | 12 +++++++++---
+ src/mem.c     |  1 +
+ src/wrapper.c |  1 +
+ 3 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/src/filter.c b/src/filter.c
+index d53e091..5bb2a5f 100644
+--- a/src/filter.c
++++ b/src/filter.c
+@@ -39,6 +39,7 @@
+ #include "epson-escpr-api.h"
+ #include "epson-escpr-services.h"
+ #include "epson-escpr-mem.h"
++#include "epson-escpr-services.h"
+ 
+ #include "err.h"
+ #include "mem.h"
+@@ -48,6 +49,11 @@
+ #include "optBase.h"
+ #include "linux_cmn.h"
+ #include "custompage.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)
+ 
+@@ -453,7 +459,7 @@ main (int argc, char *argv[])
+ 	}
+ 	
+ 	printJob.jobStatus = EPS_STATUS_ESTABLISHED;
+-	int printHeight = 0;
++	EPS_UINT32 printHeight = 0;
+ ///////////////////////////////////////////////////////////////////////////////////////////////////////////	
+ 
+ 	print_area_x = printJob.printableAreaWidth;
+@@ -632,7 +638,7 @@ main (int argc, char *argv[])
+ 						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;
+ 			}
+ 
+@@ -925,7 +931,7 @@ set_pips_parameter (filter_option_t *filter_opt_p, EPS_OPT *printOpt)
+ 
+ 	/* Get number of pages */
+ 	char page_num;
+-	read (STDIN_FILENO, &page_num, 1);
++	(void)read (STDIN_FILENO, &page_num, 1);
+ 	debug_msg("total pages = %d\n", page_num);
+ 
+ 	/* Others */
+diff --git a/src/mem.c b/src/mem.c
+index f53f2bc..d6c945a 100644
+--- a/src/mem.c
++++ b/src/mem.c
+@@ -23,6 +23,7 @@
+ 
+ #include <stdlib.h>
+ #include "mem.h"
++#include "err.h"
+ 
+ void *
+ mem_malloc (unsigned int size, bool_t crit)
+diff --git a/src/wrapper.c b/src/wrapper.c
+index 1fa6daa..bfd567d 100644
+--- a/src/wrapper.c
++++ b/src/wrapper.c
+@@ -33,6 +33,7 @@
+ /* added 22-04-2004 */
+ #include <signal.h>
+ 
++#include "custompage.h"
+ #include "libprtX.h"
+ 
+ #define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4)
+-- 
+2.45.1
+