diff options
| -rw-r--r-- | x11-libs/gtk+/Manifest | 2 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch | 24 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch | 138 | ||||
| -rw-r--r-- | x11-libs/gtk+/gtk+-3.22.2.ebuild (renamed from x11-libs/gtk+/gtk+-3.21.4.ebuild) | 16 |
4 files changed, 146 insertions, 34 deletions
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index 3ceeed29..cadd37b2 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -1 +1 @@ -DIST gtk+-3.21.4.tar.xz 20507568 SHA256 46bb46c420b1406dcb7d6034a9a4c80340f0db464fb98a8c271343bf56e43cf1 +DIST gtk+-3.22.2.tar.xz 18257964 SHA256 2343dcaed2fc237ef718136ff4110fef7eb1ebfe178a9b064aa21cd74ecb6946 diff --git a/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch deleted file mode 100644 index b121dd57..00000000 --- a/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d83443d10381a53637226b937094454951de44c1 Mon Sep 17 00:00:00 2001 -From: Ole Reifschneider <tranquility@gentoo.org> -Date: Thu, 16 Apr 2015 23:51:51 +0200 -Subject: [PATCH] Remove update-icon-cache from bin_PROGRAMS - ---- - gtk/Makefile.am | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index 83dfe31..a5afc03 100644 ---- a/gtk/Makefile.am -+++ b/gtk/Makefile.am -@@ -1380,7 +1380,6 @@ endif - # - bin_PROGRAMS = \ - gtk-query-immodules-3.0 \ -- gtk-update-icon-cache \ - gtk-encode-symbolic-svg \ - gtk-launch - --- -2.0.5 - diff --git a/x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch new file mode 100644 index 00000000..fc1e86e9 --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch @@ -0,0 +1,138 @@ +From 101b43f4a38904ee21070a3e2eb5ba03dfe17647 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 | 44 ---------------------------------------- + 5 files changed, 4 insertions(+), 47 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4f9f183..ecf99dc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -999,6 +999,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 8c15e16..5d774d2 100644 +--- a/demos/gtk-demo/Makefile.am ++++ b/demos/gtk-demo/Makefile.am +@@ -171,7 +171,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 a6bfbdc..28a3be2 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 5a88a12..b51f3ac 100644 +--- a/docs/reference/gtk/Makefile.am ++++ b/docs/reference/gtk/Makefile.am +@@ -504,7 +504,6 @@ EXTRA_DIST += version.xml.in gtk3.types.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 3b76b82..d4c5681 100644 +--- a/gtk/Makefile.am ++++ b/gtk/Makefile.am +@@ -1581,7 +1581,6 @@ endif + # + bin_PROGRAMS = \ + gtk-query-immodules-3.0 \ +- gtk-update-icon-cache \ + gtk-encode-symbolic-svg \ + gtk-builder-tool \ + gtk-query-settings \ +@@ -1594,9 +1593,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) \ +@@ -1621,46 +1617,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): +- (echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' ; \ +- echo '<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">' ; \ +- echo ' <assemblyIdentity version="1.0.0.0"' ; \ +- echo ' processorArchitecture="'$(EXE_MANIFEST_ARCHITECTURE)'"' ; \ +- echo ' name="gtk-update-icon-cache.exe"' ; \ +- echo ' type="win32"/>' ; \ +- echo ' <!-- Identify the application security requirements. -->' ; \ +- echo ' <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">' ; \ +- echo ' <security>' ; \ +- echo ' <requestedPrivileges>' ; \ +- echo ' <requestedExecutionLevel' ; \ +- echo ' level="asInvoker"' ; \ +- echo ' uiAccess="false"/>' ; \ +- echo ' </requestedPrivileges>' ; \ +- echo ' </security>' ; \ +- echo ' </trustInfo>' ; \ +- echo '</assembly>' ) >$@ +- +-$(GTK_UPDATE_ICON_CACHE_RC): +- (echo 'CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST '$(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.10.1 + diff --git a/x11-libs/gtk+/gtk+-3.21.4.ebuild b/x11-libs/gtk+/gtk+-3.22.2.ebuild index 751ad226..63f7e894 100644 --- a/x11-libs/gtk+/gtk+-3.21.4.ebuild +++ b/x11-libs/gtk+/gtk+-3.22.2.ebuild @@ -1,8 +1,5 @@ -# Copyright 2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 EAPI=6 -RESTRICT="mirror" GNOME2_LA_PUNT="yes" inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal @@ -29,7 +26,7 @@ RESTRICT="test" # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) COMMON_DEPEND=" >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}] - >=dev-libs/glib-2.49.3:2[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.49.4:2[${MULTILIB_USEDEP}] media-libs/fontconfig[${MULTILIB_USEDEP}] >=media-libs/libepoxy-1.0[${MULTILIB_USEDEP}] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] @@ -45,7 +42,7 @@ COMMON_DEPEND=" introspection? ( >=dev-libs/gobject-introspection-1.39:= ) wayland? ( >=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}] - >=dev-libs/wayland-protocols-1.0 + >=dev-libs/wayland-protocols-1.7 media-libs/mesa[wayland,${MULTILIB_USEDEP}] >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] ) @@ -68,9 +65,9 @@ DEPEND="${COMMON_DEPEND} app-text/docbook-xml-dtd:4.1.2 dev-libs/libxslt dev-libs/gobject-introspection-common - >=dev-util/gdbus-codegen-2.38.2 + >=dev-util/gdbus-codegen-2.48 >=dev-util/gtk-doc-am-1.20 - >=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}] + >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}] virtual/pkgconfig[${MULTILIB_USEDEP}] X? ( x11-proto/xextproto[${MULTILIB_USEDEP}] @@ -88,6 +85,7 @@ DEPEND="${COMMON_DEPEND} # >=xorg-server-1.11.4 needed for # https://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html RDEPEND="${COMMON_DEPEND} + >=dev-util/gtk-update-icon-cache-3 !<gnome-base/gail-1000 !<x11-libs/vte-0.31.0:2.90 adwaita-icon-theme? ( >=x11-themes/adwaita-icon-theme-3.14 ) @@ -101,7 +99,7 @@ PDEPEND=" " MULTILIB_CHOST_TOOLS=( - /usr/bin/gtk-query-immodules-3.0 + /usr/bin/gtk-query-immodules-3.0$(get_exeext) ) strip_builddir() { @@ -134,7 +132,7 @@ src_prepare() { fi # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache - eapply "${FILESDIR}"/${PN}-3.16.2-remove_update-icon-cache.patch + eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch # Use patches from BSD to make gtk3-atk-bridge (at-spi2-atk) a true option- # This was intentionally removed by upstream, see |