commit: 0338600dee1675a09d42c2d17266be2ea2f2c56a Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Sun Feb 14 22:04:12 2021 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Sun Feb 14 22:21:18 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0338600d
x11-libs/gtk+: bump to 3.24.25 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> x11-libs/gtk+/Manifest | 2 + .../files/gtk+-3.24.25-update-icon-cache.patch | 121 ++++++++++ x11-libs/gtk+/gtk+-3.24.25.ebuild | 257 +++++++++++++++++++++ 3 files changed, 380 insertions(+) diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index c937b50318d..d3ed5d80099 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.20.tar.xz 22726768 BLAKE2B 75daa850275d55758503fa98055ca4deb9adca172e0f38c39ca4d5e7f8179398ca8753a759b0d3afc1ad1712ac6e3aa2cc1bce29e2a8fff4198a7f2d70002b11 SHA512 bda8eeacf721afcff4565756fe45857cbf8b053494d1d747ca9b97c899e9fe21fddef6871ecd5ec9a7a0f87b0a3ede2f9d6b5e5712de10a845100d82464a4556 DIST gtk+-3.24.22.tar.xz 21349784 BLAKE2B 03dac82b3928a77beab1b4fcfcb9fdeb5e458fae13f7ff5459c2c65c7acdd6b255e62cbeaace02ec19ab4a41ff3ba2003dc004bcbaa4ee8206986e35fd7d1084 SHA512 ac653438a0a818885f2aa46a131b1ab0038a57b438406724a674313d8bf4325b1d2e87e4e8c77a92d0cfa8f8d6eaac46ba6890830290e9a9e598c978144861a2 DIST gtk+-3.24.24.tar.xz 21341240 BLAKE2B a48024c008061b7e9c6ce8fe787e6c2f734923f5f17f818d2284afa6ea9ac080a55d358afcd0b73f3a124d57959c7a07a90c479b784fc881a3c9a0b9e354454f SHA512 f4e22d7c78d7c641ac7c3beeb3181000b72b025c65074bab6bd51b9a86ec4f6a2e25f06ad7671a908be421c064f4c26e2185febb424f310a2530561aebde8520 +DIST gtk+-3.24.25-patchset.tar.xz 8884 BLAKE2B 34531ebe0c2ca96d276071bed6b512ccffae4eb8f50263985af3c9c3e74f252690d5fdf354a6bca4cd2e54f7aa2636b2ab676fca13554901b221f1284de7b13e SHA512 11ca6bc40199a11875a31624e29d2d36800ae67ae596d145a146b0fff835f02b7864f46aef3689a7108f53e5db18b4855e34ff1dad1a201937320a51a97716cb +DIST gtk+-3.24.25.tar.xz 21417428 BLAKE2B 3a5ac2a453a6067bba43c2b712925dea150d1e5d5783d05ff5c1e01db5d04cee3bced6d327f66dcdcfbdd992ecadfe03e1ac1c545280bef4a4bb4d3d4afaff2e SHA512 e476e7900d5694ca538a5b0acce088a1485560dd697efb8839be93741e0c1ddda90c9cc73fc64af68d7ffacbf9b5cf9a74ab08454d684f182beda9fd09b6132b 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 new file mode 100644 index 00000000000..a648ba40f4c --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-3.24.25-update-icon-cache.patch @@ -0,0 +1,121 @@ +From ce23725d2b25b61a4eec8db0899d49d5a9dbcc6d Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <[email protected]> +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+/gtk+-3.24.25.ebuild b/x11-libs/gtk+/gtk+-3.24.25.ebuild new file mode 100644 index 00000000000..e878b6859cf --- /dev/null +++ b/x11-libs/gtk+/gtk+-3.24.25.ebuild @@ -0,0 +1,257 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +GNOME2_EAUTORECONF="yes" + +inherit gnome2 multilib multilib-minimal virtualx + +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 sysprof test vim-syntax wayland +X xinerama" +REQUIRED_USE=" + || ( aqua wayland X ) + xinerama? ( X ) +" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-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.32.0[introspection?,${MULTILIB_USEDEP}] + >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}] + media-libs/fontconfig[${MULTILIB_USEDEP}] + >=media-libs/harfbuzz-0.9:= + >=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}] + virtual/libintl[${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}] + x11-misc/shared-mime-info + + cloudprint? ( + >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] + >=net-libs/rest-0.7[${MULTILIB_USEDEP}] + ) + colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) + cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1.39:= ) + sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[${MULTILIB_USEDEP}] ) + wayland? ( + >=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}] + >=dev-libs/wayland-protocols-1.17 + media-libs/mesa[wayland,${MULTILIB_USEDEP}] + >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] + ) + X? ( + >=app-accessibility/at-spi2-atk-2.15.1[${MULTILIB_USEDEP}] + media-libs/mesa[X(+),${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXcomposite[${MULTILIB_USEDEP}] + x11-libs/libXcursor[${MULTILIB_USEDEP}] + x11-libs/libXdamage[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libXfixes[${MULTILIB_USEDEP}] + >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] + >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] + xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) + ) +" +DEPEND="${COMMON_DEPEND} + test? ( + media-fonts/font-cursor-misc + media-fonts/font-misc-misc + ) + X? ( x11-base/xorg-proto ) +" +# 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 ) +" +BDEPEND=" + app-text/docbook-xml-dtd:4.1.2 + app-text/docbook-xsl-stylesheets + dev-libs/gobject-introspection-common + dev-libs/libxslt + >=dev-util/gdbus-codegen-2.48 + dev-util/glib-utils + >=dev-util/gtk-doc-am-1.20 + >=sys-devel/gettext-0.19.7 + virtual/pkgconfig + gtk-doc? ( + app-text/docbook-xml-dtd:4.3 + >=dev-util/gtk-doc-1.20 + ) +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gtk-query-immodules-3.0$(get_exeext) +) + +PATCHES=( + # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache + "${FILESDIR}"/${PN}-3.24.25-update-icon-cache.patch + + # Fix broken autotools logic + "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch + + # origin/gtk-3-24 imcontext regression fixes up to commit 5f13ee0afe0 + "${WORKDIR}"/patches +) + +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 + + gnome2_src_prepare +} + +multilib_src_configure() { + local myconf=( + $(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 sysprof profiler) + $(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) + # cloudprovider is not packaged in Gentoo yet + --disable-cloudproviders + --disable-papi + --enable-man + --with-xml-catalog="${EPREFIX}"/etc/xml/catalog + # need libdir here to avoid a double slash in a path that libtool doesn't + # grok so well during install (// between $EPREFIX and usr ...) + # TODO: Is this still the case? + --libdir="${EPREFIX}"/usr/$(get_libdir) + CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" + ) + + if use wayland; then + myconf+=( + # Include wayland immodule into gtk itself, to avoid problems like + # https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a + # user overridden GTK_IM_MODULE envvar + --with-included-immodules=wayland + ) + fi; + + ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}" + + # 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} that would get installed by default + DOCS=( AUTHORS ChangeLog 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 +}
