gentoo auto-resync : 29:01:2024 - 18:57:21

4 files changed, 36 insertions, 1 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 2bbef45e0b43..834a494f4a5b 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 9e3b89e9413c..dbfea9a09c39 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,10 +1,11 @@
 AUX mysql-workbench-6.2.5-wbcopytables.patch 496 BLAKE2B 4666f32098ec43ad36f1c726903472e829873002521262d6781a2febfc1394dac6f9708fbb99a3fa52a032a5b8f695c9b98579b28a63e74727eac21a8ef3fbe6 SHA512 c0766315cd345893af57880eccdc2c1dd9ffa456a27d0c736af1382ca24c507de865188588753f212f35d8781305dcbd8d555f128edd6454dc2299bd0357fd5b
 AUX mysql-workbench-8.0.19-mysql-connector-8.patch 624 BLAKE2B 0cb899a8b0127664471877bb9cdcda946c35ed7a159646b94891a791a618c77201cc7696d6f2893e95fd78dbc13325cef752740f76e69974e10c0f88084594fb SHA512 09c2349cb42393f6d32f24804e2c3438a5d846fc9611e0684ccf2139fd30b0abcb0f2aa7b205c60a081259e073fb345cd72837dab1a216e6a8aaaba5ec3decf7
 AUX mysql-workbench-8.0.33-gcc13.patch 1516 BLAKE2B 831bde621ae092aeb75bf3e9cab6ad8eecfef27e036586fe4a3ca8a60f8d512ce4610a9ebf20e956c4a903df18eb0c3f2c5608cda462ca3c2a1cee50b0e6b1f9 SHA512 a37e9d9de5d7606528bdf80f15fda67511328bb8826005810a633eeb5b12d942b27c8a4b8287d13de8e77979f8dab90f671fb3d0334cdb9d4d7ed10bdac84ef5
+AUX mysql-workbench-8.0.36-libxml2-2.12-support.patch 1167 BLAKE2B f0f7275dd923191accaeea90bdfff2e511c20eb1d5a7e369852b1d572b8b2e5945c2f04ec95a9eb92b7c96c3622d817a1d60da18ea31f4037d4a8406957971a7 SHA512 89196eb3c61636111914eed8fbf501cfeb1bd5c605c7b0bd2bac8e56fad957c7d02d34b423b456365c5c11b367ac10e9bf04ba07e8486d53170eb11003e5990d
 DIST antlr-4.11.1-complete.jar 3547867 BLAKE2B 24e9799a402302fd13ebd91028a8e3b8141af50b446bc06bb4df3f7619cad956e9b681c0908b870a1f9d6701049e89099906cdc6038dc007984b19f7a8cc756b SHA512 a445bb71e4470ffa7bbb382a873fe5c5737b96b2c68b57593c1151ed9944ec701ce0c299ea5c3b593bd33916d384d598e2538a9b0b11b41c77a399beca4aab88
 DIST mysql-workbench-community-8.0.34-src.tar.gz 27906155 BLAKE2B 3a05e1763eddba5c72242eb3d79100fee43915a96fc0198ad5624f14f5228cc11040d424ccd484ee312d8bcd2372c5197ae0136e8d33f3fd45b3ed429ff9ee20 SHA512 e031f6a0cadab528d64160113539535e93aea4631e0139256f6b3e812fa6d12a35c71f16f78d60ceeb004edb3a67bbd4db6ac3e5c286df23491d3f0b410f1c77
 DIST mysql-workbench-community-8.0.36-src.tar.gz 27419906 BLAKE2B 47ab5c64b5beee712c9227cdb5c46a6863d830ef75983e0e56702e0b08370b9118b301d0c34ba95180bef2fe0b01ae24791337c9e1922cd412a37f057906027a SHA512 953f072414abb8c236ffccb8a4439dcd4c5eb76ff07f5ca276c35e8cf6102ef73292412fc70113a167f34bd998603ef22b59038ae06cf84d2f0440769c1d9689
 EBUILD mysql-workbench-8.0.34-r1.ebuild 2909 BLAKE2B 16a1fe8662821ee5131bd8611027bafd860db8c9b7d236b3e835decfbf01f60c5ecc123e644129ec90020ea2774848c29fdf7a54fa774acbd2c3f0c1ff24d4b0 SHA512 3e009bff8ba2177e5b9bbfe1c734e359a81739fbcfb1898624911c840e70ca5ce4876e88d156d707fcb18f9b53fd1ca1daded15375deedf00ede66d5b5ce0305
 EBUILD mysql-workbench-8.0.34.ebuild 2897 BLAKE2B a626b8912309d75a92321048d9ee6b3add79f68be2505bbdb513a6feaa90d8d9a85738d2021441931087cd3bb1c1fdd80302fc70700a0d01e664e1332bceed73 SHA512 9602a001c551afd8a98eb04218720e2295508e11b8fb968f71213ac7520ce4e89c72d6bec9140554e2b8ff239d1ad0f13f7bc74c62abd7a08184e335d5176825
-EBUILD mysql-workbench-8.0.36.ebuild 2892 BLAKE2B badc6a48e227a00c8910d5699edafa88cf5686744a59a7a5f68e8b84a35759c379f9b47a0059796a406e8fff4c6548b0b60de8c3fe0f9a3e12a17d3c10ddb3c3 SHA512 244d3c68ac1cf476250ba43a1dc3db3d43f16a5e154ec770b035c1f2ba093633655be67e157dda7bf2a1e8765b3f0d371fbffd8ae94fcda4e51044083ae28b9f
+EBUILD mysql-workbench-8.0.36.ebuild 2947 BLAKE2B 7fc8cee4530b3ced40b51b0bc6a7b60cc833d9e4dd678948ac9412d009686670c083a9c3bccc03a1a4b46b168bc9540e948ad8235d642e10ebb36b96a6ee9a66 SHA512 1f974b5112b19a6a4a43a4f84206ad60148b20ad9621a8104904db7316e9c04fe869387f3773bd85acffa1957bf220800b9efbd39f920714fbdb130439447be1
 MISC metadata.xml 312 BLAKE2B 8c491f0d45e24b9e367ef63f8822daf6925a17f8d44ff822b8faf7485f729524de02309b91e18411421b4533aa086853914c4a0b2a93d3fd5573a289fa1e3715 SHA512 01f2f645d167290bdb313e6c1c386b0426b41edd0ee9b50acf538a7353855c84321111ffd11c213c71424c7df73aa48b8fb9f3f2af914b595fb2961cc6b3186c
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-8.0.36-libxml2-2.12-support.patch b/dev-db/mysql-workbench/files/mysql-workbench-8.0.36-libxml2-2.12-support.patch
new file mode 100644
index 000000000000..e3ee9aa099f0
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-8.0.36-libxml2-2.12-support.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/923020
+https://github.com/mysql/mysql-workbench/pull/43
+
+From 8f8917671ab5a06f842a340f31c6d4ec7634147a Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona@protonmail.com>
+Date: Sat, 27 Jan 2024 22:51:15 +0200
+Subject: [PATCH] Fix support for libxml2-2.12 with its api and header changes
+
+Signed-off-by: Alfred Wingate <parona@protonmail.com>
+--- a/library/grt/src/grt.h
++++ b/library/grt/src/grt.h
+@@ -34,6 +34,7 @@
+ #include <vector>
+ #include <stdexcept>
+ #include <boost/function.hpp>
++#include <libxml/tree.h>
+ #include <libxml/xmlmemory.h>
+ #include "base/threading.h"
+ #include <string>
+--- a/library/grt/src/unserializer.cpp
++++ b/library/grt/src/unserializer.cpp
+@@ -401,7 +401,11 @@ ValueRef internal::Unserializer::unserialize_xmldata(const char *data, size_t si
+   xmlDocPtr doc = xmlReadMemory(data, (int)size, NULL, NULL, XML_PARSE_NOENT);
+ 
+   if (!doc) {
++#if LIBXML_VERSION >= 21200
++    const xmlError* error = xmlGetLastError();
++#else
+     xmlErrorPtr error = xmlGetLastError();
++#endif
+ 
+     if (error)
+       throw std::runtime_error(base::strfmt("Could not parse XML data. Line %d, %s", error->line, error->message));
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.36.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.36.ebuild
index c8e0352d19f7..2f2d812652f4 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.36.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.36.ebuild
@@ -70,6 +70,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
 	"${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
 	"${FILESDIR}/${PN}-8.0.33-gcc13.patch"
+	"${FILESDIR}/${PN}-8.0.36-libxml2-2.12-support.patch"
 )
 
 src_unpack() {