commit: a0edc86d99bba70f585b6a1a55ef07e3db5c1635 Author: Joonas Niilola <juippis <AT> gentoo <DOT> org> AuthorDate: Mon Feb 15 09:01:32 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Mon Feb 15 09:03:52 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0edc86d
dev-libs/xerces-c: bring back patch that fixes XERCESC_NLS_HOME Closes: https://bugs.gentoo.org/738140 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> .../files/xerces-c-3.2.2-fix-XERCESC-2163.patch | 24 ++++++++++++++++++++++ ...ces-c-3.2.3.ebuild => xerces-c-3.2.3-r1.ebuild} | 6 +++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2163.patch b/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2163.patch new file mode 100644 index 00000000000..57dde722098 --- /dev/null +++ b/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2163.patch @@ -0,0 +1,24 @@ +From db7a8b0cd2a163de1e3ef8c950cf9e708b0b5f98 Mon Sep 17 00:00:00 2001 +From: Craig Andrews <candr...@integralblue.com> +Date: Wed, 2 Jan 2019 15:01:21 -0500 +Subject: [PATCH] build: Install XercesMessages_en_US.cat to + /usr/share/xerces-c/msg + +Fixes XERCESC-2163 +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index c29aa257b..6f1929d99 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1198,7 +1198,7 @@ if(XERCES_USE_MSGLOADER_ICONV) + + install( + FILES "${RESTARGET}" +- DESTINATION "${CMAKE_INSTALL_PREFIX}/msg" ++ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/xerces-c/msg" + COMPONENT "runtime") + endif() + diff --git a/dev-libs/xerces-c/xerces-c-3.2.3.ebuild b/dev-libs/xerces-c/xerces-c-3.2.3-r1.ebuild similarity index 96% rename from dev-libs/xerces-c/xerces-c-3.2.3.ebuild rename to dev-libs/xerces-c/xerces-c-3.2.3-r1.ebuild index 9c89e65548c..b6a53f71d1b 100644 --- a/dev-libs/xerces-c/xerces-c-3.2.3.ebuild +++ b/dev-libs/xerces-c/xerces-c-3.2.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -32,6 +32,10 @@ DEPEND="${RDEPEND} DOCS=( CREDITS KEYS NOTICE README ) +PATCHES=( + "${FILESDIR}"/xerces-c-3.2.2-fix-XERCESC-2163.patch +) + pkg_setup() { export ICUROOT="${EPREFIX}/usr"
