summaryrefslogtreecommitdiff
path: root/x11-libs/gtk+/files
diff options
context:
space:
mode:
Diffstat (limited to 'x11-libs/gtk+/files')
-rw-r--r--x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch33
-rw-r--r--x11-libs/gtk+/files/gtk+-2.24.31-update-icon-cache.patch78
-rw-r--r--x11-libs/gtk+/files/gtk+-2.24.33-Fix-casts.patch167
-rw-r--r--x11-libs/gtk+/files/gtk+-2.24.33-respect-NM.patch12
4 files changed, 290 insertions, 0 deletions
diff --git a/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch b/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch
new file mode 100644
index 0000000..451233c
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch
@@ -0,0 +1,33 @@
1From 9e0f33144aff8d792ab105927cf686eda0afd25e Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
3Date: Sun, 18 May 2014 10:50:05 +0200
4Subject: [PATCH] aliasfilecheck: check for sources both in builddir & srcdir.
5
6The $gtk_all_c_sources variable contains both supplied and generated
7sources. The former reside in $srcdir, the latter in the build directory
8(cwd).
9
10In order to handle both kinds properly, first try to find each source
11file in cwd, and then fallback to $srcdir. This makes it possible to use
12out-of-source builds, and guarantees that fresh-built source files will
13be used rather than pre-generated copies included in the distribution
14tarball.
15---
16 gtk/aliasfilescheck.sh | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/gtk/aliasfilescheck.sh b/gtk/aliasfilescheck.sh
20index 31b49d4..3636a82 100755
21--- a/gtk/aliasfilescheck.sh
22+++ b/gtk/aliasfilescheck.sh
23@@ -6,6 +6,6 @@ if test "x$gtk_all_c_sources" = x; then
24 fi
25
26 grep 'IN_FILE' ${srcdir-.}/gtk.symbols | sed 's/.*(//;s/).*//' | grep __ | sort -u > expected-files
27-{ cd ${srcdir-.}; grep '^ *# *define __' $gtk_all_c_sources; } | sed 's/.*define //;s/ *$//' | sort > actual-files
28+{ for f in $gtk_all_c_sources; do if test -f ${f}; then grep '^ *# *define __' ${f}; else grep '^ *# *define __' "${srcdir-.}"/${f}; fi; done } | sed 's/.*define //;s/ *$//' | sort > actual-files
29
30 diff expected-files actual-files && rm -f expected-files actual-files
31--
321.9.3
33
diff --git a/x11-libs/gtk+/files/gtk+-2.24.31-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-2.24.31-update-icon-cache.patch
new file mode 100644
index 0000000..11dbb5e
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.24.31-update-icon-cache.patch
@@ -0,0 +1,78 @@
1From 260f94f3914ba18a256e6f1c222f643a57854e80 Mon Sep 17 00:00:00 2001
2From: Gilles Dartiguelongue <eva@gentoo.org>
3Date: Sat, 9 May 2015 23:30:58 +0200
4Subject: [PATCH] Always use external gtk-update-icon-cache
5
6---
7 configure.ac | 8 +++-----
8 docs/reference/gtk/Makefile.am | 2 +-
9 gtk/Makefile.am | 13 ++-----------
10 3 files changed, 6 insertions(+), 17 deletions(-)
11
12diff --git a/configure.ac b/configure.ac
13index 4e11b40..7ef8cb6 100644
14--- a/configure.ac
15+++ b/configure.ac
16@@ -913,11 +913,9 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
17
18 AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
19
20-if test $cross_compiling = yes; then
21- AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
22- if test x$GTK_UPDATE_ICON_CACHE = xno; then
23- REBUILD_PNGS=#
24- fi
25+AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
26+if test x$GTK_UPDATE_ICON_CACHE = xno; then
27+ REBUILD_PNGS=#
28 fi
29
30 AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
31diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
32index c239445..60b5265 100644
33--- a/docs/reference/gtk/Makefile.am
34+++ b/docs/reference/gtk/Makefile.am
35@@ -368,7 +368,7 @@ EXTRA_DIST += version.xml.in
36
37 if ENABLE_MAN
38
39-man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1
40+man_MANS = gtk-query-immodules-2.0.1 gtk-builder-convert.1
41
42 %.1 : %.xml
43 @XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
44diff --git a/gtk/Makefile.am b/gtk/Makefile.am
45index 8cc4536..a7afbf3 100644
46--- a/gtk/Makefile.am
47+++ b/gtk/Makefile.am
48@@ -1087,8 +1087,7 @@ endif
49 # Installed tools
50 #
51 bin_PROGRAMS = \
52- gtk-query-immodules-2.0 \
53- gtk-update-icon-cache
54+ gtk-query-immodules-2.0
55
56 bin_SCRIPTS = gtk-builder-convert
57
58@@ -1438,16 +1437,8 @@ stamp-icons: $(STOCK_ICONS)
59 ) done \
60 && touch stamp-icons
61
62-if CROSS_COMPILING
63-gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
64-else
65-gtk_update_icon_cache_program = \
66- ./gtk-update-icon-cache
67-endif
68-
69 gtkbuiltincache.h: @REBUILD@ stamp-icons
70- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
71- $(gtk_update_icon_cache_program) --force --ignore-theme-index \
72+ $(GTK_UPDATE_ICON_CACHE) --force --ignore-theme-index \
73 --include-image-data \
74 --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
75 mv gtkbuiltincache.h.tmp gtkbuiltincache.h
76--
772.10.0
78
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 0000000..4ee55d2
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.24.33-Fix-casts.patch
@@ -0,0 +1,167 @@
1https://bugs.gentoo.org/880617
2
3From 81c42586e6d9db7434e9b3f657fbd238294dd9d9 Mon Sep 17 00:00:00 2001
4From: Matt Turner <mattst88@gentoo.org>
5Date: Sat, 13 May 2023 11:35:28 -0400
6Subject: [PATCH] Fix casts
7
8---
9 gtk/gtkcellrendererspin.c | 2 +-
10 gtk/gtkcomboboxtext.c | 2 +-
11 gtk/gtkimmodule.c | 2 +-
12 gtk/gtklabel.c | 2 +-
13 gtk/gtkscale.c | 2 +-
14 gtk/gtktoolpalette.c | 2 +-
15 gtk/gtktreeview.c | 2 +-
16 gtk/gtkuimanager.c | 2 +-
17 gtk/gtkwidget.c | 2 +-
18 modules/other/gail/gailtreeview.c | 2 +-
19 modules/printbackends/cups/gtkprintbackendcups.c | 2 +-
20 11 files changed, 11 insertions(+), 11 deletions(-)
21
22diff --git a/gtk/gtkcellrendererspin.c b/gtk/gtkcellrendererspin.c
23index 2a3961bf20..68e5b9aaae 100644
24--- a/gtk/gtkcellrendererspin.c
25+++ b/gtk/gtkcellrendererspin.c
26@@ -207,7 +207,7 @@ gtk_cell_renderer_spin_set_property (GObject *object,
27 }
28
29 if (obj)
30- priv->adjustment = g_object_ref_sink (obj);
31+ priv->adjustment = GTK_ADJUSTMENT (g_object_ref_sink (obj));
32 break;
33 case PROP_CLIMB_RATE:
34 priv->climb_rate = g_value_get_double (value);
35diff --git a/gtk/gtkcomboboxtext.c b/gtk/gtkcomboboxtext.c
36index 9ffba68766..42c51abebc 100644
37--- a/gtk/gtkcomboboxtext.c
38+++ b/gtk/gtkcomboboxtext.c
39@@ -275,7 +275,7 @@ gtk_combo_box_text_buildable_custom_tag_start (GtkBuildable *buildable,
40
41 parser_data = g_slice_new0 (ItemParserData);
42 parser_data->builder = g_object_ref (builder);
43- parser_data->object = g_object_ref (buildable);
44+ parser_data->object = G_OBJECT (g_object_ref (buildable));
45 parser_data->domain = gtk_builder_get_translation_domain (builder);
46 *parser = item_parser;
47 *data = parser_data;
48diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
49index 1fcb17a7d8..445b2be87f 100644
50--- a/gtk/gtkimmodule.c
51+++ b/gtk/gtkimmodule.c
52@@ -662,7 +662,7 @@ lookup_immodule (gchar **immodules_list)
53 gboolean found;
54 gchar *context_id;
55 found = g_hash_table_lookup_extended (contexts_hash, *immodules_list,
56- &context_id, NULL);
57+ (gpointer *) &context_id, NULL);
58 if (found)
59 return context_id;
60 }
61diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
62index c47de5924f..cf68685536 100644
63--- a/gtk/gtklabel.c
64+++ b/gtk/gtklabel.c
65@@ -1336,7 +1336,7 @@ gtk_label_buildable_custom_tag_start (GtkBuildable *buildable,
66
67 parser_data = g_slice_new0 (PangoParserData);
68 parser_data->builder = g_object_ref (builder);
69- parser_data->object = g_object_ref (buildable);
70+ parser_data->object = G_OBJECT (g_object_ref (buildable));
71 *parser = pango_parser;
72 *data = parser_data;
73 return TRUE;
74diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
75index 4317523fb8..a573b2f6ba 100644
76--- a/gtk/gtkscale.c
77+++ b/gtk/gtkscale.c
78@@ -1471,7 +1471,7 @@ gtk_scale_add_mark (GtkScale *scale,
79 mark->position = position;
80
81 priv->marks = g_slist_insert_sorted_with_data (priv->marks, mark,
82- (GCompareFunc) compare_marks,
83+ compare_marks,
84 GINT_TO_POINTER (
85 gtk_range_get_inverted (GTK_RANGE (scale))
86 ));
87diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c
88index b984193ca3..f64b552fb0 100644
89--- a/gtk/gtktoolpalette.c
90+++ b/gtk/gtktoolpalette.c
91@@ -734,7 +734,7 @@ gtk_tool_palette_add (GtkContainer *container,
92
93 g_ptr_array_add (palette->priv->groups, info);
94 info->pos = palette->priv->groups->len - 1;
95- info->widget = g_object_ref_sink (child);
96+ info->widget = (GtkToolItemGroup *) g_object_ref_sink (child);
97
98 gtk_widget_set_parent (child, GTK_WIDGET (palette));
99 }
100diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
101index 89301eb91d..0d2d15b488 100644
102--- a/gtk/gtktreeview.c
103+++ b/gtk/gtktreeview.c
104@@ -14147,7 +14147,7 @@ gtk_tree_view_set_search_entry (GtkTreeView *tree_view,
105
106 if (entry)
107 {
108- tree_view->priv->search_entry = g_object_ref (entry);
109+ tree_view->priv->search_entry = GTK_WIDGET (g_object_ref (entry));
110 tree_view->priv->search_custom_entry_set = TRUE;
111
112 if (tree_view->priv->search_entry_changed_id == 0)
113diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
114index d004cf1ed3..8cbeda9e85 100644
115--- a/gtk/gtkuimanager.c
116+++ b/gtk/gtkuimanager.c
117@@ -503,7 +503,7 @@ gtk_ui_manager_buildable_construct_child (GtkBuildable *buildable,
118 g_signal_connect (widget, "hierarchy-changed",
119 G_CALLBACK (child_hierarchy_changed_cb),
120 GTK_UI_MANAGER (buildable));
121- return g_object_ref (widget);
122+ return G_OBJECT (g_object_ref (widget));
123 }
124
125 static void
126diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
127index 1d1f6bb60e..a2ae2b430f 100644
128--- a/gtk/gtkwidget.c
129+++ b/gtk/gtkwidget.c
130@@ -10679,7 +10679,7 @@ gtk_widget_buildable_custom_tag_start (GtkBuildable *buildable,
131 AccelGroupParserData *parser_data;
132
133 parser_data = g_slice_new0 (AccelGroupParserData);
134- parser_data->object = g_object_ref (buildable);
135+ parser_data->object = G_OBJECT (g_object_ref (buildable));
136 *parser = accel_group_parser;
137 *data = parser_data;
138 return TRUE;
139diff --git a/modules/other/gail/gailtreeview.c b/modules/other/gail/gailtreeview.c
140index 23923c59a1..ac6ff0a1c4 100644
141--- a/modules/other/gail/gailtreeview.c
142+++ b/modules/other/gail/gailtreeview.c
143@@ -995,7 +995,7 @@ gail_tree_view_ref_child (AtkObject *obj,
144 gail_cell_add_state (cell, ATK_STATE_FOCUSABLE, FALSE);
145 if (focus_index == i)
146 {
147- gailview->focus_cell = g_object_ref (cell);
148+ gailview->focus_cell = ATK_OBJECT (g_object_ref (cell));
149 gail_cell_add_state (cell, ATK_STATE_FOCUSED, FALSE);
150 g_signal_emit_by_name (gailview,
151 "active-descendant-changed",
152diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
153index 2a000dc16f..753c53cb89 100644
154--- a/modules/printbackends/cups/gtkprintbackendcups.c
155+++ b/modules/printbackends/cups/gtkprintbackendcups.c
156@@ -3479,7 +3479,7 @@ cups_request_ppd (GtkPrinter *printer)
157 g_io_channel_set_encoding (data->ppd_io, NULL, NULL);
158 g_io_channel_set_close_on_unref (data->ppd_io, TRUE);
159
160- data->printer = g_object_ref (printer);
161+ data->printer = GTK_PRINTER_CUPS (g_object_ref (printer));
162
163 resource = g_strdup_printf ("/printers/%s.ppd",
164 gtk_printer_cups_get_ppd_name (GTK_PRINTER_CUPS (printer)));
165--
1662.39.3
167
diff --git a/x11-libs/gtk+/files/gtk+-2.24.33-respect-NM.patch b/x11-libs/gtk+/files/gtk+-2.24.33-respect-NM.patch
new file mode 100644
index 0000000..0c74d96
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.24.33-respect-NM.patch
@@ -0,0 +1,12 @@
1https://bugs.gentoo.org/725852
2--- a/configure.ac
3+++ b/configure.ac
4@@ -190,7 +190,7 @@ m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
5 AC_SYS_LARGEFILE
6
7 AM_PROG_AS
8-AC_PATH_TOOL(NM, nm, nm)
9+AC_CHECK_TOOL(NM, nm, nm)
10
11 dnl Initialize maintainer mode
12 AM_MAINTAINER_MODE([enable])
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 05:47:25 +0000