diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2019-03-29 23:30:31 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-03-30 10:58:22 +0100 |
commit | 61e590adbee50a9c9b4b96b32b61e24d7140d412 (patch) | |
tree | 80a8845106f355e8c4bb5b1250cba3ef35223bce /dev-libs/icu/files | |
parent | dev-libs/libical: Drop vulnerable 2.0.0-r3 (diff) | |
download | gentoo-61e590adbee50a9c9b4b96b32b61e24d7140d412.tar.gz gentoo-61e590adbee50a9c9b4b96b32b61e24d7140d412.tar.bz2 gentoo-61e590adbee50a9c9b4b96b32b61e24d7140d412.zip |
dev-libs/icu: 64.1 version bump
Closes: https://bugs.gentoo.org/682032
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-libs/icu/files')
-rw-r--r-- | dev-libs/icu/files/icu-64.1-guard-memory-include.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/dev-libs/icu/files/icu-64.1-guard-memory-include.patch b/dev-libs/icu/files/icu-64.1-guard-memory-include.patch new file mode 100644 index 000000000000..618a42541277 --- /dev/null +++ b/dev-libs/icu/files/icu-64.1-guard-memory-include.patch @@ -0,0 +1,52 @@ +From 5ecd46bab07561758e0c37a9178e74175e989bdf Mon Sep 17 00:00:00 2001 +From: Alon Bar-Lev <alon.barlev@gmail.com> +Date: Sat, 30 Mar 2019 09:59:46 +0300 +Subject: [PATCH] ICU-20530 Guard memory include for C++ +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Introduce by ICU-20357, commit b7a3571b adding <memory> include without guard. + +Fails when compiling within extern "C". + +a.cxx +--- +extern "C" { + #include <unicode/localpointer.h> +} +--- +In file included from /usr/lib/gcc/x86_64-pc-linux-gnu/8.2.0/include/g++-v8/memory:84, + from /tmp/icu/icu4c/source/common/unicode/localpointer.h:45, + from a.cxx:4: +/usr/lib/gcc/x86_64-pc-linux-gnu/8.2.0/include/g++-v8/backward/auto_ptr.h:325:3: error: template with C linkage + template<typename _Tp, typename _Dp> + ^~~~~~~~ +a.cxx:3:1: note: ‘extern "C"’ linkage started here + extern "C" { + ^~~~~~~~~~ +--- + +Found by usage of xmlsec. + +Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com> +--- + icu4c/source/common/unicode/localpointer.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/icu4c/source/common/unicode/localpointer.h b/icu4c/source/common/unicode/localpointer.h +index e011688b1a5..8e35ded0b10 100644 +--- a/common/unicode/localpointer.h ++++ b/common/unicode/localpointer.h +@@ -42,7 +42,11 @@ + + #if U_SHOW_CPLUSPLUS_API + ++#ifdef __cplusplus ++extern "C++" { + #include <memory> ++} ++#endif + + U_NAMESPACE_BEGIN + |