x11-libs/gtk+:3 : version bump

3 files changed, 29 insertions, 178 deletions

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
new file mode 100644
index 00000000..19af75c3
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.24.36-update-icon-cache.patch
@@ -0,0 +1,29 @@
+--- 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',