gentoo resync : 11.05.2021

3 files changed, 58 insertions, 1 deletions

diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 7114ef3e0a2a..831774ebc900 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.23-findlibssh.patch 633 BLAKE2B 12deef5c346773931fb0f6d37a24cc67d4d0d6079b05cacbcaefc7a8c453f2811a4ea018a5e71390739500d2801cc12889ac2b61346830eff9d348925fdbb88d SHA512 d1d2d7091fad56fb62f29a323df00ae29a7ce5e921a49eb9199363e1113da207872f8f636cba479bc15697b574e54b4cf312aa354f6c050bd1934a523175b79d
+AUX mysql-workbench-8.0.24-gcc11-fix.patch 1945 BLAKE2B 15c11ac1926bea61d81e58076a36751bda19eadfa189802d8e8b40cc243fce964bbfd3f7516f3f9b041846f791bc0b6caf38ac9de0bb2e75978fbf9b03c1cdd3 SHA512 11672c0160586a5a098158a645373dd6254dea748757a8c963705a65e1dd59472f1bb76eee0df57d078de1645b780b4b4ea250dc306eb9d7713cf86fd3cd1ebd
 DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed SHA512 de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
 DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 6fcdc184900cd30e42b3e1b6f56bcccbf1d3c975edc8475b92b9c0779568148f711e9bcbb77859d8fbff2d31f362a9b562847b9b9ece03c8c4b7792341fab57e SHA512 a01815324c15fbff9cb917fa2cdef85aabf34c77730913026257e92c195d11f059c73a1579ffa74616b76b5aba34fd6074b19e1de8f2f3bec1c55cd950f4947b
 DIST mysql-workbench-community-8.0.23-src.tar.gz 20719770 BLAKE2B 4e1e44428a9e8a00c23f8f9f6e1519f8d13c205fac110168da67fb462d2a13204d41f1d0e109a3dde8ad2dbd3de31fee09ae4ccea97f9de04d0bc4fb2fad180e SHA512 f50d71bd196d5e5446cd14a228e52c4e74506cc2dd95d1601cc5e99b00db0d82dbcb28fd2ed404ee77ca63c6854d47c46773938e09ab601c10009c0ca99e4d54
 DIST mysql-workbench-community-8.0.24-src.tar.gz 19105744 BLAKE2B bc38f18344ba606d29317e5706b6dcd71a29785a3d94d717c21a591c488182595026bb15e1785e57bd56d74b4eb85c87beb5d386dc050ffe2cb2bd4bb7e665bd SHA512 61dd41cd410cde5da4e43e0fcd9e25fdf4b67b831bb40d8facc9450e9bc9446844f397748875a21a839d2612c64d8f8f05eaae21e9a73e419bfa9e14a8fb19e8
 EBUILD mysql-workbench-8.0.23.ebuild 2787 BLAKE2B fbc8bafa406b87b30467b11e61cebf5caf381f90ae2acf1c3afaf4e15c97d51698ca85be0fa8c370c37731026b7732587e255f3fcfa51b9e9949bee6efe5268a SHA512 2fe267d734478e7aad69d0f4f26c03779d806fb88772a6f330358db285196e1b8ea1063f1d8d6fd68981bc9cb8de8a50e7794813e37d181aae609eae2e4da3e7
-EBUILD mysql-workbench-8.0.24.ebuild 2781 BLAKE2B 3ae8f4b6d1952ae6d7a010579de9cbb5b2bfbcd2b26c9574da9b844cf13f4ae15532b613c983edb4276351de2feb48a93e285abd892a95d39073a99887c76cd5 SHA512 eb9b0919d71de74cddfd11d93ac6d81792c9752b40a8b106864bf9d5e669aab935a27b5b6c6508e75f39b9147b452a0e2583c97e212c232ef96581410273747e
+EBUILD mysql-workbench-8.0.24.ebuild 2825 BLAKE2B 09909039fd5f73bb2f618a8a68a5f152e339f6021afda8b5dd3aa704f2549f1df7964432c6cec3ebfd77cae06a6575cb9bbe38221e3e15d846da3f39e533ceb4 SHA512 97ef69840ec882282f09851681c945a5c83511e6338f50abb73263ad5a7be5156c07f898209f88c2e554632443ede1f3843123c0fd5213ccf671928ad005a881
 MISC metadata.xml 310 BLAKE2B b0d985e39bb17865a05907e5449723c2bf862d9f3ae7f8570173c9cff443171feef6694db26a51880f8c1a4b1e3834ca7ab9bc7c2057fd6f8930b9d1c1c02cdd SHA512 f284063d72f2218f8ed60a74b43f252d608865682b8c0447f52016a02a7cbf6d45a226787d893328dd31946ade1cca78ff7556896183b4422c4142a8935a2193
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-8.0.24-gcc11-fix.patch b/dev-db/mysql-workbench/files/mysql-workbench-8.0.24-gcc11-fix.patch
new file mode 100644
index 000000000000..1ad5b1dafae3
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-8.0.24-gcc11-fix.patch
@@ -0,0 +1,55 @@
+https://bugs.gentoo.org/788199
+
+'volatile gsize' is not accepted by with gcc11 / clang12
+
+"While location has a volatile qualifier, this is a historical
+ artifact and the pointer passed to it should not be volatile"
+https://developer.gnome.org/glib/stable/glib-Threads.html#g-once-init-enter
+
+For Scintilla GTK, see also:
+https://sourceforge.net/p/scintilla/code/ci/790bfd4c0747eb5e0bc4d627a101298207a8421e/
+
+Also adds missing <memory> includes.
+
+Signed-off-by: Ionen Wolkens <sudinave@gmail.com>
+--- a/ext/scintilla/gtk/ScintillaGTKAccessible.cxx
++++ b/ext/scintilla/gtk/ScintillaGTKAccessible.cxx
+@@ -1011,5 +1011,5 @@
+ // @p parent_type is only required on GTK 3.2 to 3.6, and only on the first call

+ static GType scintilla_object_accessible_get_type(GType parent_type G_GNUC_UNUSED) {

+-	static volatile gsize type_id_result = 0;

++	static gsize type_id_result = 0;

+ 

+ 	if (g_once_init_enter(&type_id_result)) {

+@@ -1102,5 +1102,5 @@
+ 	*cache = scintilla_object_accessible_new(0, G_OBJECT(widget));

+ #elif HAVE_GTK_FACTORY // register in the factory and let GTK instantiate

+-	static volatile gsize registered = 0;

++	static gsize registered = 0;

+ 

+ 	if (g_once_init_enter(&registered)) {

+--- a/library/forms/gtk/src/mforms_acc.cpp
++++ b/library/forms/gtk/src/mforms_acc.cpp
+@@ -177,5 +177,5 @@
+     // @p parent_type is only required on GTK 3.2 to 3.6, and only on the first call
+     GType mforms_object_accessible_get_type(GType parent_type G_GNUC_UNUSED) {
+-      static volatile gsize typeIdResult = 0;
++      static gsize typeIdResult = 0;
+ 
+       if (g_once_init_enter(&typeIdResult)) {
+--- a/library/ssh/SSHCommon.h
++++ b/library/ssh/SSHCommon.h
+@@ -42,4 +42,5 @@
+ #include <thread>
+ #include <atomic>
++#include <memory>
+ #include <mutex>
+ 
+--- a/library/ssh/SSHTunnelHandler.h
++++ b/library/ssh/SSHTunnelHandler.h
+@@ -31,4 +31,5 @@
+ #include <thread>
+ #include <map>
++#include <memory>
+ #include <mutex>
+ #include <vector>
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.24.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.24.ebuild
index a565f9ac9900..d30a608ba5fb 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.24.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.24.ebuild
@@ -71,6 +71,7 @@ S="${WORKDIR}"/"${MY_P}"
 PATCHES=(
 	"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
 	"${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
+	"${FILESDIR}/${PN}-8.0.24-gcc11-fix.patch"
 )
 
 src_unpack() {