commit:     c80bc9fd425368d01927cd3a5eb88c1bb736ed70
Author:     Lukas Schmelting <lschmelting <AT> posteo <DOT> com>
AuthorDate: Fri Oct  3 09:43:25 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct  3 20:36:09 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c80bc9fd

gui-libs/gtk: add 4.20.1

- librsvg is now both DEPEND and RDEPEND instead of PDEPEND. It was
  formerly used as PDEPEND to avoid a circular dep on wd40 profiles with
  librsvg[tools]. USE="tools" on librsvg was dropped in the bump to
  librsvg-2.48.8, in commit 304759386bf
- librsvg is unkeyworded for ~alpha and ~hppa, so drop keywords for gtk,
  too

Signed-off-by: Lukas Schmelting <lschmelting <AT> posteo.com>
Part-of: https://github.com/gentoo/gentoo/pull/43763
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gui-libs/gtk/Manifest          |   1 +
 gui-libs/gtk/gtk-4.20.1.ebuild | 276 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 277 insertions(+)

diff --git a/gui-libs/gtk/Manifest b/gui-libs/gtk/Manifest
index 3656eabdce50..84cbdd8247bd 100644
--- a/gui-libs/gtk/Manifest
+++ b/gui-libs/gtk/Manifest
@@ -3,3 +3,4 @@ DIST gtk-4.16.12.tar.xz 14620652 BLAKE2B 
298c6f41e6100f9ebf7b51bf93c55102c82b4ea
 DIST gtk-4.16.13.tar.xz 14625864 BLAKE2B 
86c0bcf8c6f46db600fd000265b11e8d2f20d7dd90a9f09b2907cbe112a6d1d3a6cadef39436aa13e0917ee1f39e8c31b948862e222edcff4d412e7ac69b485a
 SHA512 
6a220b716b0fdaa9c59d28e4923388f22a84bc4de5693555e5e78af7bcf2835768d6c92dea18dbc3905681d5936761dd402c6e51016ea4c4f23ab5512894f1d8
 DIST gtk-4.18.5.tar.xz 17706144 BLAKE2B 
1184eb9c2da53b917601bda0269b8d0402a829de9a72e0d560342a45f4d7ba7f5d39e7b17b06368650df3d8d369a1e2cca5c490425d7a4171ea67ebce6d6d994
 SHA512 
4a09188fdbeb532d8c2064199126eaf60d806118bb637d5182121f3d80d374acdf343568c3423effb9574c364279ded7d7cbd4e0331dc1fb647970f60c98bff0
 DIST gtk-4.18.6.tar.xz 17710412 BLAKE2B 
8666ae72e35a9cc0686082ee054fab62ef737651015cdda85613a7d087d7649621203f98b72bf69bbd0f8191c065a26130030c6c48cfcb0b6ba1de775ff4e162
 SHA512 
636bc3adf01f444dfbf10a3fdce82cdd7b2914b9ff251e98e006a987c3216ef22f5ae8759aa5f2385d1e82813ab8bf2c8adc4f8d6db230e9f507b44fac10e359
+DIST gtk-4.20.1.tar.xz 15923336 BLAKE2B 
2db901f4b422768f32e8aecc65dd7c013bb5f96808cdb0f18c7c1c28ce06e3d5d80feb693b352f289d263edd8fb380972ede1614671e4748218b55723b7f4523
 SHA512 
b6b95b1d118e4a93f5884ee9b878a125561f552541d29f4ecc3dc9fe7202c4595aededcf1dc57dde9780938a3b2524973e21b2ac6039dfd520eca4a6a3d66655

diff --git a/gui-libs/gtk/gtk-4.20.1.ebuild b/gui-libs/gtk/gtk-4.20.1.ebuild
new file mode 100644
index 000000000000..216584e772c6
--- /dev/null
+++ b/gui-libs/gtk/gtk-4.20.1.ebuild
@@ -0,0 +1,276 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{11..14} )
+inherit gnome.org gnome2-utils meson optfeature python-any-r1 toolchain-funcs 
virtualx xdg
+
+DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user 
interfaces"
+HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/";
+
+LICENSE="LGPL-2+"
+SLOT="4"
+REQUIRED_USE="
+       || ( aqua wayland X )
+       gtk-doc? ( introspection )
+       test? ( introspection )
+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="aqua broadway cloudproviders colord cups examples gstreamer gtk-doc 
+introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c"
+
+# librsvg for svg icons and "!8541 Use librsvg for symbolics that we
+#     can't parse ourselves" (formerly a PDEPEND to avoid circular dep
+#     on wd40 profiles with librsvg[tools]), bug #547710
+# NOTE: Support was added to build against both cups2 and cups3
+COMMON_DEPEND="
+       >=dev-libs/glib-2.82:2
+       >=x11-libs/cairo-1.18.2[aqua?,glib,svg(+),X?]
+       >=x11-libs/pango-1.56.0[introspection?]
+       >=dev-libs/fribidi-1.0.6
+       >=media-libs/harfbuzz-8.4.0:=
+       >=x11-libs/gdk-pixbuf-2.30:2[introspection?]
+       media-libs/libpng:=
+       media-libs/tiff:=
+       media-libs/libjpeg-turbo:=
+       >=gnome-base/librsvg-2.48:2
+       >=media-libs/libepoxy-1.4[egl(+),X(+)?]
+       >=media-libs/graphene-1.10.0[introspection?]
+       app-text/iso-codes
+       x11-misc/shared-mime-info
+
+       cloudproviders? ( net-libs/libcloudproviders )
+       colord? ( >=x11-misc/colord-0.1.9:0= )
+       cups? ( >=net-print/cups-2.0 )
+       examples? ( gnome-base/librsvg:2 )
+       gstreamer? (
+               >=media-libs/gstreamer-1.24.0:1.0
+               >=media-libs/gst-plugins-bad-1.24.0:1.0
+               || (
+                       >=media-libs/gst-plugins-base-1.24.0:1.0[gles2]
+                       >=media-libs/gst-plugins-base-1.24.0:1.0[opengl]
+               )
+       )
+       introspection? ( >=dev-libs/gobject-introspection-1.84:= )
+       vulkan? ( >=media-libs/vulkan-loader-1.3:=[wayland?,X?] )
+       wayland? (
+               >=dev-libs/wayland-1.24.0
+               >=dev-libs/wayland-protocols-1.44
+               media-libs/mesa[wayland]
+               >=x11-libs/libxkbcommon-0.2
+       )
+       X? (
+               media-libs/fontconfig
+               media-libs/mesa[X(+)]
+               x11-libs/libX11
+               >=x11-libs/libXi-1.8
+               x11-libs/libXext
+               >=x11-libs/libXrandr-1.5
+               x11-libs/libXcursor
+               x11-libs/libXfixes
+               x11-libs/libXdamage
+               x11-libs/libXinerama
+       )
+"
+DEPEND="${COMMON_DEPEND}
+       kernel_linux? (
+               x11-libs/libdrm
+               sys-kernel/linux-headers
+       )
+       sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+       X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+       >=dev-util/gtk-update-icon-cache-3
+"
+PDEPEND="
+       >=x11-themes/adwaita-icon-theme-3.14
+"
+BDEPEND="
+       >=dev-build/meson-1.5.0
+       dev-libs/gobject-introspection-common
+       introspection? (
+               ${PYTHON_DEPS}
+               $(python_gen_any_dep '
+                       dev-python/pygobject:3[${PYTHON_USEDEP}]
+               ')
+       )
+       dev-python/docutils
+       >=dev-libs/glib-2.82
+       >=dev-util/gdbus-codegen-2.48
+       dev-util/glib-utils
+       >=sys-devel/gettext-0.19.7
+       virtual/pkgconfig
+       gtk-doc? ( dev-util/gi-docgen )
+       vulkan? ( media-libs/shaderc )
+       wayland? (
+               dev-util/wayland-scanner
+       )
+       test? (
+               dev-libs/glib:2
+               media-fonts/cantarell
+               wayland? ( dev-libs/weston[headless] )
+       )
+"
+
+PATCHES=(
+       # 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_ge_4.18.5.patch
+)
+
+python_check_deps() {
+       python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+}
+
+pkg_setup() {
+       use introspection && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+       default
+       xdg_environment_reset
+
+       # Nothing should use gtk4-update-icon-cache and an unversioned one is 
shipped by dev-util/gtk-update-icon-cache
+       sed -i \
+               -e '/gtk4-update-icon-cache/d' \
+               docs/reference/gtk/meson.build \
+               tools/meson.build \
+               || die
+
+       # 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
+}
+
+src_configure() {
+       local emesonargs=(
+               # GDK backends
+               $(meson_use X x11-backend)
+               $(meson_use wayland wayland-backend)
+               $(meson_use broadway broadway-backend)
+               -Dwin32-backend=false
+               -Dandroid-backend=false
+               $(meson_use aqua macos-backend)
+
+               # Media backends
+               $(meson_feature gstreamer media-gstreamer)
+
+               # Print backends
+               -Dprint-cpdb=disabled
+               $(meson_feature cups print-cups)
+
+               # Optional dependencies
+               $(meson_feature vulkan)
+               $(meson_feature cloudproviders)
+               $(meson_feature sysprof)
+               -Dtracker=disabled  # tracker3 is not packaged in Gentoo yet
+               $(meson_feature colord)
+               # Expected to fail with GCC < 11
+               # See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71993
+               $(meson_feature cpu_flags_x86_f16c f16c)
+               -Dandroid-runtime=disabled
+               # Introspection
+               $(meson_feature introspection)
+
+               # Documentation
+               $(meson_use gtk-doc documentation)
+               -Dscreenshots=false
+               -Dman-pages=true
+
+               # Demos, examples, and tests
+               -Dprofile=default
+               $(meson_use examples build-demos)
+               $(meson_use test build-testsuite)
+               $(meson_use examples build-examples)
+               -Dbuild-tests=false
+       )
+       meson_src_configure
+}
+
+src_test() {
+       "${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+
+       addwrite /dev/dri
+
+       # Note that skipping gsk-compare entirely means we do run *far*
+       # fewer tests, but a reliable testsuite for us is more important
+       # than absolute-maximum coverage if we can't trust the results and
+       # dismiss any failures as "probably font related" and so on.
+       if use X; then
+               einfo "Running tests under X"
+               GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx meson_src_test 
--timeout-multiplier=130 \
+                       --setup=x11 \
+                       --no-suite=failing \
+                       --no-suite=x11_failing \
+                       --no-suite=flaky \
+                       --no-suite=headless \
+                       --no-suite=gsk-compare \
+                       --no-suite=gsk-compare-broadway \
+                       --no-suite=needs-udmabuf \
+                       --no-suite=pango
+       fi
+
+       if use wayland; then
+               einfo "Running tests under Weston"
+
+               export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d 
xdg-runtime-XXXXXX)"
+
+               weston --backend=headless-backend.so --socket=wayland-5 
--idle-time=0 &
+               compositor=$!
+               export WAYLAND_DISPLAY=wayland-5
+
+               GSETTINGS_SCHEMA_DIR="${S}/gtk" meson_src_test 
--timeout-multiplier=130 \
+                       --setup=wayland \
+                       --no-suite=failing \
+                       --no-suite=wayland_failing \
+                       --no-suite=flaky \
+                       --no-suite=headless \
+                       --no-suite=gsk-compare \
+                       --no-suite=gsk-compare-broadway \
+                       --no-suite=needs-udmabuf
+
+               exit_code=$?
+               kill ${compositor}
+       fi
+}
+
+src_install() {
+       meson_src_install
+
+       if use gtk-doc; then
+               mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+               mv "${ED}"/usr/share/doc/{gtk4,gsk4,gdk4{,-wayland,-x11}} 
"${ED}"/usr/share/gtk-doc/html/ || die
+       fi
+}
+
+pkg_preinst() {
+       xdg_pkg_preinst
+       gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+       xdg_pkg_postinst
+       gnome2_schemas_update
+
+       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
+
+       if use examples ; then
+               optfeature "syntax highlighting in gtk4-demo" app-text/highlight
+       fi
+}
+
+pkg_postrm() {
+       xdg_pkg_postrm
+       gnome2_schemas_update
+}

Reply via email to