diff options
Diffstat (limited to 'gnome-base')
29 files changed, 177 insertions, 1277 deletions
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz Binary files differindex 14373f8958f7..f5324885e705 100644 --- a/gnome-base/Manifest.gz +++ b/gnome-base/Manifest.gz diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest index 7c0a7d820dc6..3b515ade9aa1 100644 --- a/gnome-base/gdm/Manifest +++ b/gnome-base/gdm/Manifest @@ -1,10 +1,9 @@ +AUX 47.0-c23.patch 2532 BLAKE2B 0954b1deaaea55a02b837031176e68037541cd9cb7cb31d5876374f958c08b221bd330c951bb1295888df839a8ceb35bf75f207b96018df00356bb9a3b7c7cf0 SHA512 cc2b5e126a16a0aabe6f935fb2e813a62e4e85f139d4d3b3a4bfc8ecbf2311b9f98abd007748e856a23959115bf87e71381530a2cd46b65e9b4e69ef2de54da0 AUX default.pa 328 BLAKE2B 558dbedcb5a0f31e0bdc01ce21deaeacb4740dee998f8b2f947361745ea6680acf8662e426adf1d3f777af714c2fb7cf5ec74b2807187c37e2d8d896e863fa0d SHA512 4f0e9c38ae0c17b8f4ee6e37b87259676c4ff4e62fd315989c9e20012a8070c5b5571f835379639f76f157530495928cdc79265473478b1d9fe6d8ad0d64785d AUX gdm-3.30.3-logo.patch 846 BLAKE2B e99b6621191c509545bc36fe838bc467c3762f2726e247aea1b3cad2a86c0b0e95c5f9953b680a072d244140615c38becbc605998a2be0ed3332d7b5ef802f55 SHA512 63428d4605d9f4f35445f364657c1d92818125a737add7bc5e5acab424beaf8ae5895368111cd2d1c03c75f5fd8b9538d8750ea732a0990b5b82507735850e4c -AUX gdm-45.0.1-c99.patch 1112 BLAKE2B 1b1251a96f6016abdb1d3c6b4ba8127310e19c288b3e5876de77c87a8776a7416b2e8d711f2ede4995c9605222210488d8d7dca54d8bbd03f900ea718ddcfc48 SHA512 f2c3a0a8833ee3854cc10699fe2c849d3bce63262adb298c90d70a81d8599fd58096b5b3212ccb28749410510e9f636d7854d96469ee001916b56bee11fa3249 -DIST gdm-45.0.1.tar.xz 855004 BLAKE2B 1ec7250c49c40a31dbc21d0a141cbe6c2555c43d9a31aa6364b497812de0dab4785f509bf9f8b38febc449ada955a86a22b11986c30d9f9226042e2eb3c485e0 SHA512 f0c667dd5df034087e284c2ec1131b55a85cd9e832c15c2aff1637e1e36d4d62a7d86528a2e524bb2782ca7d7cc7cb9c34a9ce9bba688ad222af409e2eb69abe DIST gdm-46.2.tar.xz 931868 BLAKE2B 53b6efb6ae0a60592c6790c4ff676e6bdd7e8096eabb002f3c0d7ad1ba63498cd38799bf0d6606528d05a57b72630ce36bbd1c3e3810bc344df88c445a09c517 SHA512 29cb00b42b64313f63cbf33a0caf9ecaf43f38699983017966fba951b867742129ef150cd927d02add5f7c1c20049ba1301e5ee094caa54835dc12cf29c86210 +DIST gdm-47.0.tar.xz 936172 BLAKE2B 603c253888a2f10d5acf66c29b5892134375160c6edd8badbc6314c15b8ab82c38de7a7ef22c260e32d19ddb2893d8d3c498df8731a7c39ac2337f42faee8639 SHA512 5578b2839ec78ef0b155a6ef6b82384495ef0f3ceb49f4bc7c656bf9dafa95b260148c7fc9b8295b71d4a2d33f6fe6c4a47485cd9eba5c0929f0492ba06e0893 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 -EBUILD gdm-45.0.1-r2.ebuild 5813 BLAKE2B d9c32f5bbb3bb34c7c917e6d6145514953f75c78aaae7780179daeec096cf93dbcae873a18e26859b32f055c86277e54d2fef735d470afc8611315653d1d43bc SHA512 bbd0f006a767ccc517a73925cc38717bfff5e717668efc79a3224d4d834d83639bd3a5a091028d7a692ee2555148302448956b679984444a9ed73ebd7f89eacf -EBUILD gdm-46.2-r1.ebuild 5741 BLAKE2B afcf4555f4d4d16561375cb9482a3fd309c633420e49834f6ad9c4b738ea6db9291bbf44334356e6595e111306643888ea65265dbc660885b8ed2ff06ebfc1a3 SHA512 4dfebfddad2422ad1ceabf441862a00d42212f06f38fe5f035f35e0c24a9259a9f54a57bd6f4ddf7f9d2ffeebcf9e220ad7cd80bc69716a1979a48db1ae6faa9 EBUILD gdm-46.2-r2.ebuild 5782 BLAKE2B 847c64d7611304417e046c7c68b8c41cd90605469aad4c4513d33ea0edc6ae25cd9327fbc10d1b34bc2372c5c560644551a5a529bb29ffcaff3417d9481f28eb SHA512 1c03f8c5222d52e7017f1902b5f8cb9cc5831e60a2cef49d76cd99732ff0f4744e10484fd400764babad78a7196ffc289468ffb8cfa81f5b28dcd698e738ccf3 +EBUILD gdm-47.0.ebuild 5762 BLAKE2B 22a1128eeffeca07689d919a5cb31ba85835b0eb4dd8da89800072e883ae11d94142c3608190fff6d44ae8bcae5b1e033d74d5456a07bb16497f32bc576930f3 SHA512 ab604593feda549b2b5e97d23bfa0021477d60e904d522bce2dd5884533688e9fc058becdcf03be4b893f77d9f5d3063b576b330d3c66bfed29202db5c3b936e MISC metadata.xml 775 BLAKE2B c5e6f026d1a42133c98e450ac82e943485e81d42ead7e632d9c8610442d5a138393bb1c0e97827f2b450719ba0450471eff7d04908429acd63818cbea6f49144 SHA512 562bea1d24550c5de69a15102f259e05498f1bd6b7d2a40bd4997546dd373e9fe9911a7873ee3b3c16c149f891766eb5bdfbefa3aa6589f9c8425f7d3b65ced0 diff --git a/gnome-base/gdm/files/47.0-c23.patch b/gnome-base/gdm/files/47.0-c23.patch new file mode 100644 index 000000000000..f2a48d7334c1 --- /dev/null +++ b/gnome-base/gdm/files/47.0-c23.patch @@ -0,0 +1,55 @@ +https://bugs.gentoo.org/944223 +https://gitlab.gnome.org/GNOME/gdm/-/issues/964 +https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/273 + +From a5f9f274c9c902519336a489cfed0548206d2bca Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> +Date: Mon, 27 Jan 2025 14:01:23 +0100 +Subject: [PATCH] gdm-settings-utils: rename variable to fix build with gcc 15 + +In GNU23 C++, bool is a keyword. Rename the variable to avoid syntax error. +--- + common/gdm-settings-utils.c | 8 ++++---- + common/gdm-settings-utils.h | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/common/gdm-settings-utils.c b/common/gdm-settings-utils.c +index 636be3a9e..da4c7aefb 100644 +--- a/common/gdm-settings-utils.c ++++ b/common/gdm-settings-utils.c +@@ -287,16 +287,16 @@ gdm_settings_parse_boolean_as_value (gboolean boolval) + /* adapted from GKeyFile */ + gboolean + gdm_settings_parse_value_as_boolean (const char *value, +- gboolean *bool) ++ gboolean *boolval) + { + g_return_val_if_fail (value != NULL, FALSE); +- g_return_val_if_fail (bool != NULL, FALSE); ++ g_return_val_if_fail (boolval != NULL, FALSE); + + if (g_ascii_strcasecmp (value, "true") == 0 || strcmp (value, "1") == 0) { +- *bool = TRUE; ++ *boolval = TRUE; + return TRUE; + } else if (g_ascii_strcasecmp (value, "false") == 0 || strcmp (value, "0") == 0) { +- *bool = FALSE; ++ *boolval = FALSE; + return TRUE; + } else { + return FALSE; +diff --git a/common/gdm-settings-utils.h b/common/gdm-settings-utils.h +index 4f2362ce7..734d625c7 100644 +--- a/common/gdm-settings-utils.h ++++ b/common/gdm-settings-utils.h +@@ -44,7 +44,7 @@ gboolean gdm_settings_parse_schemas (const char *fil + GSList **list); + + gboolean gdm_settings_parse_value_as_boolean (const char *value, +- gboolean *bool); ++ gboolean *boolval); + gboolean gdm_settings_parse_value_as_integer (const char *value, + int *intval); + gboolean gdm_settings_parse_value_as_double (const char *value, +-- +GitLab diff --git a/gnome-base/gdm/files/gdm-45.0.1-c99.patch b/gnome-base/gdm/files/gdm-45.0.1-c99.patch deleted file mode 100644 index 2d0f5b9cc0eb..000000000000 --- a/gnome-base/gdm/files/gdm-45.0.1-c99.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://bugs.gentoo.org/919081 -https://gitlab.gnome.org/GNOME/gdm/-/issues/893 -https://gitlab.gnome.org/GNOME/gdm/-/commit/08ef19e848176e58511f1a66992b5a26cb3c51a2 - -From 08ef19e848176e58511f1a66992b5a26cb3c51a2 Mon Sep 17 00:00:00 2001 -From: Alessandro Bono <alessandro.bono369@gmail.com> -Date: Wed, 1 Nov 2023 12:35:44 +0100 -Subject: [PATCH] gdm-session: Pass the correct pointer type - ---- a/daemon/gdm-session.c -+++ b/daemon/gdm-session.c -@@ -3045,7 +3045,7 @@ free_pending_worker_connection (GdmSession *self, - worker_manager_interface = g_object_get_data (G_OBJECT (connection), - "gdm-dbus-worker-manager-interface"); - if (worker_manager_interface != NULL) { -- g_dbus_interface_skeleton_unexport (worker_manager_interface); -+ g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (worker_manager_interface)); - g_object_set_data (G_OBJECT (connection), - "gdm-dbus-worker-manager-interface", - NULL); --- -GitLab diff --git a/gnome-base/gdm/gdm-45.0.1-r2.ebuild b/gnome-base/gdm/gdm-45.0.1-r2.ebuild deleted file mode 100644 index 751155c45338..000000000000 --- a/gnome-base/gdm/gdm-45.0.1-r2.ebuild +++ /dev/null @@ -1,220 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop flag-o-matic gnome2 meson pam readme.gentoo-r1 systemd udev - -DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" -HOMEPAGE="https://wiki.gnome.org/Projects/GDM https://gitlab.gnome.org/GNOME/gdm" - -SRC_URI="${SRC_URI} - branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz ) -" - -LICENSE=" - GPL-2+ - branding? ( CC-BY-SA-4.0 ) -" - -SLOT="0" - -IUSE="accessibility audit bluetooth-sound branding elogind fprint plymouth selinux systemd tcpd test wayland" -RESTRICT="!test? ( test )" -REQUIRED_USE="^^ ( elogind systemd )" - -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" - -# dconf, dbus and g-s-d are needed at install time for dconf update -# keyutils is automagic dep that makes autologin unlock login keyring -# when all the passwords match (disk encryption, user pw and login keyring) -# dbus-run-session used at runtime -COMMON_DEPEND=" - virtual/udev - >=dev-libs/libgudev-232:= - >=dev-libs/glib-2.56:2 - >=x11-libs/gtk+-2.91.1:3 - || ( - media-libs/libcanberra-gtk3 - >=media-libs/libcanberra-0.4[gtk3(-)] - ) - >=sys-apps/accountsservice-0.6.35 - x11-libs/libxcb - sys-apps/keyutils:= - selinux? ( sys-libs/libselinux ) - - x11-libs/libX11 - x11-libs/libXau - x11-base/xorg-server[-minimal] - x11-libs/libXdmcp - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - - systemd? ( >=sys-apps/systemd-186:0=[pam] ) - elogind? ( >=sys-auth/elogind-239.3[pam] ) - - plymouth? ( sys-boot/plymouth ) - audit? ( sys-process/audit ) - - sys-libs/pam - sys-auth/pambase[elogind?,systemd?] - - >=gnome-base/dconf-0.20 - >=gnome-base/gnome-settings-daemon-3.1.4 - gnome-base/gsettings-desktop-schemas - sys-apps/dbus - - >=x11-misc/xdg-utils-1.0.2-r3 - - >=dev-libs/gobject-introspection-0.9.12:= -" -# XXX: These deps are from session and desktop files in data/ directory -# fprintd is used via dbus by gdm-fingerprint-extension -RDEPEND="${COMMON_DEPEND} - acct-group/gdm - acct-user/gdm - >=gnome-base/gnome-session-3.6 - >=gnome-base/gnome-shell-3.1.90 - x11-apps/xhost - - accessibility? ( - >=app-accessibility/orca-3.10 - gnome-extra/mousetweaks - ) - fprint? ( sys-auth/fprintd[pam] ) -" -DEPEND="${COMMON_DEPEND} - x11-base/xorg-proto -" -BDEPEND=" - app-text/docbook-xml-dtd:4.1.2 - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/itstool - >=gnome-base/dconf-0.20 - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - test? ( >=dev-libs/check-0.9.4 ) - app-text/yelp-tools -" - -DOC_CONTENTS=" - To start GDM at boot with systemd, run:\n - # systemctl enable gdm.service\n - \n - To start GDM at boot with OpenRC, set DISPLAYMANAGER=\"gdm\"\n - in /etc/conf.d/display-manager and enable the display-manager service:\n - # rc-update add display-manager\n - \n - For passwordless login to unlock your keyring, you need to install - sys-auth/pambase with USE=gnome-keyring and set an empty password - on your keyring. Use app-crypt/seahorse for that.\n - \n - You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11 - for smartcard support -" - -PATCHES=( - "${FILESDIR}"/${PN}-45.0.1-c99.patch -) - -src_prepare() { - default - - # Show logo when branding is enabled - use branding && eapply "${FILESDIR}/${PN}-3.30.3-logo.patch" -} - -src_configure() { - # bug #944223 - append-cflags -std=gnu17 - - # --with-initial-vt=7 conflicts with plymouth, bug #453392 - # gdm-3.30 now reaps (stops) the login screen when the login VT isn't active, which - # saves on memory. However this means if we don't start on VT1, gdm doesn't start up - # before user manually goes to VT7. Thus as-is we can not keep gdm away from VT1, - # so lets try always having it in VT1 and see if that is an issue for people before - # hacking up workarounds for the initial start case. - local emesonargs=( - --localstatedir /var - - -Ddefault-pam-config=exherbo - -Dgdm-xsession=true - -Dgroup=gdm - -Dipv6=true - $(meson_feature audit libaudit) - -Dlogind-provider=$(usex systemd systemd elogind) - -Dpam-mod-dir=$(getpam_mod_dir) - $(meson_feature plymouth) - -Drun-dir=/run/gdm - $(meson_feature selinux) - $(meson_use systemd systemd-journal) - $(meson_use tcpd tcp-wrappers) - -Dudev-dir=$(get_udevdir)/rules.d - -Duser=gdm - -Duser-display-server=true - $(meson_use wayland wayland-support) - -Dxdmcp=enabled - ) - - if use elogind; then - emesonargs+=( - -Dinitial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility - -Dsystemdsystemunitdir=no - -Dsystemduserunitdir=no - ) - else - emesonargs+=( - -Dinitial-vt=1 - -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)" - -Dsystemduserunitdir="$(systemd_get_userunitdir)" - ) - fi - - meson_src_configure -} - -src_install() { - meson_src_install - - if ! use accessibility ; then - rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die - fi - - if ! use bluetooth-sound ; then - # Workaround https://gitlab.freedesktop.org/pulseaudio/pulseaudio/merge_requests/10 - # bug #679526 - insinto /var/lib/gdm/.config/pulse - doins "${FILESDIR}"/default.pa - fi - - # install XDG_DATA_DIRS gdm changes - echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm - doenvd 99xdg-gdm - - use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg - - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - local d ret - - # bug #669146; gdm may crash if /var/lib/gdm subdirs are not owned by gdm:gdm - ret=0 - ebegin "Fixing ${EROOT}/var/lib/gdm ownership" - chown --no-dereference gdm:gdm "${EROOT}/var/lib/gdm" || ret=1 - for d in "${EROOT}/var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do - [[ ! -e "${d}" ]] || chown --no-dereference -R gdm:gdm "${d}" || ret=1 - done - eend ${ret} - - systemd_reenable gdm.service - readme.gentoo_print_elog - - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/gnome-base/gdm/gdm-46.2-r1.ebuild b/gnome-base/gdm/gdm-47.0.ebuild index abf4cbfb61f7..9a2ee26825b0 100644 --- a/gnome-base/gdm/gdm-46.2-r1.ebuild +++ b/gnome-base/gdm/gdm-47.0.ebuild @@ -1,12 +1,12 @@ -# Copyright 2023-2024 Gentoo Authors +# Copyright 2023-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit desktop flag-o-matic gnome2 meson pam readme.gentoo-r1 systemd udev +inherit desktop gnome.org gnome2-utils meson pam readme.gentoo-r1 systemd udev xdg DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" -HOMEPAGE="https://wiki.gnome.org/Projects/GDM https://gitlab.gnome.org/GNOME/gdm" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gdm" SRC_URI="${SRC_URI} branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz ) @@ -21,10 +21,10 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="accessibility audit bluetooth-sound branding elogind fprint plymouth selinux systemd tcpd test wayland" +IUSE="accessibility audit bluetooth-sound branding elogind fprint plymouth selinux systemd tcpd test wayland +X" RESTRICT="!test? ( test )" -REQUIRED_USE="^^ ( elogind systemd )" +REQUIRED_USE="^^ ( elogind systemd ) || ( wayland X )" # dconf, dbus and g-s-d are needed at install time for dconf update # keyutils is automagic dep that makes autologin unlock login keyring @@ -34,21 +34,19 @@ COMMON_DEPEND=" virtual/udev >=dev-libs/libgudev-232:= >=dev-libs/glib-2.68:2 - >=x11-libs/gtk+-2.91.1:3 >=dev-libs/json-glib-1.2.0 - || ( - media-libs/libcanberra-gtk3 - >=media-libs/libcanberra-0.4[gtk3(-)] - ) >=sys-apps/accountsservice-0.6.35 - x11-libs/libxcb sys-apps/keyutils:= selinux? ( sys-libs/libselinux ) - x11-libs/libX11 - x11-libs/libXau - x11-base/xorg-server[-minimal] - x11-libs/libXdmcp + X? ( + x11-libs/libxcb + x11-libs/libX11 + x11-libs/libXau + x11-base/xorg-server[-minimal] + x11-libs/libXdmcp + >=x11-libs/gtk+-2.91.1:3 + ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) systemd? ( >=sys-apps/systemd-186:0=[pam] ) @@ -118,12 +116,11 @@ src_prepare() { # Show logo when branding is enabled use branding && eapply "${FILESDIR}/${PN}-3.30.3-logo.patch" + + eapply "${FILESDIR}/47.0-c23.patch" } src_configure() { - # bug #944223 - append-cflags -std=gnu17 - # --with-initial-vt=7 conflicts with plymouth, bug #453392 # gdm-3.30 now reaps (stops) the login screen when the login VT isn't active, which # saves on memory. However this means if we don't start on VT1, gdm doesn't start up @@ -149,7 +146,8 @@ src_configure() { -Duser=gdm -Duser-display-server=true $(meson_use wayland wayland-support) - -Dxdmcp=enabled + $(meson_use X x11-support) + $(meson_feature X xdmcp) ) if use elogind; then @@ -193,7 +191,9 @@ src_install() { } pkg_postinst() { - gnome2_pkg_postinst + xdg_pkg_postinst + gnome2_schemas_update + local d ret # bug #669146; gdm may crash if /var/lib/gdm subdirs are not owned by gdm:gdm @@ -212,5 +212,7 @@ pkg_postinst() { } pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update udev_reload } diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest index eb9dc225652b..08a7d876363c 100644 --- a/gnome-base/gnome-control-center/Manifest +++ b/gnome-base/gnome-control-center/Manifest @@ -1,14 +1,9 @@ -DIST gnome-control-center-45.0-patchset.tar.xz 5888 BLAKE2B 7b7d818392e8758ca4d9247f55b84e4e8a37419859040e35d8fb3cef16f09423ad74a88a821a5f5947b3f36543ccc328f9a61cb71f92155b6a14669732569910 SHA512 e58adc6bb61d04f8c5ecf36335fedd190e063e42eed8e1023dcac95665a270d57c7cbd377fd0f5239f2c144040a9699b428536ffdbac798655b2c9aef25e71ae -DIST gnome-control-center-45.3.tar.xz 7757512 BLAKE2B 2f38b9b6a5c7171eefd8899bb9156b49f6b41f60ce2bfb36d7ade7261cd038ddb60bcc9a6a71e6c49209f0f3c13c49b38758a19f02cc9735cea2874368602434 SHA512 0aad27f3324940292551c0aa9fa79771d1d41cc5a633970c709836a2d6af575f688df8553755f936495f75a02268a5a1f89e7f3b5fb03512140c73bf14fc4cf5 -DIST gnome-control-center-45.4.tar.xz 7764264 BLAKE2B 5e3632901b1203fc71b839a71aad50f63741412dfc673b8b8f87c72716fda386a1c7641b64642be811f94d6b2c54263deb45c4624d828ec66726d2a833a272e4 SHA512 d16b3c1cffeb7db27e9743106b6bc7ad925a832162764d0714b4931d0c21c9e02137b5b5e101be93dd8a92aebaa8556f6ce52e83c5e05e9e3d7e40d46b8c11d5 -DIST gnome-control-center-46.2-patchset.tar.xz 5872 BLAKE2B 745e817b0fcec81d5e390cd35e0a14ab249af2861f6bb206f77ace93b0ffc9620479213bae69dd6ef1af01b50a647b7cae14d72ae831a66f11c44c6f91c886a3 SHA512 efa7e4f4c488d1f41501c2e7d36b07000eb659e0f7c98779490ee520914967c6644f7c112827327e0c4f43e5194044aa36f589a3c729c1ebbd10889cb932fdb2 -DIST gnome-control-center-46.2.tar.xz 8030924 BLAKE2B 2c51bc6929ae6692f2c52f1b7b38972ac563b511b321e2b09358ee75a6c78254b0f0b60a079fb22bd5019f4d49effb32967029c9526cf3acd399098cf5e2b975 SHA512 0c91a0480f4f46ae3a9ec62294716bb5dbd0e606f22f842a4f7bc1d388496f0a3a36ed1da4a9f31139d8fd07e23e22367c212c98a0afc00842920092d71aecf5 DIST gnome-control-center-46.4-patchset-r1.tar.xz 5996 BLAKE2B 0df54d229f05d8803d99d32d60afb40c2ccd08c79061301a568a854fe2a6462003391b5d71ccb8bfd828cb189a56320d03d97674a06429a8e129d6b87dc14f81 SHA512 e7a48d431aa432513c90b41ed20327a8d6b378801a02d8c77dba147db04d287a719a3fb24965b0aab5f54684a69917fa0799aa080275fb58b7edcc474fb4c2e2 DIST gnome-control-center-46.4.tar.xz 8031580 BLAKE2B f26c2fde336d94cd53b3e3044b2e82de16729cfd48dae7b8dace3512dec9e4a298cd42135a6b5f7e8127d6802862dc3289065c7ac2e0eb543814b4caa7269650 SHA512 83a935cea6bec668c64bfbe4c72fe872d85d393f7cbad8c09a996008c35253c76801739d9dddfada186185403dee3ef7838384218853cd076694085c39b44d69 +DIST gnome-control-center-47.3-patchset.tar.xz 4980 BLAKE2B a9c8e8b20462d368d579c004e17ba837b7bae4d391ce5ecca5311dd3d3d11a20b7b06c1abe419adcda22e97ba0d3dd752926bccf27756353e9cbaaf8d0afed0a SHA512 a5ade6c98b3ba5b51e20ec22ea3d64c169b08f23c99fe988afd8d8699edaec8b158da652dacb236e0b16c446e9bd2d384cc4e383c5148acaa0792ca44a6e8bb1 +DIST gnome-control-center-47.3.tar.xz 7084876 BLAKE2B f7958d5d7b226bf94111a84dafd615343d92ba11ae21fce7c1466142d196267258ec2ea8050279e2cc0084b88be0e18c0947a35ddbcbc6b509463cf1c4dd1c44 SHA512 045c6e1dc50340c2f79d5ea333cdc2274aeb71b36b2b3c0ae707685e81d09d016b7de776793b690f8901461e36e0d3619b6c296e0453d93b19e7c2ecaa2b51b4 DIST gnome-control-center-gentoo-logo-dark.svg 14293 BLAKE2B 570e9326b8abe45849c31fd5cdb3fcfb1b2f18eac522f958928df5c3b747b0699f50a882f31cf7c0ae1f2138194f18596f738f42c942b57d340c53d46d82c551 SHA512 91227dafcf2091bb1568b0f9eec68b5e371ec64c9a6bc3605821f60d6bf2bd94dec0564f6a16a4a70d1db4d4df49fc25b6c910367bae3b85205cc609a9f2701b DIST gnome-control-center-gentoo-logo.svg 14288 BLAKE2B 371fc68b1015c8672db3e3858ae9077b1e3a9937e6add8690c39db36302ec031391c4d35e0c0b87094ca474a00c4187849e2d7111df34f43bc5bd7be52678527 SHA512 cf88933546de54ca15e2e830ac1086a78c4150f0ff59b8091e7e1cade5961c4e4cb83120a818a960b77841353ce3584ddc8f36b6edbde05543600283a143ad7b -EBUILD gnome-control-center-45.3-r1.ebuild 6994 BLAKE2B 50bf3bd37c2e369d35003887c1f97ca0dccb3455c66a2890ee3ba3d4c7930c51bdfff53fdb23e7b7d06507afcab67240420b9e2a2855f425e553aea669995d55 SHA512 101a376be52c688e34b89991d133d75406762922d3ad787a355da4a02c6556b84017095649f3e2b25988df576c7ee03093631f6b2e1109bdd86172acd4be6f94 -EBUILD gnome-control-center-45.4-r1.ebuild 6996 BLAKE2B 22673022a498bfea45bc0298644c33c78b7c063eb6e0063724ecf1991dcae595a7a2652a35dd8891f7036f6502a0cd589f6357cfb1886fed37606b211a23e266 SHA512 10409ebe117dea73dcec01a0653631635d53781bd50de4d516b2513066caa14345ea5079ecc3379934fb5783a798938ea7eef2a4b175b5aa70bd0b4bc7e23e09 -EBUILD gnome-control-center-46.2-r1.ebuild 7104 BLAKE2B 7d14a3730c206af23115fa2f1d1957393d66d9f969ecf62519964bbb7b4df58e091a625ab82a387a665fa981611bc47275537e910d21db3984e1d6b51821c445 SHA512 1231514c96c2612e245e5ec1b1faf9edac61a94c7fdd936f8bde3767a1b7252bc6fedaad27de985a7ff5185e4cc881509a49dd885a67d87603bf001acdb6873b EBUILD gnome-control-center-46.4-r1.ebuild 7077 BLAKE2B 71f1552492581e38c3a00bc0fe66c30cf9c9bd41d32615ebd49c35815da66fb1903b469687bca391155167803bd480893f79f0200dc533a7ee3a31ee18e2d695 SHA512 90048bbfc3f72b76af03bfaa77209e1ef83baf0fe83a874ef6a78730815d094bf3d706b9e9037ac92219c105c5fed86dc1ddc2188a223a45f1cc5cf2465db8ba +EBUILD gnome-control-center-47.3.ebuild 7094 BLAKE2B 56ff6bc234f45d718e9f2c6f1e39c14c25ad6373e155715bdb4be7402e0fd60e3f15ab13b14509a7f609011eef60fe836f6d7a7999474e917d5e84c030d03fb1 SHA512 0f1690e044b8dd5906c953514ee93f17c6b3c238e5bb82c558e774a68eaa81d5a997687b3e663b76b54a297b9eafe562f1619bdba4d8aa36601f59127958d013 MISC metadata.xml 610 BLAKE2B 33cb646209b89a151b412f3a5be10b29cf85cde070e8a55b50f18417b02806763f940a1f56684ec8f494f9bd07258e9219b4dc2dc01ef6710aedc03bb609d42e SHA512 1d1fd521a3901c3601d3bd4ab78ac95c44d058fc0de2506df38c5ad8ba5156ff04c4b112b7a801a13f5ed9c37243c64629cf7038ca156196fa5f3229606a1f9c diff --git a/gnome-base/gnome-control-center/gnome-control-center-45.3-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-45.3-r1.ebuild deleted file mode 100644 index 8d2500b29530..000000000000 --- a/gnome-base/gnome-control-center/gnome-control-center-45.3-r1.ebuild +++ /dev/null @@ -1,211 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit flag-o-matic gnome.org gnome2-utils meson python-any-r1 virtualx xdg - -DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" -HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-control-center" -SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-45.0-patchset.tar.xz" -SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo.svg" -SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo-dark.svg" -# Logo is CC-BY-SA-2.5 -LICENSE="GPL-2+ CC-BY-SA-2.5" -SLOT="2" -IUSE="+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test wayland" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - ^^ ( elogind systemd ) -" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, -# but needs testing if handled gracefully enough -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86" - -# kerberos unfortunately means mit-krb5; build fails with heimdal -# display panel requires colord and gnome-settings-daemon[colord] -# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support -# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional) -# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional). -# Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order -DEPEND=" - gnome-online-accounts? ( - x11-libs/gtk+:3 - >=net-libs/gnome-online-accounts-3.25.3:= - ) - >=media-libs/libpulse-2.0[glib] - >=gui-libs/gtk-4.11.2:4[X,wayland=] - >=gui-libs/libadwaita-1.4_alpha:1 - >=sys-apps/accountsservice-0.6.39 - >=x11-misc/colord-0.1.34:0= - >=x11-libs/gdk-pixbuf-2.23.0:2 - >=dev-libs/glib-2.75.0:2 - gnome-base/gnome-desktop:4= - >=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?] - >=gnome-base/gsettings-desktop-schemas-42_alpha - dev-libs/libxml2:2 - >=sys-power/upower-0.99.8:= - >=dev-libs/libgudev-232 - >=x11-libs/libX11-1.8 - >=x11-libs/libXi-1.2 - media-libs/libepoxy - app-crypt/gcr:0= - >=dev-libs/libpwquality-1.2.2 - >=sys-auth/polkit-0.114 - cups? ( - >=net-print/cups-1.7[dbus] - >=net-fs/samba-4.0.0[client] - ) - ibus? ( >=app-i18n/ibus-1.5.2 ) - networkmanager? ( - >=net-libs/libnma-1.10.2 - >=net-misc/networkmanager-1.24.0[modemmanager] - >=net-misc/modemmanager-0.7.990:= - ) - bluetooth? ( net-wireless/gnome-bluetooth:3= ) - input_devices_wacom? ( >=dev-libs/libwacom-0.27:= ) - kerberos? ( app-crypt/mit-krb5 ) - - x11-libs/cairo[glib] - >=x11-libs/colord-gtk-0.3.0:= - media-libs/fontconfig - gnome-base/libgtop:2= - >=sys-fs/udisks-2.1.8:2 - app-crypt/libsecret - net-libs/gnutls:= - media-libs/gsound - - x11-libs/pango -" -# media-libs/libcanberra[pulseaudio,sound] needed for Speaker tests in -# Settings/Sound/Output/Output Device, bug #814110 -# systemd/elogind USE flagged because package manager will potentially try to satisfy a -# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed. -# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel -# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x -# -# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474 -# Also we need newer driver versions to allow wacom and libinput drivers to -# not collide -# -# system-config-printer provides org.fedoraproject.Config.Printing service and interface -# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy -RDEPEND="${DEPEND} - media-libs/libcanberra[pulseaudio,sound(+)] - systemd? ( >=sys-apps/systemd-31 ) - elogind? ( - app-admin/openrc-settingsd - sys-auth/elogind - ) - x11-themes/adwaita-icon-theme - >=gnome-extra/gnome-color-manager-3.1.2 - cups? ( - app-admin/system-config-printer - net-print/cups-pk-helper - ) - gnome-extra/tecla - wayland? ( dev-libs/libinput ) - !wayland? ( - >=x11-drivers/xf86-input-libinput-0.19.0 - input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) - ) -" -# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel -# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login -PDEPEND=">=gnome-base/gnome-session-2.91.6-r1 - networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor - -# meson.build depends on python unconditionally -BDEPEND="${PYTHON_DEPS} - dev-libs/libxslt - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.2 - x11-base/xorg-proto - dev-libs/libxml2:2 - dev-util/gdbus-codegen - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - test? ( - $(python_gen_any_dep ' - dev-python/python-dbusmock[${PYTHON_USEDEP}] - ') - x11-apps/setxkbmap - ) -" - -PATCHES=( - # Makes some panels and dependencies optional - # https://bugzilla.gnome.org/686840, 697478, 700145 - # Fix some absolute paths to be appropriate for Gentoo - "${WORKDIR}"/patches/ -) - -python_check_deps() { - use test || return 0 - python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]" -} - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - default - xdg_environment_reset - # Mark python tests with shebang executable, so that meson will launch them directly, instead - # of via its own python-single-r1 version, which might not match what we get from python_check_deps - chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die -} - -src_configure() { - # -Werror=strict-aliasing - # https://bugs.gentoo.org/889008 - # https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/2563 - # - # Do not trust with LTO either - append-flags -fno-strict-aliasing - filter-lto - - local emesonargs=( - $(meson_use bluetooth) - -Dcups=$(usex cups enabled disabled) - -Ddocumentation=true # manpage - -Dgoa=$(usex gnome-online-accounts enabled disabled) - $(meson_use ibus) - -Dkerberos=$(usex kerberos enabled disabled) - $(meson_use networkmanager network_manager) - -Dprivileged_group=wheel - -Dsnap=false - $(meson_use test tests) - $(meson_use input_devices_wacom wacom) - #$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code - # bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, - # which is the same as $(get_bashcompdir) - -Dmalcontent=false # unpackaged - -Ddistributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo.svg - -Ddark_mode_distributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo-dark.svg - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} - -src_install() { - meson_src_install - insinto /usr/share/pixmaps - doins "${DISTDIR}"/gnome-control-center-gentoo-logo.svg - doins "${DISTDIR}"/gnome-control-center-gentoo-logo-dark.svg -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/gnome-base/gnome-control-center/gnome-control-center-45.4-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-45.4-r1.ebuild deleted file mode 100644 index 9b23e641e3cc..000000000000 --- a/gnome-base/gnome-control-center/gnome-control-center-45.4-r1.ebuild +++ /dev/null @@ -1,211 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit flag-o-matic gnome.org gnome2-utils meson python-any-r1 virtualx xdg - -DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" -HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-control-center" -SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-45.0-patchset.tar.xz" -SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo.svg" -SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo-dark.svg" -# Logo is CC-BY-SA-2.5 -LICENSE="GPL-2+ CC-BY-SA-2.5" -SLOT="2" -IUSE="+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test wayland" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - ^^ ( elogind systemd ) -" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, -# but needs testing if handled gracefully enough -KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" - -# kerberos unfortunately means mit-krb5; build fails with heimdal -# display panel requires colord and gnome-settings-daemon[colord] -# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support -# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional) -# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional). -# Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order -DEPEND=" - gnome-online-accounts? ( - x11-libs/gtk+:3 - >=net-libs/gnome-online-accounts-3.25.3:= - ) - >=media-libs/libpulse-2.0[glib] - >=gui-libs/gtk-4.11.2:4[X,wayland=] - >=gui-libs/libadwaita-1.4_alpha:1 - >=sys-apps/accountsservice-0.6.39 - >=x11-misc/colord-0.1.34:0= - >=x11-libs/gdk-pixbuf-2.23.0:2 - >=dev-libs/glib-2.75.0:2 - gnome-base/gnome-desktop:4= - >=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?] - >=gnome-base/gsettings-desktop-schemas-42_alpha - dev-libs/libxml2:2 - >=sys-power/upower-0.99.8:= - >=dev-libs/libgudev-232 - >=x11-libs/libX11-1.8 - >=x11-libs/libXi-1.2 - media-libs/libepoxy - app-crypt/gcr:0= - >=dev-libs/libpwquality-1.2.2 - >=sys-auth/polkit-0.114 - cups? ( - >=net-print/cups-1.7[dbus] - >=net-fs/samba-4.0.0[client] - ) - ibus? ( >=app-i18n/ibus-1.5.2 ) - networkmanager? ( - >=net-libs/libnma-1.10.2 - >=net-misc/networkmanager-1.24.0[modemmanager] - >=net-misc/modemmanager-0.7.990:= - ) - bluetooth? ( net-wireless/gnome-bluetooth:3= ) - input_devices_wacom? ( >=dev-libs/libwacom-0.27:= ) - kerberos? ( app-crypt/mit-krb5 ) - - x11-libs/cairo[glib] - >=x11-libs/colord-gtk-0.3.0:= - media-libs/fontconfig - gnome-base/libgtop:2= - >=sys-fs/udisks-2.1.8:2 - app-crypt/libsecret - net-libs/gnutls:= - media-libs/gsound - - x11-libs/pango -" -# media-libs/libcanberra[pulseaudio,sound] needed for Speaker tests in -# Settings/Sound/Output/Output Device, bug #814110 -# systemd/elogind USE flagged because package manager will potentially try to satisfy a -# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed. -# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel -# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x -# -# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474 -# Also we need newer driver versions to allow wacom and libinput drivers to -# not collide -# -# system-config-printer provides org.fedoraproject.Config.Printing service and interface -# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy -RDEPEND="${DEPEND} - media-libs/libcanberra[pulseaudio,sound(+)] - systemd? ( >=sys-apps/systemd-31 ) - elogind? ( - app-admin/openrc-settingsd - sys-auth/elogind - ) - x11-themes/adwaita-icon-theme - >=gnome-extra/gnome-color-manager-3.1.2 - cups? ( - app-admin/system-config-printer - net-print/cups-pk-helper - ) - gnome-extra/tecla - wayland? ( dev-libs/libinput ) - !wayland? ( - >=x11-drivers/xf86-input-libinput-0.19.0 - input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) - ) -" -# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel -# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login -PDEPEND=">=gnome-base/gnome-session-2.91.6-r1 - networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor - -# meson.build depends on python unconditionally -BDEPEND="${PYTHON_DEPS} - dev-libs/libxslt - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.2 - x11-base/xorg-proto - dev-libs/libxml2:2 - dev-util/gdbus-codegen - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - test? ( - $(python_gen_any_dep ' - dev-python/python-dbusmock[${PYTHON_USEDEP}] - ') - x11-apps/setxkbmap - ) -" - -PATCHES=( - # Makes some panels and dependencies optional - # https://bugzilla.gnome.org/686840, 697478, 700145 - # Fix some absolute paths to be appropriate for Gentoo - "${WORKDIR}"/patches/ -) - -python_check_deps() { - use test || return 0 - python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]" -} - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - default - xdg_environment_reset - # Mark python tests with shebang executable, so that meson will launch them directly, instead - # of via its own python-single-r1 version, which might not match what we get from python_check_deps - chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die -} - -src_configure() { - # -Werror=strict-aliasing - # https://bugs.gentoo.org/889008 - # https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/2563 - # - # Do not trust with LTO either - append-flags -fno-strict-aliasing - filter-lto - - local emesonargs=( - $(meson_use bluetooth) - -Dcups=$(usex cups enabled disabled) - -Ddocumentation=true # manpage - -Dgoa=$(usex gnome-online-accounts enabled disabled) - $(meson_use ibus) - -Dkerberos=$(usex kerberos enabled disabled) - $(meson_use networkmanager network_manager) - -Dprivileged_group=wheel - -Dsnap=false - $(meson_use test tests) - $(meson_use input_devices_wacom wacom) - #$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code - # bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, - # which is the same as $(get_bashcompdir) - -Dmalcontent=false # unpackaged - -Ddistributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo.svg - -Ddark_mode_distributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo-dark.svg - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} - -src_install() { - meson_src_install - insinto /usr/share/pixmaps - doins "${DISTDIR}"/gnome-control-center-gentoo-logo.svg - doins "${DISTDIR}"/gnome-control-center-gentoo-logo-dark.svg -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/gnome-base/gnome-control-center/gnome-control-center-46.2-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-47.3.ebuild index 87e7f2c931ed..c76cd6ed807e 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-46.2-r1.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-47.3.ebuild @@ -1,14 +1,14 @@ -# Copyright 2023-2024 Gentoo Authors +# Copyright 2023-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +PYTHON_COMPAT=( python3_{10..13} ) -PYTHON_COMPAT=( python3_{10..12} ) inherit flag-o-matic gnome.org gnome2-utils meson python-any-r1 virtualx xdg DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-control-center" -SRC_URI+=" https://dev.gentoo.org/~pacho/${PN}/${PN}-46.2-patchset.tar.xz" +SRC_URI+=" https://dev.gentoo.org/~pacho/${PN}/${P}-patchset.tar.xz" SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo.svg" SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo-dark.svg" # Logo is CC-BY-SA-2.5 @@ -33,18 +33,18 @@ RESTRICT="!test? ( test )" DEPEND=" gnome-online-accounts? ( x11-libs/gtk+:3 - >=net-libs/gnome-online-accounts-3.49.1:= + >=net-libs/gnome-online-accounts-3.51.0:= ) >=media-libs/libpulse-2.0[glib] - >=gui-libs/gtk-4.11.2:4[X,wayland=] - >=gui-libs/libadwaita-1.4_alpha:1 + >=gui-libs/gtk-4.15.2:4[X,wayland=] + >=gui-libs/libadwaita-1.6_beta:1 >=sys-apps/accountsservice-0.6.39 >=x11-misc/colord-0.1.34:0= >=x11-libs/gdk-pixbuf-2.23.0:2 >=dev-libs/glib-2.76.6:2 gnome-base/gnome-desktop:4= >=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?] - >=gnome-base/gsettings-desktop-schemas-46_beta + >=gnome-base/gsettings-desktop-schemas-47.0 dev-libs/libxml2:2 >=sys-power/upower-0.99.8:= >=dev-libs/libgudev-232 diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest index c25d4f500ba5..8f4ca863c40a 100644 --- a/gnome-base/gnome-session/Manifest +++ b/gnome-base/gnome-session/Manifest @@ -3,10 +3,9 @@ AUX 15-xdg-data-gnome-r1 262 BLAKE2B 8ea3192680b1cda2076ebceafd7cd4f340f6f4c5f5b AUX 90-xcursor-theme-gnome 384 BLAKE2B 985ea5b7de4d51b46625c21b803c5d225ac598b81813bb0bf00620a8b825a90f2b54717ed24ca8c9554c3ae6f8dbd75424f2b4ae8c6f38fcb789e655aa35aad6 SHA512 3d692715a744303f31a78ddf7aaefdbece8c50ebc5dfaac84cdfb6430155db465ab0140340eea4b5caf6d4dff030736eca9d028f24ed1d41ebc345fa309a4a4b AUX Gnome 2391 BLAKE2B ac78e23bb1172844c1da04a2615f03209b703d25d3e4d8976b7d62cc52fe128b35eb3f9e8f0bf3884f0c444ab2da88eb6ba12d9a852e8a058f4abdcf050dc68c SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6 AUX defaults.list-r6 18459 BLAKE2B e219daae31ffebc4301baf21cca9842ff1e9842af302bac4d4cf34cc3b9e9ffba4ca95992cdbb9e47c3f071e4d354f1e8b3801af53fc35d52f994a3a04bb62b1 SHA512 a0cd5f879c2ec16251ea92923470481d87531e3065e8582345dc317a2b20a5dce11ac87810e56eb097090f2c0bd718b0e10a1b9ba309fdf7c91697ed243b9d6b -AUX gnome-session-3.38.0-meson-Support-elogind.patch 2808 BLAKE2B da7ad139fe118edc4c53570acc5e56d59e3073caae7941c54b11c59208675eaa148eb03d437d0edfa0f0d024880b77bc60ba65140422f25319ac132299dfe972 SHA512 2a57894b95662ca4488f95110943076a82ecbe7f3bb8ed4d95e2c8082276839f4b1a7ecc20915557378e73e1947df856e4ff57d9d5b9ae32a9673f2cc3b2fbc2 AUX gnome-session-46.0-meson-Support-elogind.patch 658 BLAKE2B f93613aabe85c377107978fa0d69bc0602907134ed9cd229304088ca804f9c61798487ff59bc57a19070501ef3f72169b85ba7124339e4b0f2ed8bf6d41e6ae6 SHA512 40a28843efb1eae8127eb468b6c59bad0d3456dc2d4d56b0bce5825b032cccb816210f127002b1832e36013fbcb70dbbe98e7f9b98b88082e33e77ed4f14496f -DIST gnome-session-45.0.tar.xz 485992 BLAKE2B 473f0b3d94ffa8c1e2bf45884d053c753e5d5ad791b7cd9f889ce7952a273c4631c9867f038edaa6fe8e6ce16b9659c479755ce8028076016a658ad23291eeb7 SHA512 3eb3b4b9fcab2ec35bb61bac6257b254f142167250bbc1eb71d46aed350372f8942601c9d5ca5856e8686b53b70321f914cb55f1639daecfe6c61d84cb6d8aba DIST gnome-session-46.0.tar.xz 484368 BLAKE2B 9519530abd84957df9b936706647f1b60ed660efa095602ad67e5f84a5047653ed711a73eaa272424c06c8080a46c86aebf9e3fa5bda8c9b09f291b2ca6bda20 SHA512 2187b8ae4ac4ec728283c5dc03edba6472864a704f6c6cd7a3e962515a3925d3a8438f7f89855dd082d2c013868da81e16da280c70b0e07537c8e431301b4bd8 -EBUILD gnome-session-45.0-r1.ebuild 3558 BLAKE2B a7f94751dde967067a8bbd159ba3df977de6946e9e9bd01a5958606aba2ef7cd93ba42a9e8df8beb75760a0dd7eb4e85fb3260de972b46d329142a1b036fb716 SHA512 97f7d4cc6821c81756c57b1562ed4ae623a2211364ef99926db8c03f61717af2f80696787091661ff52d71e9e5e30ae57b6b05d0c87fc71aa063374e91101ac3 +DIST gnome-session-47.0.1.tar.xz 486996 BLAKE2B 011556506e047c569d04b43a0d6157ba9dd3ae2abb5ce3b74b6b431c5a632846305f14b978a400513015d3f39e07007c8e86e12c89248b0b4caf094f59f3003a SHA512 83268ab2531f1a98f1bb483ca8337cac97542445a1d83d6e8a478ebb3361eb4454e111278dc428a139a6de63741367bdbc3443e53183fd187ca1a768e5df67a3 EBUILD gnome-session-46.0-r1.ebuild 3167 BLAKE2B 0cad50f19d026e9e48bdac20b1fa4a462fddd3bc13a373f3b869a198d8a960f82ae041cf169d5cb6252408c59f378fc52b5aca884e0408d7f8f2911a07f32fec SHA512 72d72ac961b8aed21fc3e4a9f8941256fea9a2f5c7642b5f8644b1e7612958a8dc595b0deb78ddf193f0a2674e7c3eacdedb06007074bd666eb5cf3015ae8927 +EBUILD gnome-session-47.0.1.ebuild 3212 BLAKE2B 5df845807b26d5a0bcfd3584a140ea4b2a510f3fe605b4a255ffa71a673229447c8b9b372169852016005d7dfc7b9b8e7d604d5737843213d6a3a5616fbdf730 SHA512 0f672ec80ecadc109422b94f638ed257d678deef57deec0266757a89ec3c2d62a0cf48b2423f7fd2bcb8408c523dc251a50b226322576cf531562f4fcc4c1442 MISC metadata.xml 460 BLAKE2B a735510be82f9e08b4002cbf033f75e601ec6f35a860c92728439367e6bdedf747c4fccc0250c89d231aa8e96348ae01275f577a21c958985cdaf0ef47615216 SHA512 df3adfa8e27c264a9bb6ba74ca43345a15f1cb0984461ea1fb831d4b355c77dfa94d491fdf28b34d58fd1d9e60428cfa8c40af2402bb9be42292202b63e7a052 diff --git a/gnome-base/gnome-session/files/gnome-session-3.38.0-meson-Support-elogind.patch b/gnome-base/gnome-session/files/gnome-session-3.38.0-meson-Support-elogind.patch deleted file mode 100644 index 37bb6921ed34..000000000000 --- a/gnome-base/gnome-session/files/gnome-session-3.38.0-meson-Support-elogind.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 4454f2a63394b69fba2c900151165ad8b5742f31 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Sun, 15 Mar 2020 14:34:39 +0200 -Subject: [PATCH] meson: Support elogind - ---- - meson.build | 12 +++++++++--- - meson_options.txt | 1 + - 2 files changed, 10 insertions(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index ef5132c6..7f68aaae 100644 ---- a/meson.build -+++ b/meson.build -@@ -124,8 +124,10 @@ enable_systemd = get_option('systemd') - enable_systemd_session = get_option('systemd_session') != 'disable' - use_systemd_session = get_option('systemd_session') == 'default' - enable_systemd_journal = get_option('systemd_journal') -+enable_elogind = get_option('elogind') - enable_consolekit = get_option('consolekit') --if enable_systemd or enable_consolekit -+assert(not (enable_systemd and enable_elogind), 'Can not support systemd and elogind at once') -+if enable_systemd or enable_elogind or enable_consolekit - session_bin_deps += dependency('gio-unix-2.0', version: glib_req_version) - - # Check for systemd -@@ -152,6 +154,10 @@ if enable_systemd or enable_consolekit - endif - - session_tracking = 'systemd' -+ elif enable_elogind -+ libelogind_dep = dependency('libelogind', version: '>= 239.4') -+ session_bin_deps += libelogind_dep -+ session_tracking = 'elogind' - endif - - # Check for ConsoleKit -@@ -161,7 +167,7 @@ if enable_systemd or enable_consolekit - - session_bin_deps += dbus_glib_dep - -- if enable_systemd -+ if enable_systemd or enable_elogind - session_tracking += ' (with fallback to ConsoleKit)' - else - session_tracking = 'ConsoleKit' -@@ -171,7 +177,7 @@ endif - if enable_systemd_session - assert(enable_systemd, 'Systemd support must be enabled when using systemd session management') - endif --config_h.set('HAVE_SYSTEMD', enable_systemd) -+config_h.set('HAVE_SYSTEMD', enable_systemd or enable_elogind) - config_h.set('ENABLE_SYSTEMD_SESSION', enable_systemd_session) - config_h.set('ENABLE_SYSTEMD_JOURNAL', enable_systemd_journal) - config_h.set('HAVE_CONSOLEKIT', enable_consolekit) -diff --git a/meson_options.txt b/meson_options.txt -index 4c05dc6e..512d1528 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,4 +1,5 @@ - option('deprecation_flags', type: 'boolean', value: false, description: 'use *_DISABLE_DEPRECATED flags') -+option('elogind', type: 'boolean', value: true, description: 'Use elogind') - option('session_selector', type: 'boolean', value: false, description: 'enable building a custom session selector dialog') - option('systemd', type: 'boolean', value: true, description: 'Use systemd') - option('systemd_session', type: 'combo', choices: ['disable', 'enable', 'default'], value: 'default', description: 'Whether to include systemd session support and use it by default') --- -2.26.2 - diff --git a/gnome-base/gnome-session/gnome-session-45.0-r1.ebuild b/gnome-base/gnome-session/gnome-session-47.0.1.ebuild index ca065962d0ba..c0cbd4eb0f66 100644 --- a/gnome-base/gnome-session/gnome-session-45.0-r1.ebuild +++ b/gnome-base/gnome-session/gnome-session-47.0.1.ebuild @@ -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 EAPI=8 @@ -9,23 +9,24 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="doc elogind systemd" -# There is a null backend available, thus ?? not ^^ -REQUIRED_USE="?? ( elogind systemd )" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="doc elogind systemd X" + +REQUIRED_USE="^^ ( elogind systemd )" COMMON_DEPEND=" >=dev-libs/glib-2.46.0:2 - >=x11-libs/gtk+-3.22.0:3 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 + X? ( + >=x11-libs/gtk+-3.22.0:3 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + ) >=gnome-base/gnome-desktop-3.34.2:3= >=dev-libs/json-glib-0.10 media-libs/libglvnd[X] media-libs/libepoxy x11-libs/libXcomposite - systemd? ( >=sys-apps/systemd-242:0= ) elogind? ( >=sys-auth/elogind-239.4 ) " @@ -40,7 +41,7 @@ COMMON_DEPEND=" RDEPEND="${COMMON_DEPEND} >=gnome-base/gnome-settings-daemon-3.35.91 >=gnome-base/gsettings-desktop-schemas-0.1.7 - sys-apps/dbus[X] + sys-apps/dbus[elogind=,systemd=,X] x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk @@ -60,7 +61,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-3.38.0-meson-Support-elogind.patch + "${FILESDIR}"/${PN}-46.0-meson-Support-elogind.patch ) src_prepare() { @@ -74,15 +75,11 @@ src_prepare() { src_configure() { local emesonargs=( -Ddeprecation_flags=false - $(meson_use elogind) -Dsession_selector=true # gnome-custom-session - $(meson_use systemd) - -Dsystemd_session=$(usex systemd default disable) - $(meson_use systemd systemd_journal) $(meson_use doc docbook) - -Dsystemduserunitdir="$(systemd_get_userunitdir)" - -Dconsolekit=false -Dman=true + -Dsystemduserunitdir="$(systemd_get_userunitdir)" + $(meson_use X x11) ) meson_src_configure } @@ -115,11 +112,6 @@ pkg_postinst() { ewarn "If you use a custom .xinitrc for your X session," ewarn "make sure that the commands in the xinitrc.d scripts are run." fi - - if ! use systemd && ! use elogind; then - ewarn "You are building without systemd or elogind support." - ewarn "gnome-session won't be able to correctly track and manage your session." - fi } pkg_postrm() { diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest index 7d84d259c11e..442cd6a4106a 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -2,8 +2,8 @@ AUX 42.1-build-Make-wacom-optional-and-controllable-via-meson.patch 1759 BLAKE2B AUX gnome-settings-daemon-3.38.1-build-Allow-NM-optional-on-Linux.patch 694 BLAKE2B e4f32a376c2b1c55a396504e98c8a69d512bb9161a854482aa877023a2761e59d3fc682d724398ffb53bc138b010c33276071359d42ac19bcac2d9af87d42eef SHA512 618ad312b54709d0f95e5d881c2896c156246ae41eee1925f76b0a398b7ce6815a7466f8587f2291b07f7a34d1a3e1afb7df33823d9b52ebe8ad46a3f5f1e84d AUX gnome-settings-daemon-46.0-add-elogind-support.patch 3587 BLAKE2B 764d69f55f5bba44b5198b42b24ae378db7e08a4dd8f52b631691a6158c8599b0f8bd5d4c61695a017e83386eacb9538654afde8638113c9f8ba1c20fff1f737 SHA512 c43ffac9ea61232fde8d503cb2563e3dddf43f5850262ebb0a1a52224ada50bc1cf978a75ab66f12e1e75d3efb3c5bba68991e5e50b5426d4821c0b1d105f39f AUX org.gnome.settings-daemon.plugins.power.gschema.override 75 BLAKE2B 1c80bbb15e998de9f5fddc956dab862552ecc3734083391f124ef577dd2efb70e29efd230511cca83536dcd8c32118ecebcfe52b2927d6f0094540ec73a6ae23 SHA512 9c4b1e1b63b1a6d97eed962969704accca2fc53763a4b7806e2a3e4ff49ecc7d4a0d7f8253ff2e33d83e766908d852721ffa33f363aed7d04c20002bfdee173b -DIST gnome-settings-daemon-45.1.tar.xz 1473256 BLAKE2B 25c114cc1918975247db360f24a9041d019546dd0a0714d19f2409b78ee6e2712d6dc1272eb9a40afb7ed4e973eaa45854322947567b5d54d2761b48a2e812b9 SHA512 ccec193f3f2acdfb5eefda697d6ef2ac0edca18e85d934a83cc34fd5af6c78c56469ffeebbd1c64e8c392462686663c2dd55000bc962beac472580fdfa0717a8 DIST gnome-settings-daemon-46.0.tar.xz 1480952 BLAKE2B 42f2eb46b255e3e44a045b90b7ad98e15836aa3780f04740861c65417dd58e79996481d397f3f482158286c905245ca13dec0ad52770972856ecfd939d06073a SHA512 445e9ee4709af7a67ded55733d4041357995fe9746bcf00fa81f52f6dddc2071e7114e9bf836bcf464bc0f04da3b3c08be04c1942963c1910d1a14b4434f6633 -EBUILD gnome-settings-daemon-45.1-r1.ebuild 3476 BLAKE2B 0bf8ea522050cb745e94009a85444ddc0183f4b73a507ccf35cbd90b5ddb3591b3e6e440fa85b2f08c148cda7d488b41b17c0f9cbaf862ee301a8565a2e158ab SHA512 46f1deccfe2483b3b73a25bbb1a16603b65b8830b9d2a7a41251b95d2aef5fb49e9dcc4afef80bd4fd6126534afa740cd70b31f7e3189f71b6fbd7e35f0ab78c +DIST gnome-settings-daemon-47.2.tar.xz 1480428 BLAKE2B e2f1a2e75aa85a354bdc623c75b4dd995c85b102fa8ca114733290316533b11fc9f99bf13b1921fc745d892ce7a00d5b45a81160a889dbc061ca81bd50bef21f SHA512 fd3e358aa1f6a317dc49436965135dde204bd55fee9c96127d1208aafb60af3667fcc344a1667be1596892987f67ebab3fc7eefaeeefce82e1c65635e36c126f EBUILD gnome-settings-daemon-46.0-r2.ebuild 3636 BLAKE2B eb1c328dc6badc86aa942d7099440acf1a028cc87833cf433553053ae84125ca6cb70a0455f7e355c0173aa31cf6dbfe6ba572c8624c0df6a9f15ae1708aad82 SHA512 505c6086c151dab79cc5f15c829c602785d8ded770536e45d29af4623d403002bc2eca99d0b1d23ff72c1e894b80c3638ee63cbdf71bc9e4fe153430d552dfa6 +EBUILD gnome-settings-daemon-47.2.ebuild 3516 BLAKE2B c8729f52dd83524c796a45e263e9accb5ec16da9106c5f32962eb5d83a871f2f30c530987a49c04e8154daa243214572a94fb24982b0b29c070b88c9a33436fd SHA512 91dfba788e351081dfe5be8be26cb2434042e7f58a3aa62abb7d096c6ca0c1cb0f4afdb29c0db911ea0a95e4a997a64387bb528d78ac6ec61d7d6827ab50957f MISC metadata.xml 663 BLAKE2B 27a0e4135576aeea4c6b962c90d894df06f92b3b015fab78246724ce7ca2f985cfde730f1f9c91f0cc01733f274c0225816e24fac2fca40c585b1a8667fd7d4d SHA512 e21c9dc181f13228662a2a91d7d8e0fedc6270f818a79308e270c9de788011379c155e835534ebb5dbd5f3b07a9e83ec618d9d85f81f46784007b380c6a7ef18 diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-45.1-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-47.2.ebuild index 1ac9c699315f..db29254f2a64 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-45.1-r1.ebuild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-47.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg @@ -11,22 +11,24 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-settings-daemon" LICENSE="GPL-2+ LGPL-2+" SLOT="0" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" + IUSE="+colord +cups debug elogind input_devices_wacom modemmanager networkmanager smartcard systemd test wayland" RESTRICT="!test? ( test )" REQUIRED_USE="^^ ( elogind systemd )" -KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" COMMON_DEPEND=" >=sci-geosciences/geocode-glib-3.10:2 - >=dev-libs/glib-2.58:2 + >=dev-libs/glib-2.70:2 >=gnome-base/gnome-desktop-3.37.1:3= - >=gnome-base/gsettings-desktop-schemas-42 + >=gnome-base/gsettings-desktop-schemas-46.0 >=x11-libs/gtk+-3.15.3:3[X,wayland?] >=dev-libs/libgweather-4.2.0:4= colord? ( >=x11-misc/colord-1.4.5:= ) || ( media-libs/libcanberra-gtk3 - media-libs/libcanberra[gtk3(-)] + >=media-libs/libcanberra-0.25[gtk3(-)] ) >=app-misc/geoclue-2.3.1:2.0 >=x11-libs/libnotify-0.7.3 @@ -53,9 +55,8 @@ COMMON_DEPEND=" x11-libs/libXi x11-libs/libXext media-libs/fontconfig - systemd? ( - >=sys-apps/systemd-243 - ) + elogind? ( >=sys-auth/elogind-209 ) + systemd? ( >=sys-apps/systemd-243 ) " DEPEND="${COMMON_DEPEND} x11-base/xorg-proto @@ -63,7 +64,6 @@ DEPEND="${COMMON_DEPEND} # logind needed for power and session management, bug #464944 RDEPEND="${COMMON_DEPEND} gnome-base/dconf - elogind? ( sys-auth/elogind ) " # rfkill requires linux/rfkill.h, thus linux-headers dep, not os-headers. # If this package wants to work on other kernels, we need to make rfkill conditional instead @@ -104,6 +104,7 @@ src_configure() { local emesonargs=( -Dudev_dir="$(get_udevdir)" $(meson_use systemd) + $(meson_use elogind) -Dalsa=true -Dgudev=true -Dgcr3=false diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest index 756e518d9487..972bdc38ad09 100644 --- a/gnome-base/gnome-shell/Manifest +++ b/gnome-base/gnome-shell/Manifest @@ -1,12 +1,7 @@ -AUX 37e49e8a22c223b030297f9607bdb748c219e060.patch 1613 BLAKE2B 5e9b6206c720bdf6e60c0e89225e094fdda56e6977c78ac8dc694796a3a80ba752461a0288905313aed01b1d7839e53ac9ecf8ca8e7586d317013667f344ee36 SHA512 770c05f6a7de722806508bfdf5637dd87c1f982ed2593b69c45c928e656e2c566857e2433762879922579e643487a25720ef22a0250e0711cf52c8cf6c65f48a -AUX 40.0-defaults.patch 1412 BLAKE2B e36f7215cf756586479b8bdc71339beb3bbde53ca9745ddc4ef1c3feb59c720e4920e8aa4aadd7912874c386e7495a4b5d554e0d0616db17a81c4ec52a2baa6b SHA512 d82cf1e329d5974755738e29e6366bb10452620021a5db6c2ec63c4ee38e87a65dada34d57026e9510dbffa78c7060ae6f2ccec1739e3026bb0c67dab95f94a9 AUX 46.4-defaults.patch 934 BLAKE2B 597b3e4e844c37e1ea5f2a8c58a702b61b3d9051a26187aa5c5c1bfaf7a85d94afa32144d35954f17d09ce33c22e3906e3548ce84b16e16fcc6ce7d3b5b8bf0d SHA512 ae6309d0af3aed265ae47a4f92f7bd6bb8bf2ade36e52b1b2cc5dc45cd0603e92f32fbde8e7b2296e4d02f431488a2484ee465945043cbd321b899218341dc2f -DIST gnome-shell-45.5.tar.xz 2016720 BLAKE2B a6c28a698a59724ef2381546110caeafd7d9a4541e8046e1d562bc2762660a979fb3b83d0823690fba912ebd2240df746f83e37b2fd722c9a54e038776afbef7 SHA512 4c463635cff3b640ed88f9ada542c98ea6f803c31bce6f67dca2e054ea8cdc1de764d7695bd9365b97d59bd04ad54043b858f26b4553f7a7eff9943d2ffb995b -DIST gnome-shell-45.6.tar.xz 2016488 BLAKE2B 6590c160eabae21e1f5a79787113d02950db52b052330beb9b82d4b837ad7f9038c3c5ae2671c6688710d625a348f9b65b360d53e8d635824ce91be47cc73923 SHA512 7e8ce152cc9fa6374d45cb3163ea8a56db7386c924cfc0799c4d5aec6285e50c7fc8555dd2b8d702fc33f3206027aa2711bbbc1a1e782eaa24e9003e69d7a843 -DIST gnome-shell-46.4.tar.xz 2046736 BLAKE2B d511524cf097888df429589ed48973e06395922d3631a2ecc594f90822a8f7c6b53c16c812aece35d7971214603d318a79e6f13a135f7fe43674eebd8376f1f1 SHA512 cf024e90835084d017f5bf866c802ff9b657d5f69af64af5b60b649d591bc8ea74ad48fe625e7691d9132ca288138f1a5a70482a41ca9864cb294c128ecc47b9 DIST gnome-shell-46.7.tar.xz 2049252 BLAKE2B 5dc0aa3bee1e7a92e0abcff8dd9381c9e94d4fcc0e12116a37481486a1f7535b536138ddd52df18ca5e7a9dbfb65e5534e63d202132dfcbe11b509f9895819c9 SHA512 7d889d72d1d1893727a0e415772d31d414cc4991205a441ecc24863ddc7768b851a83ca3365a6819f4d645ad6057ce6f9a4b810136c5ee461f4b55a5360df740 -EBUILD gnome-shell-45.5.ebuild 6622 BLAKE2B 873d703c22fa68390f381c29c86cbc87677b76ef52521e108fb41abf4bd084e19d548734469dcd39f23d6e7a7d3245cd83efa05702ca514994e581bd79a3433e SHA512 e4d05f4d3fdecb80aef9b0de8c080b880ee5bb470681ba52d4400de14dd585ffa5b839b0f585dfe8de452d8801f7b6899e4ee0f155d38913b069c3b235f1a23b -EBUILD gnome-shell-45.6-r1.ebuild 6751 BLAKE2B c7204282b146c14511c90c9b2ff6af1ef9484b6514d1b9b22781d671a45e86e9082e31bdd8662859009863934620b7a2b2a2bc07e6ed100944c8750c16028d50 SHA512 50411bfb7f968ae18ad06e3a4a22d5a6d05ab1670d2660117db873ddf0bc2c2583e14692cba7640386375f590c80ae4d3c583e7ddaca939fb1ae967ce67fc5ab -EBUILD gnome-shell-46.4.ebuild 6619 BLAKE2B 116962b79e3e239d886c5360f1c3dd780971a69a17aab223de62ce6d2ffa5064e4fb79bf4d7eadcf6f314608f837ffc617d20a2c1dc1a5c13afb6162ba256573 SHA512 489c4a1910bb9de34b7fa49c810391d74c14767a7a10ef01e734f561713b0d97894817fbf48bb1764e08ecaedb601b85a4635190965d9ee772aec7ad1d19d1a6 +DIST gnome-shell-47.3.tar.xz 2135184 BLAKE2B 9dd2857c7a0a1f6615407b0087ff60d641eb7433276269218cf67de5df42a4dc1155147dcb870319f9758fe8618170dd98119f0d1038db965c69960119f20d8f SHA512 d9d553ec0ccdd98fb7878b7bd7f64f966320d34df75c10967c85ceb79edf13a70d0c0898abdc46f3c790246dc387b4586dbfd0cc47ef321ab858f5c4863cc6e2 EBUILD gnome-shell-46.7.ebuild 6573 BLAKE2B 0d03d15aa30a1001ee83e361ccbf1b5a6618e541a30cc71fcb25c61814568ae31fc8df76c319c5a8e95a511413e4f2a07ea982d110673979618bd6d17a54290d SHA512 fc6eccf7c8f9ecfd8df62380bf8d5e1822be627b493868a0088b499f28662d3cdc30dba08807bec068792aee8491d77f062ed5348c3ea1c8ff8e6cf058c969d9 +EBUILD gnome-shell-47.3-r1.ebuild 6636 BLAKE2B a2d4b882931d21f0acfca717fa312bd58c47db2f6c2a30a00f8910dee9c0dcc2c4d5b565f9b33845f4502a0515352583c33c0b4aba730d0fed05478cc923c7e5 SHA512 527590c7258a900df8c74ee523c815beb966ce8f4a46d8c5a1eda2b005d5253a5382b2a75ccd06c95e450d4fbd4347bf741f15cb3effb70f0376349004799679 +EBUILD gnome-shell-47.3.ebuild 6633 BLAKE2B 8ff6a35c27a1f40b5a83d87b8c516a0f57aa8ac9abe30bcf3eff5a35c766c629c3877c6321076a6aab76011eb943844fdcb0e415415d8474c695170407bd1c9f SHA512 fdd6fb156000044d112da5180cf8d7dd0cd34f59a07d6f4cbc1ab05f09d13e92336546238472cabc7304db459a9b1b280c009d61d296e0c70257333469c105ff MISC metadata.xml 1032 BLAKE2B 2089aace6c8db78bc28c445d9eac949fcea533a9abc26b05430d5e4a11a7bd57ffd00cb8b2edefdd3aa0c0f46e56e573e8f2f544b9e205685877fba957a29de0 SHA512 44e5d05ff803a3fdffe9ad9942da3197150da07e6097f0f92ab9f6b8209b6337149da0a4c535950c879e3184615b2d68a866c1a34d7f2ecdb69810dd5ba0fbd9 diff --git a/gnome-base/gnome-shell/files/37e49e8a22c223b030297f9607bdb748c219e060.patch b/gnome-base/gnome-shell/files/37e49e8a22c223b030297f9607bdb748c219e060.patch deleted file mode 100644 index d56db89bbacd..000000000000 --- a/gnome-base/gnome-shell/files/37e49e8a22c223b030297f9607bdb748c219e060.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 37e49e8a22c223b030297f9607bdb748c219e060 Mon Sep 17 00:00:00 2001 -From: Philip Withnall <pwithnall@gnome.org> -Date: Tue, 28 May 2024 18:08:27 +0100 -Subject: [PATCH] shell-camera-monitor: Fix warning about strict aliasing -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Changing type when casting a double pointer is not strictly allowed in -C. In order to fix compilation with `-fstrict-aliasing`, don’t use -`g_clear_pointer()` for clearing this pointer where the type expected by -the destroy notify function does not match the type stored in the -`ShellCameraMonitor` struct. - -This introduces no functional changes. - -Signed-off-by: Philip Withnall <pwithnall@gnome.org> -Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3351> ---- - src/shell-camera-monitor.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/shell-camera-monitor.c b/src/shell-camera-monitor.c -index 1e2e0f14569..b2e6e0b2af2 100644 ---- a/src/shell-camera-monitor.c -+++ b/src/shell-camera-monitor.c -@@ -298,7 +298,11 @@ shell_camera_monitor_disconnect_core (ShellCameraMonitor *monitor) - g_clear_handle_id (&monitor->delayed_disable_id, g_source_remove); - - spa_hook_remove (&monitor->registry_listener); -- g_clear_pointer ((struct pw_proxy**) &monitor->registry, pw_proxy_destroy); -+ if (monitor->registry != NULL) -+ { -+ pw_proxy_destroy ((struct pw_proxy *) monitor->registry); -+ monitor->registry = NULL; -+ } - spa_hook_remove (&monitor->core_listener); - g_clear_pointer (&monitor->core, pw_core_disconnect); - } --- -GitLab - diff --git a/gnome-base/gnome-shell/files/40.0-defaults.patch b/gnome-base/gnome-shell/files/40.0-defaults.patch deleted file mode 100644 index 012514100e09..000000000000 --- a/gnome-base/gnome-shell/files/40.0-defaults.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 1179f970e4b165ac6daf22d0e3b61df4879f3438 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Tue, 10 Dec 2013 23:33:51 +0100 -Subject: [PATCH 1/2] Alter list of default applications - -Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org> -[Updated to include desktop file renames to reverse DNS and 3.36 changes] -Signed-off-by: Mart Raudsepp <leio@gentoo.org> ---- - data/org.gnome.shell.gschema.xml.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in -index cd6a2356d..6200df11c 100644 ---- a/data/org.gnome.shell.gschema.xml.in -+++ b/data/org.gnome.shell.gschema.xml.in -@@ -50,7 +50,7 @@ - </description> - </key> - <key name="favorite-apps" type="as"> -- <default>[ 'org.gnome.Epiphany.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default> -+ <default>[ 'chromium-browser-chromium.desktop', 'firefox.desktop', 'firefox-bin.desktop', 'org.gnome.Evolution.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default> - <summary>List of desktop file IDs for favorite applications</summary> - <description> - The applications corresponding to these identifiers --- -2.26.2 - diff --git a/gnome-base/gnome-shell/gnome-shell-45.6-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-45.6-r1.ebuild deleted file mode 100644 index c9c3acd73caa..000000000000 --- a/gnome-base/gnome-shell/gnome-shell-45.6-r1.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) - -inherit gnome.org gnome2-utils meson optfeature python-single-r1 virtualx xdg - -DESCRIPTION="Provides core UI functions for the GNOME desktop" -HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell https://gitlab.gnome.org/GNOME/gnome-shell" - -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" -IUSE="elogind gtk-doc +ibus +networkmanager pipewire systemd test" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - ?? ( elogind systemd )" -RESTRICT="!test? ( test )" - -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" - -# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h> -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-45.0:0/13[introspection,test?] - >=sys-auth/polkit-0.120_p20220509[introspection] - >=gnome-base/gsettings-desktop-schemas-42_beta[introspection] - >=x11-libs/startup-notification-0.11 - >=app-i18n/ibus-1.5.19 - >=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-libs/libxslt - >=dev-util/gdbus-codegen-2.45.3 - dev-util/glib-utils - gtk-doc? ( >=dev-util/gtk-doc-1.17 - 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}"/40.0-defaults.patch - # backport fix for strict-aliasing violation with USE=pipewire - "${FILESDIR}"/37e49e8a22c223b030297f9607bdb748c219e060.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 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 -} diff --git a/gnome-base/gnome-shell/gnome-shell-45.5.ebuild b/gnome-base/gnome-shell/gnome-shell-47.3-r1.ebuild index 704c07339fef..9cb0e9ecdd72 100644 --- a/gnome-base/gnome-shell/gnome-shell-45.5.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-47.3-r1.ebuild @@ -1,36 +1,36 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit gnome.org gnome2-utils meson optfeature python-single-r1 virtualx xdg DESCRIPTION="Provides core UI functions for the GNOME desktop" -HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell https://gitlab.gnome.org/GNOME/gnome-shell" +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 )" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" - # libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h> 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] + >=dev-libs/gjs-1.73.1[cairo(+)] >=gui-libs/gtk-4:4[introspection] - >=x11-wm/mutter-45.0:0/13[introspection,test?] + >=x11-wm/mutter-47.0:0/15[introspection,test?] >=sys-auth/polkit-0.120_p20220509[introspection] - >=gnome-base/gsettings-desktop-schemas-42_beta[introspection] - >=x11-libs/startup-notification-0.11 + >=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] @@ -119,6 +119,7 @@ BDEPEND=" >=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 @@ -133,7 +134,7 @@ BDEPEND=" PATCHES=( # Change favorites defaults, bug #479918 - "${FILESDIR}"/40.0-defaults.patch + "${FILESDIR}"/46.4-defaults.patch ) src_prepare() { @@ -152,6 +153,7 @@ src_configure() { -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 diff --git a/gnome-base/gnome-shell/gnome-shell-46.4.ebuild b/gnome-base/gnome-shell/gnome-shell-47.3.ebuild index e9129bd020c0..edd7e0961ca1 100644 --- a/gnome-base/gnome-shell/gnome-shell-46.4.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-47.3.ebuild @@ -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 EAPI=8 @@ -7,11 +7,11 @@ PYTHON_COMPAT=( python3_{10..13} ) inherit gnome.org gnome2-utils meson optfeature python-single-r1 virtualx xdg DESCRIPTION="Provides core UI functions for the GNOME desktop" -HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell https://gitlab.gnome.org/GNOME/gnome-shell" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-shell" LICENSE="GPL-2+ LGPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" IUSE="elogind gtk-doc +ibus +networkmanager pipewire systemd test" REQUIRED_USE="${PYTHON_REQUIRED_USE} @@ -22,14 +22,15 @@ RESTRICT="!test? ( test )" DEPEND=" >=gnome-extra/evolution-data-server-3.46.0:= >=app-crypt/gcr-3.90.0:4=[introspection] - >=dev-libs/glib-2.79.2:2 + >=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-46.0:0/14[introspection,test?] + >=x11-wm/mutter-47.0:0/15[introspection,test?] >=sys-auth/polkit-0.120_p20220509[introspection] - >=gnome-base/gsettings-desktop-schemas-46_beta[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] @@ -152,6 +153,7 @@ src_configure() { -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 diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest index 44a621333135..f35ce2163991 100644 --- a/gnome-base/gvfs/Manifest +++ b/gnome-base/gvfs/Manifest @@ -1,5 +1,5 @@ -DIST gvfs-1.52.2.tar.xz 1232776 BLAKE2B 70d17e849f2741da299f363b6b4ec7607b3c30e92efbc05f68ad8445dc18615e4e6c584e3cc595a42d12cd899502fde62e1ebb7ba7fe0681b5d5c2e9d45b7314 SHA512 85684625822a1dcaa2258b7e8389ef53769850d05b7b2538a1335c9e16b882a08a5a33131779a132a2bf7ed23875f16791238fcdebc9cf3e543050d64aee8331 DIST gvfs-1.52.3.tar.xz 1233584 BLAKE2B 056e548442b9d149fcd82f0a9b62dc2c7cab5528d3b19f5b8d5f36d1c4d590e91a12f02b1b8660ca4d7ea08eef47f444d749e8258404b4462d6cf9b17e14b8b0 SHA512 7116d79db932d7d6388f3b292f1ab28926679bbbf4a59ec2eb5a4c5da4df26c94d9972e105a7c8b64fb1aa4ee2f928817766be3ffc63ed50d8bb9273a489566c -EBUILD gvfs-1.52.2.ebuild 3872 BLAKE2B 92c8164ee1a641a279752abcf066f4321263721393d03ef79994b2e4fcc6bb5b9f22bade8b9a34b37d2b5506d6f1cd910137debf3c07108dbac8f69fbf360d4e SHA512 28c2c2f5883dd3a05e52ea6fec692a66d11a9a0171e4fcc5c596f7f3cd4a615e954c307c69139c711c5946540a26d0129a02726b9c3647685903b44e5dd696d6 +DIST gvfs-1.56.1.tar.xz 1266412 BLAKE2B e9249a89b7af4633dd407d068ae0b07258340bc2fc52d6bba4758ef26b876d06b5ecfda96d53194e69d1cd2b6587beab5104012bd6988a223149d4135a7cfef8 SHA512 09a6fef47c7689437bb6ddf98baf228c25731e82ac6165838c55c8255c2079795e5bb824983a691c976875b2a086c46246a65979c54fdebb41a241ad983c3c33 EBUILD gvfs-1.52.3.ebuild 3872 BLAKE2B 92c8164ee1a641a279752abcf066f4321263721393d03ef79994b2e4fcc6bb5b9f22bade8b9a34b37d2b5506d6f1cd910137debf3c07108dbac8f69fbf360d4e SHA512 28c2c2f5883dd3a05e52ea6fec692a66d11a9a0171e4fcc5c596f7f3cd4a615e954c307c69139c711c5946540a26d0129a02726b9c3647685903b44e5dd696d6 -MISC metadata.xml 1857 BLAKE2B ecd1ccd9d258829723b274a45c4d831755032988e60edad0294c2c313addd274f4f9c7b3b3fb6db4e705a9694dd07f5963440b1bed00a51a4266b6f1c638d11b SHA512 8f45e74dbd38fdfbae9bd51734ffdc516f2fd55ed964d03bd3ee8bb809bf0d858d7b93bc17894a446d5e4a4299da4cc65062d52f49cf4cb60c72d26d45d26dc1 +EBUILD gvfs-1.56.1.ebuild 4154 BLAKE2B 8118425aa69df1ad55af7b59853af706d26e644599502fe4b8b012ddf5d587a7840cb1916c7a24952909fef06607d49ef14550ce261adca2946ef70d85dc841c SHA512 e424e12fe1926cb783e60605db9c2ab26b8801103f9a433bbcc292e10e63b10675215bbd3a03065829613bc028dcfb450174b6ac0a4e877386e5c349064509e3 +MISC metadata.xml 1947 BLAKE2B 21e091b06522ec3bb25c5f07034d03c8a3f7e62bfbd5fc0fa58654619954e7a363bbfd2e56de596aba035081f8b5f39f838f296b1931e54d8025fe3c4ffd1618 SHA512 0d6d91562b4aed4dba57d61a62d872477de8f8d0fad433cb5c68415e9ed2938f295b43be81b60189c93072548afd12850c2b5493d3aa24a4c72273dfd67104ec diff --git a/gnome-base/gvfs/gvfs-1.52.2.ebuild b/gnome-base/gvfs/gvfs-1.56.1.ebuild index e1064f06ee3c..f947588a0376 100644 --- a/gnome-base/gvfs/gvfs-1.52.2.ebuild +++ b/gnome-base/gvfs/gvfs-1.56.1.ebuild @@ -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 EAPI=8 @@ -7,12 +7,13 @@ TMPFILES_OPTIONAL=1 inherit gnome.org gnome2-utils meson systemd tmpfiles xdg DESCRIPTION="Virtual filesystem implementation for GIO" -HOMEPAGE="https://wiki.gnome.org/Projects/gvfs" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gvfs" LICENSE="LGPL-2+" SLOT="0" -IUSE="afp archive bluray cdda elogind fuse google keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="afp archive bluray cdda cdr elogind fuse google keyring gnome-online-accounts gphoto2 +http ios mtp nfs onedrive policykit samba systemd test +udev udisks zeroconf" RESTRICT="!test? ( test )" # elogind/systemd only relevant to udisks (in v1.38.1) REQUIRED_USE=" @@ -20,17 +21,17 @@ REQUIRED_USE=" cdda? ( udev ) google? ( gnome-online-accounts ) gphoto2? ( udev ) + onedrive? ( gnome-online-accounts ) mtp? ( udev ) udisks? ( udev ) " -KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" RDEPEND=" >=dev-libs/glib-2.70.0:2 >=gnome-base/gsettings-desktop-schemas-3.33.0 afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) sys-apps/dbus - app-crypt/gcr:0= + app-crypt/gcr:4= policykit? ( >=sys-auth/polkit-0.114 sys-libs/libcap @@ -68,6 +69,10 @@ RDEPEND=" google? ( >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) nfs? ( >=net-fs/libnfs-1.9.8:= ) + onedrive? ( + >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] + >=net-libs/msgraph-0.2.0 + ) virtual/openssh " DEPEND="${RDEPEND}" @@ -109,7 +114,9 @@ src_configure() { $(meson_use ios afc) $(meson_use afp) $(meson_use archive) + $(meson_use cdr burn) $(meson_use cdda) + -Ddeprecated_apis=false $(meson_use zeroconf dnssd) $(meson_use gnome-online-accounts goa) $(meson_use google) @@ -117,6 +124,7 @@ src_configure() { $(meson_use http) $(meson_use mtp) $(meson_use nfs) + $(meson_use onedrive) -Dsftp=true $(meson_use samba smb) $(meson_use udisks udisks2) @@ -134,6 +142,8 @@ src_configure() { -Dinstalled_tests=false -Dman=true -Dprivileged_group=wheel + # wsdd not in gentoo repository + -Dwsdd=false ) meson_src_configure } diff --git a/gnome-base/gvfs/metadata.xml b/gnome-base/gvfs/metadata.xml index 0e61567481be..f5a7da3e44c2 100644 --- a/gnome-base/gvfs/metadata.xml +++ b/gnome-base/gvfs/metadata.xml @@ -23,6 +23,7 @@ <flag name="google">Enables support for accessing Google accounts via <pkg>dev-libs/libgdata</pkg></flag> <flag name="http">Enable the HTTP/DAV backend using <pkg>net-libs/libsoup</pkg></flag> <flag name="nfs">Enable NFS client support via <pkg>net-fs/libnfs</pkg>.</flag> + <flag name="onedrive">Enable Onedrive backend via <pkg>net-libs/msgraph</pkg>.</flag> <flag name="udev">Enable udev base replacement code for cdda feature</flag> </use> <upstream> diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest index e9ef34a34a6b..f65d9eb341ff 100644 --- a/gnome-base/nautilus/Manifest +++ b/gnome-base/nautilus/Manifest @@ -1,8 +1,6 @@ AUX 43.0-optional-gstreamer.patch 1269 BLAKE2B 2a4599771977e44f9e1b25d2334f838a2016d1bfd6eea48c004ce410442ec12152e69efec389b6d373d1e187f00b78ac3fd617f4992e90acaf69a5a3325b7a2d SHA512 7f578859a3c8100f4d8783851b91a40c1c3d2d702851772e91bb08bade7802271ffa0524861e968004c6ea6450060da0ca6cf917808c4542ad5853bcb7d3ae45 -AUX 45.2.1-better-icon-lookup-fallback.patch 4262 BLAKE2B 0a472471f2032c32013d53afe31b55b5f2496035d0af949687a73d082bc0cc5d63c6e74bc92dc4eb845005d6829ea07bd7d2adfe7d5f1781c1da6f1116187dd8 SHA512 c2d0dc6b51ac39ce8cd27a36a6257a36481c86ba4ecdd2ad0317fcf2f718286a13f3625c1f795fbaec37fb499f95ee7521e438d80f5dd9de50c728b14078d4ee -AUX 45.2.1-fix-av-props-crash.patch 1345 BLAKE2B 14f48ec5adf2d4c7935a302f81c34f503eb62774f0c9a4b4b0321e175242bf332867c8815854331476278b4f1de3893c7b82d434e0ec558ce97e5d0718cc69dd SHA512 6331a246143991b2798600e49275e2e0d4c21ad1b5000e51b47eb3c4c79cf4f0659c00ae1c40d95f312a9d20d3e70faa283a6489bcd32143460a2dbe3b7c7d68 -DIST nautilus-45.2.1.tar.xz 3208272 BLAKE2B 80adf7ace00c21d21eddf764595c3f981e6206b936996458e5c2cc9cc51536e759528bdc38d1cddfe1c87eb94eac0ef2ced714ae797db947b81199a4bfa41c9d SHA512 c1e26e9f802f62ccb7a7d60f895575a1b31d8071f6a60206472fe79f70d64717b9abe97a5c5c0c87349994ff6f144dfe97c7bd448a05a9da00ff9918884e65fa DIST nautilus-46.2.tar.xz 3238060 BLAKE2B 6a3d79632a70d1bee969d5c71dbc2b64ae2365eff2fdc0dbe8f6030d20488c3bf3321750e0613f676912ee324a33136de805ae841a0841e7aef071582d7e2092 SHA512 6613342d7904a5516bd0035b72b6071cebcb1aba6083f0bbcb4e939acf74b9bb1a407090b91a2a8b73f00eb236d0d3a4a8e288681bfc63a31672b85326019150 -EBUILD nautilus-45.2.1-r1.ebuild 3733 BLAKE2B 08e1b1a703a659c6884cf72d50f25a098b33bb924ab07e90962c158be11a5d7ce6614ae1bb0c915f12e045618c4a997e561f0dee03059e0cc3a065baf3a83492 SHA512 c769ed474a91f6a94d1c6971912fd713ed09d6f3ee6bd9149b0f6809d170698be776aae37fdfd89a7c293c31d9396dfee07965ce301cf0e24633ebdd2b50710d +DIST nautilus-47.1.tar.xz 3262924 BLAKE2B e5e889445a8ce0518a052aa3917da12d3b53da739c72b8fa22a9687bb5c90998f023b2e8ca334729bf0fd3bb70015afb318bb1d03185947dd8ee349dc58e5d46 SHA512 132139aa3d39d220ec5edf112bda97a0dd0c5f5978f7390f897679b78d30efeab63e6330ef1f9593c193f28d96919621ff4fe5a66992ee1f10b69ab9a240255b EBUILD nautilus-46.2.ebuild 3293 BLAKE2B 2cb909af2fa9163b4e066f37f418b0c5e8b255d691fe8bce02362b59328be32f9a600572f91f56f40405576f77502cf4047ad611e5a6b56f44d0d1f048ab615a SHA512 a4b69432927155cd245ea247f8f24cc3691998f2e0b9aa07a9555e1551935160e6963d343f9de361150a94952f56f5e80157ed08f6f5df641a1e44bf0d9f5b30 -MISC metadata.xml 735 BLAKE2B 45a5510704506c6dd881fe6a653002b99eb6746d886e957022089028642969eb184001fc9d8a224bc8d699515399196088351fada65bf3c5d7085241c2be5ee4 SHA512 9f788fafb7965d95451f7f8d3bbde2357c149e2781368056893975f34f8b3e339e8b5016802c39b4bf5575649a071cd2a08185c9aae0bdb33c7a3a86b81d0353 +EBUILD nautilus-47.1.ebuild 3402 BLAKE2B eec9b748f2c41011488958da1359e8c3dd3773c2f1edb557ec8fcdede026b72e88eeaba86cfef49c1296cb72ff739eccd046b04078de31690956debee2282544 SHA512 014bd8792dea6816b0feafbe7b4a72fbe986eb9a304bb30fd3f55efab8be53b667f97d70ddc148504ae32ac6242735c91ea644e8550435b3f704e29bd9bd0165 +MISC metadata.xml 624 BLAKE2B 1ffd7ab6caaa08a41067e1e9c8f80d421803d1bf231be65cbc51b29657aed1201ae25f830dc2de1314a38e8012174261278e74d89e4f2eee8d6777638c64c89a SHA512 22bcc3581c0366df2ced88714dfdd54161e33f98d3ad38d7b2d16163f0246b6fec4ed58368ce3c7e97a17812706a111df790c109503abc1f727403cb8a28750e diff --git a/gnome-base/nautilus/files/45.2.1-better-icon-lookup-fallback.patch b/gnome-base/nautilus/files/45.2.1-better-icon-lookup-fallback.patch deleted file mode 100644 index ba7f970d7f28..000000000000 --- a/gnome-base/nautilus/files/45.2.1-better-icon-lookup-fallback.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 95befc684c535e251278ccc68b06261c2620271d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org> -Date: Sun, 10 Dec 2023 17:01:18 +0000 -Subject: [PATCH 1/2] icon-info: Don't ask the theme for an icon it doesn't - have - -GtkIconTheme changed behavior from GTK3 to GTK4. Before, it would -return NULL for a non-existent icon. Now it returns a non-scallable -`image-missing` icon. - -But our icon info code still relies on NULL icon to set a fallback. - -The documented solution to get the old behavior back is to call -gtk_icon_theme_has_gicon(). Let's just do that instead. - -Also use a more generic fallback icon that's been available in -adwaita-icon-theme for a few versions before our GTK4 port. - -Closes https://gitlab.gnome.org/GNOME/nautilus/-/issues/2796 - - -(cherry picked from commit 7de816f8a2019adec468cf39073fcd5bb922512f) ---- - src/nautilus-file.c | 2 +- - src/nautilus-icon-info.c | 7 ++++--- - src/nautilus-properties-window.c | 2 +- - 3 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/src/nautilus-file.c b/src/nautilus-file.c -index 0492e2f87..b469288a3 100644 ---- a/src/nautilus-file.c -+++ b/src/nautilus-file.c -@@ -4706,7 +4706,7 @@ get_default_file_icon (void) - static GIcon *fallback_icon = NULL; - if (fallback_icon == NULL) - { -- fallback_icon = g_themed_icon_new ("text-x-generic"); -+ fallback_icon = g_themed_icon_new ("application-x-generic"); - } - - return fallback_icon; -diff --git a/src/nautilus-icon-info.c b/src/nautilus-icon-info.c -index c6b1e9a92..a7f3243d6 100644 ---- a/src/nautilus-icon-info.c -+++ b/src/nautilus-icon-info.c -@@ -395,13 +395,14 @@ nautilus_icon_info_lookup (GIcon *icon, - return g_object_ref (icon_info); - } - -- icon_paintable = gtk_icon_theme_lookup_by_gicon (gtk_icon_theme_get_for_display (gdk_display_get_default ()), -- icon, size, scale, GTK_TEXT_DIR_NONE, 0); -- if (icon_paintable == NULL) -+ GtkIconTheme *theme = gtk_icon_theme_get_for_display (gdk_display_get_default ()); -+ if (!gtk_icon_theme_has_gicon (theme, icon)) - { - return nautilus_icon_info_new_for_paintable (NULL, scale); - } - -+ icon_paintable = gtk_icon_theme_lookup_by_gicon (theme, icon, size, scale, GTK_TEXT_DIR_NONE, 0); -+ - if (G_IS_THEMED_ICON (icon)) - { - ThemedIconKey lookup_key; -diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c -index 08bf91fcb..6a6dcc362 100644 ---- a/src/nautilus-properties-window.c -+++ b/src/nautilus-properties-window.c -@@ -570,7 +570,7 @@ get_image_for_properties_window (NautilusPropertiesWindow *self, - - if (!icon) - { -- g_autoptr (GIcon) gicon = g_themed_icon_new ("text-x-generic"); -+ g_autoptr (GIcon) gicon = g_themed_icon_new ("application-x-generic"); - - icon = nautilus_icon_info_lookup (gicon, NAUTILUS_GRID_ICON_SIZE_MEDIUM, icon_scale); - } --- -2.43.0 - - -From 038885de47293a3fd2a15410d7cf3e0d36406a0d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org> -Date: Wed, 13 Dec 2023 00:13:35 +0000 -Subject: [PATCH 2/2] icon-info: Fix build - -Previous commit relied on mixing declarations with code, which is not allowed with the build flags of this branch. - -(cherry picked from commit deed9bcab051529e64e3fc1870f299233b8c200e) ---- - src/nautilus-icon-info.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/nautilus-icon-info.c b/src/nautilus-icon-info.c -index a7f3243d6..f18d574d6 100644 ---- a/src/nautilus-icon-info.c -+++ b/src/nautilus-icon-info.c -@@ -333,6 +333,7 @@ nautilus_icon_info_lookup (GIcon *icon, - { - NautilusIconInfo *icon_info; - g_autoptr (GtkIconPaintable) icon_paintable = NULL; -+ GtkIconTheme *theme; - - if (G_IS_LOADABLE_ICON (icon)) - { -@@ -395,7 +396,7 @@ nautilus_icon_info_lookup (GIcon *icon, - return g_object_ref (icon_info); - } - -- GtkIconTheme *theme = gtk_icon_theme_get_for_display (gdk_display_get_default ()); -+ theme = gtk_icon_theme_get_for_display (gdk_display_get_default ()); - if (!gtk_icon_theme_has_gicon (theme, icon)) - { - return nautilus_icon_info_new_for_paintable (NULL, scale); --- -2.43.0 - diff --git a/gnome-base/nautilus/files/45.2.1-fix-av-props-crash.patch b/gnome-base/nautilus/files/45.2.1-fix-av-props-crash.patch deleted file mode 100644 index e1136fb196c9..000000000000 --- a/gnome-base/nautilus/files/45.2.1-fix-av-props-crash.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 6836526d6c95107f0bcdcf628ab2dfed394541a5 Mon Sep 17 00:00:00 2001 -From: Peter Eisenmann <p3732@getgoogleoff.me> -Date: Sat, 9 Dec 2023 14:40:52 +0100 -Subject: [PATCH] properties-window: fix extension callback signature - -This was added in [1] with an incorrect signature. - -Relates to #3160 - -[1] bc4dfddd80544092483fb058c946716ea4fc47f1 - - -(cherry picked from commit 8d51206503304ff62ca5eeba30ef3b29cdc50820) ---- - src/nautilus-properties-window.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c -index 14c8f74213..08bf91fcb7 100644 ---- a/src/nautilus-properties-window.c -+++ b/src/nautilus-properties-window.c -@@ -925,10 +925,10 @@ create_extension_group_row (NautilusPropertiesItem *item, - } - - static void --navigate_extension_model_page (AdwPreferencesRow *row, -- GParamSpec *params, -- NautilusPropertiesWindow *self) -+navigate_extension_model_page (AdwPreferencesRow *row, -+ gpointer user_data) - { -+ NautilusPropertiesWindow *self = NAUTILUS_PROPERTIES_WINDOW (user_data); - GListModel *list_model = g_object_get_data (G_OBJECT (row), "nautilus-extension-properties-model"); - AdwNavigationPage *page; - --- -GitLab - diff --git a/gnome-base/nautilus/metadata.xml b/gnome-base/nautilus/metadata.xml index b905953fa288..6ba4191d28fa 100644 --- a/gnome-base/nautilus/metadata.xml +++ b/gnome-base/nautilus/metadata.xml @@ -9,7 +9,6 @@ <flag name="cloudproviders">Enable the cloudproviders support</flag> <flag name="gstreamer">Enable the Audio/Video file properties page</flag> <flag name="previewer">Use <pkg>gnome-extra/sushi</pkg> to preview files from the file mananger</flag> - <flag name="sendto">Enable the nautilus-sendto extension to send files to various locations/devices</flag> </use> <upstream> <remote-id type="gnome-gitlab">GNOME/nautilus</remote-id> diff --git a/gnome-base/nautilus/nautilus-45.2.1-r1.ebuild b/gnome-base/nautilus/nautilus-47.1.ebuild index 64e21fdb42a6..4e8b926e0059 100644 --- a/gnome-base/nautilus/nautilus-45.2.1-r1.ebuild +++ b/gnome-base/nautilus/nautilus-47.1.ebuild @@ -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 EAPI=8 @@ -10,13 +10,14 @@ HOMEPAGE="https://apps.gnome.org/Nautilus/" LICENSE="GPL-3+ LGPL-2.1+" SLOT="0" -IUSE="+cloudproviders gnome +gstreamer gtk-doc +introspection +previewer selinux sendto" -REQUIRED_USE="gtk-doc? ( introspection )" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + +IUSE="+cloudproviders doc gnome +gstreamer +introspection +previewer selinux" +REQUIRED_USE="doc? ( introspection )" DEPEND=" - >=dev-libs/glib-2.77.0:2 + >=dev-libs/glib-2.79.0:2 >=media-libs/gexiv2-0.14.2 >=x11-libs/gdk-pixbuf-2.30.0:2 gstreamer? ( media-libs/gstreamer:1.0 @@ -24,13 +25,12 @@ DEPEND=" >=app-arch/gnome-autoar-0.4.4 >=gnome-base/gnome-desktop-43:4= >=gnome-base/gsettings-desktop-schemas-42 - >=gui-libs/gtk-4.11.2:4[introspection?] - >=gui-libs/libadwaita-1.4_alpha:1 - >=dev-libs/libportal-0.5:=[gtk] + >=gui-libs/gtk-4.15.2:4[introspection?] + >=gui-libs/libadwaita-1.6_beta:1 + >=dev-libs/libportal-0.7:=[gtk] >=x11-libs/pango-1.28.3 selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-3.0:3 - >=dev-libs/libxml2-2.7.8:2 cloudproviders? ( >=net-libs/libcloudproviders-0.3.1 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) " @@ -40,7 +40,7 @@ RDEPEND="${DEPEND} BDEPEND=" >=dev-util/gdbus-codegen-2.51.2 dev-util/glib-utils - gtk-doc? ( + doc? ( app-text/docbook-xml-dtd:4.1.2 dev-util/gi-docgen ) @@ -51,14 +51,11 @@ BDEPEND=" PDEPEND=" gnome? ( x11-themes/adwaita-icon-theme ) previewer? ( >=gnome-extra/sushi-0.1.9 ) - sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) >=gnome-base/gvfs-1.14[gtk(+)] " # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34 PATCHES=( "${FILESDIR}"/43.0-optional-gstreamer.patch # Allow controlling audio-video-properties build - "${FILESDIR}"/${PV}-fix-av-props-crash.patch # Fix crash opening audio/video properties, upstream #3160 - "${FILESDIR}"/${PV}-better-icon-lookup-fallback.patch # Upstream #2796 from gnome-45 branch ) src_prepare() { @@ -80,13 +77,12 @@ src_prepare() { src_configure() { local emesonargs=( - $(meson_use gtk-doc docs) - -Dextensions=true # image file properties, sendto support; also required for -Dgstreamer=true + $(meson_use doc docs) + -Dextensions=true # image file properties, also required for -Dgstreamer=true $(meson_use introspection) -Dpackagekit=false $(meson_use selinux) $(meson_use cloudproviders) - -Dprofiling=false -Dtests=$(usex test all none) $(meson_use gstreamer) # gstreamer audio-video-properties extension |