commit: 24091deabb79bba10ee9e7a7b6c7cdd0b56928d6 Author: Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com> AuthorDate: Sat Aug 26 09:22:24 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Aug 26 13:41:15 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24091dea
dev-libs/xerces-c: restore patch to fix install location Closes: https://bugs.gentoo.org/913045 Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/32457 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/xerces-c-3.2.2-fix-XERCESC-2163.patch | 24 ++++++++++++++++++++++ ...ces-c-3.2.4.ebuild => xerces-c-3.2.4-r2.ebuild} | 2 ++ dev-libs/xerces-c/xerces-c-9999.ebuild | 2 ++ 3 files changed, 28 insertions(+) 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 000000000000..57dde7220985 --- /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 <[email protected]> +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.4.ebuild b/dev-libs/xerces-c/xerces-c-3.2.4-r2.ebuild similarity index 97% rename from dev-libs/xerces-c/xerces-c-3.2.4.ebuild rename to dev-libs/xerces-c/xerces-c-3.2.4-r2.ebuild index f1046bbeb48f..c48e8dc9931c 100644 --- a/dev-libs/xerces-c/xerces-c-3.2.4.ebuild +++ b/dev-libs/xerces-c/xerces-c-3.2.4-r2.ebuild @@ -33,6 +33,8 @@ BDEPEND=" DOCS=( CREDITS KEYS NOTICE README ) +PATCHES=( "${FILESDIR}"/${PN}-3.2.2-fix-XERCESC-2163.patch ) + pkg_setup() { export ICUROOT="${EPREFIX}/usr" diff --git a/dev-libs/xerces-c/xerces-c-9999.ebuild b/dev-libs/xerces-c/xerces-c-9999.ebuild index 0fdc2749c78a..4b24ee3df5d8 100644 --- a/dev-libs/xerces-c/xerces-c-9999.ebuild +++ b/dev-libs/xerces-c/xerces-c-9999.ebuild @@ -33,6 +33,8 @@ BDEPEND=" DOCS=( CREDITS KEYS NOTICE README ) +PATCHES=( "${FILESDIR}"/${PN}-3.2.2-fix-XERCESC-2163.patch ) + pkg_setup() { export ICUROOT="${EPREFIX}/usr"
