1 |
commit: 87d62982aed70d39a59a22374ac25cd9dfa0a3a5 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 9 19:44:34 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 9 19:45:36 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87d62982 |
7 |
|
8 |
kde-misc/tellico: Fix build against [libxml2 using] ICU-64 headers |
9 |
|
10 |
Closes: https://bugs.gentoo.org/685460 |
11 |
Package-Manager: Portage-2.3.66, Repoman-2.3.12 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
kde-misc/tellico/files/tellico-3.1.4-icu-64.patch | 57 +++++++++++++++++++++++ |
15 |
kde-misc/tellico/tellico-3.1.4.ebuild | 1 + |
16 |
2 files changed, 58 insertions(+) |
17 |
|
18 |
diff --git a/kde-misc/tellico/files/tellico-3.1.4-icu-64.patch b/kde-misc/tellico/files/tellico-3.1.4-icu-64.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..5b10e4d259a |
21 |
--- /dev/null |
22 |
+++ b/kde-misc/tellico/files/tellico-3.1.4-icu-64.patch |
23 |
@@ -0,0 +1,57 @@ |
24 |
+From 2e552aea8d2391ea3ab8afdb58caf214954a2129 Mon Sep 17 00:00:00 2001 |
25 |
+From: Andreas Sturmlechner <asturm@g.o> |
26 |
+Date: Thu, 9 May 2019 21:16:33 +0200 |
27 |
+Subject: [PATCH] Fix build against ICU 64.1 and later |
28 |
+ |
29 |
+Summary: |
30 |
+See also: https://unicode-org.atlassian.net/browse/ICU-20530 |
31 |
+ |
32 |
+Lots of errors of the same kind (libxml/tree.h included within extern "C"): |
33 |
+ |
34 |
+``` |
35 |
+In file included from /usr/lib/gcc/x86_64-pc-linux-gnu/8.3.0/include/g++-v8/bits/shared_ptr.h:52, |
36 |
+ from /usr/lib/gcc/x86_64-pc-linux-gnu/8.3.0/include/g++-v8/memory:81, |
37 |
+ from /usr/include/unicode/localpointer.h:45, |
38 |
+ from /usr/include/unicode/uenum.h:23, |
39 |
+ from /usr/include/unicode/ucnv.h:53, |
40 |
+ from /usr/include/libxml2/libxml/encoding.h:31, |
41 |
+ from /usr/include/libxml2/libxml/parser.h:810, |
42 |
+ from /usr/include/libxml2/libxml/globals.h:18, |
43 |
+ from /usr/include/libxml2/libxml/threads.h:35, |
44 |
+ from /usr/include/libxml2/libxml/xmlmemory.h:218, |
45 |
+ from /usr/include/libxml2/libxml/tree.h:1307, |
46 |
+ from /var/tmp/portage/kde-misc/tellico-9999/work/tellico-9999/src/translators/xslthandler.h:34, |
47 |
+ from /var/tmp/portage/kde-misc/tellico-9999/work/tellico-9999/src/translators/xsltimporter.cpp:26: |
48 |
+/usr/lib/gcc/x86_64-pc-linux-gnu/8.3.0/include/g++-v8/bits/shared_ptr_base.h:338:3: error: template with C linkage |
49 |
+ template<typename _Tp, _Lock_policy _Lp = __default_lock_policy> |
50 |
+ ^~~~~~~~ |
51 |
+``` |
52 |
+ |
53 |
+Test Plan: Builds fine against ICU 64.2. |
54 |
+ |
55 |
+Reviewers: #tellico |
56 |
+ |
57 |
+Differential Revision: https://phabricator.kde.org/D21103 |
58 |
+--- |
59 |
+ src/translators/xslthandler.h | 3 ++- |
60 |
+ 1 file changed, 2 insertions(+), 1 deletion(-) |
61 |
+ |
62 |
+diff --git a/src/translators/xslthandler.h b/src/translators/xslthandler.h |
63 |
+index ebbb010b..bb2112da 100644 |
64 |
+--- a/src/translators/xslthandler.h |
65 |
++++ b/src/translators/xslthandler.h |
66 |
+@@ -29,9 +29,10 @@ |
67 |
+ #include <QHash> |
68 |
+ #include <QString> |
69 |
+ |
70 |
+-extern "C" { |
71 |
+ // for xmlDocPtr |
72 |
+ #include <libxml/tree.h> |
73 |
++ |
74 |
++extern "C" { |
75 |
+ // for xsltStyleSheetPtr |
76 |
+ #include <libxslt/xsltInternals.h> |
77 |
+ } |
78 |
+-- |
79 |
+2.21.0 |
80 |
+ |
81 |
|
82 |
diff --git a/kde-misc/tellico/tellico-3.1.4.ebuild b/kde-misc/tellico/tellico-3.1.4.ebuild |
83 |
index 14a4c066ed2..c9cec88bd7e 100644 |
84 |
--- a/kde-misc/tellico/tellico-3.1.4.ebuild |
85 |
+++ b/kde-misc/tellico/tellico-3.1.4.ebuild |
86 |
@@ -71,6 +71,7 @@ DOCS=( AUTHORS ChangeLog README ) |
87 |
PATCHES=( |
88 |
"${FILESDIR}/${P}-xmloutputclosecallback-signature.patch" |
89 |
"${FILESDIR}/${P}-empty-permissions-set.patch" |
90 |
+ "${FILESDIR}/${P}-icu-64.patch" # bug #685460 |
91 |
) |
92 |
|
93 |
src_configure() { |