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

5 files changed, 2 insertions, 139 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 0600fddef80c..6ab3668e91ef 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index ba8111fbd624..4dcee6e6cdf5 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,5 +1,3 @@
-AUX 3.24.40-gdkscreen-x11-fixes.patch 1731 BLAKE2B 7fd7f7708781fd63274a9f20a9b1bc83febe64a5e4b16e648fe6f659ada7b846c5ae9756036aaebc5feb4abb7266c9f402369896d963f17804601ef878dd6288 SHA512 f7b042326c9eae515150dfdcdf0861fce2504e2fca8a525925379847b4861a28faa448c05c3ffb13e6c4083ec27c9df0dade554de12264f1eaf43b324b3fb555
-AUX 3.24.40-test-casts-gcc14.patch 3291 BLAKE2B 8c52782f825fb65897b83639ecff22709eb0f8decc9aaff6363d2367f6264c34050b0e6338277b74e529a05aa93f36516abf5b1e7c65138c984ccb3ea26ea559 SHA512 5f2fa806228fe7d98116ba9ae93b3538abc4c1a2fde623759b13b88558211d7fb0ad1a545e97380b4da460202e82271aa47bb10a04bad1901a7ea1ac1062a12a
 AUX gtk+-2.24.24-out-of-source.patch 1487 BLAKE2B f322f3872c8e1f02f6d1d52cdfdb4b42dad26d44bda2f1a9b36ee7dae0f8e7c072f5a8e492d01429bb4ae679f886b3ef0fb9952bef5a08e75720908f2e8d616d SHA512 794903f8254a49f7d0e24f9730658dc69184969bb450419bd34bc2a9e7065d99931df4ae5ecd93abc0a18bff546aeb6816aae47531e8a79dc5aef5beaf9b6aa2
 AUX gtk+-2.24.31-update-icon-cache.patch 2504 BLAKE2B 29a8874e81e287356f230e355117aabd9c3e9dfd1a810eaa8dc7e60dbe3fb65a73719c272dc1ba2058dae95b3988d86f09fa8587963df34a7486b50e68e79732 SHA512 c2a55a410019502b0af3fa5152fc372ce8a555bd63b5cf7f9574ebe5058f3b95e21dc5f14b5b8867d52105e4f6ebca3336a59935c3a7269bfd41aa91edadab48
 AUX gtk+-2.24.33-Fix-casts.patch 6906 BLAKE2B 80247597a4bb6c84ed71d1c572125c28b2696f8f2571d3816fa44fa744a7cdb2a4cee744906b3172ee88c0d623a1ed0dbfc53c832561e0bc906fec7ebc3621e0 SHA512 0a26e9b726a2233ff5d1c1c2a4be0867c42e5127daf2c8312d68e64aa5e887deed36bb9af755db74c3d7aafd2f45bdec1e03d445d73cda325d73f75a88dfad3e
@@ -13,10 +11,10 @@ DIST gtk+-2.24.33.tar.xz 12661828 BLAKE2B f3488b220aaee54bf36fa77e2112d060152e57
 DIST gtk+-3.24.35.tar.xz 17913328 BLAKE2B 3beea3cbda7247357238ad133c951e69d5670d68e06efb4de09fae7141b141f4eb17a8c79661cab928a3db427f7b32b518875d0951254941e76b1a7aab60e34f SHA512 3a1ec35756fe12f5be3cfe33ef332d583690458327572e69bffad8b4095059d2a744a4a53b2fd31bab5da2ca7b41a2a38fbbd8ba541a45fa8cc0d00eae005ade
 DIST gtk+-3.24.38.tar.xz 12398104 BLAKE2B d24e794025d09b01c215ffcc60382f1bb74214b80fbc019bc0fc2a01bd90673c5a9e94b07b6ec981e9b28caf42b8e98032dd8150ac44a9bcab22bae83445685e SHA512 e99ec10959191b55013fce37e83f0e85bf36597db101e324081479792a2047d032cf0d213d69c02eeb4b7cd6d56d6489b7b2a60904b2bd7af23ea1b9c5a79528
 DIST gtk+-3.24.39.tar.xz 12464680 BLAKE2B 9d0d5814369211c1d60cc81de45a5dfd6ea9fc64d24948abf304e0ad1ae606d9887fc4e5ddccbfab4fb1ccc3c5bb54b453f28899cbdef4e4e885a7f041a6c70f SHA512 8ec3db3544805b51fffaa415029b126761ba0a11b68c67cea80fe001e77878abf4d4719d5d002109f8546409c0caf892ea6d7aa792f8d5d97dc4139668f0451f
-DIST gtk+-3.24.40.tar.xz 13189496 BLAKE2B 6c098e879264051e61a639c327687ead6459c79f226aed5634e4b912d066913a006a5555483e3fab92352dc355fac6af04b910f76b909e99e33d79a03a8dde1f SHA512 21fac23b6375c2e545128e60d4e39f7ee9516a824e4a1834a318af5f2a9f125a8a8572a83bf94b4c179a16c66b6a913e74574ccf2e810301f1a593006a1980c7
+DIST gtk+-3.24.41.tar.xz 13188312 BLAKE2B fbded114fe2b5c1c7bffe79d0a22d559f97081eb972baf31b5c9bd7190bd1ea2875f1c632d3f3be8233377299f1df15bbffbe45d50cc7ff588e034eb41eb8f6e SHA512 aaf061d846fac592e71089feace302bdef1bb64bb2ad6ff30d51d90000da9084cad2fa5bf88cb75adcd789c911d94231ae60a2ca7cf97a2f5720687369a3da98
 EBUILD gtk+-2.24.33-r3.ebuild 9873 BLAKE2B 2c8a9b6615fbf5a53f6bc4ffbe35455029a9401886a7c74258c52a542615a47ef67b3cc59a1b96fab194d8ce4106469d13b7466462473265b3c7d83beb5e14ff SHA512 c807aa90c4289afcebd66ea67b77dd844ff74e3aa7f54ddd0276b4d6df5286f5331ff5a05a88133f67ef4fcee50fb671e96d064acb40b0c03d69043d780be4e2
 EBUILD gtk+-3.24.35.ebuild 6975 BLAKE2B 0f546d052435348f1eb7fe32c286e599d949d078170034f43ff145ad37f5b7212bf39bbd6efe6e6a700ea9d803145b44f1c20db411676b0e43a7cbe78685e3aa SHA512 8567a382f37b0ee50ab8a38104ed9027b4b36f97e23db6ea9ed62d9031e2526d8382fd483363bb5d3133b1178a1addf747218945fd52f845e2540a729bd90a4e
 EBUILD gtk+-3.24.38.ebuild 5764 BLAKE2B 665ef19b8277f63d2a5938f2eea1480a4c484a50d79286750331e0b96780990c5fdfeb652b04a60f0b4c27b0601f885722867a734d6d4ab294772600948129b6 SHA512 602528678ebbbfceca2d05d525932f33502bf7780772fa3e6c913d964baa32290ce02d353998668410d6bd5b26dfe4ea55b1283aa8d769420d5851805664a652
 EBUILD gtk+-3.24.39.ebuild 5698 BLAKE2B 7fff36fef02900cf034676b79123d4a171f9d84ee2fd0094516b3599935a3f40331ca2d1d6a8d0fbe08c1b0d4c2a0f37daef477bf10af87d4a7d7e85919a61c3 SHA512 f06780d559e817780ab9110aa424ad9670f89f97b83c521610f90b92adf5b49eff82424c66a9188078f94a09fc31bc7c0124abeb4e8ecc105780b33a01b7e067
-EBUILD gtk+-3.24.40.ebuild 5873 BLAKE2B 82406242802924c8a278899c4d8cb611cf27670a733ec9596666168e8ff95ce51b2bc033c0b53aff4a79150d1d80b8df511e475c59dd55d603c41c9d3d9061b4 SHA512 c271346e3d6f391b206b65c107d4014b23a4c311f1454efe0d06f330460d1458cd67497b441cce458004b034bba61a90d78fa13a024e3f66537565a598511c02
+EBUILD gtk+-3.24.41.ebuild 5699 BLAKE2B 203aea8c52bf959ddf987150436e3ef8bf7a18c2c66985b8cbf14bc0b9862a558f6b934653a429e71f7e48e5785e31f265c20dcb1d6e737dee57b3c151856498 SHA512 d78bae5baf1bbb6ad0099559c82dcf1b3f1393dd3d3e98e82293f0cf749055c7f5880876a7e979bbca2bfcdd8044d1fe245f3faf866c202373df2f159c21c3fa
 MISC metadata.xml 1041 BLAKE2B 00e12e2caeeb34f9b79de3340f677ee56569fdd977169e5d7c28678936646170b8e5c51c697385453eae323e6dd8948b074caa5928298afb46717589def22a6f SHA512 82401f5bdd721846511ce9364b672a0dfb47c434ac9187bdb361265c7c83698f0777f99ce563f65daddeb03e4abf3741721de3a4589980779d3a7417f64f427e
diff --git a/x11-libs/gtk+/files/3.24.40-gdkscreen-x11-fixes.patch b/x11-libs/gtk+/files/3.24.40-gdkscreen-x11-fixes.patch
deleted file mode 100644
index e096e920eaee..000000000000
--- a/x11-libs/gtk+/files/3.24.40-gdkscreen-x11-fixes.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 6880ac90a0211095cfea753316e002bd668a4e92 Mon Sep 17 00:00:00 2001
-From: Michael Wyraz <mw@brick4u.de>
-Date: Fri, 19 Jan 2024 19:15:52 +0100
-Subject: [PATCH 1/2] don't free monitor->name twice (fixes #6345)
-
----
- gdk/x11/gdkscreen-x11.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
-index f54bf51d04..4ac3167b30 100644
---- a/gdk/x11/gdkscreen-x11.c
-+++ b/gdk/x11/gdkscreen-x11.c
-@@ -922,7 +922,6 @@ init_randr13 (GdkScreen *screen, gboolean *changed)
-           g_object_ref (monitor);
-           g_ptr_array_remove (x11_display->monitors, monitor);
-           gdk_display_monitor_removed (display, GDK_MONITOR (monitor));
--          free (monitor->name);
-           g_object_unref (monitor);
-           *changed = TRUE;
-         }
--- 
-2.43.0
-
-
-From ba58b3a23df4213e17a80816c7687a59e104769d Mon Sep 17 00:00:00 2001
-From: Michael Wyraz <mw@brick4u.de>
-Date: Fri, 19 Jan 2024 22:20:02 +0100
-Subject: [PATCH 2/2] Fix for #6342
-
----
- gdk/x11/gdkscreen-x11.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
-index 4ac3167b30..6207b5f443 100644
---- a/gdk/x11/gdkscreen-x11.c
-+++ b/gdk/x11/gdkscreen-x11.c
-@@ -851,7 +851,7 @@ init_randr13 (GdkScreen *screen, gboolean *changed)
-               monitor = g_object_new (gdk_x11_monitor_get_type (),
-                                       "display", display,
-                                       NULL);
--              monitor->name = g_steal_pointer (&name);
-+              monitor->name = g_strdup (name);
-               monitor->output = output;
-               monitor->add = TRUE;
-               g_ptr_array_add (x11_display->monitors, monitor);
--- 
-2.43.0
-
diff --git a/x11-libs/gtk+/files/3.24.40-test-casts-gcc14.patch b/x11-libs/gtk+/files/3.24.40-test-casts-gcc14.patch
deleted file mode 100644
index aadbd7be0b7c..000000000000
--- a/x11-libs/gtk+/files/3.24.40-test-casts-gcc14.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 76bc2a57136fd6cf0374fa3f86a7ba646b779803 Mon Sep 17 00:00:00 2001
-From: David King <amigadave@amigadave.com>
-Date: Fri, 19 Jan 2024 10:41:33 +0000
-Subject: [PATCH 1/2] tests: Add GdkEvent casts in testinput
-
----
- tests/testinput.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tests/testinput.c b/tests/testinput.c
-index b68552a428..3d4d7f6f87 100644
---- a/tests/testinput.c
-+++ b/tests/testinput.c
-@@ -194,7 +194,7 @@ button_press_event (GtkWidget *widget, GdkEventButton *event)
- 
-       print_axes (event->device, event->axes);
-       gdk_event_get_axis ((GdkEvent *)event, GDK_AXIS_PRESSURE, &pressure);
--      draw_brush (widget, gdk_device_get_source (gdk_event_get_source_device (event)),
-+      draw_brush (widget, gdk_device_get_source (gdk_event_get_source_device ((GdkEvent *)event)),
-                   event->x, event->y, pressure);
- 
-       motion_time = event->time;
-@@ -239,10 +239,10 @@ motion_notify_event (GtkWidget *widget, GdkEventMotion *event)
- 	      gdk_device_get_axis (event->device, events[i]->axes, GDK_AXIS_X, &x);
- 	      gdk_device_get_axis (event->device, events[i]->axes, GDK_AXIS_Y, &y);
- 	      gdk_device_get_axis (event->device, events[i]->axes, GDK_AXIS_PRESSURE, &pressure);
--	      draw_brush (widget, gdk_device_get_source (gdk_event_get_source_device (event)),
-+	      draw_brush (widget, gdk_device_get_source (gdk_event_get_source_device ((GdkEvent *)event)),
-                           x, y, pressure);
- 
--	      print_axes (gdk_event_get_source_device (event), events[i]->axes);
-+	      print_axes (gdk_event_get_source_device ((GdkEvent *)event), events[i]->axes);
- 	    }
- 	  gdk_device_free_history (events, n_events);
- 	}
-@@ -252,7 +252,7 @@ motion_notify_event (GtkWidget *widget, GdkEventMotion *event)
- 
- 	  gdk_event_get_axis ((GdkEvent *)event, GDK_AXIS_PRESSURE, &pressure);
- 
--	  draw_brush (widget, gdk_device_get_source (gdk_event_get_source_device (event)),
-+	  draw_brush (widget, gdk_device_get_source (gdk_event_get_source_device ((GdkEvent *)event)),
-                       event->x, event->y, pressure);
- 	}
-       motion_time = event->time;
--- 
-2.43.0
-
-
-From 05a12b1c5f8eecc621a7135eb313d6bfe6ccdc3b Mon Sep 17 00:00:00 2001
-From: David King <amigadave@amigadave.com>
-Date: Fri, 19 Jan 2024 11:04:37 +0000
-Subject: [PATCH 2/2] testsuite: Fix casts in reftests
-
----
- testsuite/reftests/gtk-reftest.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c
-index 1a51a9756b..88d8a849ca 100644
---- a/testsuite/reftests/gtk-reftest.c
-+++ b/testsuite/reftests/gtk-reftest.c
-@@ -381,7 +381,7 @@ enforce_default_settings (void)
- 
-   klass = g_type_class_ref (G_OBJECT_TYPE (settings));
- 
--  pspecs = g_object_class_list_properties (klass, &n_pspecs);
-+  pspecs = g_object_class_list_properties (G_OBJECT_CLASS (klass), &n_pspecs);
-   for (i = 0; i < n_pspecs; i++)
-     {
-       GParamSpec *pspec = pspecs[i];
-@@ -394,7 +394,7 @@ enforce_default_settings (void)
-         continue;
- 
-       value = g_param_spec_get_default_value (pspec);
--      g_object_set_property (settings, pspec->name, value);
-+      g_object_set_property (G_OBJECT (settings), pspec->name, value);
-     }
- 
-   g_free (pspecs);
--- 
-2.43.0
-
diff --git a/x11-libs/gtk+/gtk+-3.24.40.ebuild b/x11-libs/gtk+/gtk+-3.24.41.ebuild
index 3b353a3e007f..e274f217c53b 100644
--- a/x11-libs/gtk+/gtk+-3.24.40.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.41.ebuild
@@ -93,9 +93,6 @@ MULTILIB_CHOST_TOOLS=(
 )
 
 PATCHES=(
-	# Upstream gtk-3-24 branch regression fixes and tests compile compat for modern C
-	"${FILESDIR}"/${PV}-gdkscreen-x11-fixes.patch
-	"${FILESDIR}"/${PV}-test-casts-gcc14.patch
 	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
 	"${FILESDIR}"/${PN}-3.24.36-update-icon-cache.patch
 )