summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoonas Niilola <juippis@gentoo.org>2021-02-15 11:01:32 +0200
committerJoonas Niilola <juippis@gentoo.org>2021-02-15 11:03:52 +0200
commita0edc86d99bba70f585b6a1a55ef07e3db5c1635 (patch)
treed8a9f5d10891db006c6de21e31edbdc848f57471 /dev-libs
parentdev-ml/js_of_ocaml: adjust KEYWORDS (diff)
downloadgentoo-a0edc86d99bba70f585b6a1a55ef07e3db5c1635.tar.gz
gentoo-a0edc86d99bba70f585b6a1a55ef07e3db5c1635.tar.bz2
gentoo-a0edc86d99bba70f585b6a1a55ef07e3db5c1635.zip
dev-libs/xerces-c: bring back patch that fixes XERCESC_NLS_HOME
Closes: https://bugs.gentoo.org/738140 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2163.patch24
-rw-r--r--dev-libs/xerces-c/xerces-c-3.2.3-r1.ebuild (renamed from dev-libs/xerces-c/xerces-c-3.2.3.ebuild)6
2 files changed, 29 insertions, 1 deletions
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 <candrews@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
index 9c89e65548c1..b6a53f71d1b0 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"