diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
| commit | 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch) | |
| tree | 25413d1cb3a0cbfe36029db32398c0f333609215 /net-print/c2esp | |
| parent | 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff) | |
gentoo resync : 14.12.2020
Diffstat (limited to 'net-print/c2esp')
| -rw-r--r-- | net-print/c2esp/Manifest | 5 | ||||
| -rw-r--r-- | net-print/c2esp/c2esp-27.ebuild | 6 | ||||
| -rw-r--r-- | net-print/c2esp/files/c2esp-27-fno-common.patch | 32 | ||||
| -rw-r--r-- | net-print/c2esp/files/c2esp-27-missing-includes.patch (renamed from net-print/c2esp/files/0001-Fix-various-missing-includes.patch) | 0 |
4 files changed, 39 insertions, 4 deletions
diff --git a/net-print/c2esp/Manifest b/net-print/c2esp/Manifest index 8806c5863c56..2f38b7290d20 100644 --- a/net-print/c2esp/Manifest +++ b/net-print/c2esp/Manifest @@ -1,5 +1,6 @@ -AUX 0001-Fix-various-missing-includes.patch 1107 BLAKE2B 36063d8bf6025e4c7df3151b3b3da868d0850bde7ed28e4c5c7c9ce604709e1acb8473cd54bce7643df710ed51ac1aad56c1a42ca24ebda791cbdfecbfb8bf9b SHA512 90dc8880864ec2aed498ebba2173c07697f8136bc95788f0e3e446fe16519857288c07c0a67c5a319c19837550e0b52e38a788419ffc85ebcbc0434edde2c0de AUX c2esp-26-ldflags-cppflags.patch 1152 BLAKE2B dc5463e1574c0f8852cbcb567fd24a0bc7f29a537d3073f4b6835cdf54deed2d3d3595816ae0ba84e4f026edf66daa3dbe4ad66765b47284b9862765656afd2e SHA512 c85abc2a3511ee7cf4ab4045c77ac257d85579354c98403a27209a21915fcd2180053db86fef09151d5e52e98684f46e14bd57bae9f0250597c451286fbe3da4 +AUX c2esp-27-fno-common.patch 1208 BLAKE2B 20158c4ae4e51cb91758c95bd5821f813d0ad7d1ebd7a9da2471037f74dbbffdf4fcd13309ae51e2b47c47abdf5b1a8832c47945a8c43fad004a89baf75e7889 SHA512 91823ceb5ace665769e928e6ead5eec9cc1cccffea9230c7e97d4ca1579b45c02c4cd192f2dd7e8257de8b43bc6176b78343f9992a0cb222722abd173c2d1394 +AUX c2esp-27-missing-includes.patch 1107 BLAKE2B 36063d8bf6025e4c7df3151b3b3da868d0850bde7ed28e4c5c7c9ce604709e1acb8473cd54bce7643df710ed51ac1aad56c1a42ca24ebda791cbdfecbfb8bf9b SHA512 90dc8880864ec2aed498ebba2173c07697f8136bc95788f0e3e446fe16519857288c07c0a67c5a319c19837550e0b52e38a788419ffc85ebcbc0434edde2c0de DIST c2esp-27.tar.gz 143551 BLAKE2B 7cc80fd72eed24c24cb153d7395a692849c51249ca40a563f94bedbb82c6d976bce6b44d47dbe21c36ec40f26571178f562b175485f404d356724b4bc3f611bf SHA512 d3ff9dc6de7cf692e4be4f4b316f862d271bff06181f0000daf1ce2fb6921f1b24efe88ec24f7b811d78cb9dca18fcba3f17dd5273ac84ceb9f6bfcecedeecce -EBUILD c2esp-27.ebuild 699 BLAKE2B 0d0be951c38fd455af0b511ed0f9b4c7949b41747240794700e31288ba1846d9c89717f012ed46f5c2fa4a16cceaee255d9de7be65f5dfa7df7add78dff09606 SHA512 c8062f8f6d66fc63b44361afd0544ee42ffe45b81dcb64e153e2b78ef69594f19527bd2e900c39e05e8d344d7b481a2e40a4d6adf106ea501d2007aed58d8819 +EBUILD c2esp-27.ebuild 722 BLAKE2B 7bbb30c176e826cf170bbcb76af4d829f4489fc5627252800ff04d86323b95c09ec567880fd12d122b64b6c52f78862440d22c4360ce02132b9ad0082ed5bd55 SHA512 9f3a0cebc757ff77fcdd48ad4a5d6b88076dd411dd08bc8dd9d17a5fb2c09ab9ebe2b6fdccdbec61e8e9afaac871fe6dff88513db129b89312d98f959e576f6d MISC metadata.xml 354 BLAKE2B 125545bf6e8dbd21bb674f494585d22d2e293738a9409613fa91eb7d888f4d6c10028aaf3b55beab10e5f94e4cbaee34eb9fb3d8f24c9f64056b6085edf6319c SHA512 d392c1b2ed7e557c5f9ce293e4cb668e0c229ece25dfdb098f569c0cbf9f797d706a0f55a066a8c5649bbc2184866a92d169f32c1f2eaa97c6f073e6d77c57a7 diff --git a/net-print/c2esp/c2esp-27.ebuild b/net-print/c2esp/c2esp-27.ebuild index 69e58fbb92f9..f7fe2a2c6a37 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 000000000000..8e4dc81519e2 --- /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 index bde86e666688..bde86e666688 100644 --- a/net-print/c2esp/files/0001-Fix-various-missing-includes.patch +++ b/net-print/c2esp/files/c2esp-27-missing-includes.patch |