diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2019-05-09 21:44:34 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-05-09 21:45:36 +0200 |
| commit | 87d62982aed70d39a59a22374ac25cd9dfa0a3a5 (patch) | |
| tree | 88597430f973a24cd83496094d19b133b8a9b4b7 | |
| parent | kde-apps: Drop KDE Applications 19.04.0 (diff) | |
| download | gentoo-87d62982.tar.gz gentoo-87d62982.tar.bz2 gentoo-87d62982.zip | |
kde-misc/tellico: Fix build against [libxml2 using] ICU-64 headers
Closes: https://bugs.gentoo.org/685460
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | kde-misc/tellico/files/tellico-3.1.4-icu-64.patch | 57 | ||||
| -rw-r--r-- | kde-misc/tellico/tellico-3.1.4.ebuild | 1 |
2 files changed, 58 insertions, 0 deletions
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 new file mode 100644 index 000000000000..5b10e4d259a9 --- /dev/null +++ b/kde-misc/tellico/files/tellico-3.1.4-icu-64.patch @@ -0,0 +1,57 @@ +From 2e552aea8d2391ea3ab8afdb58caf214954a2129 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Thu, 9 May 2019 21:16:33 +0200 +Subject: [PATCH] Fix build against ICU 64.1 and later + +Summary: +See also: https://unicode-org.atlassian.net/browse/ICU-20530 + +Lots of errors of the same kind (libxml/tree.h included within extern "C"): + +``` +In file included from /usr/lib/gcc/x86_64-pc-linux-gnu/8.3.0/include/g++-v8/bits/shared_ptr.h:52, + from /usr/lib/gcc/x86_64-pc-linux-gnu/8.3.0/include/g++-v8/memory:81, + from /usr/include/unicode/localpointer.h:45, + from /usr/include/unicode/uenum.h:23, + from /usr/include/unicode/ucnv.h:53, + from /usr/include/libxml2/libxml/encoding.h:31, + from /usr/include/libxml2/libxml/parser.h:810, + from /usr/include/libxml2/libxml/globals.h:18, + from /usr/include/libxml2/libxml/threads.h:35, + from /usr/include/libxml2/libxml/xmlmemory.h:218, + from /usr/include/libxml2/libxml/tree.h:1307, + from /var/tmp/portage/kde-misc/tellico-9999/work/tellico-9999/src/translators/xslthandler.h:34, + from /var/tmp/portage/kde-misc/tellico-9999/work/tellico-9999/src/translators/xsltimporter.cpp:26: +/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 + template<typename _Tp, _Lock_policy _Lp = __default_lock_policy> + ^~~~~~~~ +``` + +Test Plan: Builds fine against ICU 64.2. + +Reviewers: #tellico + +Differential Revision: https://phabricator.kde.org/D21103 +--- + src/translators/xslthandler.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/translators/xslthandler.h b/src/translators/xslthandler.h +index ebbb010b..bb2112da 100644 +--- a/src/translators/xslthandler.h ++++ b/src/translators/xslthandler.h +@@ -29,9 +29,10 @@ + #include <QHash> + #include <QString> + +-extern "C" { + // for xmlDocPtr + #include <libxml/tree.h> ++ ++extern "C" { + // for xsltStyleSheetPtr + #include <libxslt/xsltInternals.h> + } +-- +2.21.0 + diff --git a/kde-misc/tellico/tellico-3.1.4.ebuild b/kde-misc/tellico/tellico-3.1.4.ebuild index 14a4c066ed22..c9cec88bd7e1 100644 --- a/kde-misc/tellico/tellico-3.1.4.ebuild +++ b/kde-misc/tellico/tellico-3.1.4.ebuild @@ -71,6 +71,7 @@ DOCS=( AUTHORS ChangeLog README ) PATCHES=( "${FILESDIR}/${P}-xmloutputclosecallback-signature.patch" "${FILESDIR}/${P}-empty-permissions-set.patch" + "${FILESDIR}/${P}-icu-64.patch" # bug #685460 ) src_configure() { |