| 1 |
commit: b2c34e86772c33a88fb514cd82d1f3c56969c91c |
| 2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
| 3 |
AuthorDate: Sat Nov 28 23:09:03 2020 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 28 23:09:03 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2c34e86 |
| 7 |
|
| 8 |
net-print/c2esp: fix build with gcc-10 |
| 9 |
|
| 10 |
* Thanks to Sam James for providing the patch link |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/708236 |
| 13 |
Package-Manager: Portage-3.0.9, Repoman-3.0.1 |
| 14 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
| 15 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 16 |
|
| 17 |
net-print/c2esp/c2esp-27.ebuild | 6 ++-- |
| 18 |
net-print/c2esp/files/c2esp-27-fno-common.patch | 32 ++++++++++++++++++++++ |
| 19 |
...ludes.patch => c2esp-27-missing-includes.patch} | 0 |
| 20 |
3 files changed, 36 insertions(+), 2 deletions(-) |
| 21 |
|
| 22 |
diff --git a/net-print/c2esp/c2esp-27.ebuild b/net-print/c2esp/c2esp-27.ebuild |
| 23 |
index 69e58fbb92f..f7fe2a2c6a3 100644 |
| 24 |
--- a/net-print/c2esp/c2esp-27.ebuild |
| 25 |
+++ b/net-print/c2esp/c2esp-27.ebuild |
| 26 |
@@ -1,4 +1,4 @@ |
| 27 |
-# Copyright 1999-2018 Gentoo Foundation |
| 28 |
+# Copyright 1999-2020 Gentoo Authors |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
|
| 31 |
EAPI=7 |
| 32 |
@@ -6,6 +6,7 @@ EAPI=7 |
| 33 |
DESCRIPTION="A CUPS filter for Kodak ESP printers" |
| 34 |
HOMEPAGE="https://sourceforge.net/projects/cupsdriverkodak" |
| 35 |
SRC_URI="mirror://sourceforge/cupsdriverkodak/files/${P}.tar.gz" |
| 36 |
+ |
| 37 |
LICENSE="GPL-2" |
| 38 |
SLOT="0" |
| 39 |
KEYWORDS="~amd64 ~arm ~x86" |
| 40 |
@@ -17,7 +18,8 @@ DEPEND=">=media-libs/jbigkit-2.0-r1:= |
| 41 |
RDEPEND="${DEPEND}" |
| 42 |
|
| 43 |
PATCHES=( |
| 44 |
- "${FILESDIR}"/0001-Fix-various-missing-includes.patch |
| 45 |
+ "${FILESDIR}"/${P}-missing-includes.patch |
| 46 |
+ "${FILESDIR}"/${P}-fno-common.patch |
| 47 |
) |
| 48 |
|
| 49 |
src_configure() { |
| 50 |
|
| 51 |
diff --git a/net-print/c2esp/files/c2esp-27-fno-common.patch b/net-print/c2esp/files/c2esp-27-fno-common.patch |
| 52 |
new file mode 100644 |
| 53 |
index 00000000000..8e4dc81519e |
| 54 |
--- /dev/null |
| 55 |
+++ b/net-print/c2esp/files/c2esp-27-fno-common.patch |
| 56 |
@@ -0,0 +1,32 @@ |
| 57 |
+Taken from: https://sources.debian.org/patches/c2esp/27-8/0002-Add-extern-stanzas-to-variable-definitions-in-header.patch/ |
| 58 |
+Author: Didier Raboud <odyx@××××××.org> |
| 59 |
+ |
| 60 |
+--- a/src/c2espcommon.c |
| 61 |
++++ b/src/c2espcommon.c |
| 62 |
+@@ -42,11 +42,11 @@ |
| 63 |
+ * Globals... |
| 64 |
+ */ |
| 65 |
+ char CallerName[50]; /* String that identifies the calling program */ |
| 66 |
+-int DoBack; /* Enables the back channel comms */ |
| 67 |
++extern int DoBack; /* Enables the back channel comms */ |
| 68 |
+ char BackBuf[32000]; //for the back channel replies from the printer |
| 69 |
+ int BackBufLen=sizeof(BackBuf)-1; |
| 70 |
+ FILE *LogFile = NULL; //file descriptor for log file |
| 71 |
+-time_t StartTime; |
| 72 |
++extern time_t StartTime; |
| 73 |
+ int BlackPercent, ColourPercent; |
| 74 |
+ |
| 75 |
+ time_t KeepAwake(time_t Start, int Interval, FILE *PrintFile) |
| 76 |
+--- a/src/c2espcommon.h |
| 77 |
++++ b/src/c2espcommon.h |
| 78 |
+@@ -35,8 +35,8 @@ |
| 79 |
+ /* |
| 80 |
+ * Globals... |
| 81 |
+ */ |
| 82 |
+-char BackBuf[32000]; //for the back channel replies from the printer |
| 83 |
+-int ColourPercent, BlackPercent; //to store the detected marker levels |
| 84 |
++extern char BackBuf[32000]; //for the back channel replies from the printer |
| 85 |
++extern int ColourPercent, BlackPercent; //to store the detected marker levels |
| 86 |
+ |
| 87 |
+ |
| 88 |
+ time_t KeepAwake(time_t Start, int Interval, FILE *PrintFile); |
| 89 |
|
| 90 |
diff --git a/net-print/c2esp/files/0001-Fix-various-missing-includes.patch b/net-print/c2esp/files/c2esp-27-missing-includes.patch |
| 91 |
similarity index 100% |
| 92 |
rename from net-print/c2esp/files/0001-Fix-various-missing-includes.patch |
| 93 |
rename to net-print/c2esp/files/c2esp-27-missing-includes.patch |
Archives