1 |
commit: 42a083cf5594e682bd1bb31d0abb08a13cac478b |
2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
3 |
AuthorDate: Mon Dec 28 11:50:14 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 28 11:50:14 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42a083cf |
7 |
|
8 |
net-print/pnm2ppa: fix build with gcc-10 |
9 |
|
10 |
* Thanks to Sam James for providing the patch link |
11 |
|
12 |
Closes: https://bugs.gentoo.org/707032 |
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 |
.../pnm2ppa/files/pnm2ppa-1.13-fno-common.patch | 26 ++++++++++++++++++++++ |
18 |
net-print/pnm2ppa/pnm2ppa-1.13-r1.ebuild | 2 ++ |
19 |
2 files changed, 28 insertions(+) |
20 |
|
21 |
diff --git a/net-print/pnm2ppa/files/pnm2ppa-1.13-fno-common.patch b/net-print/pnm2ppa/files/pnm2ppa-1.13-fno-common.patch |
22 |
new file mode 100644 |
23 |
index 00000000000..e12ba7ba246 |
24 |
--- /dev/null |
25 |
+++ b/net-print/pnm2ppa/files/pnm2ppa-1.13-fno-common.patch |
26 |
@@ -0,0 +1,26 @@ |
27 |
+Taken from: https://sources.debian.org/patches/pnm2ppa/1.13-10/0005-Declare-syslog_message-correctly-for-GCC-10-FTBFS.patch |
28 |
+Author: Zdenek Dohnal <zdohnal@××××××.com> |
29 |
+--- a/ppa_syslog.h |
30 |
++++ b/ppa_syslog.h |
31 |
+@@ -39,7 +39,7 @@ |
32 |
+ #include <syslog.h> |
33 |
+ #endif |
34 |
+ |
35 |
+-char syslog_message[128]; |
36 |
++extern char syslog_message[128]; |
37 |
+ extern size_t message_size ; |
38 |
+ |
39 |
+ void wrap_syslog( int, char *, char *); |
40 |
+diff --git a/syslog.c b/syslog.c |
41 |
+index 9b11c55..dccab91 100644 |
42 |
+--- a/syslog.c |
43 |
++++ b/syslog.c |
44 |
+@@ -31,6 +31,8 @@ |
45 |
+ #include "ppa_syslog.h" |
46 |
+ #include "global.h" |
47 |
+ |
48 |
++char syslog_message[128]; |
49 |
++ |
50 |
+ BOOLEAN verbose = false ; |
51 |
+ |
52 |
+ /* |
53 |
|
54 |
diff --git a/net-print/pnm2ppa/pnm2ppa-1.13-r1.ebuild b/net-print/pnm2ppa/pnm2ppa-1.13-r1.ebuild |
55 |
index bab71f44628..4cfb04d59fb 100644 |
56 |
--- a/net-print/pnm2ppa/pnm2ppa-1.13-r1.ebuild |
57 |
+++ b/net-print/pnm2ppa/pnm2ppa-1.13-r1.ebuild |
58 |
@@ -26,6 +26,8 @@ RDEPEND=" |
59 |
syslog? ( virtual/logger )" |
60 |
DEPEND="${RDEPEND}" |
61 |
|
62 |
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) |
63 |
+ |
64 |
src_configure() { |
65 |
local lng i withval |