* [gentoo-commits] repo/gentoo:master commit in: net-print/c2esp/, net-print/c2esp/files/
@ 2018-08-27 21:05 James Le Cuirot
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2018-08-27 21:05 UTC (permalink / raw
To: gentoo-commits
commit: 6187a8a72f11aa97a1af587b9ca412642117dc87
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 27 19:44:11 2018 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 27 21:05:33 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6187a8a7
net-print/c2esp: Drop old 25c
Package-Manager: Portage-2.3.48, Repoman-2.3.10
net-print/c2esp/Manifest | 1 -
net-print/c2esp/c2esp-25c.ebuild | 52 ----------------------
.../c2esp/files/c2esp-25c-ldflags-cppflags.patch | 32 -------------
3 files changed, 85 deletions(-)
diff --git a/net-print/c2esp/Manifest b/net-print/c2esp/Manifest
index c3a56a3241b..9fe17203207 100644
--- a/net-print/c2esp/Manifest
+++ b/net-print/c2esp/Manifest
@@ -1,3 +1,2 @@
DIST c2esp-27.tar.gz 143551 BLAKE2B 7cc80fd72eed24c24cb153d7395a692849c51249ca40a563f94bedbb82c6d976bce6b44d47dbe21c36ec40f26571178f562b175485f404d356724b4bc3f611bf SHA512 d3ff9dc6de7cf692e4be4f4b316f862d271bff06181f0000daf1ce2fb6921f1b24efe88ec24f7b811d78cb9dca18fcba3f17dd5273ac84ceb9f6bfcecedeecce
-DIST c2esp25c.tar.gz 338047 BLAKE2B 645127bdd61f478d519a7d17a1f621357e0c80ac6b313832ddcaba6744cb7f4a62a592c1140293e78a3a63447ad7295bd3fcda0f6f18f0d33b1cca0cca162803 SHA512 788da75c0049c1aa445890d67a7088bc4e7aa5c4e3e67689677fa5bee0e17e29fbb6e7ba9397aaec99f43ba79043aca7d147b6c510e3dd472d238ce6e2636b12
DIST c2esp26.tar.gz 127593 BLAKE2B 84e6ff61fc5af225526a569861bf316a2b7b1aa8f2bf4d7af15a04042f9dd2da7726d34b66d12dea8748532a54d5ae3a1b0bbfafdccccbea192725751cf3416e SHA512 aa1ca61f895de4892e1058b349fcf1830da78455ffbd0d9989b7ac4e922076e184de91a2b79f285d946d29ece7a6d8159f62c900ed8d6c76859a4261c92da359
diff --git a/net-print/c2esp/c2esp-25c.ebuild b/net-print/c2esp/c2esp-25c.ebuild
deleted file mode 100644
index 8b27ec8952c..00000000000
--- a/net-print/c2esp/c2esp-25c.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-MY_P=${PN}${PV}
-
-DESCRIPTION="A cups filter for Kodak ESP printers"
-HOMEPAGE="http://cupsdriverkodak.sf.net/"
-SRC_URI="mirror://sourceforge/cupsdriverkodak/files/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-DEPEND=">=media-libs/jbigkit-2.0-r1
- >=net-print/cups-1.4"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-ldflags-cppflags.patch
-
- # Remove embedded media-libs/jbigkit
- rm -f *jbig* || die
-
- # Remove the embedded jbig files from the Makefile's dependencies:
- sed -i \
- -e '/^[a-z0-9.]*:/s/\$(LIBJBG[[:digit:]]*)//g' \
- -e '/^[a-z0-9.]*:/s/jbig[^ ]*\.h//g' \
- -e '/\$(INSTALL).*COPYING/d' \
- Makefile || die
-
- # Use Gentoo-style cups paths
- sed -i -e s,/usr/lib/cups/filter,/usr/libexec/cups/filter,g ppd/*.ppd || die
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" LIBJBG=-ljbig LIBJBG85=-ljbig85
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- FILTERBIN="${D}"/usr/libexec/cups/filter \
- DOCDIR="${ED}"/usr/share/doc/${PF} \
- install
-}
diff --git a/net-print/c2esp/files/c2esp-25c-ldflags-cppflags.patch b/net-print/c2esp/files/c2esp-25c-ldflags-cppflags.patch
deleted file mode 100644
index a551cc0f46a..00000000000
--- a/net-print/c2esp/files/c2esp-25c-ldflags-cppflags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -166,16 +166,16 @@
- @echo
-
- c2esp: c2esp.o c2espcommon.o $(LIBJBG85)
-- $(CC) $(CFLAGS) -o $@ c2esp.o c2espcommon.o -lcupsimage -lcups -lcupsdriver $(LIBJBG85)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ c2esp.o c2espcommon.o -lcupsimage -lcups -lcupsdriver $(LIBJBG85)
-
- c2espC: c2espC.o c2espcommon.o
-- $(CC) $(CFLAGS) -o $@ c2espC.o c2espcommon.o -lcupsimage -lcups -lcupsdriver -lz
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ c2espC.o c2espcommon.o -lcupsimage -lcups -lcupsdriver -lz
-
- command2esp: command2esp.o c2espcommon.o
-- $(CC) $(CFLAGS) -o $@ command2esp.o c2espcommon.o -lcups -lcupsdriver
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ command2esp.o c2espcommon.o -lcups -lcupsdriver
-
- myopldecode: myopldecode.o $(LIBJBG)
-- $(CC) $(CFLAGS) -o $@ $@.o $(LIBJBG) -lz
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.o $(LIBJBG) -lz
-
- #
- # Installation rules
-@@ -351,3 +326,8 @@
- command2esp.o: c2espcommon.h
- c2espcommon.o: c2espcommon.h
-
-+
-+# Respect CPPFLAGS.
-+.SUFFIXES: .c .o
-+.c.o:
-+ $(CC) -c $(CFLAGS) $(CPPFLAGS) -o '$@' '$<'
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/c2esp/, net-print/c2esp/files/
@ 2018-08-27 21:05 James Le Cuirot
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2018-08-27 21:05 UTC (permalink / raw
To: gentoo-commits
commit: 3496e0734aea0e27e88cfe7b5bf804714c5fcba6
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 27 19:43:13 2018 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 27 21:05:32 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3496e073
net-print/c2esp: Version bump to 27, EAPI 7
This now uses CMake, which is much less painful. Unfortunately my old
printer turned out to be dead so this has only been build tested.
Package-Manager: Portage-2.3.48, Repoman-2.3.10
net-print/c2esp/Manifest | 1 +
net-print/c2esp/c2esp-27.ebuild | 29 ++++++++++++++++++
.../files/0001-Fix-various-missing-includes.patch | 35 ++++++++++++++++++++++
3 files changed, 65 insertions(+)
diff --git a/net-print/c2esp/Manifest b/net-print/c2esp/Manifest
index bbe6a99c995..c3a56a3241b 100644
--- a/net-print/c2esp/Manifest
+++ b/net-print/c2esp/Manifest
@@ -1,2 +1,3 @@
+DIST c2esp-27.tar.gz 143551 BLAKE2B 7cc80fd72eed24c24cb153d7395a692849c51249ca40a563f94bedbb82c6d976bce6b44d47dbe21c36ec40f26571178f562b175485f404d356724b4bc3f611bf SHA512 d3ff9dc6de7cf692e4be4f4b316f862d271bff06181f0000daf1ce2fb6921f1b24efe88ec24f7b811d78cb9dca18fcba3f17dd5273ac84ceb9f6bfcecedeecce
DIST c2esp25c.tar.gz 338047 BLAKE2B 645127bdd61f478d519a7d17a1f621357e0c80ac6b313832ddcaba6744cb7f4a62a592c1140293e78a3a63447ad7295bd3fcda0f6f18f0d33b1cca0cca162803 SHA512 788da75c0049c1aa445890d67a7088bc4e7aa5c4e3e67689677fa5bee0e17e29fbb6e7ba9397aaec99f43ba79043aca7d147b6c510e3dd472d238ce6e2636b12
DIST c2esp26.tar.gz 127593 BLAKE2B 84e6ff61fc5af225526a569861bf316a2b7b1aa8f2bf4d7af15a04042f9dd2da7726d34b66d12dea8748532a54d5ae3a1b0bbfafdccccbea192725751cf3416e SHA512 aa1ca61f895de4892e1058b349fcf1830da78455ffbd0d9989b7ac4e922076e184de91a2b79f285d946d29ece7a6d8159f62c900ed8d6c76859a4261c92da359
diff --git a/net-print/c2esp/c2esp-27.ebuild b/net-print/c2esp/c2esp-27.ebuild
new file mode 100644
index 00000000000..69e58fbb92f
--- /dev/null
+++ b/net-print/c2esp/c2esp-27.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A CUPS filter for Kodak ESP printers"
+HOMEPAGE="https://sourceforge.net/projects/cupsdriverkodak"
+SRC_URI="mirror://sourceforge/cupsdriverkodak/files/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND=">=media-libs/jbigkit-2.0-r1:=
+ >=net-print/cups-1.6
+ sys-libs/zlib:="
+
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/0001-Fix-various-missing-includes.patch
+)
+
+src_configure() {
+ # Don't trust cups-config in case ROOT!=/.
+
+ econf \
+ --with-cupsfilterdir="${EPREFIX}"/usr/libexec/cups/filter \
+ --with-cupsdatadir="${EPREFIX}"/usr/share/cups
+}
diff --git a/net-print/c2esp/files/0001-Fix-various-missing-includes.patch b/net-print/c2esp/files/0001-Fix-various-missing-includes.patch
new file mode 100644
index 00000000000..bde86e66668
--- /dev/null
+++ b/net-print/c2esp/files/0001-Fix-various-missing-includes.patch
@@ -0,0 +1,35 @@
+From 4341f243a34dbb8140800337d189345c370dc499 Mon Sep 17 00:00:00 2001
+From: Didier Raboud <odyx@debian.org>
+Date: Fri, 9 Feb 2018 17:23:25 +0100
+Subject: Fix various missing includes
+
+Last-Update: 2016-10-03
+---
+ src/c2espcommon.h | 1 +
+ src/command2esp.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/c2espcommon.h b/src/c2espcommon.h
+index 471f46a..088a2b8 100644
+--- a/src/c2espcommon.h
++++ b/src/c2espcommon.h
+@@ -19,6 +19,7 @@
+ */
+
+ #include <cups/sidechannel.h> //FlushBackChannel, and the side channel functions and constants
++#include <stdio.h> // FILE
+ #include <fcntl.h> //files
+ #include <time.h> //time functions used for debugging
+
+diff --git a/src/command2esp.c b/src/command2esp.c
+index 529342c..e30357e 100644
+--- a/src/command2esp.c
++++ b/src/command2esp.c
+@@ -44,6 +44,7 @@ Maintenance=003?
+ #include <cups/cups.h>
+ #include <cups/sidechannel.h> //FlushBackChannel, and the side channel functions and constants
+ #include "string.h"
++#include "strings.h" // strncasecmp
+ #include <ctype.h>
+ #include <fcntl.h> //files
+ #include <time.h> //time functions used for debugging
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/c2esp/, net-print/c2esp/files/
@ 2020-11-28 23:10 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2020-11-28 23:10 UTC (permalink / raw
To: gentoo-commits
commit: b2c34e86772c33a88fb514cd82d1f3c56969c91c
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sat Nov 28 23:09:03 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 23:09:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2c34e86
net-print/c2esp: fix build with gcc-10
* Thanks to Sam James for providing the patch link
Closes: https://bugs.gentoo.org/708236
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
net-print/c2esp/c2esp-27.ebuild | 6 ++--
net-print/c2esp/files/c2esp-27-fno-common.patch | 32 ++++++++++++++++++++++
...ludes.patch => c2esp-27-missing-includes.patch} | 0
3 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/net-print/c2esp/c2esp-27.ebuild b/net-print/c2esp/c2esp-27.ebuild
index 69e58fbb92f..f7fe2a2c6a3 100644
--- a/net-print/c2esp/c2esp-27.ebuild
+++ b/net-print/c2esp/c2esp-27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,6 +6,7 @@ EAPI=7
DESCRIPTION="A CUPS filter for Kodak ESP printers"
HOMEPAGE="https://sourceforge.net/projects/cupsdriverkodak"
SRC_URI="mirror://sourceforge/cupsdriverkodak/files/${P}.tar.gz"
+
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
@@ -17,7 +18,8 @@ DEPEND=">=media-libs/jbigkit-2.0-r1:=
RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}"/0001-Fix-various-missing-includes.patch
+ "${FILESDIR}"/${P}-missing-includes.patch
+ "${FILESDIR}"/${P}-fno-common.patch
)
src_configure() {
diff --git a/net-print/c2esp/files/c2esp-27-fno-common.patch b/net-print/c2esp/files/c2esp-27-fno-common.patch
new file mode 100644
index 00000000000..8e4dc81519e
--- /dev/null
+++ b/net-print/c2esp/files/c2esp-27-fno-common.patch
@@ -0,0 +1,32 @@
+Taken from: https://sources.debian.org/patches/c2esp/27-8/0002-Add-extern-stanzas-to-variable-definitions-in-header.patch/
+Author: Didier Raboud <odyx@debian.org>
+
+--- a/src/c2espcommon.c
++++ b/src/c2espcommon.c
+@@ -42,11 +42,11 @@
+ * Globals...
+ */
+ char CallerName[50]; /* String that identifies the calling program */
+-int DoBack; /* Enables the back channel comms */
++extern int DoBack; /* Enables the back channel comms */
+ char BackBuf[32000]; //for the back channel replies from the printer
+ int BackBufLen=sizeof(BackBuf)-1;
+ FILE *LogFile = NULL; //file descriptor for log file
+-time_t StartTime;
++extern time_t StartTime;
+ int BlackPercent, ColourPercent;
+
+ time_t KeepAwake(time_t Start, int Interval, FILE *PrintFile)
+--- a/src/c2espcommon.h
++++ b/src/c2espcommon.h
+@@ -35,8 +35,8 @@
+ /*
+ * Globals...
+ */
+-char BackBuf[32000]; //for the back channel replies from the printer
+-int ColourPercent, BlackPercent; //to store the detected marker levels
++extern char BackBuf[32000]; //for the back channel replies from the printer
++extern int ColourPercent, BlackPercent; //to store the detected marker levels
+
+
+ time_t KeepAwake(time_t Start, int Interval, FILE *PrintFile);
diff --git a/net-print/c2esp/files/0001-Fix-various-missing-includes.patch b/net-print/c2esp/files/c2esp-27-missing-includes.patch
similarity index 100%
rename from net-print/c2esp/files/0001-Fix-various-missing-includes.patch
rename to net-print/c2esp/files/c2esp-27-missing-includes.patch
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-11-28 23:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-27 21:05 [gentoo-commits] repo/gentoo:master commit in: net-print/c2esp/, net-print/c2esp/files/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2020-11-28 23:10 David Seifert
2018-08-27 21:05 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox