1 |
commit: 023e1a434092beb0b6083f299a9530998f3253f4 |
2 |
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 14 08:55:23 2020 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 14 08:57:43 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=023e1a43 |
7 |
|
8 |
net-im/spectrum2: add fix for boost-1.73 and gcc-10 |
9 |
|
10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
11 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
12 |
|
13 |
.../spectrum2-2.0.12-boost-173-compatibility.patch | 21 +++++++++ |
14 |
.../spectrum2-2.0.12-gcc-10-compatibility.patch | 54 ++++++++++++++++++++++ |
15 |
net-im/spectrum2/spectrum2-2.0.12-r2.ebuild | 5 ++ |
16 |
3 files changed, 80 insertions(+) |
17 |
|
18 |
diff --git a/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch b/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..b9a8adeee5a |
21 |
--- /dev/null |
22 |
+++ b/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch |
23 |
@@ -0,0 +1,21 @@ |
24 |
+From 1a6ede2dbf0f621e3e6864675befcbc32e02c8b6 Mon Sep 17 00:00:00 2001 |
25 |
+From: Conrad Kostecki <kostecki@×××.de> |
26 |
+Date: Thu, 14 May 2020 10:34:43 +0200 |
27 |
+Subject: [PATCH] Fix compilation with boost-1.73 |
28 |
+ |
29 |
+Signed-off-by: Conrad Kostecki <conrad@××××××××.com> |
30 |
+--- |
31 |
+ include/transport/ThreadPool.h | 1 + |
32 |
+ 1 file changed, 1 insertion(+) |
33 |
+ |
34 |
+diff --git a/include/transport/ThreadPool.h b/include/transport/ThreadPool.h |
35 |
+index 5902f965..ffd07c8e 100644 |
36 |
+--- a/include/transport/ThreadPool.h |
37 |
++++ b/include/transport/ThreadPool.h |
38 |
+@@ -1,5 +1,6 @@ |
39 |
+ #pragma once |
40 |
+ |
41 |
++#include <boost/bind.hpp> |
42 |
+ #include <boost/thread.hpp> |
43 |
+ #include <boost/thread/mutex.hpp> |
44 |
+ #include <queue> |
45 |
|
46 |
diff --git a/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch b/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch |
47 |
new file mode 100644 |
48 |
index 00000000000..ad13208b3e1 |
49 |
--- /dev/null |
50 |
+++ b/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch |
51 |
@@ -0,0 +1,54 @@ |
52 |
+From 95e6968c0f8c95f6bd817e5081e0b10dea9d4269 Mon Sep 17 00:00:00 2001 |
53 |
+From: Conrad Kostecki <kostecki@×××.de> |
54 |
+Date: Wed, 13 May 2020 14:22:27 +0200 |
55 |
+Subject: [PATCH] Fix dfrotz compilation with GCC >= 10 |
56 |
+ |
57 |
+Since GCC enables by default -fno-common, |
58 |
+the compilation of dfrotz due multiple definitions will fail. |
59 |
+ |
60 |
+Signed-off-by: Conrad Kostecki <conrad@××××××××.com> |
61 |
+--- |
62 |
+ backends/frotz/dfrotz/dumb/dumb_init.c | 2 +- |
63 |
+ backends/frotz/dfrotz/dumb/dumb_input.c | 2 +- |
64 |
+ backends/frotz/dfrotz/dumb/dumb_output.c | 2 +- |
65 |
+ 3 files changed, 3 insertions(+), 3 deletions(-) |
66 |
+ |
67 |
+diff --git a/backends/frotz/dfrotz/dumb/dumb_init.c b/backends/frotz/dfrotz/dumb/dumb_init.c |
68 |
+index 4b9c6704..35295b74 100644 |
69 |
+--- a/backends/frotz/dfrotz/dumb/dumb_init.c |
70 |
++++ b/backends/frotz/dfrotz/dumb/dumb_init.c |
71 |
+@@ -7,7 +7,7 @@ |
72 |
+ |
73 |
+ #include "dumb_frotz.h" |
74 |
+ |
75 |
+-f_setup_t f_setup; |
76 |
++extern f_setup_t f_setup; |
77 |
+ |
78 |
+ #define INFORMATION "\ |
79 |
+ An interpreter for all Infocom and other Z-Machine games.\n\ |
80 |
+diff --git a/backends/frotz/dfrotz/dumb/dumb_input.c b/backends/frotz/dfrotz/dumb/dumb_input.c |
81 |
+index 4149b2b0..88fc8ae5 100644 |
82 |
+--- a/backends/frotz/dfrotz/dumb/dumb_input.c |
83 |
++++ b/backends/frotz/dfrotz/dumb/dumb_input.c |
84 |
+@@ -5,7 +5,7 @@ |
85 |
+ */ |
86 |
+ |
87 |
+ #include "dumb_frotz.h" |
88 |
+-f_setup_t f_setup; |
89 |
++extern f_setup_t f_setup; |
90 |
+ |
91 |
+ static char runtime_usage[] = |
92 |
+ "DUMB-FROTZ runtime help:\n" |
93 |
+diff --git a/backends/frotz/dfrotz/dumb/dumb_output.c b/backends/frotz/dfrotz/dumb/dumb_output.c |
94 |
+index 9e505167..6dc7db82 100644 |
95 |
+--- a/backends/frotz/dfrotz/dumb/dumb_output.c |
96 |
++++ b/backends/frotz/dfrotz/dumb/dumb_output.c |
97 |
+@@ -7,7 +7,7 @@ |
98 |
+ |
99 |
+ #include "dumb_frotz.h" |
100 |
+ |
101 |
+-f_setup_t f_setup; |
102 |
++extern f_setup_t f_setup; |
103 |
+ |
104 |
+ static bool show_line_numbers = FALSE; |
105 |
+ static bool show_line_types = -1; |
106 |
|
107 |
diff --git a/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild b/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild |
108 |
index 0bc829465f9..e2a557eb711 100644 |
109 |
--- a/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild |
110 |
+++ b/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild |
111 |
@@ -64,6 +64,11 @@ DEPEND=" |
112 |
# Tests are currently restricted, as they do completly fail |
113 |
RESTRICT="test" |
114 |
|
115 |
+PATCHES=" |
116 |
+ "${FILESDIR}/${P}-boost-173-compatibility.patch" |
117 |
+ "${FILESDIR}/${P}-gcc-10-compatibility.patch" |
118 |
+" |
119 |
+ |
120 |
python_check_deps() { |
121 |
has_version "dev-python/sleekxmpp[${PYTHON_USEDEP}]" |
122 |
} |