From b227ba074afdfe81c17ef0947ee9a78a0894ade3 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 29 Jun 2025 23:21:05 +0100 Subject: [PATCH 1/5] x11-wm/mutter: add 47.9 Signed-off-by: Sam James --- x11-wm/mutter/Manifest | 1 + x11-wm/mutter/mutter-47.9.ebuild | 256 +++++++++++++++++++++++++++++++ 2 files changed, 257 insertions(+) create mode 100644 x11-wm/mutter/mutter-47.9.ebuild diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest index 437bb5864046b..9c578bff5c64d 100644 --- a/x11-wm/mutter/Manifest +++ b/x11-wm/mutter/Manifest @@ -2,3 +2,4 @@ DIST mutter-46.7.tar.xz 6755308 BLAKE2B 69cb8457ec9ab905c8764ffa8fbd44050431b359 DIST mutter-47.6.tar.xz 6858272 BLAKE2B 7275961beb30e6aac0004805c6e5248d0cf19caa245ea13918a59b48dc85370698a5c6dadb13af6875bf4a7e1a02f5e9b6d9180e9b711b0888b10d41be5ab8d7 SHA512 8997096b3dab1e98532fd238b921fa7820621c0f0ac1701f4abfa37b1cc29095bb60ecee1135a6be147d06fcede86276b8a02d5dbca7d1dcba2d51c43821bfc9 DIST mutter-47.8.1.tar.xz 6859284 BLAKE2B 2ebac60ae6d56370dd8325cfd657ae9b0970db64ed93c5cd1cd9a476dc4840507ca0e7d2c74214902be6140fad84d038b0dae2902969a3db6841a2a38fd9550e SHA512 b373ebed2fa0b4a9185f2bb3b0bbc7412a736a901a9ecbce89093e53f21137057bbe82f07e43a112b8b2145717e8f76178e2c29381c3dffc43b84eebe868802e DIST mutter-47.8.tar.xz 6859416 BLAKE2B 596dfb932481f9d2e090e29bb5dd5d8e8a5e369714759080010d7cd55d03928d6a2126a3897e569b4d7447b74ae857c42e51e7d2f8ab7db040513e71257e625d SHA512 e7c90a79853c98ee9c0d0fcfd65c95c1525b9171d7c463e8a3be124190a80632905992b4dc2a172d2f28b8302f17bc6f24de660517b3337c070660e726a17fa1 +DIST mutter-47.9.tar.xz 6860464 BLAKE2B 4ce64bb8b979ff8e5fb006893e525fba23479d1e577de5fc631c1a5f3eda806c29f3c41ac3cd25deee301a7276dc10e48cca32e17c3ae88672fb1d023499b0b2 SHA512 aa4cfc2e096c3626c7796982863033792f9eb028bac7fdc61d9b7886dbc3aafa0a979d1b28f5729143d15ea9df695073259a9d46d309229412fd4741e836f9e2 diff --git a/x11-wm/mutter/mutter-47.9.ebuild b/x11-wm/mutter/mutter-47.9.ebuild new file mode 100644 index 0000000000000..224737a2e7f4f --- /dev/null +++ b/x11-wm/mutter/mutter-47.9.ebuild @@ -0,0 +1,256 @@ +# Copyright 1999-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 python-any-r1 udev xdg + +DESCRIPTION="GNOME compositing window manager based on Clutter" +HOMEPAGE="https://mutter.gnome.org" +LICENSE="GPL-2+" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/mutter.git" + SRC_URI="" + SLOT="0/15" # This can get easily out of date, but better than 9967 +else + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" + SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-.pc) should use the subslot +fi + +IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection +libdisplay screencast sysprof systemd test udev wayland X +xwayland video_cards_nvidia" +# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider +REQUIRED_USE=" + || ( X wayland ) + gtk-doc? ( introspection ) + wayland? ( ^^ ( elogind systemd ) udev ) + test? ( wayland )" +RESTRICT="!test? ( test )" + +# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema +# USE=libei was first introduced in xwayland-23.2.1; we min dep on that to ensure the [libei(+)] works right, as missing USE flag with +# previous versions meant that it's not there, while the intention seems to be to make it always enabled without USE flag in the future; +# this ensures have_enable_ei_portal is always there in xwayland.pc, which affects how Xwayland is launched, thus if it were toggled off +# in Xwayland after mutter is installed, Xwayland would fail to be started by mutter. mutter already hard-depends on libei, so there's +# really no extra deps here (besides xdg-desktop-portal, but we want that too, anyhow). +# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order +# dev-libs/wayland is always needed at build time due to https://bugs.gentoo.org/937632 +RDEPEND=" + >=media-libs/graphene-1.10.2[introspection?] + x11-libs/gdk-pixbuf:2 + >=x11-libs/pango-1.46[introspection?] + >=x11-libs/cairo-1.14[X] + >=x11-libs/pixman-0.42 + >=dev-libs/fribidi-1.0.0 + >=gnome-base/gsettings-desktop-schemas-47_beta[introspection?] + >=dev-libs/glib-2.81.1:2 + gnome-base/gnome-settings-daemon + >=dev-libs/json-glib-0.12.0[introspection?] + >=app-accessibility/at-spi2-core-2.46:2[introspection?] + sys-apps/dbus + >=x11-misc/colord-1.4.5:= + >=media-libs/lcms-2.6:2 + >=media-libs/harfbuzz-2.6.0:= + >=dev-libs/libei-1.0.901 + + gnome? ( gnome-base/gnome-desktop:4= ) + + >=media-libs/libcanberra-0.26 + + media-libs/libglvnd[X] + + >=dev-libs/wayland-1.23.0 + wayland? ( + >=dev-libs/wayland-protocols-1.36 + + >=x11-libs/libdrm-2.4.118 + media-libs/mesa[gbm(+)] + >=dev-libs/libinput-1.26.0:= + + elogind? ( sys-auth/elogind ) + xwayland? ( >=x11-base/xwayland-23.2.1[libei(+)] ) + video_cards_nvidia? ( gui-libs/egl-wayland ) + ) + udev? ( + >=virtual/libudev-232-r1:= + >=dev-libs/libgudev-238 + ) + systemd? ( sys-apps/systemd ) + x11-libs/libSM + input_devices_wacom? ( >=dev-libs/libwacom-0.13:= ) + >=x11-libs/startup-notification-0.7 + screencast? ( >=media-video/pipewire-1.2.0:= ) + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) + libdisplay? ( media-libs/libdisplay-info:= ) + test? ( + >=x11-libs/gtk+-3.19.8:3[X,introspection?] + gnome-extra/zenity + ) + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 >=dev-util/sysprof-3.46.0 ) +" + +X_OR_XWAYLAND_DEPS=" + >=gui-libs/gtk-4.0.0:4[X,introspection?] + >=x11-libs/libX11-1.7.0 + >=x11-libs/libXcomposite-0.4 + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + >=x11-libs/libXfixes-6 + >=x11-libs/libXi-1.7.4 + x11-libs/libxkbfile + x11-misc/xkeyboard-config + x11-libs/libXrender + x11-libs/libxcb:= + x11-libs/libXinerama + x11-libs/libXau +" + +RDEPEND+=" + X? ( + ${X_OR_XWAYLAND_DEPS} + x11-libs/libICE + >=x11-libs/libXrandr-1.5.0 + >=x11-libs/libxkbcommon-0.4.3[X] + x11-libs/libXtst + ) + wayland? ( xwayland? ( ${X_OR_XWAYLAND_DEPS} ) ) +" + +DEPEND="${RDEPEND} + x11-base/xorg-proto + sysprof? ( >=dev-util/sysprof-common-3.38.0 ) +" +BDEPEND=" + dev-util/wayland-scanner + dev-util/gdbus-codegen + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) + test? ( + ${PYTHON_DEPS} + $(python_gen_any_dep ' + >=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}] + ') + app-text/docbook-xml-dtd:4.5 + X? ( x11-misc/xvfb-run ) + ) + wayland? ( + >=sys-kernel/linux-headers-4.4 + x11-libs/libxcvt + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-43.0-Disable-anonymous-file-test.patch +) + +python_check_deps() { + if use test; then + python_has_version ">=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]" + fi +} + +src_configure() { + use debug && EMESON_BUILDTYPE=debug + local emesonargs=( + # Mutter X11 renderer only supports gles2 and GLX, thus do NOT pass + # + # -Dopengl_libname=libOpenGL.so.0 + # + # while we build the x11 renderer, as we currently enable gles2 only + # with USE=wayland and x11 renderer wouldn't find the needed GLX symbols + # in a configuration where wayland is disabled, as libOpenGL doesn't + # include them. + # + # See + # - https://bugs.gentoo.org/835786 + # - https://forums.gentoo.org/viewtopic-p-8695669.html + + -Dopengl=true + $(meson_use wayland gles2) + #gles2_libname + -Degl=true + $(meson_use X glx) + $(meson_use wayland) + ) + + if use wayland; then + emesonargs+=( + $(meson_use xwayland) + ) + else + emesonargs+=( + -Dxwayland=false + ) + fi + + emesonargs+=( + $(meson_use systemd) + $(meson_use wayland native_backend) + $(meson_use screencast remote_desktop) + $(meson_use gnome libgnome_desktop) + $(meson_use udev) + -Dudev_dir=$(get_udevdir) + $(meson_use input_devices_wacom libwacom) + -Dsound_player=true + -Dstartup_notification=true + $(meson_feature libdisplay libdisplay_info) + $(meson_use X sm) + $(meson_use introspection) + $(meson_use gtk-doc docs) + $(meson_use test cogl_tests) + $(meson_use test clutter_tests) + $(meson_use test mutter_tests) + $(meson_feature test tests) + -Dkvm_tests=false + -Dtty_tests=false + $(meson_use sysprof profiler) + -Dinstalled_tests=false + $(meson_use X x11) + + #verbose # Let upstream choose default for verbose mode + #xwayland_path + # TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops) + #xwayland_grab_default_access_rules + ) + + if use wayland && use video_cards_nvidia; then + emesonargs+=( + -Degl_device=true + -Dwayland_eglstream=true + ) + else + emesonargs+=( + -Degl_device=false + -Dwayland_eglstream=false + ) + fi + + meson_src_configure +} + +src_test() { + # Reset variables to avoid issues from /etc/profile.d/flatpak.sh file + gnome2_environment_reset + export XDG_DATA_DIRS="${EPREFIX}"/usr/share + glib-compile-schemas "${BUILD_DIR}"/data + GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data + + # FIXME: Check on bump, needs access do /dev/dri/ + meson_src_test +} + +pkg_postinst() { + use udev && udev_reload + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + use udev && udev_reload + xdg_pkg_postrm + gnome2_schemas_update +} From f882964d2f4934fe91ac3f137a4a2fbc1f7fd797 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 29 Jun 2025 23:46:28 +0100 Subject: [PATCH 2/5] gnome-base/gnome-shell: add 47.8 Signed-off-by: Sam James --- gnome-base/gnome-shell/Manifest | 1 + .../gnome-shell/gnome-shell-47.8.ebuild | 191 ++++++++++++++++++ 2 files changed, 192 insertions(+) create mode 100644 gnome-base/gnome-shell/gnome-shell-47.8.ebuild diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest index bda6a0647dcf0..66266e519c051 100644 --- a/gnome-base/gnome-shell/Manifest +++ b/gnome-base/gnome-shell/Manifest @@ -1,3 +1,4 @@ DIST gnome-shell-46.7.tar.xz 2049252 BLAKE2B 5dc0aa3bee1e7a92e0abcff8dd9381c9e94d4fcc0e12116a37481486a1f7535b536138ddd52df18ca5e7a9dbfb65e5534e63d202132dfcbe11b509f9895819c9 SHA512 7d889d72d1d1893727a0e415772d31d414cc4991205a441ecc24863ddc7768b851a83ca3365a6819f4d645ad6057ce6f9a4b810136c5ee461f4b55a5360df740 DIST gnome-shell-47.3.tar.xz 2135184 BLAKE2B 9dd2857c7a0a1f6615407b0087ff60d641eb7433276269218cf67de5df42a4dc1155147dcb870319f9758fe8618170dd98119f0d1038db965c69960119f20d8f SHA512 d9d553ec0ccdd98fb7878b7bd7f64f966320d34df75c10967c85ceb79edf13a70d0c0898abdc46f3c790246dc387b4586dbfd0cc47ef321ab858f5c4863cc6e2 DIST gnome-shell-47.7.tar.xz 2142328 BLAKE2B f21f867b5169727eb1e34d6867e51716dfa0ac9a6ecd0af389d36a1b022fe25c270a3623b42e6aef16f6983ad77776e4d7e431fa840400efacce4564e5b04095 SHA512 65932de6ff2f0acd8a9c3b67f9f70b155ccc0feebc7501ada145bf4f3cca5c90ff85a24c2c130e5418085ddfdc3c112709909e55cd51aaad02ce4e77c44ae80d +DIST gnome-shell-47.8.tar.xz 2142660 BLAKE2B 7166e34e32d4e78e3c701a7dda7128a6be04ec7c32dcc4c8af6e96444d7c354750be64802aac2a44056d99e3602ac0ae38932a6cdb4152f2140998d828cc802f SHA512 7fd25adbb698d239e1ae75f0caa0ef8198a152b4b859dcc23c4d63972a1629ca56c286d380211a0b4431c7b506bccf4edb6c9c1a1d899509d1a585eea4693acb diff --git a/gnome-base/gnome-shell/gnome-shell-47.8.ebuild b/gnome-base/gnome-shell/gnome-shell-47.8.ebuild new file mode 100644 index 0000000000000..1c102e48f8fb9 --- /dev/null +++ b/gnome-base/gnome-shell/gnome-shell-47.8.ebuild @@ -0,0 +1,191 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{11..13} ) + +inherit gnome.org gnome2-utils meson optfeature python-single-r1 virtualx xdg + +DESCRIPTION="Provides core UI functions for the GNOME desktop" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-shell" + +LICENSE="GPL-2+ LGPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" + +IUSE="elogind gtk-doc +ibus +networkmanager pipewire systemd test" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + ?? ( elogind systemd )" +RESTRICT="!test? ( test )" + +# libXfixes-5.0 needed for pointer barriers and #include +DEPEND=" + >=gnome-extra/evolution-data-server-3.46.0:= + >=app-crypt/gcr-3.90.0:4=[introspection] + >=dev-libs/glib-2.68:2 + >=dev-libs/gobject-introspection-1.49.1:= + >=dev-libs/gjs-1.73.1[cairo(+)] + >=gui-libs/gtk-4:4[introspection] + >=x11-wm/mutter-47.0:0/15[introspection,test?] + >=sys-auth/polkit-0.120_p20220509[introspection] + >=gnome-base/gsettings-desktop-schemas-47_alpha[introspection] + >=app-i18n/ibus-1.5.19 + dev-python/docutils + >=gnome-base/gnome-desktop-40.0:4= + networkmanager? ( + >=net-misc/networkmanager-1.10.4[introspection] + net-libs/libnma[introspection] + >=app-crypt/libsecret-0.18 + ) + pipewire? ( >=media-video/pipewire-0.3.49:= ) + systemd? ( + >=sys-apps/systemd-246:= + >=gnome-base/gnome-desktop-3.34.2:3=[systemd] + ) + elogind? ( >=sys-auth/elogind-237 ) + + app-arch/gnome-autoar + dev-libs/json-glib + + >=app-accessibility/at-spi2-core-2.46:2[introspection] + x11-libs/gdk-pixbuf:2[introspection] + dev-libs/libxml2:2= + x11-libs/libX11 + + >=media-libs/libpulse-2[glib] + dev-libs/libical:= + >=x11-libs/libXfixes-5.0 + + gui-libs/gtk:4[introspection] + + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') + media-libs/libglvnd[X] +" +# Runtime-only deps are probably incomplete and approximate. +# Introspection deps generated from inspection of the output of: +# for i in `rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- |sort -u`; do echo $i ;done |cut -d, -f1 |sort -u +# or +# rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- | sed -e 's:[{}]::g' | awk '{$1=$1; print}' | awk -F',' '{$1=$1;print}' | tr ' ' '\n' | sort -u | sed -e 's/://g' +# These will give a lot of unnecessary things due to greedy matching (TODO), and `(?s).*?` doesn't seem to work as desired. +# Compare with `grep -rhI 'imports.gi.versions' |sort -u` for any SLOT requirements +# Each block: +# 1. Introspection stuff needed via imports.gi (those that build time check may be listed above already) +# 2. gnome-session needed for shutdown/reboot/inhibitors/etc +# 3. Control shell settings +# 4. xdg-utils needed for xdg-open, used by extension tool +# 5. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+) +# 6. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review +# 7. IBus is needed for nls integration +# 8. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too) +# 9. xdg-desktop-portal-gtk for various integration, e.g. #764632 +# 10. TODO: semi-optional webkit-gtk[introspection] for captive portal helper +RDEPEND="${DEPEND} + >=sys-apps/accountsservice-0.6.14[introspection] + app-accessibility/at-spi2-core:2[introspection] + app-misc/geoclue:2.0[introspection] + media-libs/graphene[introspection] + x11-libs/pango[introspection] + net-libs/libsoup:3.0[introspection] + >=sys-power/upower-0.99:=[introspection] + gnome-base/librsvg:2[introspection] + gui-libs/libadwaita:1[introspection] + + >=gnome-base/gnome-session-2.91.91 + >=gnome-base/gnome-settings-daemon-3.8.3 + + x11-misc/xdg-utils + + >=x11-themes/adwaita-icon-theme-3.26 + + networkmanager? ( + net-misc/mobile-broadband-provider-info + sys-libs/timezone-data + ) + ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] ) + media-fonts/cantarell + + sys-apps/xdg-desktop-portal-gnome +" +# avoid circular dependency, see bug #546134 +PDEPEND=" + >=gnome-base/gdm-3.5[introspection(+)] + >=gnome-base/gnome-control-center-3.26[networkmanager(+)?] +" +BDEPEND=" + >=dev-build/meson-1.3.0 + dev-libs/libxslt + >=dev-util/gdbus-codegen-2.45.3 + dev-util/glib-utils + gtk-doc? ( >=dev-util/gtk-doc-1.17 + >=dev-util/gi-docgen-2021.1 + app-text/docbook-xml-dtd:4.5 ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + test? ( + sys-apps/dbus + x11-wm/mutter[test] + ) +" +# These are not needed from tarballs, unless stylesheets or manpage get patched with patchset: +# dev-lang/sassc +# app-text/asciidoc + +PATCHES=( + # Change favorites defaults, bug #479918 + "${FILESDIR}"/46.4-defaults.patch +) + +src_prepare() { + default + xdg_environment_reset + # Hack in correct python shebang + sed -e "s:python\.full_path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die +} + +src_configure() { + local emesonargs=( + $(meson_use pipewire camera_monitor) + -Dextensions_tool=true + -Dextensions_app=true + $(meson_use gtk-doc gtk_doc) + -Dman=true + $(meson_use test tests) + $(meson_use networkmanager) + $(meson_use networkmanager portal_helper) + $(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4 + # (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session) + # suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary + ) + meson_src_configure +} + +src_test() { + # Reset variables to avoid issues from /etc/profile.d/flatpak.sh file modifying XDG_DATA_DIRS + gnome2_environment_reset + export XDG_DATA_DIRS="${EPREFIX}"/usr/share + virtx dbus-run-session meson test -C "${BUILD_DIR}" || die +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update + + if ! has_version "media-libs/mesa[llvm]"; then + elog "llvmpipe is used as fallback when no 3D acceleration" + elog "is available. You will need to enable llvm USE for" + elog "media-libs/mesa if you do not have hardware 3D setup." + fi + + optfeature "Bluetooth integration" gnome-base/gnome-control-center[bluetooth] net-wireless/gnome-bluetooth:3[introspection] + optfeature "Browser extension integration" gnome-extra/gnome-browser-connector + optfeature "Screencast/capture support" media-video/pipewire media-libs/gstreamer[introspection] media-libs/gst-plugins-base[introspection] media-libs/gst-plugins-good media-plugins/gst-plugins-vpx + optfeature "Weather support" dev-libs/libgweather:4[introspection] +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} From e0b3460738482f8f3808a9d552c052eadbc4e101 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 29 Jun 2025 23:51:57 +0100 Subject: [PATCH 3/5] x11-misc/colord: add 1.4.8 Signed-off-by: Sam James --- x11-misc/colord/Manifest | 1 + x11-misc/colord/colord-1.4.8.ebuild | 126 ++++++++++++++++++++++++++++ 2 files changed, 127 insertions(+) create mode 100644 x11-misc/colord/colord-1.4.8.ebuild diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest index d4d19bcb59ed0..254f4cf18bfce 100644 --- a/x11-misc/colord/Manifest +++ b/x11-misc/colord/Manifest @@ -1 +1,2 @@ DIST colord-1.4.7.tar.xz 1799168 BLAKE2B f4434ec817fc2afc1ade144f533d2c3b98117356677b5962ff95b566a8c66b6b8ce95ec8f76b3ae849a6468000dc08b8f8fc207c2cc9c85a966157fb1612078e SHA512 d8a23899c038af980f1b257eace68b682c3f5592d19e2ae1044da749371694052c00e58e4754ebb6ee2f7900b0ef44c01be5fcf857294813c07af94ffbf6d0be +DIST colord-1.4.8.tar.xz 1916884 BLAKE2B 392b9c1ecb78ccf0af585e45e3f9206774298f025999d5dfb8401e7ed8d50dc7f1614856b75e0bb2bcf99ac9eae291ee0f245eb614854892b244b5723f79543f SHA512 5e9a3b9ee93ca86a0467630905190cf9659f659ae6e7917c75df307793b8a78e80f598ee873e5b1070ead1c683780bb22b82410746aff41f50f801aa10e71018 diff --git a/x11-misc/colord/colord-1.4.8.ebuild b/x11-misc/colord/colord-1.4.8.ebuild new file mode 100644 index 0000000000000..f133166e5c86b --- /dev/null +++ b/x11-misc/colord/colord-1.4.8.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +VALA_USE_DEPEND="vapigen" + +inherit bash-completion-r1 meson-multilib tmpfiles udev vala + +DESCRIPTION="System service to accurately color manage input and output devices" +HOMEPAGE="https://www.freedesktop.org/software/colord/" +SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz" + +LICENSE="GPL-2+" +SLOT="0/2" # subslot = libcolord soname version +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + +IUSE="gtk-doc argyllcms examples extra-print-profiles +introspection scanner selinux systemd test vala" +RESTRICT="!test? ( test ) test" # Tests try to read and write files in /tmp +REQUIRED_USE="vala? ( introspection )" + +DEPEND=" + >=dev-libs/glib-2.58.0:2[${MULTILIB_USEDEP}] + >=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}] + dev-db/sqlite:3=[${MULTILIB_USEDEP}] + >=dev-libs/libgusb-0.2.7[introspection?,${MULTILIB_USEDEP}] + + dev-libs/libgudev:=[${MULTILIB_USEDEP}] + virtual/libudev:=[${MULTILIB_USEDEP}] + virtual/udev + + systemd? ( >=sys-apps/systemd-44:0= ) + scanner? ( + media-gfx/sane-backends + sys-apps/dbus + ) + >=sys-auth/polkit-0.114 + argyllcms? ( media-gfx/argyllcms ) + introspection? ( >=dev-libs/gobject-introspection-1.56:= ) +" +RDEPEND="${DEPEND} + acct-group/colord + acct-user/colord + selinux? ( sec-policy/selinux-colord ) +" +BDEPEND=" + acct-group/colord + acct-user/colord + app-text/docbook-xsl-ns-stylesheets + dev-libs/libxslt + >=sys-devel/gettext-0.17 + virtual/pkgconfig + extra-print-profiles? ( media-gfx/argyllcms ) + gtk-doc? ( + dev-util/gtk-doc + app-text/docbook-xml-dtd:4.1.2 + ) + vala? ( $(vala_depend) ) +" + +pkg_setup() { + use vala && vala_setup +} + +src_prepare() { + default + + # Test requires a running session + # https://github.com/hughsie/colord/issues/94 + sed -i -e "/test('colord-test-daemon'/d" lib/colord/meson.build || die + + # Adapt to Gentoo paths + sed -i \ + -e "s|find_program('spotread'|find_program('argyll-spotread'|" \ + -e "s|find_program('colprof'|find_program('argyll-colprof'|" \ + meson.build || die + + # meson gnome.generate_vapi properly handles VAPIGEN and other vala + # environment variables. It is counter-productive to check for an + # unversioned vapigen, as that breaks versioned VAPIGEN usages. + sed -i -e "/find_program('vapigen')/d" meson.build || die +} + +multilib_src_configure() { + local emesonargs=( + $(meson_native_true daemon) + -Dbash_completion=false + $(meson_native_true udev_rules) # Install udev rules only from native build + $(meson_native_use_bool systemd) + -Dlibcolordcompat=true + $(meson_native_use_bool argyllcms argyllcms_sensor) + $(meson_native_use_bool scanner sane) + $(meson_native_use_bool introspection) + $(meson_native_use_bool vala vapi) + $(meson_native_use_bool extra-print-profiles print_profiles) + $(meson_use test tests) + -Dinstalled_tests=false + -Ddaemon_user=colord + $(meson_native_true man) + $(meson_use gtk-doc docs) + --localstatedir="${EPREFIX}"/var + ) + meson_src_configure +} + +multilib_src_install_all() { + newbashcomp data/colormgr colormgr + + # Ensure config and profile directories exist and /var/lib/colord/* + # is writable by colord user + keepdir /var/lib/color{,d}/icc + fowners colord:colord /var/lib/colord{,/icc} + + if use examples; then + docinto examples + dodoc examples/*.c + fi +} + +pkg_postinst() { + udev_reload + tmpfiles_process colord.conf +} + +pkg_postrm() { + udev_reload +} From ae92cc7730e0373b26df191574009fccf9a3aa07 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 29 Jun 2025 23:52:22 +0100 Subject: [PATCH 4/5] games-simulation/openrct2: Stabilize 0.4.21 amd64, #959289 Signed-off-by: Sam James --- games-simulation/openrct2/openrct2-0.4.21.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-simulation/openrct2/openrct2-0.4.21.ebuild b/games-simulation/openrct2/openrct2-0.4.21.ebuild index 89fb631d91e52..4c06e97690cea 100644 --- a/games-simulation/openrct2/openrct2-0.4.21.ebuild +++ b/games-simulation/openrct2/openrct2-0.4.21.ebuild @@ -31,7 +31,7 @@ S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="dedicated +flac +opengl scripting test +truetype +vorbis" RESTRICT="!test? ( test )" From 28b60013d6c03a8d25143efd9b9901cdad9f8af1 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 29 Jun 2025 23:55:55 +0100 Subject: [PATCH 5/5] perl-module.eclass: move DIST_MAKE setting into perl-module_src_configure Quoting https://bugs.gentoo.org/959230#c1 > What's interesting is, in https://bugs.gentoo.org/943847#c3, I added -std=gnu17 > (because dev-perl/Tk is kind of a mess, loads of pending PRs upstream for Modern C fixes), > but that seems to not be working now with EAPI 8 because of some perl-module.eclass changes. Move DIST_MAKE into perl-module_src_configure so that append-flags in src_configure works. Acked by dilfridge on IRC. Bug: https://bugs.gentoo.org/943847 Closes: https://bugs.gentoo.org/959230 Signed-off-by: Sam James --- eclass/perl-module.eclass | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass index 27cd053f0ea7d..29b4959bfa98d 100644 --- a/eclass/perl-module.eclass +++ b/eclass/perl-module.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: perl-module.eclass @@ -190,9 +190,6 @@ LICENSE="${LICENSE:-|| ( Artistic GPL-1+ )}" # (EAPI=8 and later) This Bash array contains parameters to the make call # from ExtUtils::MakeMaker. Replaces mymake in EAPI=7 and earlier. # Defaults to ( OPTIMIZE="${CFLAGS}" ) -if [[ $(declare -p DIST_MAKE 2>&-) != "declare -a DIST_MAKE="* ]]; then - DIST_MAKE=( OPTIMIZE="${CFLAGS}" ) -fi DIST_NAME=${DIST_NAME:-${PN}} DIST_P=${DIST_NAME}-${DIST_VERSION:-${PV}} @@ -234,6 +231,10 @@ perl-module_src_prepare() { perl-module_src_configure() { debug-print-function ${FUNCNAME} "$@" + if [[ $(declare -p DIST_MAKE 2>&-) != "declare -a DIST_MAKE="* ]]; then + DIST_MAKE=( OPTIMIZE="${CFLAGS}" ) + fi + # Perl runs LD with LDFLAGS export CCLD=$(tc-getCC) unset LD