commit: 55b187b39ad3e9de4981c4501cb720419a0b7a43 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Feb 21 21:54:03 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Feb 21 21:54:03 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55b187b3
x11-libs/gtk+: drop 3.24.35, 3.24.41, 3.24.41-r1 Signed-off-by: Sam James <sam <AT> gentoo.org> x11-libs/gtk+/Manifest | 2 - .../files/gtk+-3.24.25-update-icon-cache.patch | 121 ---------- x11-libs/gtk+/gtk+-3.24.35.ebuild | 245 --------------------- x11-libs/gtk+/gtk+-3.24.41-r1.ebuild | 205 ----------------- x11-libs/gtk+/gtk+-3.24.41.ebuild | 200 ----------------- 5 files changed, 773 deletions(-) diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index 3617011e7455..eeb1beb150a5 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -1,5 +1,3 @@ DIST gtk+-2.24.33.tar.xz 12661828 BLAKE2B f3488b220aaee54bf36fa77e2112d060152e57938845d240014a7d43a5743b1d4de19cc09c683d9d238fd1967cd67cc3c493f2475e4e481f6709f5cdc652c65c SHA512 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5 -DIST gtk+-3.24.35.tar.xz 17913328 BLAKE2B 3beea3cbda7247357238ad133c951e69d5670d68e06efb4de09fae7141b141f4eb17a8c79661cab928a3db427f7b32b518875d0951254941e76b1a7aab60e34f SHA512 3a1ec35756fe12f5be3cfe33ef332d583690458327572e69bffad8b4095059d2a744a4a53b2fd31bab5da2ca7b41a2a38fbbd8ba541a45fa8cc0d00eae005ade -DIST gtk+-3.24.41.tar.xz 13188312 BLAKE2B fbded114fe2b5c1c7bffe79d0a22d559f97081eb972baf31b5c9bd7190bd1ea2875f1c632d3f3be8233377299f1df15bbffbe45d50cc7ff588e034eb41eb8f6e SHA512 aaf061d846fac592e71089feace302bdef1bb64bb2ad6ff30d51d90000da9084cad2fa5bf88cb75adcd789c911d94231ae60a2ca7cf97a2f5720687369a3da98 DIST gtk+-3.24.42.tar.xz 13226980 BLAKE2B 04675abfa056d19a8324c8310789227e661458cfa356b670ba79d61a9498fa1c65161d19799d33d717742912cdddc3400a548573809d5dd4e0f289d0c75e88d9 SHA512 53e86e35d33f82384f1d40bd91feee67be68bc9003abd095842991441b1f2ee11a5b431168963270d3ffc0c653d26673ca97cdd55a8f577ef21dbd5d6004b643 DIST gtk-3.24.48.tar.xz 13414436 BLAKE2B d5201f434d2045feb68bf9cdbf1e254eba8377a17fcc1d32daf3298338cd3482b5f26158f1c498d70dc122451da45dfdbcea3a39ecd0b074a3659a362a4eb3ea SHA512 aea1c4e2c5c7415692ffedc238321a58c6fc1a56000694e00f7bfe374c6e52fde89f510c1bcccfe3713f8f645e5a117323186e4bb1cffc62855caa5ab08e6b1f 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 a648ba40f4c8..000000000000 --- 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 <[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.35.ebuild b/x11-libs/gtk+/gtk+-3.24.35.ebuild deleted file mode 100644 index bf161a727c02..000000000000 --- a/x11-libs/gtk+/gtk+-3.24.35.ebuild +++ /dev/null @@ -1,245 +0,0 @@ -# Copyright 1999-2024 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/"; - -LICENSE="LGPL-2+" -SLOT="3" -IUSE="aqua broadway 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 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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=" - >=app-accessibility/at-spi2-core-2.46.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-2.2.0:= - >=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.44.0[introspection?,${MULTILIB_USEDEP}] - x11-misc/shared-mime-info - - 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.21 - media-libs/mesa[wayland,${MULTILIB_USEDEP}] - >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] - ) - X? ( - media-libs/libglvnd[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.8[${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 ) -" -RDEPEND="${COMMON_DEPEND} - >=dev-util/gtk-update-icon-cache-3 -" -# 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-build/gtk-doc-am-1.20 - wayland? ( dev-util/wayland-scanner ) - >=sys-devel/gettext-0.19.7 - virtual/pkgconfig - x11-libs/gdk-pixbuf:2 - 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 -) - -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 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 -} diff --git a/x11-libs/gtk+/gtk+-3.24.41-r1.ebuild b/x11-libs/gtk+/gtk+-3.24.41-r1.ebuild deleted file mode 100644 index 500b29dc74ed..000000000000 --- a/x11-libs/gtk+/gtk+-3.24.41-r1.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome2 meson-multilib multilib toolchain-funcs virtualx - -DESCRIPTION="Gimp ToolKit +" -HOMEPAGE="https://www.gtk.org/"; - -LICENSE="LGPL-2+" -SLOT="3" -IUSE="aqua broadway cloudproviders colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama" -REQUIRED_USE=" - || ( aqua wayland X ) - test? ( X ) - xinerama? ( X ) -" -RESTRICT="!test? ( test )" - -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" - -COMMON_DEPEND=" - >=app-accessibility/at-spi2-core-2.46.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-2.2.0:= - >=media-libs/libepoxy-1.4[X(+)?,egl(+),${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.44.0[introspection?,${MULTILIB_USEDEP}] - x11-misc/shared-mime-info - - cloudproviders? ( net-libs/libcloudproviders[${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.32 - media-libs/mesa[wayland,${MULTILIB_USEDEP}] - >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] - ) - X? ( - media-libs/libglvnd[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.8[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) - ) -" -DEPEND="${COMMON_DEPEND} - X? ( x11-base/xorg-proto ) -" -RDEPEND="${COMMON_DEPEND} - >=dev-util/gtk-update-icon-cache-3 -" -# 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-build/gtk-doc-am-1.20 - wayland? ( dev-util/wayland-scanner ) - >=sys-devel/gettext-0.19.7 - virtual/pkgconfig - x11-libs/gdk-pixbuf:2 - gtk-doc? ( - app-text/docbook-xml-dtd:4.3 - >=dev-util/gtk-doc-1.20 - ) - test? ( sys-apps/dbus ) -" - -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.36-update-icon-cache.patch - # Gentoo-specific patch to add a "poison" macro support, allowing other ebuilds - # with USE="-wayland -X" to trick gtk into claiming that it wasn't built with - # such support. - # https://bugs.gentoo.org/624960 - "${FILESDIR}"/0001-gdk-add-a-poison-macro-to-hide-GDK_WINDOWING_.patch -) - -src_prepare() { - default - - # The border-image-excess-size.ui test is known to fail on big-endian platforms - # See https://gitlab.gnome.org/GNOME/gtk/-/issues/5904 - if [[ $(tc-endian) == big ]]; then - sed -i \ - -e "/border-image-excess-size.ui/d" \ - -e "/^xfails =/a 'border-image-excess-size.ui'," \ - testsuite/reftests/meson.build || die - fi -} - -multilib_src_configure() { - local emesonargs=( - $(meson_use aqua quartz_backend) - $(meson_use broadway broadway_backend) - $(meson_use cloudproviders) - $(meson_use examples demos) - $(meson_use examples) - $(meson_native_use_bool gtk-doc gtk_doc) - $(meson_native_use_bool introspection) - $(meson_use sysprof profiler) - $(meson_use wayland wayland_backend) - $(meson_use X x11_backend) - -Dcolord=$(usex colord yes no) - -Dprint_backends=$(usex cups cups,file,lpr file,lpr) - -Dxinerama=$(usex xinerama yes no) - # Include backend immodules into gtk itself, to avoid problems like - # https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a - # user overridden GTK_IM_MODULE envvar - -Dbuiltin_immodules=backend - -Dman=true - $(meson_use test tests) - -Dtracker3=false - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_test() { - virtx dbus-run-session meson test -C "${BUILD_DIR}" --timeout-multiplier 4 || die -} - -multilib_src_install() { - meson_src_install -} - -multilib_src_install_all() { - insinto /etc/gtk-3.0 - doins "${FILESDIR}"/settings.ini - # Skip README.win32.md that would get installed by default - DOCS=( NEWS README.md ) - 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 -} diff --git a/x11-libs/gtk+/gtk+-3.24.41.ebuild b/x11-libs/gtk+/gtk+-3.24.41.ebuild deleted file mode 100644 index 82d2b4737e10..000000000000 --- a/x11-libs/gtk+/gtk+-3.24.41.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome2 meson-multilib multilib toolchain-funcs virtualx - -DESCRIPTION="Gimp ToolKit +" -HOMEPAGE="https://www.gtk.org/"; - -LICENSE="LGPL-2+" -SLOT="3" -IUSE="aqua broadway cloudproviders colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama" -REQUIRED_USE=" - || ( aqua wayland X ) - test? ( X ) - xinerama? ( X ) -" -RESTRICT="!test? ( test )" - -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" - -COMMON_DEPEND=" - >=app-accessibility/at-spi2-core-2.46.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-2.2.0:= - >=media-libs/libepoxy-1.4[X(+)?,egl(+),${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.44.0[introspection?,${MULTILIB_USEDEP}] - x11-misc/shared-mime-info - - cloudproviders? ( net-libs/libcloudproviders[${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.32 - media-libs/mesa[wayland,${MULTILIB_USEDEP}] - >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] - ) - X? ( - media-libs/libglvnd[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.8[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) - ) -" -DEPEND="${COMMON_DEPEND} - X? ( x11-base/xorg-proto ) -" -RDEPEND="${COMMON_DEPEND} - >=dev-util/gtk-update-icon-cache-3 -" -# 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-build/gtk-doc-am-1.20 - wayland? ( dev-util/wayland-scanner ) - >=sys-devel/gettext-0.19.7 - virtual/pkgconfig - x11-libs/gdk-pixbuf:2 - gtk-doc? ( - app-text/docbook-xml-dtd:4.3 - >=dev-util/gtk-doc-1.20 - ) - test? ( sys-apps/dbus ) -" - -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.36-update-icon-cache.patch -) - -src_prepare() { - default - - # The border-image-excess-size.ui test is known to fail on big-endian platforms - # See https://gitlab.gnome.org/GNOME/gtk/-/issues/5904 - if [[ $(tc-endian) == big ]]; then - sed -i \ - -e "/border-image-excess-size.ui/d" \ - -e "/^xfails =/a 'border-image-excess-size.ui'," \ - testsuite/reftests/meson.build || die - fi -} - -multilib_src_configure() { - local emesonargs=( - $(meson_use aqua quartz_backend) - $(meson_use broadway broadway_backend) - $(meson_use cloudproviders) - $(meson_use examples demos) - $(meson_use examples) - $(meson_native_use_bool gtk-doc gtk_doc) - $(meson_native_use_bool introspection) - $(meson_use sysprof profiler) - $(meson_use wayland wayland_backend) - $(meson_use X x11_backend) - -Dcolord=$(usex colord yes no) - -Dprint_backends=$(usex cups cups,file,lpr file,lpr) - -Dxinerama=$(usex xinerama yes no) - # Include backend immodules into gtk itself, to avoid problems like - # https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a - # user overridden GTK_IM_MODULE envvar - -Dbuiltin_immodules=backend - -Dman=true - $(meson_use test tests) - -Dtracker3=false - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_test() { - virtx dbus-run-session meson test -C "${BUILD_DIR}" --timeout-multiplier 4 || die -} - -multilib_src_install() { - meson_src_install -} - -multilib_src_install_all() { - insinto /etc/gtk-3.0 - doins "${FILESDIR}"/settings.ini - # Skip README.win32.md that would get installed by default - DOCS=( NEWS README.md ) - 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 -}
