gentoo auto-resync : 13:05:2023 - 21:59:42

4 files changed, 174 insertions, 4 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index c4cef053f58d..eebbd8cec3c2 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 43c08ba6c3d9..99bc296e52ea 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,5 +1,6 @@
 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
 AUX gtk+-2.24.33-respect-NM.patch 273 BLAKE2B e7636db1e4a8a0de67ebeaf98a04d5dbc99d06da9dc0edee3f60a747cdd4ec1ec42ec2d3552d6c29566dbe9a744ad816bfac0d0e798ac60e8a0664b8a94e37e5 SHA512 b9e5f876f35f8f7f1fa07b82d2bd8ebbb4a4e6973e61ac9d9c678b76a8c653ca5b90504407b927e0023f504208a198d790f52cda9601eadff669d62e7db1dd1d
 AUX gtk+-3.22.20-libcloudproviders-automagic.patch 1904 BLAKE2B ed4e774a5641a8e857ae63b83cd481479f3562de3471b5c662eb5b110e583a0a84e7defe272c2fdc6fba58649763b3e97a7e453f83e4693f40a051c8565de7b5 SHA512 3981e3d0dd9a7422b41918a6e426fe36715c6a80c7a46a241edbd1ea364381ac34fa0ae6240bc59980dd56bb816cead55dd4d29437ff288d78b90c139cb5807f
 AUX gtk+-3.24.25-update-icon-cache.patch 4770 BLAKE2B 57d80da1fdb365130dd18ea4f2752d42dde343228c92144fa6194d19474735dc597818933433b1a33029f03d1cc42576621d381d8993d9d1da48e924a3eb154e SHA512 25ba99662299cbd9fb2427b3361dff9ae72c65d49aa14e90c367410908b8dd365f62c971f17cb24b2742d152d22b9d80789d707ba3841b21781c69207ea70f10
@@ -9,7 +10,7 @@ AUX settings.ini 96 BLAKE2B dd0ffe58f3c702d0518e1ad59930a511f98fd1b6e7139b2b2293
 DIST gtk+-2.24.33.tar.xz 12661828 BLAKE2B f3488b220aaee54bf36fa77e2112d060152e57938845d240014a7d43a5743b1d4de19cc09c683d9d238fd1967cd67cc3c493f2475e4e481f6709f5cdc652c65c SHA512 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5
 DIST gtk+-3.24.35.tar.xz 17913328 BLAKE2B 3beea3cbda7247357238ad133c951e69d5670d68e06efb4de09fae7141b141f4eb17a8c79661cab928a3db427f7b32b518875d0951254941e76b1a7aab60e34f SHA512 3a1ec35756fe12f5be3cfe33ef332d583690458327572e69bffad8b4095059d2a744a4a53b2fd31bab5da2ca7b41a2a38fbbd8ba541a45fa8cc0d00eae005ade
 DIST gtk+-3.24.37.tar.xz 12401196 BLAKE2B 1cffcf0066f0f9d42fd01d9cf0dbab2465bf749fe70ebe24a843807c77b696047cbb739fead7f7872833ee562439d96857d02b3037b949babaa3797482104fda SHA512 118521686cb40c5b6ddfcc361be8ff8a16aced2108a24d1f6b7f29d32c235a77774d365b0bd283c9a6873003fca144d67793d12094c74d224a08fc1be341a22f
-EBUILD gtk+-2.24.33-r2.ebuild 9818 BLAKE2B 5a631aa842e0651ad920e7e759af97d08083e39c167697b25fbaa72fb52cad031befc60922734aef5f2eaf7b7ab3d17bc7d2330e9029d4672126d466f4800a9b SHA512 878d48c0009433cb5d15eba3f26d5c137f79b718238b4920ac34fe7c61276ab2bd15dd5f76383fca2febad56fff3f8a7f99f9ce72ff5044a83885f1176da4d0c
+EBUILD gtk+-2.24.33-r3.ebuild 9907 BLAKE2B e89c4d65b0c1291b5351ee4ae24c88af139f3fb407f2c55f842d1228f5897f2ef7a714acef5c8213c87ec9aa0f87e045aa84a8af2c2c1afbe58821f1fc9fe6a7 SHA512 d2a359f040bd3a8a04ab9bfd4ad0f7823f9b7d1f51e0c8557a2408086d7c33c7600d4582c4dbc926f6c75328a5a94c0f45a5c7f218ff5273f0757d6cfb7aa218
 EBUILD gtk+-3.24.35.ebuild 7018 BLAKE2B ca017af92b058f58b51f6bf49f751188cf97702b0b7eba11626a024a5aeace8c4ac6b9bd16cdd3ca200a0bdc84ffd7f06caf7971ac9b194efba6fc1ef3f78e3c SHA512 084deed3cd289cb2b35163bb7aec97b7ee98ced90c136581e3fed6d04c2674059bb4ef7e6adc2632b133e73a5c860764c877de2d5036a96b2c304a3a1645d2c9
 EBUILD gtk+-3.24.37.ebuild 5346 BLAKE2B 8b1a718f526a14e792e9bbd8210f730bec556786a2260c91caeb727cd147c50654454d39ace5015550efcfd6fcb6bb6c15090b16adb6396d43e22d441d725394 SHA512 2418b3c9608e33899bfa83d22cb2cfb2480054d84b2b45d9679eb19f8539bd86734c1ba0cf897da3ef4b781e20881c2f26d1fb31f04e518e04d941f945cce7f7
 MISC metadata.xml 1041 BLAKE2B 00e12e2caeeb34f9b79de3340f677ee56569fdd977169e5d7c28678936646170b8e5c51c697385453eae323e6dd8948b074caa5928298afb46717589def22a6f SHA512 82401f5bdd721846511ce9364b672a0dfb47c434ac9187bdb361265c7c83698f0777f99ce563f65daddeb03e4abf3741721de3a4589980779d3a7417f64f427e
diff --git a/x11-libs/gtk+/files/gtk+-2.24.33-Fix-casts.patch b/x11-libs/gtk+/files/gtk+-2.24.33-Fix-casts.patch
new file mode 100644
index 000000000000..4ee55d277f3a
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.24.33-Fix-casts.patch
@@ -0,0 +1,167 @@
+https://bugs.gentoo.org/880617
+
+From 81c42586e6d9db7434e9b3f657fbd238294dd9d9 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gentoo.org>
+Date: Sat, 13 May 2023 11:35:28 -0400
+Subject: [PATCH] Fix casts
+
+---
+ gtk/gtkcellrendererspin.c                        | 2 +-
+ gtk/gtkcomboboxtext.c                            | 2 +-
+ gtk/gtkimmodule.c                                | 2 +-
+ gtk/gtklabel.c                                   | 2 +-
+ gtk/gtkscale.c                                   | 2 +-
+ gtk/gtktoolpalette.c                             | 2 +-
+ gtk/gtktreeview.c                                | 2 +-
+ gtk/gtkuimanager.c                               | 2 +-
+ gtk/gtkwidget.c                                  | 2 +-
+ modules/other/gail/gailtreeview.c                | 2 +-
+ modules/printbackends/cups/gtkprintbackendcups.c | 2 +-
+ 11 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/gtk/gtkcellrendererspin.c b/gtk/gtkcellrendererspin.c
+index 2a3961bf20..68e5b9aaae 100644
+--- a/gtk/gtkcellrendererspin.c
++++ b/gtk/gtkcellrendererspin.c
+@@ -207,7 +207,7 @@ gtk_cell_renderer_spin_set_property (GObject      *object,
+ 	}
+ 
+       if (obj)
+-	priv->adjustment = g_object_ref_sink (obj);
++	priv->adjustment = GTK_ADJUSTMENT (g_object_ref_sink (obj));
+       break;
+     case PROP_CLIMB_RATE:
+       priv->climb_rate = g_value_get_double (value);
+diff --git a/gtk/gtkcomboboxtext.c b/gtk/gtkcomboboxtext.c
+index 9ffba68766..42c51abebc 100644
+--- a/gtk/gtkcomboboxtext.c
++++ b/gtk/gtkcomboboxtext.c
+@@ -275,7 +275,7 @@ gtk_combo_box_text_buildable_custom_tag_start (GtkBuildable     *buildable,
+ 
+       parser_data = g_slice_new0 (ItemParserData);
+       parser_data->builder = g_object_ref (builder);
+-      parser_data->object = g_object_ref (buildable);
++      parser_data->object = G_OBJECT (g_object_ref (buildable));
+       parser_data->domain = gtk_builder_get_translation_domain (builder);
+       *parser = item_parser;
+       *data = parser_data;
+diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
+index 1fcb17a7d8..445b2be87f 100644
+--- a/gtk/gtkimmodule.c
++++ b/gtk/gtkimmodule.c
+@@ -662,7 +662,7 @@ lookup_immodule (gchar **immodules_list)
+ 	  gboolean found;
+ 	  gchar *context_id;
+ 	  found = g_hash_table_lookup_extended (contexts_hash, *immodules_list,
+-						&context_id, NULL);
++						(gpointer *) &context_id, NULL);
+ 	  if (found)
+ 	    return context_id;
+ 	}
+diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
+index c47de5924f..cf68685536 100644
+--- a/gtk/gtklabel.c
++++ b/gtk/gtklabel.c
+@@ -1336,7 +1336,7 @@ gtk_label_buildable_custom_tag_start (GtkBuildable     *buildable,
+ 
+       parser_data = g_slice_new0 (PangoParserData);
+       parser_data->builder = g_object_ref (builder);
+-      parser_data->object = g_object_ref (buildable);
++      parser_data->object = G_OBJECT (g_object_ref (buildable));
+       *parser = pango_parser;
+       *data = parser_data;
+       return TRUE;
+diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
+index 4317523fb8..a573b2f6ba 100644
+--- a/gtk/gtkscale.c
++++ b/gtk/gtkscale.c
+@@ -1471,7 +1471,7 @@ gtk_scale_add_mark (GtkScale        *scale,
+   mark->position = position;
+  
+   priv->marks = g_slist_insert_sorted_with_data (priv->marks, mark,
+-                                                 (GCompareFunc) compare_marks,
++                                                 compare_marks,
+                                                  GINT_TO_POINTER (
+                                                    gtk_range_get_inverted (GTK_RANGE (scale)) 
+                                                    ));
+diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c
+index b984193ca3..f64b552fb0 100644
+--- a/gtk/gtktoolpalette.c
++++ b/gtk/gtktoolpalette.c
+@@ -734,7 +734,7 @@ gtk_tool_palette_add (GtkContainer *container,
+ 
+   g_ptr_array_add (palette->priv->groups, info);
+   info->pos = palette->priv->groups->len - 1;
+-  info->widget = g_object_ref_sink (child);
++  info->widget = (GtkToolItemGroup *) g_object_ref_sink (child);
+ 
+   gtk_widget_set_parent (child, GTK_WIDGET (palette));
+ }
+diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
+index 89301eb91d..0d2d15b488 100644
+--- a/gtk/gtktreeview.c
++++ b/gtk/gtktreeview.c
+@@ -14147,7 +14147,7 @@ gtk_tree_view_set_search_entry (GtkTreeView *tree_view,
+ 
+   if (entry)
+     {
+-      tree_view->priv->search_entry = g_object_ref (entry);
++      tree_view->priv->search_entry = GTK_WIDGET (g_object_ref (entry));
+       tree_view->priv->search_custom_entry_set = TRUE;
+ 
+       if (tree_view->priv->search_entry_changed_id == 0)
+diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
+index d004cf1ed3..8cbeda9e85 100644
+--- a/gtk/gtkuimanager.c
++++ b/gtk/gtkuimanager.c
+@@ -503,7 +503,7 @@ gtk_ui_manager_buildable_construct_child (GtkBuildable *buildable,
+   g_signal_connect (widget, "hierarchy-changed",
+ 		    G_CALLBACK (child_hierarchy_changed_cb),
+ 		    GTK_UI_MANAGER (buildable));
+-  return g_object_ref (widget);
++  return G_OBJECT (g_object_ref (widget));
+ }
+ 
+ static void
+diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
+index 1d1f6bb60e..a2ae2b430f 100644
+--- a/gtk/gtkwidget.c
++++ b/gtk/gtkwidget.c
+@@ -10679,7 +10679,7 @@ gtk_widget_buildable_custom_tag_start (GtkBuildable     *buildable,
+       AccelGroupParserData *parser_data;
+ 
+       parser_data = g_slice_new0 (AccelGroupParserData);
+-      parser_data->object = g_object_ref (buildable);
++      parser_data->object = G_OBJECT (g_object_ref (buildable));
+       *parser = accel_group_parser;
+       *data = parser_data;
+       return TRUE;
+diff --git a/modules/other/gail/gailtreeview.c b/modules/other/gail/gailtreeview.c
+index 23923c59a1..ac6ff0a1c4 100644
+--- a/modules/other/gail/gailtreeview.c
++++ b/modules/other/gail/gailtreeview.c
+@@ -995,7 +995,7 @@ gail_tree_view_ref_child (AtkObject *obj,
+         gail_cell_add_state (cell, ATK_STATE_FOCUSABLE, FALSE);
+         if (focus_index == i)
+           {
+-            gailview->focus_cell = g_object_ref (cell);
++            gailview->focus_cell = ATK_OBJECT (g_object_ref (cell));
+             gail_cell_add_state (cell, ATK_STATE_FOCUSED, FALSE);
+             g_signal_emit_by_name (gailview,
+                                    "active-descendant-changed",
+diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
+index 2a000dc16f..753c53cb89 100644
+--- a/modules/printbackends/cups/gtkprintbackendcups.c
++++ b/modules/printbackends/cups/gtkprintbackendcups.c
+@@ -3479,7 +3479,7 @@ cups_request_ppd (GtkPrinter *printer)
+   g_io_channel_set_encoding (data->ppd_io, NULL, NULL);
+   g_io_channel_set_close_on_unref (data->ppd_io, TRUE);
+ 
+-  data->printer = g_object_ref (printer);
++  data->printer = GTK_PRINTER_CUPS (g_object_ref (printer));
+ 
+   resource = g_strdup_printf ("/printers/%s.ppd", 
+                               gtk_printer_cups_get_ppd_name (GTK_PRINTER_CUPS (printer)));
+-- 
+2.39.3
+
diff --git a/x11-libs/gtk+/gtk+-2.24.33-r2.ebuild b/x11-libs/gtk+/gtk+-2.24.33-r3.ebuild
index ee0d251e3c97..baffb82eba3c 100644
--- a/x11-libs/gtk+/gtk+-2.24.33-r2.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.33-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 GNOME2_EAUTORECONF="yes"
 
 inherit flag-o-matic gnome2 multilib multilib-minimal readme.gentoo-r1 virtualx
@@ -23,7 +23,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390
 RESTRICT="test"
 
 COMMON_DEPEND="
-	>=dev-libs/atk-2.10.0[introspection?,${MULTILIB_USEDEP}]
+	>=app-accessibility/at-spi2-core-2.46.0[introspection?,${MULTILIB_USEDEP}]
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
 	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
 	virtual/libintl[${MULTILIB_USEDEP}]
@@ -104,6 +104,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.24.31-update-icon-cache.patch # requires eautoreconf
 	# Respect ${NM}, bug #725852
 	"${FILESDIR}"/${PN}-2.24.33-respect-NM.patch # requires eautoreconf
+	# Fix casts, bug #880617
+	"${FILESDIR}"/${PN}-2.24.33-Fix-casts.patch
 )
 
 strip_builddir() {