From 67ef3600e8b820e0c2327eb0a058c04fc6f2e20c Mon Sep 17 00:00:00 2001 From: Marcin Deranek Date: Wed, 26 Jan 2022 21:38:01 +0100 Subject: Dropping in favour of epson-inkjet-printer-escpr2 from escpr2 overlay --- net-print/epson-inkjet-printer-escpr2/Manifest | 4 -- .../epson-inkjet-printer-escpr2-1.1.42.ebuild | 37 ----------- .../files/bug_x86_64.patch | 76 ---------------------- net-print/epson-inkjet-printer-escpr2/metadata.xml | 8 --- 4 files changed, 125 deletions(-) delete mode 100644 net-print/epson-inkjet-printer-escpr2/Manifest delete mode 100644 net-print/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2-1.1.42.ebuild delete mode 100644 net-print/epson-inkjet-printer-escpr2/files/bug_x86_64.patch delete mode 100644 net-print/epson-inkjet-printer-escpr2/metadata.xml (limited to 'net-print/epson-inkjet-printer-escpr2') diff --git a/net-print/epson-inkjet-printer-escpr2/Manifest b/net-print/epson-inkjet-printer-escpr2/Manifest deleted file mode 100644 index f77eba0..0000000 --- a/net-print/epson-inkjet-printer-escpr2/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX bug_x86_64.patch 2075 BLAKE2B 9283624efcd02b0054b6dfe067b54e2ca176d15caf314d3ba9e1cb73b35f8ab093231bead439af4b7f535ee91cba3a2127ab263850c152966346b7ab2cd51635 SHA512 ec751f27362d7fca4cc7bad33a552670a340dc7bb6728b700580886e145cd31346318d51a429be1a377b6ef03a21da02241429968d2a7c120cbabe0a873601d9 -DIST epson-inkjet-printer-escpr2-1.1.42-1lsb3.2.src.rpm 3941611 BLAKE2B aa8fa85c07441bfc88d68977c958fc3f3ac845365dd4db93683d531de60f64c04d2b2111a4a40e167e69d7416c7a361afd2b36d0613705069f08d9ed8454c693 SHA512 3811b128077c86e4f2574dfb19479198d2a1cb34a2ee8f36f32a6154e6c6d719f025f3f85e382e8f4c4409815ac5a7e59bd208222904943704a13849e6272111 -EBUILD epson-inkjet-printer-escpr2-1.1.42.ebuild 855 BLAKE2B 846263754e7182869d655af1c7da37fcb7f1c7406e25d8aee359b3ddaf59a79c89b83d026faa788accb5af9167f341051f2dccf7813f59efeeb132fde76dd4b8 SHA512 344e79b633c4133bff9e9b7a13f897a915d2729708fb1aef48cbd00e6cec79ed4b8eaff79e03c728496da377b7a39b6886d85b31779d438746b8798765666ba0 -MISC metadata.xml 255 BLAKE2B fec818e56877b2451e889c05ed95700632e02438bbe9ae515925548714246b19bdf3b141e0771f64b92483ade6734afe8828d0b177db1d76902c535871ea5551 SHA512 f5e088eef2af90b4f6129ca7ed31d833f61521a8fe6c60e5d5cb871601a85374bf330f445c298990760d51e5186ec8156a192ff30b42f8abc3cb82d329ccc803 diff --git a/net-print/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2-1.1.42.ebuild b/net-print/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2-1.1.42.ebuild deleted file mode 100644 index 6e93a21..0000000 --- a/net-print/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2-1.1.42.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit rpm - -DESCRIPTION="Epson Inkjet Printer Driver (ESC/P-R) 2" -HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX" -SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/13/07/72/df79cc238a167b9526f70cc123459c6bbe1edbad/${P}-1lsb3.2.src.rpm" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND="net-print/cups" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/bug_x86_64.patch" -) - -src_configure() { - econf --disable-shared - - # Makefile calls ls to generate a file list which is included in Makefile.am - # Set the collation to C to avoid automake being called automatically - unset LC_ALL - export LC_COLLATE=C -} - -src_install() { - emake -C ppd DESTDIR="${D}" install - emake -C src DESTDIR="${D}" install - einstalldocs -} diff --git a/net-print/epson-inkjet-printer-escpr2/files/bug_x86_64.patch b/net-print/epson-inkjet-printer-escpr2/files/bug_x86_64.patch deleted file mode 100644 index 65f65f6..0000000 --- a/net-print/epson-inkjet-printer-escpr2/files/bug_x86_64.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/src/filter.c b/src/filter.c -index d13f10e..105eae9 100755 ---- a/src/filter.c -+++ b/src/filter.c -@@ -40,6 +40,8 @@ - #include "epson-escpr-api.h" - #include "epson-escpr-services.h" - #include "epson-escpr-mem.h" -+#include "epson-escpr-services.h" -+//#include "epson-escpage.h" - - #include "err.h" - #include "mem.h" -@@ -48,6 +50,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) - -@@ -431,7 +438,7 @@ main (int argc, char *argv[]) - } - - printJob.jobStatus = EPS_STATUS_ESTABLISHED; -- int printHeight = 0; -+ EPS_UINT32 printHeight = 0; - /////////////////////////////////////////////////////////////////////////////////////////////////////////// - - print_area_x = printJob.printableAreaWidth; -@@ -605,7 +612,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; - } - -@@ -898,7 +905,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 */ -@@ -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 ---- a/src/mem.c -+++ b/src/mem.c -@@ -24,6 +24,7 @@ - - #include - #include "mem.h" -+#include "err.h" - - void * - mem_malloc (unsigned int size, bool_t crit) --- -2.15.1 - diff --git a/net-print/epson-inkjet-printer-escpr2/metadata.xml b/net-print/epson-inkjet-printer-escpr2/metadata.xml deleted file mode 100644 index 1196209..0000000 --- a/net-print/epson-inkjet-printer-escpr2/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - marcin.deranek@slonko.net - Marcin Deranek - - -- cgit v1.2.3