diff options
| author |   Michael Mair-Keimberger <m.mairkeimberger@gmail.com> | 2019-06-05 20:34:16 +0200 |
|---|---|---|
| committer |   Andreas Sturmlechner <asturm@gentoo.org> | 2019-06-05 21:19:51 +0200 |
| commit | 1f55efa244d3858fb2d3682f0036092040a58813 (patch) | |
| tree | a4de070f5e6d6b9f145406fd5a1224ca4c92500b /dev-libs/icu/files | |
| parent | kde-misc/kolor-manager: https, drop bogus upstream remote-id (diff) | |
| download | gentoo-1f55efa244d3858fb2d3682f0036092040a58813.tar.gz gentoo-1f55efa244d3858fb2d3682f0036092040a58813.tar.bz2 gentoo-1f55efa244d3858fb2d3682f0036092040a58813.zip | |
dev-libs/icu: remove unused patch
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12197
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, 0 insertions, 52 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 deleted file mode 100644 index 618a42541277..000000000000 --- a/dev-libs/icu/files/icu-64.1-guard-memory-include.patch +++ /dev/null @@ -1,52 +0,0 @@ -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 - |