x11-libs/gtk+: bump to 3.24.8

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio@gentoo.org>

3 files changed, 374 insertions, 0 deletions

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 52931b67b912..50e265e19942 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -3,3 +3,5 @@ DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169
 DIST gtk+-3.24.1.tar.xz 19307612 BLAKE2B f09b7cb252898b7290a3806f8fb579b706fc0ecd021817e34e71b101a7d222604b395c850c559f3ff0c38e0848abdffc483efe65f086357532be85db872028e7 SHA512 13ddb1099a2a0eb44ea53fa4be5054a403e1b27468a33862646ba111577b7bb72b9bbe4f6aea15889c2a2bee1238023bc23524b901cf2dbb3adf0e126eb6ea5d
 DIST gtk+-3.24.4.tar.xz 21102236 BLAKE2B 1ef6445d582217a54538549fd63c59dd1e7f14832b33a41e971d2dd184a8887876d1eb599cb9fcbd590ec1a16ca29f0be92bc96344b1e7d2fdf88456d63c9a7f SHA512 d1cce6d0d7f1c5ef0f4e8988b88372a32b9d8a2924da4cfc46a80ede91cf8a2aacdcd87eec122dfab1369b36fc849d875832ac11d79426cf6884e1730e5d4dd1
 DIST gtk+-3.24.7.tar.xz 19375708 BLAKE2B 28ec4106258a7ecfa78d2f3dd8d2145cdf8ecbb55167bf22002e38186721e2e1658885032630eb306785bfe36486834c40e34fd5ac20d1c30d4f5de58cba7fae SHA512 2605087c3e09c81192769e6c4bcc4374e0fadbc4d05433edeaefd9915e128ff925c64fb3d07799bacccb16d85d31e53936ac09c696a09349efa6e21d886074c5
+DIST gtk+-3.24.8-patchset.tar.xz 3684 BLAKE2B 686356993b95f5342942764af5f92ab52b17fcd326ee3fd0de5179ed2a55b6e0192e16707ee882866d39ede7d28150b8b8bc6945355f04a4b191b671ae70fb7d SHA512 31f9b982592a81095afad91f16ad96e72a7a2b0e2bf812f0b719da56d70235bc06bc991b5f619fefded3e1634efc5b7e8ef00053929c89e967351d8625518428
+DIST gtk+-3.24.8.tar.xz 22419364 BLAKE2B 262384d0bf1d843edfcb13007eae3584235fa166286f071b8b98803d452df3f4f8934f2b1830427d0c0cd956b67170e576f8c3f733e9b6323b8f89f6d0ddea71 SHA512 a988ca2e25f0f32e55b2931f16c72f9649ed98405579d217e8a5e7f0ac10bcd1969090c622c5d9eb7d75235813ff7ccb90e30e252afd71ba283c6172ee459fe5
diff --git a/x11-libs/gtk+/files/gtk+-3.24.8-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.24.8-update-icon-cache.patch
new file mode 100644
index 000000000000..6fcbb5c07ba4
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.24.8-update-icon-cache.patch
@@ -0,0 +1,138 @@
+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
+
+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 f700616649..e3604fef05 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -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)
+ 
++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 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
+ 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 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
+ 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 abdea7fb59..0ee826c31e 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
+ 
+ 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 e556e9d3af..4d7973f3b1 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -1653,7 +1653,6 @@ endif
+ #
+ bin_PROGRAMS = \
+ 	gtk-query-immodules-3.0	\
+-	gtk-update-icon-cache \
+ 	gtk-encode-symbolic-svg \
+ 	gtk-builder-tool \
+ 	gtk-query-settings \
+@@ -1666,9 +1665,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)			\
+@@ -1693,46 +1689,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 -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
+-
+-gtk_update_icon_cache_LDADD += $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT)
+-
+-endif
+-
+ .PHONY: files
+ 
+ files:
+-- 
+2.17.0
+
diff --git a/x11-libs/gtk+/gtk+-3.24.8.ebuild b/x11-libs/gtk+/gtk+-3.24.8.ebuild
new file mode 100644
index 000000000000..2044ec67b36e
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.24.8.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit flag-o-matic gnome2 multilib virtualx multilib-minimal
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="https://www.gtk.org/"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	xinerama? ( X )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Upstream wants us to do their job:
+# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
+RESTRICT="test"
+
+# FIXME: introspection data is built against system installation of gtk+:3,
+# bug #????
+COMMON_DEPEND="
+	>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.53.4:2[${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	>=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.41.0[introspection?,${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-0.9:=
+	x11-misc/shared-mime-info
+
+	cloudprint? (
+		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
+		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
+	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
+	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+	wayland? (
+		>=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.12
+		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+		x11-libs/libXdamage[${MULTILIB_USEDEP}]
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.1.2
+	dev-libs/libxslt
+	dev-libs/gobject-introspection-common
+	>=dev-util/gdbus-codegen-2.48
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.20
+	gtk-doc? ( >=dev-util/gtk-doc-1.20 )
+	>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	X? ( x11-base/xorg-proto )
+	test? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )
+"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-update-icon-cache-3
+	!<gnome-base/gail-1000
+	!<x11-libs/vte-0.31.0:2.90
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+	gnome-base/librsvg[${MULTILIB_USEDEP}]
+	>=x11-themes/adwaita-icon-theme-3.14
+	vim-syntax? ( app-vim/gtk-syntax )
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
+)
+
+strip_builddir() {
+	local rule=$1
+	shift
+	local directory=$1
+	shift
+	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+		|| die "Could not strip director ${directory} from build."
+}
+
+src_prepare() {
+	if ! use test ; then
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
+
+		# the tests dir needs to be build now because since commit
+		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
+		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+	fi
+
+	if ! use examples; then
+		# don't waste time building demos
+		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+		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}"/${P}-update-icon-cache.patch
+
+	# Fix broken autotools logic
+	eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# need libdir here to avoid a double slash in a path that libtool doesn't
+	# grok so well during install (// between $EPREFIX and usr ...)
+	# cloudprovider is not packaged in Gentoo
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		$(use_enable aqua quartz-backend) \
+		$(use_enable broadway broadway-backend) \
+		$(use_enable cloudprint) \
+		$(use_enable colord) \
+		$(use_enable cups cups auto) \
+		$(multilib_native_use_enable gtk-doc) \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable wayland wayland-backend) \
+		$(use_enable X x11-backend) \
+		$(use_enable X xcomposite) \
+		$(use_enable X xdamage) \
+		$(use_enable X xfixes) \
+		$(use_enable X xkb) \
+		$(use_enable X xrandr) \
+		$(use_enable xinerama) \
+		--disable-cloudproviders \
+		--disable-mir-backend \
+		--disable-papi \
+		--enable-man \
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		local d
+		for d in gdk gtk libgail-util; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+	GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	insinto /etc/gtk-3.0
+	doins "${FILESDIR}"/settings.ini
+	# Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
+	DOCS=( AUTHORS NEWS README )
+	einstalldocs
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make immodules.cache belongs to gtk+ alone
+		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+	multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_query_immodules_gtk3 \
+			|| die "Update immodules cache failed (for ${ABI})"
+	}
+	multilib_parallel_foreach_abi multilib_pkg_postinst
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+	fi
+}