gentoo auto-resync : 20:12:2022 - 01:49:56

3 files changed, 54 insertions, 1 deletions

diff --git a/dev-libs/xalan-c/Manifest b/dev-libs/xalan-c/Manifest
index e48de8200d72..17e3c01136df 100644
--- a/dev-libs/xalan-c/Manifest
+++ b/dev-libs/xalan-c/Manifest
@@ -2,10 +2,11 @@ AUX 1.11.0_pre797991-as-needed.patch 4803 BLAKE2B 1dd127bb9fd93cc58ac0a09e45354d
 AUX 1.11.0_pre797991-bugfixes.patch 1409 BLAKE2B 78c628ae10560bf950c7fed9ae4c28216bfb97bc7936064f20ee91403e74297d0b15ea1755901f26d900e53ba935fee937b726bee65511272e305f2731bdc94d SHA512 3eaa70d2936b7091e036d936ff8b35cbf2399ccbb81444b8a6a9583cbd11aa865e7f927a035b1d0223c172eb8de891e4da3b7113b155dfc4e8b19d0da5c4c4da
 AUX 1.11.0_pre797991-parallel-build.patch 2530 BLAKE2B 2d88ed70b30643cae4bcf6a88de56706fd1f0cf5b71e2d12dd24812217ce06023b08b8914dcbcfd828e8c8ba8b116d227d621cc785fbd3591a2d2d502be5fa37 SHA512 be994c118b212b3b96409c273b01d2b00b0a8b0f7ec53338f8efc6ec9d9dccd4fb6fdcaf7c365351024a965e96992ff23ba849c90d6d6aa1e7086c51c763cbef
 AUX xalan-c-1.12-fix-lto.patch 823 BLAKE2B db4000d8959e5869d0f0afd92ede88f2bb279af6a9dfb1109655628a23357673dfe1594033d49eb595b8e0bfe1197ecb4492be81b47df6d367fa78378f3bae59 SHA512 efe6df198bd68ae4feb5f75e9679b57a2d53e21b1efa724889cb74a9fa90ac77fc598bada8042bac01e1a898a53ad0ef9e7b9bc3a328aab22b9c5506d477b671
+AUX xalan-c-1.12-fix-threads.patch 1074 BLAKE2B 086208fa8dbebc3b5edc5119386ba3976d7a939e505a81c625ab6fb7b8dddd198aa41bbc93177e575d8475a8ee4fdec62d27d4c3442121c29f72c341a123df8d SHA512 33aa9cc55bc4cc29e3d1fedd9dbd1792695ad52f50e2ed46f7872585892dca579d75622ad91d4d854d9ed1dabf38b282c69ef39a3d909321ad2b48e5e8244066
 DIST Xalan-C_r1153059-src.tar.gz 1573651 BLAKE2B 5e684b80bc962776c1e0102a97023ee3a9b9357b6fc05e02687971d5d879b01a5dc426fd6ab2af68a7ad6ec48a799d70fd912a4e3a30d8e3a22a954d84d21f59 SHA512 2382c1343ae97d0196d84053139758d3b3b7574bcd835b754e34acdc6ab708a58fc23d2f27d41870c768c78a1de7be1bb6031cc78d205b6024f1ad7cd6fca653
 DIST xalan_c-1.12.tar.gz 1130924 BLAKE2B c2f0fb98d39e516d5219ab0e075517c2c916b451bfce6d90399899870a8a73fb59f8d2465f58bd97208d19c5a7a18df5a49ece156d8dfe47bf57fc875793fb43 SHA512 a9f72f0e8e199ee2cfb4c19ecf390d5007f597aad96a53f55bc475805190302c7e0d800d776b7fb20fe8e2dddb6391e70aa3a8861a2303370135e8b0a5fd15fc
 DIST xalan_c-1.12.tar.gz.asc 488 BLAKE2B 1e5d7091ca184ac7e2897fe52417b01d9618ab0435f2bcc7748d563287ad81692e61bee92ec9bc71e5c21c11bc8245a4ec09ff7e6ed44a4b3113264b096ba277 SHA512 1c532367d5a3f16622cda3eaca05eac648b415a9de8685cf43f5e62683db30b396e669b6952f5bbe161327b8171cd1e54ad4dbefa54122243aa01298d53d400d
 EBUILD xalan-c-1.11.0_pre1153059.ebuild 2180 BLAKE2B a31ce8f492efc514caec802d6d855d0329561d47c7692c3bc864415c545f644decd633427eb03f4065799215f80a8fa8c0e309391f6542f808e876bb036b249d SHA512 948a65343d58b40f06aae2cf4625782679528e714a1f3de5f2ecd10062135d4cdc39d49a84b1248989e7b42d3ee11e7ea83d4aef4ad9ee5fb06cd062aedc845b
-EBUILD xalan-c-1.12-r2.ebuild 1209 BLAKE2B cd6b0f9300bae7e46336aadfab066098794868181fc25c46266f7292ef0eca0c1b6bea899a25008648b380de50c7da3d789e426f38ae511437efa3081a138651 SHA512 a94bba534dd15fa62082adc1a96e07c96d4e2f832aaa9e4c9e8fbc4d186bcea5a95f00a7250e532633cea7c1e33c89d87ef8f38a9f0ce3678b818d1155763ac9
+EBUILD xalan-c-1.12-r2.ebuild 1247 BLAKE2B bf9bb59fbba8408dce961936e656d157130eda7a8c182f4f4eac7ece7e0e122a0eb74dd44fc58843adf2dc033cfffa59091a313e8d3fc6921c58793935d8c8d5 SHA512 2e9d660bf1d79796e24e58b47f8c683d3b736310d145f8047483bf1dd93e4b023f5784cecde829c5e4e037d0c4706d24fe9d838faee9e1444d4bf840cf07911f
 EBUILD xalan-c-9999.ebuild 1215 BLAKE2B 6d7e50d203f4533e17a5846d4d74a189c7e6bf9f6fc39954fbf6b1db524a9b40e91e631ef884bc98a93839e2444543d31846916eca1a9779f82c7b8d0a4321a4 SHA512 23183fa1e95f45ac7e9d5d2da6a6676f924b1ca4128e22f45fccdb4961c481e0e7da88429a7854cc94d7af7a99648745b8454d6a2270d47b7b7cab65723e031f
 MISC metadata.xml 321 BLAKE2B a2e8e4499ce42f511537b6f3a1975f857ef40205dca2220536cc124bcb9f94c1017efe3f5e9124490f65758ac277b5db57bace8987e8118ea4a524b57d1a07a2 SHA512 af706a4b4d2a6e5f9ce31f83f367423097168c97fc8ca42e82a1c93a542329cd699d52902aaa63fc9b43cfc5a5c15cd26a87b754cc314d25131f9bb8652447ef
diff --git a/dev-libs/xalan-c/files/xalan-c-1.12-fix-threads.patch b/dev-libs/xalan-c/files/xalan-c-1.12-fix-threads.patch
new file mode 100644
index 000000000000..4a8e0e582621
--- /dev/null
+++ b/dev-libs/xalan-c/files/xalan-c-1.12-fix-threads.patch
@@ -0,0 +1,51 @@
+xercesc::XMLMutex doesn't work, replace it by std::mutex
+Bug: https://bugs.gentoo.org/887197
+
+--- a/Tests/Threads/ThreadTest.cpp
++++ b/Tests/Threads/ThreadTest.cpp
+@@ -49,6 +49,7 @@
+ 
+ #if defined(XALAN_USE_THREAD_STD)
+ #include <thread>
++#include <mutex>
+ #elif defined(XALAN_USE_THREAD_WINDOWS)
+ 
+ #include <process.h>
+@@ -95,8 +96,8 @@
+ 
+ 
+ 
+-typedef xercesc::XMLMutex         XMLMutexType;
+-typedef xercesc::XMLMutexLock     XMLMutexLockType;
++typedef std::mutex                  XMLMutexType;
++typedef std::lock_guard<std::mutex> XMLMutexLockType;
+ 
+ 
+ 
+@@ -121,7 +122,7 @@
+ 
+     XMLMutexType    m_mutex;
+ 
+-    long            m_counter;
++    volatile long   m_counter;
+ };
+ 
+ 
+@@ -143,7 +144,7 @@
+ void
+ SynchronizedCounter::increment()
+ {
+-    const XMLMutexLockType  theLock(&m_mutex);
++    const XMLMutexLockType  theLock(m_mutex);
+ 
+     if (m_counter < LONG_MAX)
+     {
+@@ -156,7 +157,7 @@
+ void
+ SynchronizedCounter::decrement()
+ {
+-    const XMLMutexLockType  theLock(&m_mutex);
++    const XMLMutexLockType  theLock(m_mutex);
+ 
+     if (m_counter > 0)
+     {
diff --git a/dev-libs/xalan-c/xalan-c-1.12-r2.ebuild b/dev-libs/xalan-c/xalan-c-1.12-r2.ebuild
index cd8b913943ee..74e63f8e818f 100644
--- a/dev-libs/xalan-c/xalan-c-1.12-r2.ebuild
+++ b/dev-libs/xalan-c/xalan-c-1.12-r2.ebuild
@@ -43,6 +43,7 @@ BDEPEND+="
 
 PATCHES=(
 	"${FILESDIR}"/${P}-fix-lto.patch
+	"${FILESDIR}"/${P}-fix-threads.patch
 )
 
 src_configure() {