diff options
Diffstat (limited to 'x11-libs/gtk+/files')
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch | 33 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch | 42 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-2.24.31-update-icon-cache.patch | 78 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-2.24.33-Fix-casts.patch | 167 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-2.24.33-respect-NM.patch | 12 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch | 57 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-3.24.25-update-icon-cache.patch | 121 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-3.24.36-update-icon-cache.patch | 29 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-atk-bridge-config.ac.patch | 21 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-atk-bridge-config.h.in.patch | 16 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-atk-bridge-gtkaccessibility.patch | 25 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-atk-bridge-meson.build.patch | 31 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-atk-bridge-meson_options.txt.patch | 14 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/gtkrc | 39 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/settings.ini | 4 |
15 files changed, 0 insertions, 689 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 deleted file mode 100644 index 451233ca..00000000 --- a/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9e0f33144aff8d792ab105927cf686eda0afd25e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Sun, 18 May 2014 10:50:05 +0200 -Subject: [PATCH] aliasfilecheck: check for sources both in builddir & srcdir. - -The $gtk_all_c_sources variable contains both supplied and generated -sources. The former reside in $srcdir, the latter in the build directory -(cwd). - -In order to handle both kinds properly, first try to find each source -file in cwd, and then fallback to $srcdir. This makes it possible to use -out-of-source builds, and guarantees that fresh-built source files will -be used rather than pre-generated copies included in the distribution -tarball. ---- - gtk/aliasfilescheck.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gtk/aliasfilescheck.sh b/gtk/aliasfilescheck.sh -index 31b49d4..3636a82 100755 ---- a/gtk/aliasfilescheck.sh -+++ b/gtk/aliasfilescheck.sh -@@ -6,6 +6,6 @@ if test "x$gtk_all_c_sources" = x; then - fi - - grep 'IN_FILE' ${srcdir-.}/gtk.symbols | sed 's/.*(//;s/).*//' | grep __ | sort -u > expected-files --{ cd ${srcdir-.}; grep '^ *# *define __' $gtk_all_c_sources; } | sed 's/.*define //;s/ *$//' | sort > actual-files -+{ 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 - - diff expected-files actual-files && rm -f expected-files actual-files --- -1.9.3 - diff --git a/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch b/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch deleted file mode 100644 index 1d09721b..00000000 --- a/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch +++ /dev/null @@ -1,42 +0,0 @@ -From debba4d14155a9e5736de069c2b693ab6f6e21aa Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen@redhat.com> -Date: Wed, 5 Oct 2016 12:20:14 -0400 -Subject: [PATCH] entry: Fix a corner case of overwrite mode - -We currently beep when a character is appended at the end in -overwrite mode. That is obviously not right. Patch based on -a patch by Ian MacDonald. - -https://bugzilla.gnome.org/show_bug.cgi?id=772389 ---- - gtk/gtkentry.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c -index b522039..bc33754 100644 ---- a/gtk/gtkentry.c -+++ b/gtk/gtkentry.c -@@ -5224,6 +5224,7 @@ gtk_entry_enter_text (GtkEntry *entry, - GtkEditable *editable = GTK_EDITABLE (entry); - gint tmp_pos; - gboolean old_need_im_reset; -+ guint text_length; - - old_need_im_reset = entry->need_im_reset; - entry->need_im_reset = FALSE; -@@ -5233,7 +5234,11 @@ gtk_entry_enter_text (GtkEntry *entry, - else - { - if (entry->overwrite_mode) -- gtk_entry_delete_from_cursor (entry, GTK_DELETE_CHARS, 1); -+ { -+ text_length = gtk_entry_buffer_get_length (get_buffer (entry)); -+ if (entry->current_pos < text_length) -+ gtk_entry_delete_from_cursor (entry, GTK_DELETE_CHARS, 1); -+ } - } - - tmp_pos = entry->current_pos; --- -2.10.0 - 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 deleted file mode 100644 index 11dbb5e4..00000000 --- a/x11-libs/gtk+/files/gtk+-2.24.31-update-icon-cache.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 260f94f3914ba18a256e6f1c222f643a57854e80 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Sat, 9 May 2015 23:30:58 +0200 -Subject: [PATCH] Always use external gtk-update-icon-cache - ---- - configure.ac | 8 +++----- - docs/reference/gtk/Makefile.am | 2 +- - gtk/Makefile.am | 13 ++----------- - 3 files changed, 6 insertions(+), 17 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4e11b40..7ef8cb6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -913,11 +913,9 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling - - AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) - --if test $cross_compiling = yes; then -- AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no) -- if test x$GTK_UPDATE_ICON_CACHE = xno; then -- REBUILD_PNGS=# -- fi -+AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no) -+if test x$GTK_UPDATE_ICON_CACHE = xno; then -+ REBUILD_PNGS=# - fi - - AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no) -diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am -index c239445..60b5265 100644 ---- a/docs/reference/gtk/Makefile.am -+++ b/docs/reference/gtk/Makefile.am -@@ -368,7 +368,7 @@ EXTRA_DIST += version.xml.in - - if ENABLE_MAN - --man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1 -+man_MANS = gtk-query-immodules-2.0.1 gtk-builder-convert.1 - - %.1 : %.xml - @XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< -diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index 8cc4536..a7afbf3 100644 ---- a/gtk/Makefile.am -+++ b/gtk/Makefile.am -@@ -1087,8 +1087,7 @@ endif - # Installed tools - # - bin_PROGRAMS = \ -- gtk-query-immodules-2.0 \ -- gtk-update-icon-cache -+ gtk-query-immodules-2.0 - - bin_SCRIPTS = gtk-builder-convert - -@@ -1438,16 +1437,8 @@ stamp-icons: $(STOCK_ICONS) - ) done \ - && touch stamp-icons - --if CROSS_COMPILING --gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE) --else --gtk_update_icon_cache_program = \ -- ./gtk-update-icon-cache --endif -- - gtkbuiltincache.h: @REBUILD@ stamp-icons -- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) -- $(gtk_update_icon_cache_program) --force --ignore-theme-index \ -+ $(GTK_UPDATE_ICON_CACHE) --force --ignore-theme-index \ - --include-image-data \ - --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ - mv gtkbuiltincache.h.tmp gtkbuiltincache.h --- -2.10.0 - 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 deleted file mode 100644 index 4ee55d27..00000000 --- a/x11-libs/gtk+/files/gtk+-2.24.33-Fix-casts.patch +++ /dev/null @@ -1,167 +0,0 @@ -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+/files/gtk+-2.24.33-respect-NM.patch b/x11-libs/gtk+/files/gtk+-2.24.33-respect-NM.patch deleted file mode 100644 index 0c74d962..00000000 --- a/x11-libs/gtk+/files/gtk+-2.24.33-respect-NM.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://bugs.gentoo.org/725852 ---- a/configure.ac -+++ b/configure.ac -@@ -190,7 +190,7 @@ m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) - AC_SYS_LARGEFILE - - AM_PROG_AS --AC_PATH_TOOL(NM, nm, nm) -+AC_CHECK_TOOL(NM, nm, nm) - - dnl Initialize maintainer mode - AM_MAINTAINER_MODE([enable]) diff --git a/x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch b/x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch deleted file mode 100644 index 8913bc88..00000000 --- a/x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 4588c9c6463d8958d8305caafa58ea5c263fd352 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Tue, 16 Jan 2018 09:07:38 +0100 -Subject: [PATCH] Fix libcloudproviders check - -Use autotools managed variables and make use of pkgconfig macros. ---- - configure.ac | 26 +++++++++++++------------- - 1 file changed, 13 insertions(+), 13 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 24110386b4..cebe66c2e5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -349,8 +349,10 @@ AC_ARG_ENABLE(mir-backend, - - AC_ARG_ENABLE(cloudproviders, - [AS_HELP_STRING([--enable-cloudproviders], -- [enable libcloudproviders integration])], -- [cloudproviders_set=yes]) -+ [enable libcloudproviders integration]) -+ ], -+ [], -+ [enable_cloudproviders=yes]) - - if test -z "$backend_set"; then - if test "$platform_win32" = yes; then -@@ -1350,17 +1352,15 @@ fi - # Check for libcloudproviders - - CLOUDPROVIDER_PACKAGES="" --if test "x$cloudproviders_set" = "xyes"; then -- CLOUDPROVIDER_PACKAGES="cloudproviders >= cloudproviders_required_version" -- if $PKG_CONFIG --exists $CLOUDPROVIDER_PACKAGES ; then -- AC_DEFINE(HAVE_CLOUDPROVIDERS, [1], -- [Define if libcloudproviders is available] -- ) -- else -- AC_MSG_ERROR([ --*** libcloudproviders not found.]) -- fi --fi -+AS_IF([test "$enable_cloudproviders" = "yes"], -+ [ -+ CLOUDPROVIDER_PACKAGES="cloudproviders >= cloudproviders_required_version" -+ PKG_CHECK_EXISTS( -+ [$CLOUDPROVIDER_PACKAGES], -+ [AC_DEFINE(HAVE_CLOUDPROVIDERS, [1], [Define if libcloudproviders is available])], -+ [AC_MSG_ERROR([*** libcloudproviders not found])] -+ ) -+ ]) - - CFLAGS="$saved_cflags" - LDFLAGS="$saved_ldflags" --- -2.15.1 - diff --git a/x11-libs/gtk+/files/gtk+-3.24.25-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.24.25-update-icon-cache.patch deleted file mode 100644 index a648ba40..00000000 --- a/x11-libs/gtk+/files/gtk+-3.24.25-update-icon-cache.patch +++ /dev/null @@ -1,121 +0,0 @@ -From ce23725d2b25b61a4eec8db0899d49d5a9dbcc6d Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Tue, 1 Nov 2016 15:24:22 +0100 -Subject: [PATCH] Always use external gtk-update-icon-cache - -Check for gtk-update-icon-cache to install demos, otherwise it is not -used when building. ---- - configure.ac | 2 ++ - demos/gtk-demo/Makefile.am | 2 +- - demos/widget-factory/Makefile.am | 2 +- - docs/reference/gtk/Makefile.am | 1 - - gtk/Makefile.am | 27 --------------------------- - 5 files changed, 4 insertions(+), 30 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 36dda2ebaf..df9d9b0e9b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -974,6 +974,8 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling - - AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) - -+AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, [gtk-update-icon-cache], [no]) -+ - ######################################## - # Windowing system checks - ######################################## -diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am -index 4a2f827469..369ba5d3cc 100644 ---- a/demos/gtk-demo/Makefile.am -+++ b/demos/gtk-demo/Makefile.am -@@ -174,7 +174,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.sy - dist_appsicon48_DATA = data/48x48/gtk3-demo.png data/48x48/gtk3-demo-symbolic.symbolic.png - dist_appsicon256_DATA = data/256x256/gtk3-demo.png data/256x256/gtk3-demo-symbolic.symbolic.png - --update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force -+update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force - - install-data-hook: install-update-icon-cache - uninstall-hook: uninstall-update-icon-cache -diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am -index c33a6d0a95..291f389f53 100644 ---- a/demos/widget-factory/Makefile.am -+++ b/demos/widget-factory/Makefile.am -@@ -47,7 +47,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png data/32x32/gtk3-widget - dist_appsicon48_DATA = data/48x48/gtk3-widget-factory.png data/48x48/gtk3-widget-factory-symbolic.symbolic.png - dist_appsicon256_DATA = data/256x256/gtk3-widget-factory.png data/256x256/gtk3-widget-factory-symbolic.symbolic.png - --update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force -+update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force - - install-data-hook: install-update-icon-cache - uninstall-hook: uninstall-update-icon-cache -diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am -index dc9b80c6c5..bcaa4032c9 100644 ---- a/docs/reference/gtk/Makefile.am -+++ b/docs/reference/gtk/Makefile.am -@@ -502,7 +502,6 @@ EXTRA_DIST += version.xml.in gtk3.types.in getting_started.xml.in - - man_MANS = \ - gtk-query-immodules-3.0.1 \ -- gtk-update-icon-cache.1 \ - gtk-encode-symbolic-svg.1 \ - gtk-launch.1 \ - gtk3-demo.1 \ -diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index 9608ab3355..74792a4b40 100644 ---- a/gtk/Makefile.am -+++ b/gtk/Makefile.am -@@ -1658,7 +1658,6 @@ endif - # - bin_PROGRAMS = \ - gtk-query-immodules-3.0 \ -- gtk-update-icon-cache \ - gtk-encode-symbolic-svg \ - gtk-builder-tool \ - gtk-query-settings \ -@@ -1671,9 +1670,6 @@ gtk_query_immodules_3_0_LDADD = \ - $(GMODULE_LIBS) \ - $(GTK_DEP_LIBS) - --gtk_update_icon_cache_SOURCES = updateiconcache.c --gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS) -- - gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c - gtk_encode_symbolic_svg_LDADD = \ - $(GDK_PIXBUF_LIBS) \ -@@ -1698,29 +1694,6 @@ gtk_launch_LDADD = \ - $(top_builddir)/gdk/libgdk-3.la \ - $(GTK_DEP_LIBS) - --if OS_WIN32 -- --# Workaround for UAC silliness: programs with "update" in their name --# are believed to be installers and require elevated privileges to be --# used... Embed a manifest file into executable to tell Windows that --# gtk-update-icon-cache.exe doesn't require any special privileges. -- --GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest --GTK_UPDATE_ICON_CACHE_RC = gtk-update-icon-cache.rc --GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT = gtk-update-icon-cache_manifest.o -- --$(GTK_UPDATE_ICON_CACHE_MANIFEST): Makefile generate-uac-manifest.py -- $(PYTHON) $(srcdir)/generate-uac-manifest.py -p=gtk3 -n=gtk-update-icon-cache --pkg-version=$(GTK_VERSION) --output-dir=$(builddir) -- --$(GTK_UPDATE_ICON_CACHE_RC): $(GTK_UPDATE_ICON_CACHE_MANIFEST) -- --$(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT): $(GTK_UPDATE_ICON_CACHE_RC) $(GTK_UPDATE_ICON_CACHE_MANIFEST) -- $(WINDRES) --input $< --output $@ --output-format=coff -- --gtk_update_icon_cache_LDADD += $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT) -- --endif -- - .PHONY: files - - files: --- -2.30.0 - diff --git a/x11-libs/gtk+/files/gtk+-3.24.36-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.24.36-update-icon-cache.patch deleted file mode 100644 index 19af75c3..00000000 --- a/x11-libs/gtk+/files/gtk+-3.24.36-update-icon-cache.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/docs/reference/gtk/meson.build -+++ b/docs/reference/gtk/meson.build -@@ -500,7 +500,6 @@ - - man_files = [ - [ 'gtk-query-immodules-3.0', '1', ], -- [ 'gtk-update-icon-cache', '1', ], - [ 'gtk-encode-symbolic-svg', '1', ], - [ 'gtk-launch', '1', ], - [ 'gtk-builder-tool', '1', ], ---- a/gtk/meson.build -+++ b/gtk/meson.build -@@ -1109,16 +1109,6 @@ - extra_update_icon_cache_objs = import('windows').compile_resources(uac_rc) - endif - --gtk_update_icon_cache = executable( -- 'gtk-update-icon-cache', -- 'updateiconcache.c', -- extra_update_icon_cache_objs, -- c_args: gtk_cargs, -- dependencies: libgtk_dep, -- install: true --) --gtk_tools += gtk_update_icon_cache -- - gtk_query_immodules = executable( - 'gtk-query-immodules-3.0', - 'queryimmodules.c', diff --git a/x11-libs/gtk+/files/gtk+-atk-bridge-config.ac.patch b/x11-libs/gtk+/files/gtk+-atk-bridge-config.ac.patch deleted file mode 100644 index 8388a744..00000000 --- a/x11-libs/gtk+/files/gtk+-atk-bridge-config.ac.patch +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-configure.ac,v 1.2 2014/09/08 12:06:48 wiz Exp $ - -Make gtk3-atk-bridge an option to avoid unwanted dbus dependency. - ---- 1/configure.ac -+++ 2/configure.ac -@@ -1295,8 +1295,13 @@ AC_SUBST(GDK_DEP_CFLAGS) - # Check for Accessibility Toolkit flags - ######################################## - --if test x$enable_x11_backend = xyes; then -+AC_ARG_WITH(atk-bridge, -+ AS_HELP_STRING([--without-atk-bridge], [Do not use atk-bridge-2.0]), -+ :, with_atk_bridge=yes) -+ -+if test x$enable_x11_backend = xyes -a x$with_atk_bridge = xyes; then - ATK_PACKAGES="atk atk-bridge-2.0" -+ AC_DEFINE([HAVE_ATK_BRIDGE], [1], [Define if we're using atk-bridge-2.0]) - else - ATK_PACKAGES="atk" - fi diff --git a/x11-libs/gtk+/files/gtk+-atk-bridge-config.h.in.patch b/x11-libs/gtk+/files/gtk+-atk-bridge-config.h.in.patch deleted file mode 100644 index 6dee2e42..00000000 --- a/x11-libs/gtk+/files/gtk+-atk-bridge-config.h.in.patch +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-config.h.in,v 1.2 2014/09/08 12:06:48 wiz Exp $ - -Make gtk3-atk-bridge an option to avoid unwanted dbus dependency. - ---- 1/config.h.in -+++ 1/config.h.in -@@ -21,6 +21,9 @@ - /* Define the location where the catalogs will be installed */ - #undef GTK_LOCALEDIR - -+/* Define if we're using atk-bridge-2.0 */ -+#undef HAVE_ATK_BRIDGE -+ - /* Define to 1 if you have the `bind_textdomain_codeset' function. */ - #undef HAVE_BIND_TEXTDOMAIN_CODESET - diff --git a/x11-libs/gtk+/files/gtk+-atk-bridge-gtkaccessibility.patch b/x11-libs/gtk+/files/gtk+-atk-bridge-gtkaccessibility.patch deleted file mode 100644 index 276d2d16..00000000 --- a/x11-libs/gtk+/files/gtk+-atk-bridge-gtkaccessibility.patch +++ /dev/null @@ -1,25 +0,0 @@ -Make gtk3-atk-bridge an option to avoid unwanted dbus dependency. ---- 1/gtk/a11y/gtkaccessibility.c -+++ 1/gtk/a11y/gtkaccessibility.c -@@ -38,8 +38,10 @@ - #include <gtk/gtkaccessible.h> - - #ifdef GDK_WINDOWING_X11 -+#ifdef HAVE_ATK_BRIDGE - #include <atk-bridge.h> - #endif -+#endif - - static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, - guint n_param_values, -@@ -983,8 +985,10 @@ _gtk_accessibility_init (void) - do_window_event_initialization (); - - #ifdef GDK_WINDOWING_X11 -+#ifdef HAVE_ATK_BRIDGE - atk_bridge_adaptor_init (NULL, NULL); - #endif -+#endif - - atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); - } diff --git a/x11-libs/gtk+/files/gtk+-atk-bridge-meson.build.patch b/x11-libs/gtk+/files/gtk+-atk-bridge-meson.build.patch deleted file mode 100644 index ba07be50..00000000 --- a/x11-libs/gtk+/files/gtk+-atk-bridge-meson.build.patch +++ /dev/null @@ -1,31 +0,0 @@ -Martin V\"ath <martin at mvath.de> - -Honor atk_bridge option - ---- 1/meson.build -+++ 2/meson.build -@@ -564,7 +564,12 @@ - xfixes_dep = dependency('xfixes', required: false) - xcomposite_dep = dependency('xcomposite', required: false) - fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep']) -- atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req) -+ -+ atk_bridge_enabled = get_option('atk_bridge') -+ if atk_bridge_enabled -+ atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req) -+ cdata.set('HAVE_ATK_BRIDGE', 1) -+ endif - - backend_immodules += ['xim'] - -@@ -583,7 +588,9 @@ - x11_pkgs += ['xdamage'] - endif - -- atk_pkgs += ['atk-bridge-2.0'] -+ if atk_bridge_enabled -+ atk_pkgs += ['atk-bridge-2.0'] -+ endif - - cdata.set('HAVE_XDAMAGE', xdamage_dep.found() ? 1 : false) - cdata.set('HAVE_XCURSOR', xcursor_dep.found() ? 1 : false) diff --git a/x11-libs/gtk+/files/gtk+-atk-bridge-meson_options.txt.patch b/x11-libs/gtk+/files/gtk+-atk-bridge-meson_options.txt.patch deleted file mode 100644 index a746d4fa..00000000 --- a/x11-libs/gtk+/files/gtk+-atk-bridge-meson_options.txt.patch +++ /dev/null @@ -1,14 +0,0 @@ -Martin V\"ath <martin at mvath.de> - -Add atk_bridge option - ---- 1/meson_options.txt -+++ 2/meson_options.txt -@@ -47,3 +47,7 @@ - # input modules - option('builtin_immodules', type: 'string', - value: '', description: 'Build specified immodules into GTK so/DLL (comma-separated list), "all", "none" or "backend"') -+ -+# Recommended dependencies -+option('atk_bridge', type: 'boolean', value: true, -+ description : 'Enable atk-bridge support') diff --git a/x11-libs/gtk+/files/gtkrc b/x11-libs/gtk+/files/gtkrc deleted file mode 100644 index 8d178343..00000000 --- a/x11-libs/gtk+/files/gtkrc +++ /dev/null @@ -1,39 +0,0 @@ -style "default" - -{ - font = "-*-lucida-medium-r-normal-*-*-100-*-*-*-*-*-*" -} - -style "button" = "default" - -{ - bg[PRELIGHT] = { 0.7, 0.7, 0.9 } -} - -style "treeitem" -{ -bg[ACTIVE] = { 0.7, 0.7, 0.9 } -} - -style "scrollbar" = "button" -{ - bg[ACTIVE] = {0.6, 0.6, 0.6 } -} - -style "status" { - bg[PRELIGHT] = { 0.3, 1.0, 0.3 } -} - -style "gtk-tooltips" { - bg[NORMAL] = "#ffff60" -} - -class "GtkWidget" style "default" -class "GtkButton" style "button" -class "GtkItem" style "button" -class "GtkProgressBar" style "status" -class "GtkScrollbar" style "scrollbar" -class "GtkTreeItem" style "treeitem" -widget "gtk-tooltips" style "gtk-tooltips" - - diff --git a/x11-libs/gtk+/files/settings.ini b/x11-libs/gtk+/files/settings.ini deleted file mode 100644 index a65c0a81..00000000 --- a/x11-libs/gtk+/files/settings.ini +++ /dev/null @@ -1,4 +0,0 @@ -[Settings] -gtk-theme-name = Adwaita -gtk-icon-theme-name = gnome -gtk-cursor-theme-name = Adwaita |