diff options
| -rw-r--r-- | metadata/pkg_desc_index | 2 | ||||
| -rw-r--r-- | x11-libs/gtk+/Manifest | 3 | ||||
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-3.24.8-update-icon-cache.patch (renamed from x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch) | 28 | ||||
| -rw-r--r-- | x11-libs/gtk+/gtk+-3.24.8.ebuild (renamed from x11-libs/gtk+/gtk+-3.24.7.ebuild) | 7 |
4 files changed, 22 insertions, 18 deletions
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index 180b7249..29d77dc8 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -130,5 +130,5 @@ www-plugins/noscript 10.2.1: Firefox webextension: restrict active contents like www-plugins/skip-redirect 2.2.1: Firefox webextension: skip intermediary pages before redirecting www-plugins/translate-to-me 1.1: Firefox webextension: translate the selected text with www.linguee.com www-plugins/ublock-origin 1.17.2: Firefox webextension: An efficient list-based blocker -x11-libs/gtk+ 2.24.32-r1 3.24.7: Gimp ToolKit + +x11-libs/gtk+ 2.24.32-r1 3.24.8: Gimp ToolKit + x11-libs/motif 2.3.8-r1: The Motif user interface component toolkit diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index 30adcf41..a91d26aa 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -1,3 +1,4 @@ DIST gtk+-2.24.32-patchset.tar.xz 6392 SHA512 6c8763826b479c9c122bb991ae42b0ce0e754d460be5c6ea8d1bba28f7318c014822eccaae0b39c3b7c16804991c8c46c53cd8ded3ad6212830a2f5746567543 DIST gtk+-2.24.32.tar.xz 12620860 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696 -DIST gtk+-3.24.7.tar.xz 19375708 SHA512 2605087c3e09c81192769e6c4bcc4374e0fadbc4d05433edeaefd9915e128ff925c64fb3d07799bacccb16d85d31e53936ac09c696a09349efa6e21d886074c5 +DIST gtk+-3.24.8-patchset.tar.xz 3684 SHA512 31f9b982592a81095afad91f16ad96e72a7a2b0e2bf812f0b719da56d70235bc06bc991b5f619fefded3e1634efc5b7e8ef00053929c89e967351d8625518428 +DIST gtk+-3.24.8.tar.xz 22419364 SHA512 a988ca2e25f0f32e55b2931f16c72f9649ed98405579d217e8a5e7f0ac10bcd1969090c622c5d9eb7d75235813ff7ccb90e30e252afd71ba283c6172ee459fe5 diff --git a/x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.24.8-update-icon-cache.patch index fc1e86e9..6fcbb5c0 100644 --- a/x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch +++ b/x11-libs/gtk+/files/gtk+-3.24.8-update-icon-cache.patch @@ -1,4 +1,4 @@ -From 101b43f4a38904ee21070a3e2eb5ba03dfe17647 Mon Sep 17 00:00:00 2001 +From 87693de873b15194b122e98438b3bc1bf37f6d0b 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 @@ -10,14 +10,14 @@ used when building. demos/gtk-demo/Makefile.am | 2 +- demos/widget-factory/Makefile.am | 2 +- docs/reference/gtk/Makefile.am | 1 - - gtk/Makefile.am | 44 ---------------------------------------- + gtk/Makefile.am | 44 -------------------------------- 5 files changed, 4 insertions(+), 47 deletions(-) diff --git a/configure.ac b/configure.ac -index 4f9f183..ecf99dc 100644 +index f700616649..e3604fef05 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 +@@ -1003,6 +1003,8 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) @@ -27,7 +27,7 @@ index 4f9f183..ecf99dc 100644 # Windowing system checks ######################################## diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am -index 8c15e16..5d774d2 100644 +index c8529e5bf7..b2924fc081 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 @@ -40,7 +40,7 @@ index 8c15e16..5d774d2 100644 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 +index 62c156aa09..7aad079dcd 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 @@ -53,10 +53,10 @@ index a6bfbdc..28a3be2 100644 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 +index abdea7fb59..0ee826c31e 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 +@@ -502,7 +502,6 @@ EXTRA_DIST += version.xml.in gtk3.types.in man_MANS = \ gtk-query-immodules-3.0.1 \ @@ -65,10 +65,10 @@ index 5a88a12..b51f3ac 100644 gtk-launch.1 \ gtk3-demo.1 \ diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index 3b76b82..d4c5681 100644 +index e556e9d3af..4d7973f3b1 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am -@@ -1581,7 +1581,6 @@ endif +@@ -1653,7 +1653,6 @@ endif # bin_PROGRAMS = \ gtk-query-immodules-3.0 \ @@ -76,7 +76,7 @@ index 3b76b82..d4c5681 100644 gtk-encode-symbolic-svg \ gtk-builder-tool \ gtk-query-settings \ -@@ -1594,9 +1593,6 @@ gtk_query_immodules_3_0_LDADD = \ +@@ -1666,9 +1665,6 @@ gtk_query_immodules_3_0_LDADD = \ $(GMODULE_LIBS) \ $(GTK_DEP_LIBS) @@ -86,7 +86,7 @@ index 3b76b82..d4c5681 100644 gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c gtk_encode_symbolic_svg_LDADD = \ $(GDK_PIXBUF_LIBS) \ -@@ -1621,46 +1617,6 @@ gtk_launch_LDADD = \ +@@ -1693,46 +1689,6 @@ gtk_launch_LDADD = \ $(top_builddir)/gdk/libgdk-3.la \ $(GTK_DEP_LIBS) @@ -121,7 +121,7 @@ index 3b76b82..d4c5681 100644 - echo '</assembly>' ) >$@ - -$(GTK_UPDATE_ICON_CACHE_RC): -- (echo 'CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST '$(GTK_UPDATE_ICON_CACHE_MANIFEST)) >$@ +- (echo -e '#include <winuser.h>\nCREATEPROCESS_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 @@ -134,5 +134,5 @@ index 3b76b82..d4c5681 100644 files: -- -2.10.1 +2.17.0 diff --git a/x11-libs/gtk+/gtk+-3.24.7.ebuild b/x11-libs/gtk+/gtk+-3.24.8.ebuild index 727b98dd..56653b38 100644 --- a/x11-libs/gtk+/gtk+-3.24.7.ebuild +++ b/x11-libs/gtk+/gtk+-3.24.8.ebuild @@ -9,7 +9,7 @@ inherit flag-o-matic gnome2 multilib virtualx multilib-minimal DESCRIPTION="Gimp ToolKit +" HOMEPAGE="https://www.gtk.org/" -SRC_URI=${SRC_URI} +SRC_URI=${SRC_URI}" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" LICENSE="LGPL-2+" SLOT="3" @@ -124,8 +124,11 @@ src_prepare() { strip_builddir SRC_SUBDIRS examples Makefile.{am,in} fi + # Select patches from origin/gtk-3-24 on 2019-04-20 + eapply "${WORKDIR}"/patches + # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache - eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch + eapply "${FILESDIR}"/${P}-update-icon-cache.patch # Fix broken autotools logic eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch |