[gentoo-commits] repo/gentoo:master commit in: dev-libs/xerces-c/files/, dev-libs/xerces-c/

2024-05-22 Thread Andreas Sturmlechner 
commit: 4b23e98d6eec2b7ba230f9fc8e51402605856e5d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed May 22 16:45:17 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed May 22 16:45:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b23e98d

dev-libs/xerces-c: Fix build w/ ICU-75

Closes: https://bugs.gentoo.org/931105
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-libs/xerces-c/files/xerces-c-3.2.5-cxx17.patch | 11 +++
 dev-libs/xerces-c/xerces-c-3.2.5.ebuild|  1 +
 2 files changed, 12 insertions(+)

diff --git a/dev-libs/xerces-c/files/xerces-c-3.2.5-cxx17.patch 
b/dev-libs/xerces-c/files/xerces-c-3.2.5-cxx17.patch
new file mode 100644
index ..ed47510e08ad
--- /dev/null
+++ b/dev-libs/xerces-c/files/xerces-c-3.2.5-cxx17.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -23,7 +23,7 @@
+ 
+ # Try C++14, then fall back to C++11 and C++98.  Used for feature tests
+ # for optional features.
+-set(CMAKE_CXX_STANDARD 14)
++set(CMAKE_CXX_STANDARD 17)
+ 
+ # Use folders (for IDE project grouping)
+ set_property(GLOBAL PROPERTY USE_FOLDERS ON)

diff --git a/dev-libs/xerces-c/xerces-c-3.2.5.ebuild 
b/dev-libs/xerces-c/xerces-c-3.2.5.ebuild
index 2ff3cf44a5bc..e134d155af4b 100644
--- a/dev-libs/xerces-c/xerces-c-3.2.5.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.2.5.ebuild
@@ -35,6 +35,7 @@ DOCS=( CREDITS KEYS NOTICE README )
 
 PATCHES=(
"${FILESDIR}"/${PN}-3.2.4-strict-aliasing.patch
+   "${FILESDIR}"/${P}-cxx17.patch # bug 931105
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: dev-libs/xerces-c/files/, dev-libs/xerces-c/

2024-01-10 Thread Sam James 
commit: 231fb829f816206e368c83c44e3f3a175b217918
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 10 11:21:09 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 10 11:21:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=231fb829

dev-libs/xerces-c: disable strict aliasing, filter LTO

It's only in the tests but it implies they're not testing it at all.

Closes: https://bugs.gentoo.org/856100
Signed-off-by: Sam James  gentoo.org>

 .../xerces-c/files/xerces-c-3.2.4-strict-aliasing.patch   | 13 +
 .../{xerces-c-.ebuild => xerces-c-3.2.4-r3.ebuild}| 15 +++
 dev-libs/xerces-c/xerces-c-.ebuild| 15 +++
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/dev-libs/xerces-c/files/xerces-c-3.2.4-strict-aliasing.patch 
b/dev-libs/xerces-c/files/xerces-c-3.2.4-strict-aliasing.patch
new file mode 100644
index ..18483070e736
--- /dev/null
+++ b/dev-libs/xerces-c/files/xerces-c-3.2.4-strict-aliasing.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/856100
+--- a/cmake/XercesWarnings.cmake
 b/cmake/XercesWarnings.cmake
+@@ -50,8 +50,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR
+   -Wswitch-default
+   -Wunused-variable
+   -Wwrite-strings
+-  -Wno-variadic-macros
+-  -fstrict-aliasing)
++  -Wno-variadic-macros)
+   if(extra-warnings)
+ list(APPEND test_flags
+ -Wfloat-equal

diff --git a/dev-libs/xerces-c/xerces-c-.ebuild 
b/dev-libs/xerces-c/xerces-c-3.2.4-r3.ebuild
similarity index 89%
copy from dev-libs/xerces-c/xerces-c-.ebuild
copy to dev-libs/xerces-c/xerces-c-3.2.4-r3.ebuild
index 4b24ee3df5d8..fea427072055 100644
--- a/dev-libs/xerces-c/xerces-c-.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.2.4-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake prefix
+inherit cmake flag-o-matic prefix
 
-DESCRIPTION="A validating XML parser written in a portable subset of C++"
+DESCRIPTION="Validating XML parser written in a portable subset of C++"
 HOMEPAGE="https://xerces.apache.org/xerces-c/;
 
 if [[ ${PV} == * ]] ; then
@@ -33,7 +33,10 @@ BDEPEND="
 
 DOCS=( CREDITS KEYS NOTICE README )
 
-PATCHES=( "${FILESDIR}"/${PN}-3.2.2-fix-XERCESC-2163.patch )
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.2.2-fix-XERCESC-2163.patch
+   "${FILESDIR}"/${PN}-3.2.4-strict-aliasing.patch
+)
 
 pkg_setup() {
export ICUROOT="${EPREFIX}/usr"
@@ -45,6 +48,10 @@ pkg_setup() {
 }
 
 src_configure() {
+   # bug #856100
+   filter-lto
+   append-flags -fno-strict-aliasing
+
# 'cfurl' is only available on OSX and 'socket' isn't supposed to work.
# But the docs aren't clear about it, so we would need some testing...
local netaccessor

diff --git a/dev-libs/xerces-c/xerces-c-.ebuild 
b/dev-libs/xerces-c/xerces-c-.ebuild
index 4b24ee3df5d8..fea427072055 100644
--- a/dev-libs/xerces-c/xerces-c-.ebuild
+++ b/dev-libs/xerces-c/xerces-c-.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake prefix
+inherit cmake flag-o-matic prefix
 
-DESCRIPTION="A validating XML parser written in a portable subset of C++"
+DESCRIPTION="Validating XML parser written in a portable subset of C++"
 HOMEPAGE="https://xerces.apache.org/xerces-c/;
 
 if [[ ${PV} == * ]] ; then
@@ -33,7 +33,10 @@ BDEPEND="
 
 DOCS=( CREDITS KEYS NOTICE README )
 
-PATCHES=( "${FILESDIR}"/${PN}-3.2.2-fix-XERCESC-2163.patch )
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.2.2-fix-XERCESC-2163.patch
+   "${FILESDIR}"/${PN}-3.2.4-strict-aliasing.patch
+)
 
 pkg_setup() {
export ICUROOT="${EPREFIX}/usr"
@@ -45,6 +48,10 @@ pkg_setup() {
 }
 
 src_configure() {
+   # bug #856100
+   filter-lto
+   append-flags -fno-strict-aliasing
+
# 'cfurl' is only available on OSX and 'socket' isn't supposed to work.
# But the docs aren't clear about it, so we would need some testing...
local netaccessor

[gentoo-commits] repo/gentoo:master commit in: dev-libs/xerces-c/files/

2023-08-26 Thread Sam James 
commit: b03595edbc4e8b9ddc6588d05ce190cbd82067e0
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 26 13:43:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 26 13:43:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b03595ed

dev-libs/xerces-c: add more metadata to catalog patch

I've also no idea why I dropped the patch before, but even more interestingly,
it's been dropped in the past as well!

Bug: https://bugs.gentoo.org/673548
Bug: https://bugs.gentoo.org/738140
Bug: https://bugs.gentoo.org/913045
Signed-off-by: Sam James  gentoo.org>

 .../xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2163.patch| 13 +++--
 1 file changed, 7 insertions(+), 6 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
index 57dde7220985..50db010bf5ee 100644
--- 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
@@ -1,3 +1,10 @@
+https://bugs.gentoo.org/673548
+https://bugs.gentoo.org/738140
+https://bugs.gentoo.org/913045
+
+https://issues.apache.org/jira/browse/XERCESC-2163
+https://github.com/apache/xerces-c/pull/7
+
 From db7a8b0cd2a163de1e3ef8c950cf9e708b0b5f98 Mon Sep 17 00:00:00 2001
 From: Craig Andrews 
 Date: Wed, 2 Jan 2019 15:01:21 -0500
@@ -5,12 +12,6 @@ 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)

[gentoo-commits] repo/gentoo:master commit in: dev-libs/xerces-c/files/, dev-libs/xerces-c/

2023-08-26 Thread Sam James 
commit: 24091deabb79bba10ee9e7a7b6c7cdd0b56928d6
Author: Yiyang Wu  gmail  com>
AuthorDate: Sat Aug 26 09:22:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 26 13:41:15 2023 +
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  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32457
Signed-off-by: Sam James  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-.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 ..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 
+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-.ebuild 
b/dev-libs/xerces-c/xerces-c-.ebuild
index 0fdc2749c78a..4b24ee3df5d8 100644
--- a/dev-libs/xerces-c/xerces-c-.ebuild
+++ b/dev-libs/xerces-c/xerces-c-.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"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/xerces-c/files/, dev-libs/xerces-c/

2021-02-15 Thread Joonas Niilola 
commit: a0edc86d99bba70f585b6a1a55ef07e3db5c1635
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Feb 15 09:01:32 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Feb 15 09:03:52 2021 +
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  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 000..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 
+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"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/xerces-c/files/, dev-libs/xerces-c/

2021-02-14 Thread Andreas Sturmlechner 
commit: bf726e07931d495520975c79731606837040b224
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb 14 22:09:26 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb 14 22:09:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf726e07

dev-libs/xerces-c: Drop 3.2.2-r1

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-libs/xerces-c/Manifest |   2 -
 .../files/xerces-c-3.2.2-fix-XERCESC-2163.patch|  24 -
 dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild | 120 -
 3 files changed, 146 deletions(-)

diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index df3adb6a720..b6d8b2b5373 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -1,3 +1 @@
-DIST xerces-c-3.2.2-fix-XERCESC-2161.patch 42804 BLAKE2B 
c55aa5ff9d0ca8b716aaffb25435b0a1fbfc8684dc601dc009e3e44f3608c9c21ca3190a25d4813f7e34d75f070ca5de5554e35a2408d65f168b6a8715a156e1
 SHA512 
04d8cf6e220b7a7dc09a8dba4ff763dd8ccb133a81a5338d64a5cdf2c039f2d51958ec7eeea8ca04eeed8433c3239df8d74e6c697ac8c2c3476e8917d02507a5
-DIST xerces-c-3.2.2.tar.gz 7100953 BLAKE2B 
d167299797189ef181c384ac49095e8bc4cf4e0c7d646e72840a19f56c6eea060168d2c2d29c29ce6cc76dd44e403bea4c3dcde67f964b87f3abc807ad0b14ad
 SHA512 
13709b47b61d957d736f34b774dbc7fbd85171eedebd0cada41fd1d17929e6c42904c882b1e1d4f9b4fd464938b62e5ebb127187b4974dfade6a593e31471e80
 DIST xerces-c-3.2.3.tar.gz 7120270 BLAKE2B 
d622621657f33ada75a9ef330e2b8f9cff717d8efc06f2a1fffea77360596e5192b48a6a015403a1045aa2492c626ba05f1de15eb5b997a80ca19b032db8
 SHA512 
206c5c31510224b8f6963b051f27968e4fe70374a0adb2c2990ac1f865b3bac41f63e6bfb7279faa21477f8878a3b9671ba70726fc75a84e51f037ef158639ad

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
deleted file mode 100644
index 57dde722098..000
--- a/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2163.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From db7a8b0cd2a163de1e3ef8c950cf9e708b0b5f98 Mon Sep 17 00:00:00 2001
-From: Craig Andrews 
-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.2-r1.ebuild 
b/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
deleted file mode 100644
index 9671a52d453..000
--- a/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-
-inherit cmake-utils prefix
-
-DESCRIPTION="A validating XML parser written in a portable subset of C++"
-HOMEPAGE="https://xerces.apache.org/xerces-c/;
-
-if [[ ${PV} == * ]] ; then
-   ESVN_REPO_URI="https://svn.apache.org/repos/asf/xerces/c/trunk;
-   inherit subversion
-else
-   SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz
-   
https://dev.gentoo.org/~juippis/distfiles/tmp/xerces-c-3.2.2-fix-XERCESC-2161.patch;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 
~amd64-linux ~x86-linux ~x64-macos"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-IUSE="cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD examples iconv 
icu static-libs test threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="icu? ( dev-libs/icu:0= )
-   curl? ( net-misc/curl )
-   virtual/libiconv"
-DEPEND="${RDEPEND}
-   doc? ( app-doc/doxygen )
-   test? ( dev-lang/perl )"
-
-DOCS=( CREDITS KEYS NOTICE README )
-PATCHES=(
-   "${DISTDIR}/${P}-fix-XERCESC-2161.patch"
-   "${FILESDIR}/${P}-fix-XERCESC-2163.patch"
-)
-
-pkg_setup() {
-   export ICUROOT="${EPREFIX}/usr"
-
-   if use iconv && use icu; then
-   ewarn "This package can use iconv or icu for loading messages"
-   ewarn "and transcoding, but not both. ICU takes precedence."
-   fi
-}
-
-src_configure() {
-   # 'cfurl' is only available on OSX and 'socket' isn't supposed to work.
-   # But the docs aren't clear about it, so we would need some testing...
-   local netaccessor
-   if use curl; then
-   netaccessor="curl"
-   elif use elibc_Darwin; then
-   netaccessor="cfurl"
-   else
-   netaccessor="socket"
-   fi
-
-   local msgloader
-   if use

[gentoo-commits] repo/gentoo:master commit in: dev-libs/xerces-c/files/, dev-libs/xerces-c/

2020-11-15 Thread Joonas Niilola 
commit: dc2d0c6929361a5c2006c5d663518fee7526bf52
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Nov 15 15:01:53 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Nov 15 15:31:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc2d0c69

dev-libs/xerces-c: fix SizeViolation issue

Closes: https://bugs.gentoo.org/748174
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-libs/xerces-c/Manifest |   1 +
 .../files/xerces-c-3.2.2-fix-XERCESC-2161.patch| 770 -
 dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild |   5 +-
 3 files changed, 4 insertions(+), 772 deletions(-)

diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index 51b28cd065e..df3adb6a720 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -1,2 +1,3 @@
+DIST xerces-c-3.2.2-fix-XERCESC-2161.patch 42804 BLAKE2B 
c55aa5ff9d0ca8b716aaffb25435b0a1fbfc8684dc601dc009e3e44f3608c9c21ca3190a25d4813f7e34d75f070ca5de5554e35a2408d65f168b6a8715a156e1
 SHA512 
04d8cf6e220b7a7dc09a8dba4ff763dd8ccb133a81a5338d64a5cdf2c039f2d51958ec7eeea8ca04eeed8433c3239df8d74e6c697ac8c2c3476e8917d02507a5
 DIST xerces-c-3.2.2.tar.gz 7100953 BLAKE2B 
d167299797189ef181c384ac49095e8bc4cf4e0c7d646e72840a19f56c6eea060168d2c2d29c29ce6cc76dd44e403bea4c3dcde67f964b87f3abc807ad0b14ad
 SHA512 
13709b47b61d957d736f34b774dbc7fbd85171eedebd0cada41fd1d17929e6c42904c882b1e1d4f9b4fd464938b62e5ebb127187b4974dfade6a593e31471e80
 DIST xerces-c-3.2.3.tar.gz 7120270 BLAKE2B 
d622621657f33ada75a9ef330e2b8f9cff717d8efc06f2a1fffea77360596e5192b48a6a015403a1045aa2492c626ba05f1de15eb5b997a80ca19b032db8
 SHA512 
206c5c31510224b8f6963b051f27968e4fe70374a0adb2c2990ac1f865b3bac41f63e6bfb7279faa21477f8878a3b9671ba70726fc75a84e51f037ef158639ad

diff --git a/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2161.patch 
b/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2161.patch
deleted file mode 100644
index f1a847c5569..000
--- a/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2161.patch
+++ /dev/null
@@ -1,770 +0,0 @@
 /dev/null  2018-12-04 16:29:46.857790926 -0500
-+++ b/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg  
2018-12-07 14:18:19.183422991 -0500
-@@ -0,0 +1,767 @@
-+$quote "
-+$set 1
-+2  notation '{0}' has already been declared
-+3  attribute '{0}' has already been declared for element '{1}'
-+4  encoding '{0}' from XML declaration or manually set contradicts the 
auto-sensed encoding; ignoring
-+5  element '{0}' is referenced in a content model but was never declared
-+6  element '{0}' is referenced in an ATTLIST but was never declared
-+7  {0}
-+8  unable to include document '{0}'
-+9  unable to open text file target '{0}'
-+10  unable to include resource '{0}'
-+13  '{0}' is not allowed for the content of simpleType; only list, union, and 
restriction are allowed
-+14  globally-defined complex type must have a name
-+15  globally-declared attribute must have a name
-+16  attribute declaration must have name or 'ref' attribute
-+17  element declaration must have name or 'ref' attribute
-+18  group declaration must have name or a 'ref' attribute
-+19  attributeGroup declaration must have name or 'ref' attribute
-+20  anonymous complexType in element '{0}' has name
-+21  anonymous simpleType in element '{0}' has name
-+22  content of element declaration must match (annotation?, (simpleType | 
complexType)?, (unique | key | keyref)*)
-+23  invalid content in simple type '{0}'; only list, union, and restriction 
are allowed
-+24  expected simpleType in list definition for type '{0}'
-+25  list, union, or restriction content is invalid for type '{0}'
-+26  invalid content in list definition for type '{0}'
-+27  expected simpleType in restriction definition for type '{0}'
-+28  facet '{0}' is already defined
-+29  expected simpleType in union definition for type '{0}'
-+30  content in simpleType definition is empty
-+31  expected restriction or extension in simpleContent definition
-+32  base attribute must be specified for restriction or extension definition
-+33  expected restriction or extension in complexContent definition
-+34  invalid content in 'schema' element
-+35  invalid content for type '{0}'
-+36  unknown simpleType '{0}'
-+37  unknown complexType '{0}'
-+38  prefix '{0}' can not be resolved to namespace URI
-+39  referenced element '{0}' not found
-+40  type '{0}:{1}' not found
-+41  attribute '{0}' not found
-+42  invalid element '{0}' in complex type definition
-+43  base type '{0}' not found
-+44  unable to create validator for '{0}'
-+45  invalid element following simpleContent definition in complexType
-+46  invalid element following complexContent definition in complexType
-+47  attribute '{0}' cannot have both fixed and default values
-+48  attribute '{0}' with default value must be optional
-+49  attribute '{0}' declared more than once in the same scope
-+50  attribute '{0}' cannot have both 'type'

[gentoo-commits] repo/gentoo:master commit in: dev-libs/xerces-c/files/, dev-libs/xerces-c/

2019-01-02 Thread Craig Andrews 
commit: 76cb1c9b4b513143c25e1bf7d0ab9034ec0f9682
Author: Craig Andrews  gentoo  org>
AuthorDate: Wed Jan  2 20:16:21 2019 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Wed Jan  2 20:16:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76cb1c9b

dev-libs/xerces-c: use ninja, fix XercesMessages_en_US.cat path

Closes: https://bugs.gentoo.org/673548
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Craig Andrews  gentoo.org>

 .../files/xerces-c-3.2.2-fix-XERCESC-2163.patch|  24 +
 dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild | 118 +
 2 files changed, 142 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 000..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 
+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.2-r1.ebuild 
b/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
new file mode 100644
index 000..2c447d12051
--- /dev/null
+++ b/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+
+inherit cmake-utils prefix
+
+DESCRIPTION="A validating XML parser written in a portable subset of C++"
+HOMEPAGE="https://xerces.apache.org/xerces-c/;
+
+if [[ ${PV} == * ]] ; then
+   ESVN_REPO_URI="https://svn.apache.org/repos/asf/xerces/c/trunk;
+   inherit subversion
+else
+   SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD examples iconv 
icu static-libs test threads"
+
+RDEPEND="icu? ( dev-libs/icu:0= )
+   curl? ( net-misc/curl )
+   virtual/libiconv"
+DEPEND="${RDEPEND}
+   doc? ( app-doc/doxygen )
+   test? ( dev-lang/perl )"
+
+DOCS=( CREDITS KEYS NOTICE README )
+PATCHES=(
+   "${FILESDIR}/${P}-fix-XERCESC-2161.patch"
+   "${FILESDIR}/${P}-fix-XERCESC-2163.patch"
+)
+
+pkg_setup() {
+   export ICUROOT="${EPREFIX}/usr"
+
+   if use iconv && use icu; then
+   ewarn "This package can use iconv or icu for loading messages"
+   ewarn "and transcoding, but not both. ICU takes precedence."
+   fi
+}
+
+src_configure() {
+   # 'cfurl' is only available on OSX and 'socket' isn't supposed to work.
+   # But the docs aren't clear about it, so we would need some testing...
+   local netaccessor
+   if use curl; then
+   netaccessor="curl"
+   elif use elibc_Darwin; then
+   netaccessor="cfurl"
+   else
+   netaccessor="socket"
+   fi
+
+   local msgloader
+   if use icu; then
+   msgloader="icu"
+   elif use iconv; then
+   msgloader="iconv"
+   else
+   msgloader="inmemory"
+   fi
+
+   local transcoder
+   if use icu; then
+   transcoder="icu"
+   elif use elibc_Darwin; then
+   transcoder="macosunicodeconverter"
+   elif use elibc_FreeBSD; then
+   transcoder="iconv"
+   else
+   transcoder="gnuiconv"
+   fi
+   # for interix maybe: transcoder="windows"
+
+   local mycmakeargs=(
+   -Dnetwork-accessor="${netaccessor}"
+   -Dmessage-loader="${msgloader}"
+   -Dtranscoder="${transcoder}"
+   -Dthreads:BOOL="$(usex threads)"
+   -Dsse2:BOOL="$(usex cpu_flags_x86_sse2)"
+   )
+
+   cmake-utils_src_configure
+}
+
+src_compile() {
+   cmake-utils_src_compile
+
+   use doc && cmake-utils_src_compile doc-style createapidocs doc-xml
+}
+
+src_install () {
+   cmake-utils_src_install
+
+   # package provides .pc files
+   find "${D}" -name '*.la' -delete || die
+
+   if use examples; then
+   # clean out object files, executables, Makefiles
+   # and the like before

[gentoo-commits] repo/gentoo:master commit in: dev-libs/xerces-c/files/

2017-09-06 Thread David Seifert 
commit: c16ed07c209ebbe47d2423288044c13d8b71028b
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Sep  6 17:02:47 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Sep  6 20:03:20 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c16ed07c

dev-libs/xerces-c: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/5644

 .../files/3.1.1-disable-thread-tests.patch | 74 --
 1 file changed, 74 deletions(-)

diff --git a/dev-libs/xerces-c/files/3.1.1-disable-thread-tests.patch 
b/dev-libs/xerces-c/files/3.1.1-disable-thread-tests.patch
deleted file mode 100644
index bb94299af23..000
--- a/dev-libs/xerces-c/files/3.1.1-disable-thread-tests.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/scripts/sanityTest_ExpectedResult.log 
b/scripts/sanityTest_ExpectedResult.log
-index 3588d84..9a45457 100644
 a/scripts/sanityTest_ExpectedResult.log
-+++ b/scripts/sanityTest_ExpectedResult.log
-@@ -1146,42 +1146,7 @@ Options:
- 1Test Run Successfully
- 2Test Run Successfully
- 3Test Run Successfully
--No input XML file specified on command line.
--usage:  ThreadTest [-v] [-threads nnn] [-time nnn] [-quiet] [-verbose] 
xmlfile...
-- -v=xxx Validation scheme [always | never | auto].  Default is 
AUTO.
-- -n Enable namespace processing. Defaults to off.
-- -s Enable schema processing. Defaults to off.
-- -f Enable full schema constraint checking. Defaults to off.
-- -parser=xxxParser Type [dom | sax | sax2].  Default is SAX (SAX1).
-- -p Enable namespace prefixes. Defaults to off.
--(Only used with -parser=sax2, ignored otherwise.)
-- -quiet Suppress periodic status display.
-- -verbose   Display extra messages.
-- -reuse Retain and reuse parser.  Default creates new for each 
parse.
-- -threads nnn   Number of threads.  Default is 2.
-- -time nnn  Total time to run, in seconds.  Default is forever.
-- -parses nnnRun for nnn parses instead of time.  Default is to use 
time
-- -dump  Dump DOM tree on error.
-- -mem   Read files into memory once only, and parse them from 
there.
-- -gcEnable grammar caching (i.e. grammar cached and used in 
subsequent parses). Defaults to off.
-- -init  Perform an initial parse of the file(s) before starting 
up the individual threads.
--
--1Test Run Successfully
--2Test Run Successfully
--3Test Run Successfully
--4Test Run Successfully
--5Test Run Successfully
--6Test Run Successfully
--7Test Run Successfully
--8Test Run Successfully
--9Test Run Successfully
--10Test Run Successfully
--11Test Run Successfully
--12Test Run Successfully
--13Test Run Successfully
--14Test Run Successfully
--15Test Run Successfully
--
-+123456789101112131415
- Usage:
- MemHandlerTest [options] 
- 
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 177c1c8..f333700 100644
 a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -84,8 +84,6 @@ NetAccessorTest_SOURCES =   
src/NetAccessorTest/NetAccessorT
- #   
src/ParserTest/ParserTest_Parser.cpp \
- #   
src/ParserTest/ParserTest_Parser.hpp
- 
--testprogs +=ThreadTest
--ThreadTest_SOURCES =src/ThreadTest/ThreadTest.cpp
- 
- # Fails to compile under gcc 4 (ambiguous calls to NullPointerException)
- # dcargill says this is obsolete and we can delete it.
-diff --git a/tests/Makefile.in b/tests/Makefile.in
-index d1df240..c4749fd 100644
 a/tests/Makefile.in
-+++ b/tests/Makefile.in
-@@ -92,7 +92,7 @@ am__EXEEXT_1 = DOMTest$(EXEEXT) DOMMemTest$(EXEEXT) \
-   DOMTraversalTest$(EXEEXT) DOMTypeInfoTest$(EXEEXT) \
-   EncodingTest$(EXEEXT) InitTermTest$(EXEEXT) \
-   MemHandlerTest$(EXEEXT) NetAccessorTest$(EXEEXT) \
--  ThreadTest$(EXEEXT) XSerializerTest$(EXEEXT) \
-+  XSerializerTest$(EXEEXT) \
-   XSTSHarness$(EXEEXT) XSValueTest$(EXEEXT)
- am__dirstamp = $(am__leading_dot)dirstamp
- am_DOMMemTest_OBJECTS = src/DOM/DOMMemTest/DOMMemTest.$(OBJEXT)