From 2ff36425a002633423d9782fc1619ecc7c03ad2d Mon Sep 17 00:00:00 2001 From: oreo639 Date: Thu, 20 Nov 2025 02:09:34 -0800 Subject: [PATCH 01/25] NetworkManager: update to 1.54.2. --- srcpkgs/NetworkManager/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template index 16a7227914bacc..b7b4ef8c6802c3 100644 --- a/srcpkgs/NetworkManager/template +++ b/srcpkgs/NetworkManager/template @@ -1,6 +1,6 @@ # Template file for 'NetworkManager' pkgname=NetworkManager -version=1.50.0 +version=1.54.2 revision=1 build_style=meson build_helper="gir qemu" @@ -17,13 +17,13 @@ configure_args="-Dsystemd_journal=false $(vopt_bool gir introspection) $(vopt_bool gir vapi) -Dsession_tracking=$(vopt_if elogind elogind no) -Dsuspend_resume=$(vopt_if elogind elogind upower) - -Dconfig_dhcp_default=internal" + -Dconfig_dhcp_default=internal -Dtests=no" hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config dbus-glib-devel docbook-xsl gtk-doc polkit-devel perl $(vopt_if gir 'vala python3-gobject')" makedepends="libuuid-devel nss-devel dbus-glib-devel libgudev-devel libnl3-devel polkit-devel ppp-devel libcurl-devel - ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel + ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel libnvme-devel libpsl-devel eudev-libudev-devel mobile-broadband-provider-info gnutls-devel $(vopt_if gir 'libgirepository-devel python3-gobject') $(vopt_if elogind elogind-devel)" @@ -33,9 +33,9 @@ short_desc="Network Management daemon" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/NetworkManager" -changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-50/NEWS" -distfiles="${GNOME_SITE}/NetworkManager/${version%.*}/NetworkManager-${version}.tar.xz" -checksum=fc03e7388a656cebc454c5d89481626122b1975d7c26babc64dc7e488faa66e3 +changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-54/NEWS" +distfiles="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/archive/${version}/NetworkManager-${version}.tar.gz" +checksum=749e711154e32eef496d2a666377818c76152cf01c0b72670bb9225712a558bf # TODO: Some tests require network namespaces to run. make_check=extended lib32disabled=yes @@ -90,6 +90,7 @@ libnm_package() { fi } } + NetworkManager-devel_package() { depends="dbus-glib-devel libnm-${version}_${revision}" short_desc+=" - development files" From e0207e7350d04bd2e285fc53bfc61e63fc6167f3 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 15 Mar 2026 18:38:18 -0700 Subject: [PATCH 02/25] libnotify: update to 0.8.8. --- srcpkgs/libnotify/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template index f97c5da618e13a..b0e1b9ad2bb371 100644 --- a/srcpkgs/libnotify/template +++ b/srcpkgs/libnotify/template @@ -1,7 +1,7 @@ # Template file for 'libnotify' pkgname=libnotify -version=0.8.6 -revision=2 +version=0.8.8 +revision=1 build_style=meson build_helper=gir configure_args="$(vopt_feature gir introspection) -Dgtk_doc=false @@ -14,7 +14,7 @@ license="LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/libnotify" changelog="https://gitlab.gnome.org/GNOME/libnotify/-/raw/master/NEWS" distfiles="https://gitlab.gnome.org/GNOME/libnotify/-/archive/${version}/libnotify-${version}.tar.gz" -checksum=532c40b900b83fa8b6a36f77989470e5ee4d49335fd06cdce10678c215e5f037 +checksum=aa0f94ed3dcc45ce169f4987d2c3275f7ece17523bb7ffe41596c053606a1a00 # https://gitlab.gnome.org/GNOME/libnotify/-/issues/30 make_check=no From ff23184042964b518a6c243044e099da8cd3cf69 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 15 Mar 2026 18:39:02 -0700 Subject: [PATCH 03/25] gsettings-desktop-schemas: update to 50.0. --- srcpkgs/gsettings-desktop-schemas/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template index 1d5dc5abd46e8d..4a068861d60113 100644 --- a/srcpkgs/gsettings-desktop-schemas/template +++ b/srcpkgs/gsettings-desktop-schemas/template @@ -1,6 +1,6 @@ # Template file for 'gsettings-desktop-schemas' pkgname=gsettings-desktop-schemas -version=48.0 +version=50.0 revision=1 build_helper="gir" build_style=meson @@ -13,7 +13,7 @@ license="LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas" changelog="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/raw/master/NEWS" distfiles="${GNOME_SITE}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz" -checksum=e68f155813bf18f865a8b2c8e9d473588b6ccadcafbb666ab788857c6c2d1bd3 +checksum=358f07cb253727650e132805df3c69f7bf90448040bce171b6f6f2cb1b9c37ef # Package build options build_options="gir" From 58e5b02f343fc2339db55249a15b765d298818a4 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 15 Mar 2026 18:39:23 -0700 Subject: [PATCH 04/25] gnome-settings-daemon: update to 50.0. --- .../patches/desktop-files.patch | 105 ++++++++++++++++++ srcpkgs/gnome-settings-daemon/template | 19 +--- 2 files changed, 110 insertions(+), 14 deletions(-) create mode 100644 srcpkgs/gnome-settings-daemon/patches/desktop-files.patch diff --git a/srcpkgs/gnome-settings-daemon/patches/desktop-files.patch b/srcpkgs/gnome-settings-daemon/patches/desktop-files.patch new file mode 100644 index 00000000000000..3e4941bbd2bba6 --- /dev/null +++ b/srcpkgs/gnome-settings-daemon/patches/desktop-files.patch @@ -0,0 +1,105 @@ +From 90732cdef6db316a8d9fbbcb18da85a766fef3fe Mon Sep 17 00:00:00 2001 +From: Achill Gilgenast +Date: Sun, 15 Mar 2026 11:04:47 +0100 +Subject: [PATCH] Revert "plugins: Drop .desktop files" + +This reverts commit 242752d489b40f7cac20fc244a76eac8572cd955. + +Signed-off-by: Achill Gilgenast +--- + meson.build | 2 ++ + plugins/meson.build | 25 +++++++++++++++++-- + .../org.gnome.SettingsDaemon.Dummy.desktop.in | 7 ++++++ + .../org.gnome.SettingsDaemon.Real.desktop.in | 10 ++++++++ + 4 files changed, 42 insertions(+), 2 deletions(-) + create mode 100644 plugins/org.gnome.SettingsDaemon.Dummy.desktop.in + create mode 100644 plugins/org.gnome.SettingsDaemon.Real.desktop.in + +diff --git a/meson.build b/meson.build +index 09257cd514a8..55be97809c76 100644 +--- a/meson.build ++++ b/meson.build +@@ -37,6 +37,8 @@ gsd_pkglibdir = join_paths(gsd_libdir, gsd_api_name) + + gsd_schemadir = join_paths(gsd_datadir, 'glib-2.0', 'schemas') + ++gsd_xdg_autostart = join_paths(gsd_sysconfdir, 'xdg', 'autostart') ++ + gsd_3_0_api_name = '@0@-@1@'.format(meson.project_name(), '3.0') + gsd_gtk_modules_directory = join_paths(gsd_libdir, gsd_3_0_api_name, 'gtk-modules') + +diff --git a/plugins/meson.build b/plugins/meson.build +index d8881029cd13..27c2a7cbfc27 100644 +--- a/plugins/meson.build ++++ b/plugins/meson.build +@@ -82,15 +82,36 @@ foreach plugin: all_plugins + plugin_description = plugin[2] + plugin_dbus_name='org.gnome.SettingsDaemon.@0@'.format(plugin_name_case) + ++ desktop = 'org.gnome.SettingsDaemon.@0@.desktop'.format(plugin[1]) ++ ++ if disabled_plugins.contains(plugin_name) ++ desktop_in_file = files('org.gnome.SettingsDaemon.Dummy.desktop.in') ++ else ++ desktop_in_file = files('org.gnome.SettingsDaemon.Real.desktop.in') ++ endif ++ + cflags = [ + '-DG_LOG_DOMAIN="@0@-plugin"'.format(plugin_name), + '-DPLUGIN_NAME="@0@"'.format(plugin_name), + '-DPLUGIN_DBUS_NAME="@0@"'.format(plugin_dbus_name), + ] + plugins_cflags + ++ desktop = 'org.gnome.SettingsDaemon.@0@.desktop'.format(plugin[1]) ++ desktop_conf = configuration_data() ++ desktop_conf.set('libexecdir', gsd_libexecdir) ++ desktop_conf.set('systemd_hidden', enable_systemd ? 'true' : 'false') ++ desktop_conf.set('pluginname', plugin_name) ++ desktop_conf.set('description', plugin_description) ++ configure_file( ++ input: desktop_in_file, ++ output: desktop, ++ configuration: desktop_conf, ++ install_dir: gsd_xdg_autostart ++ ) ++ + if not disabled_plugins.contains(plugin_name) +- user_target = 'org.gnome.SettingsDaemon.@0@.target'.format(plugin_name_case) +- user_service = 'org.gnome.SettingsDaemon.@0@.service'.format(plugin_name_case) ++ user_target = 'org.gnome.SettingsDaemon.@0@.target'.format(plugin[1]) ++ user_service = 'org.gnome.SettingsDaemon.@0@.service'.format(plugin[1]) + + unit_conf = configuration_data() + unit_conf.set('plugin_name', plugin_name) +diff --git a/plugins/org.gnome.SettingsDaemon.Dummy.desktop.in b/plugins/org.gnome.SettingsDaemon.Dummy.desktop.in +new file mode 100644 +index 000000000000..f4cc7a278093 +--- /dev/null ++++ b/plugins/org.gnome.SettingsDaemon.Dummy.desktop.in +@@ -0,0 +1,7 @@ ++[Desktop Entry] ++Type=Application ++Name=GNOME Settings Daemon's @pluginname@ dummy autostart file ++Exec=false ++OnlyShowIn=GNOME; ++NoDisplay=true ++Hidden=true +diff --git a/plugins/org.gnome.SettingsDaemon.Real.desktop.in b/plugins/org.gnome.SettingsDaemon.Real.desktop.in +new file mode 100644 +index 000000000000..3034e7125550 +--- /dev/null ++++ b/plugins/org.gnome.SettingsDaemon.Real.desktop.in +@@ -0,0 +1,10 @@ ++[Desktop Entry] ++Type=Application ++Name=@description@ ++Exec=@libexecdir@/gsd-@pluginname@ ++OnlyShowIn=GNOME; ++NoDisplay=true ++X-GNOME-Autostart-Phase=Initialization ++X-GNOME-Autostart-Notify=true ++X-GNOME-AutoRestart=true ++X-GNOME-HiddenUnderSystemd=@systemd_hidden@ +-- +2.53.0 + diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template index 393893a52816dd..f33b982d1654d0 100644 --- a/srcpkgs/gnome-settings-daemon/template +++ b/srcpkgs/gnome-settings-daemon/template @@ -1,10 +1,9 @@ # Template file for 'gnome-settings-daemon' pkgname=gnome-settings-daemon -version=48.1 -revision=2 -_libgvc_gitrev=d2442f455844e5292cb4a74ffc66ecc8d7595a9f +version=50.0 +revision=1 build_style=meson -configure_args="-Dsystemd=false" +configure_args="-Dsystemd=false -Delogind=true" hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt perl pkg-config polkit" makedepends="NetworkManager-devel alsa-lib-devel colord-devel cups-devel gcr4-devel @@ -21,18 +20,10 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon" changelog="https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/raw/master/NEWS" -distfiles="${GNOME_SITE}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz - https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/${_libgvc_gitrev}/libgnome-volume-control-${_libgvc_gitrev}.tar.gz" -checksum="3860a2ea214dcbcb6600ae7a1e3358a5389215087bc3e4a47cee3f87baee062e - 4565c5e31c894a21492c10ba8b32e1dcb69e171c9adbd112304e17ebaabfdcb0" -skip_extraction="libgnome-volume-control-${_libgvc_gitrev}.tar.gz" +distfiles="${GNOME_SITE}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz" +checksum=d82b50336c98a2ed713e9716c372125bb31bdfc2dae9d95baaef4d769d614fb6 CFLAGS="-UG_DISABLE_ASSERT" -post_extract() { - rm -rf subprojects/gvc - vsrcextract -C subprojects/gvc "libgnome-volume-control-${_libgvc_gitrev}.tar.gz" -} - gnome-settings-daemon-devel_package() { depends="libglib-devel" short_desc+=" - development files" From ffa1476114dc332022b49b243519666ee3c2f11e Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 15 Mar 2026 18:41:20 -0700 Subject: [PATCH 05/25] mutter: update to 50.0. --- common/shlibs | 10 ++-- ...56e13130d32eef93f93f93be2fff379cb0f8.patch | 46 ------------------- srcpkgs/mutter/template | 20 ++++---- 3 files changed, 15 insertions(+), 61 deletions(-) delete mode 100644 srcpkgs/mutter/patches/565756e13130d32eef93f93f93be2fff379cb0f8.patch diff --git a/common/shlibs b/common/shlibs index 2817ff705f93a1..982edd9f311b28 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3014,11 +3014,11 @@ libdecoration.so.0 compiz-core-0.8.14_1 libcompizconfig.so.0 libcompizconfig-0.8.14_1 libemeraldengine.so.0 emerald-0.8.14_1 libhangul.so.1 libhangul-0.1.0_1 -libmutter-16.so.0 mutter-48.3.1_1 -libmutter-clutter-16.so.0 mutter-48.3.1_1 -libmutter-cogl-16.so.0 mutter-48.3.1_1 -libmutter-cogl-pango-16.so.0 mutter-48.3.1_1 -libmutter-mtk-16.so.0 mutter-48.3.1_1 +libmutter-18.so.0 mutter-50.0_1 +libmutter-clutter-18.so.0 mutter-50.0_1 +libmutter-cogl-18.so.0 mutter-50.0_1 +libmutter-cogl-pango-18.so.0 mutter-50.0_1 +libmutter-mtk-18.so.0 mutter-50.0_1 libgeoclue-2.so.0 geoclue2-2.4.4_1 libgepub-0.7.so.0 libgepub-0.7.1_1 libslopy.so.7.7 slop-7.7_1 diff --git a/srcpkgs/mutter/patches/565756e13130d32eef93f93f93be2fff379cb0f8.patch b/srcpkgs/mutter/patches/565756e13130d32eef93f93f93be2fff379cb0f8.patch deleted file mode 100644 index b16b29ebba5a94..00000000000000 --- a/srcpkgs/mutter/patches/565756e13130d32eef93f93f93be2fff379cb0f8.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 565756e13130d32eef93f93f93be2fff379cb0f8 Mon Sep 17 00:00:00 2001 -From: Sebastian Wick -Date: Mon, 11 Aug 2025 11:39:02 +0200 -Subject: [PATCH] wayland/transaction: Avoid crash on surfaces without roles - with - -...a time constraint. - -When the surface has no role assigned yet, it doesn't have an actor. -Ideally we would still manage to schedule the commits, but for now we -just ignore the time constraint. - -Related: https://gitlab.gnome.org/GNOME/mutter/-/issues/4108 -Part-of: ---- - src/wayland/meta-wayland-transaction.c | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - -diff --git a/src/wayland/meta-wayland-transaction.c b/src/wayland/meta-wayland-transaction.c -index d0ca29ec25f..0419663a53f 100644 ---- a/src/wayland/meta-wayland-transaction.c -+++ b/src/wayland/meta-wayland-transaction.c -@@ -503,9 +503,17 @@ meta_wayland_transaction_commit (MetaWaylandTransaction *transaction) - */ - if (max_time_us) - { -- MetaSurfaceActor *actor = meta_wayland_surface_get_actor (max_time_surface); -- ClutterFrameClock *frame_clock = -- clutter_actor_pick_frame_clock (CLUTTER_ACTOR (actor), NULL); -+ MetaSurfaceActor *actor; -+ ClutterFrameClock *frame_clock = NULL; -+ -+ /* When the surface has no role assigned yet, it doesn't have an actor. -+ * Ideally we would still manage to schedule the commits, but for now we -+ * just ignore the time constraint. -+ * See: https://gitlab.gnome.org/GNOME/mutter/-/issues/4108 -+ */ -+ actor = meta_wayland_surface_get_actor (max_time_surface); -+ if (actor) -+ frame_clock = clutter_actor_pick_frame_clock (CLUTTER_ACTOR (actor), NULL); - - if (frame_clock) - { --- -GitLab - diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index 83e8c8b41b58e8..6829872cb35f3d 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,6 +1,6 @@ # Template file for 'mutter' pkgname=mutter -version=48.7 +version=50.0 revision=1 build_helper="gir" build_style=meson @@ -13,18 +13,18 @@ makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel libei-devel - libdisplay-info-devel" + libdisplay-info-devel glycin-devel" depends="gsettings-desktop-schemas desktop-file-utils" short_desc="Wayland display server, X11 window manager and compositor library" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Mutter/" #changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS" -changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-48/NEWS" +changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-50/NEWS" distfiles="${GNOME_SITE}/mutter/${version%%.*}/mutter-${version}.tar.xz" -checksum=ec102aa3cbb0e39001206627aca3055314555f70609de5e6c2b7efcd1fa90f20 -shlib_provides="libmutter-clutter-16.so libmutter-cogl-16.so - libmutter-cogl-pango-16.so libmutter-mtk-16.so" +checksum=9870595023a9aafde4bdc11f7a8a6c475d1382ea56b369c76237bdeead72165b +shlib_provides="libmutter-clutter-18.so libmutter-cogl-18.so + libmutter-cogl-pango-18.so libmutter-mtk-18.so" make_check=no # needs a full graphical session # Upstream keeps pulling generated headers even though it can cause race @@ -36,15 +36,15 @@ pre_build() { post_install() { # modify the pkg-config files to respect ${pc_sysrootdir} for variables that are # meant to be called with 'pkg-config --variable' - vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-16|g' \ - -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-16.pc + vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-18|g' \ + -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-18.pc vmkdir usr/share/bash-completion/completions mv $DESTDIR/etc/bash_completion.d/* \ $DESTDIR/usr/share/bash-completion/completions } mutter-devel_package() { - depends="gtk4-devel graphene-devel clutter-devel + depends="gtk4-devel graphene-devel clutter-devel glycin-devel libX11-devel libXtst-devel mutter-${version}_${revision} gnome-settings-daemon-devel libei-devel libdisplay-info-devel libcanberra-devel libwacom-devel libICE-devel libSM-devel" @@ -52,7 +52,7 @@ mutter-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/mutter-16/*.gir" + vmove "usr/lib/mutter-18/*.gir" vmove "usr/lib/*.so" } } From 859647f9624c0565f1ddf13a7dab923492dcba2b Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 15 Mar 2026 18:42:37 -0700 Subject: [PATCH 06/25] gnome-shell: update to 50.0. --- srcpkgs/gnome-shell/patches/gjs-1.86.0.patch | 202 ------------------ .../patches/revert-remove-gsm.patch | 130 +++++++++++ srcpkgs/gnome-shell/template | 17 +- 3 files changed, 134 insertions(+), 215 deletions(-) delete mode 100644 srcpkgs/gnome-shell/patches/gjs-1.86.0.patch create mode 100644 srcpkgs/gnome-shell/patches/revert-remove-gsm.patch diff --git a/srcpkgs/gnome-shell/patches/gjs-1.86.0.patch b/srcpkgs/gnome-shell/patches/gjs-1.86.0.patch deleted file mode 100644 index 88770f73bc6340..00000000000000 --- a/srcpkgs/gnome-shell/patches/gjs-1.86.0.patch +++ /dev/null @@ -1,202 +0,0 @@ -From c8e28918aa96c53333ea7019eb24642b7878b548 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= -Date: Wed, 16 Jul 2025 19:06:34 +0200 -Subject: [PATCH] Port to gjs-1.85/girepository-2.0 - -gjs ported from the stand-alone gobject-introspection-1.0 to the -new girepository-2.0 library bundled with glib. - -Bump the requirements for gjs/glib and adjust to the (fairly minor) -changes. - -Part-of: ---- - .gitlab-ci.yml | 2 +- - meson.build | 7 +++---- - src/main.c | 23 +++++++++++++---------- - src/run-js-test.c | 9 ++++++--- - 4 files changed, 23 insertions(+), 18 deletions(-) - -diff --git a/meson.build b/meson.build -index 66e1592f33..ce2215032d 100644 ---- a/meson.build -+++ b/meson.build -@@ -21,9 +21,8 @@ libmutter_test_pc = 'libmutter-test-' + mutter_api_version - ecal_req = '>= 3.33.1' - eds_req = '>= 3.33.1' - gcr_req = '>= 3.90.0' --gio_req = '>= 2.79.2' --gi_req = '>= 1.49.1' --gjs_req = '>= 1.81.2' -+gio_req = '>= 2.85.1' -+gjs_req = '>= 1.85.1' - gtk_req = '>= 4.0' - mutter_req = '>= 49.beta' - polkit_req = '>= 0.100' -@@ -73,7 +72,7 @@ ecal_dep = dependency('libecal-2.0', version: ecal_req) - eds_dep = dependency('libedataserver-1.2', version: eds_req) - gcr_dep = dependency('gcr-4', version: gcr_req) - gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0') --gi_dep = dependency('gobject-introspection-1.0', version: gi_req) -+gi_dep = dependency('girepository-2.0', version: gio_req) - gio_dep = dependency('gio-2.0', version: gio_req) - gio_unix_dep = dependency('gio-unix-2.0', version: gio_req) - gjs_dep = dependency('gjs-1.0', version: gjs_req) -diff --git a/src/main.c b/src/main.c -index af4fa8597e..99eca3e3c9 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -13,7 +13,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -@@ -133,7 +133,7 @@ shell_dbus_init (gboolean replace) - - #ifdef HAVE_EXE_INTROSPECTION - static void --maybe_add_rpath_introspection_paths (void) -+maybe_add_rpath_introspection_paths (GIRepository *repo) - { - ElfW (Dyn) *dyn; - ElfW (Dyn) *rpath = NULL; -@@ -210,8 +210,8 @@ maybe_add_rpath_introspection_paths (void) - g_debug ("Prepending RPATH directory '%s' " - "to introsepciton library search path", - rpath_dir->str); -- g_irepository_prepend_search_path (rpath_dir->str); -- g_irepository_prepend_library_path (rpath_dir->str); -+ gi_repository_prepend_search_path (repo, rpath_dir->str); -+ gi_repository_prepend_library_path (repo, rpath_dir->str); - } - } - #endif /* HAVE_EXE_INTROSPECTION */ -@@ -219,20 +219,23 @@ maybe_add_rpath_introspection_paths (void) - static void - shell_introspection_init (void) - { -+ g_autoptr (GIRepository) repo = NULL; - -- g_irepository_prepend_search_path (MUTTER_TYPELIB_DIR); -- g_irepository_prepend_search_path (SHELL_TYPELIB_DIR); -+ repo = gi_repository_dup_default (); -+ -+ gi_repository_prepend_search_path (repo, MUTTER_TYPELIB_DIR); -+ gi_repository_prepend_search_path (repo, SHELL_TYPELIB_DIR); - - /* We need to explicitly add the directories where the private libraries are - * installed to the GIR's library path, so that they can be found at runtime - * when linking using DT_RUNPATH (instead of DT_RPATH), which is the default - * for some linkers (e.g. gold) and in some distros (e.g. Debian). - */ -- g_irepository_prepend_library_path (MUTTER_TYPELIB_DIR); -- g_irepository_prepend_library_path (GNOME_SHELL_PKGLIBDIR); -+ gi_repository_prepend_library_path (repo, MUTTER_TYPELIB_DIR); -+ gi_repository_prepend_library_path (repo, GNOME_SHELL_PKGLIBDIR); - - #ifdef HAVE_EXE_INTROSPECTION -- maybe_add_rpath_introspection_paths (); -+ maybe_add_rpath_introspection_paths (repo); - #endif - } - -@@ -611,7 +614,7 @@ main (int argc, char **argv) - context = meta_create_context (WM_NAME); - meta_context_add_option_entries (context, gnome_shell_options, - GETTEXT_PACKAGE); -- meta_context_add_option_group (context, g_irepository_get_option_group ()); -+ meta_context_add_option_group (context, gi_repository_get_option_group ()); - - session_mode = (char *) g_getenv ("GNOME_SHELL_SESSION_MODE"); - -diff --git a/src/run-js-test.c b/src/run-js-test.c -index 4f795252c2..7a539d3a23 100644 ---- a/src/run-js-test.c -+++ b/src/run-js-test.c -@@ -30,7 +30,7 @@ - #include - #include - --#include -+#include - #include - - #include "shell-global.h" -@@ -64,6 +64,7 @@ int - main (int argc, char **argv) - { - GOptionContext *context; -+ g_autoptr (GIRepository) repo = NULL; - g_autoptr (GError) error = NULL; - ShellGlobal *global; - GjsContext *js_context; -@@ -85,8 +86,10 @@ main (int argc, char **argv) - global = shell_global_get (); - js_context = _shell_global_get_gjs_context (global); - -- g_irepository_prepend_search_path (MUTTER_TYPELIB_DIR); -- g_irepository_prepend_search_path (SHELL_TYPELIB_DIR); -+ repo = gi_repository_dup_default (); -+ -+ gi_repository_prepend_search_path (repo, MUTTER_TYPELIB_DIR); -+ gi_repository_prepend_search_path (repo, SHELL_TYPELIB_DIR); - - if (argc < 2) - { --- -GitLab -From 1132827ce94449e2812dc2339e282423217bbcc6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= -Date: Tue, 12 Aug 2025 03:59:14 +0200 -Subject: [PATCH] shell: Use proper path to include girepository headers - -girepository-2.0 headers are inside ${PREFIX}/include/glib-2.0/girepository -and the pkg-config file provides the glib-2.0 subpath as include -directory, so we are required to use the full header path, or we may not -be able to find them. - -This is triggered a build failure in debian (with clean setup where no -libgirepository-1.0 was installed): - - ../src/shell-global.c:19:10: fatal error: girepository.h: No such file or - directory - 19 | #include - -Part-of: ---- - src/shell-global.c | 2 +- - src/shell-tray-manager.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/shell-global.c b/src/shell-global.c -index c941701b61..9a6de28e98 100644 ---- a/src/shell-global.c -+++ b/src/shell-global.c -@@ -16,7 +16,7 @@ - #include - - #include --#include -+#include - #include - #include - #include -diff --git a/src/shell-tray-manager.c b/src/shell-tray-manager.c -index ddbd17608a..5455211f28 100644 ---- a/src/shell-tray-manager.c -+++ b/src/shell-tray-manager.c -@@ -3,7 +3,7 @@ - #include "config.h" - - #include --#include -+#include - #include - - #include "shell-tray-manager.h" --- -GitLab diff --git a/srcpkgs/gnome-shell/patches/revert-remove-gsm.patch b/srcpkgs/gnome-shell/patches/revert-remove-gsm.patch new file mode 100644 index 00000000000000..43fac5b0ebf64c --- /dev/null +++ b/srcpkgs/gnome-shell/patches/revert-remove-gsm.patch @@ -0,0 +1,130 @@ +From e7e1f046569a163b2d4de6f74f517bc9a760efa0 Mon Sep 17 00:00:00 2001 +From: Achill Gilgenast +Date: Sun, 15 Mar 2026 12:52:42 +0100 +Subject: [PATCH 1/2] Reapply "main: Notify gnome-session when we're ready" + +This reverts commit d697bdceaefeae49ad0e03df7352884899c3e14a. + +Signed-off-by: Achill Gilgenast +--- + js/ui/main.js | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/js/ui/main.js b/js/ui/main.js +index 01a18b5a2d20..6c75efc02ce3 100644 +--- a/js/ui/main.js ++++ b/js/ui/main.js +@@ -314,6 +314,8 @@ async function _initializeUI() { + GLib.idle_add_once(GLib.PRIORITY_DEFAULT, () => { + Shell.util_sd_notify(); + global.context.notify_ready(); ++ _notifyGnomeSessionReady(); ++ return GLib.SOURCE_REMOVE; + }); + + _startDate = new Date(); +@@ -379,6 +381,20 @@ async function _initializeUI() { + }); + } + ++async function _notifyGnomeSessionReady() { ++ try { ++ let params = GLib.Variant.new('(ss)', ['org.gnome.Shell.desktop', '']); ++ await Gio.DBus.session.call( ++ 'org.gnome.SessionManager', ++ '/org/gnome/SessionManager', ++ 'org.gnome.SessionManager', ++ 'RegisterClient', params, null, ++ Gio.DBusCallFlags.NONE, -1, null); ++ } catch (e) { ++ log(`Error notifying gnome-session that we're ready: ${e.message}`); ++ } ++} ++ + function _handleShowWelcomeScreen() { + const lastShownVersion = global.settings.get_string(WELCOME_DIALOG_LAST_SHOWN_VERSION); + if (Util.GNOMEversionCompare(WELCOME_DIALOG_LAST_TOUR_CHANGE, lastShownVersion) > 0) { +-- +2.53.0 + +From 5ed9a22baf1f4dbebfbb2e05248643652a437f2f Mon Sep 17 00:00:00 2001 +From: Achill Gilgenast +Date: Sun, 15 Mar 2026 12:52:49 +0100 +Subject: [PATCH 2/2] Revert "data: Drop org.gnome.Shell.desktop" + +This reverts commit f3911151da7b0e3c630011cb26bd85f719e531d2. + +Signed-off-by: Achill Gilgenast +--- + data/meson.build | 13 ++++++++++++- + ....in => org.gnome.Shell.Extensions.desktop.in.in} | 0 + ...n => org.gnome.Shell.PortalHelper.desktop.in.in} | 0 + data/org.gnome.Shell.desktop.in.in | 13 +++++++++++++ + 4 files changed, 25 insertions(+), 1 deletion(-) + rename data/{org.gnome.Shell.Extensions.desktop.in => org.gnome.Shell.Extensions.desktop.in.in} (100%) + rename data/{org.gnome.Shell.PortalHelper.desktop.in => org.gnome.Shell.PortalHelper.desktop.in.in} (100%) + create mode 100644 data/org.gnome.Shell.desktop.in.in + +diff --git a/data/meson.build b/data/meson.build +index bc1c6ab2da1e..2fa16b97b36f 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,6 +1,7 @@ + data_builddir = meson.current_build_dir() + + desktop_files = [ ++ 'org.gnome.Shell.desktop', + 'org.gnome.Shell.Extensions.desktop', + ] + service_files = [] +@@ -10,9 +11,19 @@ if have_portal_helper + service_files += 'org.gnome.Shell.PortalHelper.service' + endif + ++desktopconf = configuration_data() ++# We substitute in bindir so it works as an autostart ++# file when built in a non-system prefix ++desktopconf.set('bindir', bindir) ++desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false') ++ + foreach desktop_file : desktop_files + i18n.merge_file( +- input: desktop_file + '.in', ++ input: configure_file( ++ input: desktop_file + '.in.in', ++ output: desktop_file + '.in', ++ configuration: desktopconf ++ ), + output: desktop_file, + po_dir: po_dir, + install: true, +diff --git a/data/org.gnome.Shell.Extensions.desktop.in b/data/org.gnome.Shell.Extensions.desktop.in.in +similarity index 100% +rename from data/org.gnome.Shell.Extensions.desktop.in +rename to data/org.gnome.Shell.Extensions.desktop.in.in +diff --git a/data/org.gnome.Shell.PortalHelper.desktop.in b/data/org.gnome.Shell.PortalHelper.desktop.in.in +similarity index 100% +rename from data/org.gnome.Shell.PortalHelper.desktop.in +rename to data/org.gnome.Shell.PortalHelper.desktop.in.in +diff --git a/data/org.gnome.Shell.desktop.in.in b/data/org.gnome.Shell.desktop.in.in +new file mode 100644 +index 000000000000..59d1cd2fe924 +--- /dev/null ++++ b/data/org.gnome.Shell.desktop.in.in +@@ -0,0 +1,13 @@ ++[Desktop Entry] ++Type=Application ++Name=GNOME Shell ++Comment=Window management and application launching ++Exec=@bindir@/gnome-shell ++Categories=GNOME;GTK;Core; ++OnlyShowIn=GNOME; ++NoDisplay=true ++X-GNOME-Autostart-Phase=DisplayServer ++X-GNOME-Provides=panel;windowmanager; ++X-GNOME-Autostart-Notify=true ++X-GNOME-AutoRestart=false ++X-GNOME-HiddenUnderSystemd=@systemd_hidden@ +-- +2.53.0 + diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index 3a692a7b9b8478..76426f3b66ed7e 100644 --- a/srcpkgs/gnome-shell/template +++ b/srcpkgs/gnome-shell/template @@ -1,8 +1,7 @@ # Template file for 'gnome-shell' pkgname=gnome-shell -version=48.7 +version=50.0 revision=1 -_libgvc_gitrev=d2442f455844e5292cb4a74ffc66ecc8d7595a9f build_style=meson build_helper=gir configure_args="-Dsystemd=false -Dtests=false" @@ -22,17 +21,9 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeShell" #changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS" -changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-48/NEWS" -distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz - https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/${_libgvc_gitrev}/libgnome-volume-control-${_libgvc_gitrev}.tar.gz" -checksum="2dff328d5f7e29f8c897bc21caac7d2d443be3c63ae84d7623dec800f23493c3 - 4565c5e31c894a21492c10ba8b32e1dcb69e171c9adbd112304e17ebaabfdcb0" -skip_extraction="libgnome-volume-control-${_libgvc_gitrev}.tar.gz" - -post_extract() { - rm -rf subprojects/gvc - vsrcextract -C subprojects/gvc "libgnome-volume-control-${_libgvc_gitrev}.tar.gz" -} +changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-50/NEWS" +distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz" +checksum=85952fbd4929cfe613b876b2237e0d13464b0c2788b8a9867fb51c260255b0e3 do_check() { mkdir /tmp/gnome-shell-xdg From 9c7ba5589809fe027c84caef337efef20301200f Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 15 Mar 2026 18:43:45 -0700 Subject: [PATCH 07/25] gnome-control-center: update to 50.0. --- srcpkgs/gnome-control-center/template | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template index 35122b509b8823..6e805f6ab725b3 100644 --- a/srcpkgs/gnome-control-center/template +++ b/srcpkgs/gnome-control-center/template @@ -1,15 +1,15 @@ # Template file for 'gnome-control-center' pkgname=gnome-control-center -version=48.3 +version=50.0 revision=1 build_style=meson build_helper="gir" hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config - polkit python3 gtk-update-icon-cache setxkbmap wayland-devel" + polkit python3 gtk-update-icon-cache setxkbmap wayland-devel blueprint-compiler" makedepends="ModemManager-devel accountsservice-devel alsa-plugins colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel - libSM-devel libgtop-devel + libSM-devel libgtop-devel NetworkManager-devel libpwquality-devel mit-krb5-devel libnma-devel polkit-devel pulseaudio-devel samba-devel upower-devel vala-devel libxml2-devel libX11-devel gtk4-devel libadwaita-devel cups-devel libgudev-devel @@ -22,13 +22,17 @@ short_desc="GNOME control center" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-control-center" -changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-48/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-50/NEWS" #changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/main/NEWS" distfiles="${GNOME_SITE}/gnome-control-center/${version%%.*}/gnome-control-center-${version}.tar.xz" -checksum=c0698245a6420badd077c16ffb218860e457cd7300612718eabf9aba47222bae +checksum=20e8d5b13b9f390581004cab34b74372c0ff4a16f9c11bffd93d8386fbcdeeb3 make_check=no # needs X11 and requires altered filesystem pre_build() { + if [ "$CROSS_BUILD" ]; then + export GI_TYPELIB_PATH="${XBPS_CROSS_BASE}/usr/lib/girepository-1.0" + fi + # q66: racey, included from elsewhere but not dependencies ninja -C build panels/network/cc-network-resources.h } From 497aeffd9a12fed9724e62507d59df41b93ac6f5 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 15 Mar 2026 18:44:36 -0700 Subject: [PATCH 08/25] gnome-session: fix for gnome-settings-daemon 50 --- .../patches/drop-gsd-wacom.patch | 29 +++++++++++++++++++ srcpkgs/gnome-session/template | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/gnome-session/patches/drop-gsd-wacom.patch diff --git a/srcpkgs/gnome-session/patches/drop-gsd-wacom.patch b/srcpkgs/gnome-session/patches/drop-gsd-wacom.patch new file mode 100644 index 00000000000000..b90b1a560e7944 --- /dev/null +++ b/srcpkgs/gnome-session/patches/drop-gsd-wacom.patch @@ -0,0 +1,29 @@ +From c03bb5387687028fa113338fb62077a8c74c2b55 Mon Sep 17 00:00:00 2001 +From: Carlos Garnacho +Date: Sat, 28 Jun 2025 14:50:27 +0200 +Subject: [PATCH 1/1] data: Drop dependency on Wacom g-s-d plugin + +Following https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/416 +this plugin is no longer a thing. Drop this dependency. + +Part-of: +Signed-off-by: Achill Gilgenast +--- + data/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/data/meson.build b/data/meson.build +index bd66ff0124e6..f0ae7b5e1568 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -28,7 +28,6 @@ required_components = { + 'org.gnome.SettingsDaemon.Smartcard', + 'org.gnome.SettingsDaemon.Sound', + 'org.gnome.SettingsDaemon.UsbProtection', +- 'org.gnome.SettingsDaemon.Wacom', + 'org.gnome.SettingsDaemon.XSettings', + ], + } +-- +2.53.0 + diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template index cdfc9439a3fbc6..361ee7f9945218 100644 --- a/srcpkgs/gnome-session/template +++ b/srcpkgs/gnome-session/template @@ -1,7 +1,7 @@ # Template file for 'gnome-session' pkgname=gnome-session version=48.0 -revision=1 +revision=2 build_style=meson configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user" hostmakedepends="glib-devel gettext pkg-config xmlto" From 6da56dae98b5c13b45d47ea7aa0a139674c92288 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 15 Mar 2026 18:46:19 -0700 Subject: [PATCH 09/25] gdm: fix for gnome-settings-daemon 50 --- srcpkgs/gdm/patches/gsd-50.patch | 14 ++++++++++++++ srcpkgs/gdm/template | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/gdm/patches/gsd-50.patch diff --git a/srcpkgs/gdm/patches/gsd-50.patch b/srcpkgs/gdm/patches/gsd-50.patch new file mode 100644 index 00000000000000..e614dc24004812 --- /dev/null +++ b/srcpkgs/gdm/patches/gsd-50.patch @@ -0,0 +1,14 @@ +org.gnome.SettingsDaemon.Wacom was removed from GNOME 49 + +diff -rup meson.build.orig meson.build +--- a/data/meson.build ++++ b/data/meson.build +@@ -77,7 +77,6 @@ gdm_gnome_session_required_components = + 'org.gnome.SettingsDaemon.Sharing', + 'org.gnome.SettingsDaemon.Smartcard', + 'org.gnome.SettingsDaemon.Sound', +- 'org.gnome.SettingsDaemon.Wacom', + ] + + gdm_gnome_user_session_wanted_components = gdm_gnome_session_required_components + diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index 10bf88db687668..7f5d7bf05c73cf 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,7 +1,7 @@ # Template file for 'gdm' pkgname=gdm version=48.0 -revision=2 +revision=3 build_helper="gir" build_style=meson configure_args=" From 58ae1d66bd26b4aa20f09928a6057dc29c78f447 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 15 Mar 2026 18:47:00 -0700 Subject: [PATCH 10/25] xdg-desktop-portal-gnome: update to 50.0. --- srcpkgs/xdg-desktop-portal-gnome/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template index e6fe7c0b202331..ee97fc3488befe 100644 --- a/srcpkgs/xdg-desktop-portal-gnome/template +++ b/srcpkgs/xdg-desktop-portal-gnome/template @@ -1,6 +1,6 @@ # Template file for 'xdg-desktop-portal-gnome' pkgname=xdg-desktop-portal-gnome -version=48.0 +version=50.0 revision=1 build_style=meson configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user" @@ -18,4 +18,4 @@ changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NE # FIXME: dead link changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-48/NEWS" distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz" -checksum=cd15aca2e1364da308eb3796bb8ae4a577e60ca4fe12006b315232cfd19c8861 +checksum=ceeef2fb68b34b3f66a3def0a332a22a70af272641fb6c50065b7a2fde3d5759 From 703211d987e6d5478c98afbf13db4aa48e531f56 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 15 Mar 2026 19:04:44 -0700 Subject: [PATCH 11/25] gnome-shell-extensions: update to 50.0. --- srcpkgs/gnome-shell-extensions/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template index 5b8865865dd551..f15e1fc1c03a9d 100644 --- a/srcpkgs/gnome-shell-extensions/template +++ b/srcpkgs/gnome-shell-extensions/template @@ -1,6 +1,6 @@ # Template file for 'gnome-shell-extensions' pkgname=gnome-shell-extensions -version=48.3 +version=50.0 revision=1 build_style=meson configure_args="-Dextension_set=all" @@ -13,4 +13,4 @@ homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions" changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-48/NEWS" #changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS" distfiles="${GNOME_SITE}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz" -checksum=adde34c08f40b63411be6f1d17e235550a0090494871e6481c312989d7f4a2d4 +checksum=bb8b0ca4f27efb5f962caf5ea49d8b7ca7b5a9e7e44b3501fc9dde2fde27c067 From 1b40f1256d3e46f76854712b16c84f5a0d619cc3 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 15 Mar 2026 21:24:01 -0700 Subject: [PATCH 12/25] gnome-software: update to 50.0. --- srcpkgs/gnome-software/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-software/template b/srcpkgs/gnome-software/template index 5e6558c53d960c..8fa6091315cc13 100644 --- a/srcpkgs/gnome-software/template +++ b/srcpkgs/gnome-software/template @@ -1,6 +1,6 @@ # Template file for 'gnome-software' pkgname=gnome-software -version=48.2 +version=50.0 revision=1 build_style=meson configure_args="-Dpackagekit=false -Dfwupd=false @@ -19,7 +19,7 @@ license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-software" changelog="https://gitlab.gnome.org/GNOME/gnome-software/-/raw/main/NEWS" distfiles="https://gitlab.gnome.org/GNOME/gnome-software/-/archive/${version}/gnome-software-${version}.tar.gz" -checksum=fe5e9aaaf1e3297e40e11736f89f3b4db07fafc4108f656ae2cd4999224a229a +checksum=9dd6ec6a68c6c944a6a5eaf24d7af71ff7e07ed3e5ed8bba5231d5b69187fbf8 make_check=no # Requires system dbus build_options="gtk_doc" From 2190e03ca10f9bfe7c722161ca1265625b069e79 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 15 Mar 2026 21:24:26 -0700 Subject: [PATCH 13/25] adwaita-fonts: update to 50.0. --- srcpkgs/adwaita-fonts/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/adwaita-fonts/template b/srcpkgs/adwaita-fonts/template index 01b1f44fa4fab2..ffd3273b9d0a3d 100644 --- a/srcpkgs/adwaita-fonts/template +++ b/srcpkgs/adwaita-fonts/template @@ -1,6 +1,6 @@ # Template file for 'adwaita-fonts' pkgname=adwaita-fonts -version=48.2 +version=50.0 revision=1 build_style=meson depends="font-util" @@ -9,5 +9,5 @@ maintainer="oreo639 " license="OFL-1.1" homepage="https://gitlab.gnome.org/GNOME/adwaita-fonts" distfiles="${GNOME_SITE}/adwaita-fonts/${version%.*}/adwaita-fonts-${version}.tar.xz" -checksum=156f7e92f2f82e527fc73c309dbb237c0a4a5c3a95bc5ee94a5efb6947c553e0 +checksum=4c927fbfeec1c503801ba510c2c94e0054c82c522cf7ba0d3be5d4d41fcf5c86 font_dirs="/usr/share/fonts/Adwaita/" From c6698389204be0c8a81ea7286c90540a4de9b5aa Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 15 Mar 2026 21:24:53 -0700 Subject: [PATCH 14/25] adwaita-icon-theme: update to 50.0. --- srcpkgs/adwaita-icon-theme/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template index 75f65a738a0449..9277c49d74732c 100644 --- a/srcpkgs/adwaita-icon-theme/template +++ b/srcpkgs/adwaita-icon-theme/template @@ -1,6 +1,6 @@ # Template file for 'adwaita-icon-theme' pkgname=adwaita-icon-theme -version=49.0 +version=50.0 revision=1 build_style=meson hostmakedepends="pkg-config" @@ -11,7 +11,7 @@ license="LGPL-3.0-or-later, CC-BY-SA-3.0" homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme" changelog="https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/raw/master/NEWS" distfiles="${GNOME_SITE}/adwaita-icon-theme/${version/.*/}/adwaita-icon-theme-${version}.tar.xz" -checksum=65166461d1b278aa942f59aa8d0fccf1108d71c65f372c6266e172449791755c +checksum=fac6e0401fca714780561a081b8f7e27c3bc1db34ebda4da175081f26b24d460 pre_configure() { ln -s /bin/true "$XBPS_WRAPPERDIR/gtk-update-icon-cache" From 8ae49cfc6c2373b9be7684e77d4cf695236defee Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 15 Mar 2026 21:25:14 -0700 Subject: [PATCH 15/25] gnome-backgrounds: update to 50.0. --- srcpkgs/gnome-backgrounds/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template index 4cdad17e9fc109..945022008b9bf7 100644 --- a/srcpkgs/gnome-backgrounds/template +++ b/srcpkgs/gnome-backgrounds/template @@ -1,6 +1,6 @@ # Template file for 'gnome-backgrounds' pkgname=gnome-backgrounds -version=48.2.1 +version=50.0 revision=1 build_style=meson hostmakedepends="gettext" @@ -11,4 +11,4 @@ license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0" homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds" changelog="https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/raw/main/NEWS" distfiles="${GNOME_SITE}/gnome-backgrounds/${version%%.*}/gnome-backgrounds-${version}.tar.xz" -checksum=6a1c5b7b2e0d8f5ce977926d55f9c2d65dd180822cdea5e59150dcfb5abd1ed9 +checksum=1acdba7acb4f34c7321febc6273444344fd55fd593611d446de70860183b52b8 From d1d5bf568150e096e9e1360b26d39f83495a34d9 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 15 Mar 2026 21:25:41 -0700 Subject: [PATCH 16/25] gnome-initial-setup: update to 50.0. --- srcpkgs/gnome-initial-setup/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template index 29ffb1cac34e8f..0bd462d7fc9292 100644 --- a/srcpkgs/gnome-initial-setup/template +++ b/srcpkgs/gnome-initial-setup/template @@ -1,9 +1,9 @@ # Template file for 'gnome-initial-setup' pkgname=gnome-initial-setup -version=48.1 +version=50.0 revision=1 build_style=meson -configure_args="-Dparental_controls=disabled -Dsystemd=false" +configure_args="-Dparental_controls=disabled" hostmakedepends="pkg-config glib-devel gettext dconf" makedepends="NetworkManager-devel accountsservice-devel libglib-devel gnome-desktop-devel libgweather-devel libwebkitgtk60-devel @@ -18,4 +18,4 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Design/OS/InitialSetup" changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/master/NEWS" distfiles="${GNOME_SITE}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz" -checksum=b3dabf7e79b665ff12241fbdba615489513d886224759986af8f48657592315e +checksum=2da96b76a3434468a557fe481b8cfe606262f3537b00a4c20d4aa239a44e96e1 From 1c111de73b301addca5dbb4a4ec7946690731b31 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 15 Mar 2026 21:26:32 -0700 Subject: [PATCH 17/25] gnome-keyring: update to 50.0. --- srcpkgs/gnome-keyring/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-keyring/template b/srcpkgs/gnome-keyring/template index a6fd74fee57d96..bf4492348628da 100644 --- a/srcpkgs/gnome-keyring/template +++ b/srcpkgs/gnome-keyring/template @@ -1,6 +1,6 @@ # Template file for 'gnome-keyring' pkgname=gnome-keyring -version=48.0 +version=50.0 revision=1 build_style=meson configure_args="-Dsystemd=disabled -Dssh-agent=true" @@ -14,7 +14,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GnomeKeyring/" changelog="https://gitlab.gnome.org/GNOME/gnome-keyring/-/raw/main/NEWS" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=f20518c920e9ea3f9c9b8b44be8c50d8d7feecd0dd5624960f77bd2ca4fbeb9d +checksum=cbd72062c53c9702bc2c4733991ad5f051ca682882b30905a2829bcf1a8ecc7c lib32disabled=yes make_check_pre="dbus-run-session xvfb-run" make_check=ci-skip # times out From 5b372c39b16cb8d6ac3313b4079304512c77c13c Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 15 Mar 2026 21:26:58 -0700 Subject: [PATCH 18/25] gnome-online-accounts: update to 3.58.0. --- srcpkgs/gnome-online-accounts/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template index c54c9823b5a29c..c86bc6cc9efbbf 100644 --- a/srcpkgs/gnome-online-accounts/template +++ b/srcpkgs/gnome-online-accounts/template @@ -1,6 +1,6 @@ # Template file for 'gnome-online-accounts' pkgname=gnome-online-accounts -version=3.54.4 +version=3.58.0 revision=1 build_style=meson build_helper="gir" @@ -18,7 +18,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeOnlineAccounts" changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-48/NEWS" #changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/master/NEWS" distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz" -checksum=55739943e747dcb4885ea607a4c2767d8002f71295e1affea62ea36f6d1cf593 +checksum=344d4dff9149a1adc4539417193e1eccc2f76ef40ac24e104ccf58072be55999 build_options="gir" build_options_default="gir" From 4ba4d7d84efd350a3dec0973bed73dafd3acb6ef Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 15 Mar 2026 21:27:49 -0700 Subject: [PATCH 19/25] New package: libgexiv2-0.16-0.16.0 --- common/shlibs | 1 + srcpkgs/libgexiv2-0.16-devel | 1 + srcpkgs/libgexiv2-0.16/template | 35 +++++++++++++++++++++++++++++++++ srcpkgs/libgexiv2-0.16/update | 1 + 4 files changed, 38 insertions(+) create mode 120000 srcpkgs/libgexiv2-0.16-devel create mode 100644 srcpkgs/libgexiv2-0.16/template create mode 100644 srcpkgs/libgexiv2-0.16/update diff --git a/common/shlibs b/common/shlibs index 982edd9f311b28..a68f1f6d001f25 100644 --- a/common/shlibs +++ b/common/shlibs @@ -867,6 +867,7 @@ libdiscid.so.0 libdiscid-0.2.2_1 librhythmbox-core.so.10 librhythmbox-3.4.1_1 libdmapsharing-4.0.so.3 libdmapsharing-3.9.13_1 libgexiv2.so.2 libgexiv2-0.6.1_1 +libgexiv2-0.16.so.4 libgexiv2-0.16-0.16.0_1 libraw.so.23 libraw-0.21.0_1 libraw_r.so.23 libraw-0.21.0_1 libdjvulibre.so.21 libdjvulibre-3.5.24_1 diff --git a/srcpkgs/libgexiv2-0.16-devel b/srcpkgs/libgexiv2-0.16-devel new file mode 120000 index 00000000000000..6474145a5a1ffa --- /dev/null +++ b/srcpkgs/libgexiv2-0.16-devel @@ -0,0 +1 @@ +libgexiv2-0.16 \ No newline at end of file diff --git a/srcpkgs/libgexiv2-0.16/template b/srcpkgs/libgexiv2-0.16/template new file mode 100644 index 00000000000000..dd9134f5d585e6 --- /dev/null +++ b/srcpkgs/libgexiv2-0.16/template @@ -0,0 +1,35 @@ +# Template file for 'libgexiv2-0.16' +pkgname=libgexiv2-0.16 +version=0.16.0 +revision=1 +build_style=meson +build_helper="gir" +configure_args="$(vopt_bool gir introspection) $(vopt_bool vala vapi)" +hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala') python3-gobject" +makedepends="libglib-devel exiv2-devel" +short_desc="GObject-based wrapper around the Exiv2 library" +maintainer="Enno Boland " +license="GPL-2.0-or-later" +homepage="https://wiki.gnome.org/Projects/gexiv2" +changelog="https://gitlab.gnome.org/GNOME/gexiv2/-/raw/master/NEWS" +distfiles="${GNOME_SITE}/gexiv2/${version%.*}/gexiv2-${version}.tar.xz" +checksum=d96f895f24539f966f577b2bb2489ae84f8232970a8d0c064e4a007474a77bbb + +build_options="gir vala" +build_options_default="gir vala" + +libgexiv2-0.16-devel_package() { + depends="${makedepends} ${sourcepkg}-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig + if [ "$build_option_vala" ]; then + vmove usr/share/vala + fi + if [ "$build_option_gir" ]; then + vmove "usr/share/gir-*" + fi + } +} diff --git a/srcpkgs/libgexiv2-0.16/update b/srcpkgs/libgexiv2-0.16/update new file mode 100644 index 00000000000000..3cc5e8fbe2dffc --- /dev/null +++ b/srcpkgs/libgexiv2-0.16/update @@ -0,0 +1 @@ +pkgname=gexiv2 From 19b0b6bf828bd1c413c9655fdd64825271323e48 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 15 Mar 2026 21:28:10 -0700 Subject: [PATCH 20/25] tinysparql: update to 3.11.0. --- srcpkgs/tinysparql/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tinysparql/template b/srcpkgs/tinysparql/template index 7aca9611b81208..d4e976bea3e181 100644 --- a/srcpkgs/tinysparql/template +++ b/srcpkgs/tinysparql/template @@ -1,6 +1,6 @@ # Template file for 'tinysparql' pkgname=tinysparql -version=3.10.1 +version=3.11.0 revision=1 build_style=meson build_helper="gir qemu" @@ -18,7 +18,7 @@ homepage="https://gitlab.gnome.org/GNOME/tinysparql" changelog="https://gitlab.gnome.org/GNOME/tinysparql/-/raw/main/NEWS" #changelog="https://gitlab.gnome.org/GNOME/tinysparql/-/raw/tinysparql-3.9/NEWS" distfiles="${GNOME_SITE}/tinysparql/${version%.*}/tinysparql-${version}.tar.xz" -checksum=5a7f3e789db6671a550ed6280ed4f60a60bea77368da92be68dc7d8d7e230265 +checksum=011e758a53f31112a8c45700fd6039ae55617f0dac70119d9eddafc03cf68fe5 make_check_pre="dbus-run-session" replaces="tracker>=0 tracker3>=0" From 6780778f7366469fdeace730e7aaca90bc85becc Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 15 Mar 2026 21:28:46 -0700 Subject: [PATCH 21/25] localsearch: update to 3.11.0. --- .../localsearch/patches/sqlite-seccomp.patch | 21 +++++++++---------- srcpkgs/localsearch/template | 4 ++-- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/srcpkgs/localsearch/patches/sqlite-seccomp.patch b/srcpkgs/localsearch/patches/sqlite-seccomp.patch index f7f573e1b5455a..ca04a7034be99c 100644 --- a/srcpkgs/localsearch/patches/sqlite-seccomp.patch +++ b/srcpkgs/localsearch/patches/sqlite-seccomp.patch @@ -10,15 +10,14 @@ This is necessary for sqlite SQLITE_ENABLE_BATCH_ATOMIC_WRITE. +#include #include - #include -@@ -246,6 +247,10 @@ tracker_seccomp_init (void) - SCMP_CMP(0, SCMP_CMP_EQ, 2)) < 0) - goto out; + #if defined(__linux__) && defined(__x86_64__) +@@ -299,6 +300,8 @@ tracker_seccomp_init (gboolean readonly) + CUSTOM_RULE (ioctl, SCMP_ACT_ALLOW, SCMP_CMP(1, SCMP_CMP_EQ, BTRFS_IOC_GET_SUBVOL_INFO)); + #endif + CUSTOM_RULE (ioctl, SCMP_ACT_ALLOW, SCMP_CMP(1, SCMP_CMP_EQ, FS_IOC_GETFSUUID)); ++ ++ CUSTOM_RULE (ioctl, SCMP_ACT_ERRNO (EACCES), SCMP_CMP(1, SCMP_CMP_EQ, _IOR(0xf5, 12, __u32))); -+ if (seccomp_rule_add (ctx, SCMP_ACT_ERRNO (EACCES), SCMP_SYS(ioctl), 1, -+ SCMP_CMP(1, SCMP_CMP_EQ, _IOR(0xf5, 12, __u32))) < 0) -+ goto out; -+ - /* Special requirements for open/openat, allow O_RDONLY calls, - * but fail if write permissions are requested. - */ + if (readonly) { + /* Special requirements for open/openat, allow O_RDONLY calls, + diff --git a/srcpkgs/localsearch/template b/srcpkgs/localsearch/template index a6d27fdd8dceba..7e2db1cb0f6a9d 100644 --- a/srcpkgs/localsearch/template +++ b/srcpkgs/localsearch/template @@ -1,6 +1,6 @@ # Template file for 'localsearch' pkgname=localsearch -version=3.10.2 +version=3.11.0 revision=1 build_style=meson build_helper=qemu @@ -28,7 +28,7 @@ homepage="https://tracker.gnome.org/" changelog="https://gitlab.gnome.org/GNOME/localsearch/-/raw/main/NEWS" #changelog="https://gitlab.gnome.org/GNOME/localsearch/-/raw/localsearch-3.9/NEWS" distfiles="${GNOME_SITE}/localsearch/${version%.*}/localsearch-${version}.tar.xz" -checksum=b4dd89c85d76617101bad4ec9a33678f631ec5032e9880eb423dce52e878a285 +checksum=c6774761a8b9f4a06f6812f1c8078bee2e937d65e376c3d2338b78993e5f4666 make_check_pre="dbus-run-session" make_check=ci-skip # TODO: d-bus tests timeout ci From 5b834227d93b8048ba02065e196b686f63276dd6 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 15 Mar 2026 21:29:14 -0700 Subject: [PATCH 22/25] nautilus: update to 50.0. --- srcpkgs/nautilus/template | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template index f7ff98a7578548..9ad9328c77e96f 100644 --- a/srcpkgs/nautilus/template +++ b/srcpkgs/nautilus/template @@ -1,16 +1,17 @@ # Template file for 'nautilus' pkgname=nautilus -version=49.3 +version=50.0 revision=1 build_style=meson build_helper="gir" -configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)" +configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false) + -Dselinux=disabled" hostmakedepends="gettext glib-devel libxslt pkg-config desktop-file-utils - localsearch gtk4-update-icon-cache wayland-devel" + localsearch gtk4-update-icon-cache wayland-devel blueprint-compiler" makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk4-devel - libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel - libxml2-devel gst-plugins-base1-devel harfbuzz-devel - libadwaita-devel libportal-gtk4-devel" + libexif-devel libgexiv2-0.16-devel libglib-devel libnotify-devel libseccomp-devel + libxml2-devel gst-plugins-base1-devel harfbuzz-devel libselinux-devel + libadwaita-devel libportal-gtk4-devel glycin-gtk4-devel" depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme tinysparql localsearch gvfs" checkdepends="tinysparql localsearch python3-gobject dbus" @@ -21,11 +22,17 @@ homepage="https://wiki.gnome.org/Nautilus" #changelog="https://gitlab.gnome.org/GNOME/nautilus/-/raw/main/NEWS" changelog="https://gitlab.gnome.org/GNOME/nautilus/-/raw/gnome-49/NEWS" distfiles="${GNOME_SITE}/nautilus/${version%%.*}/nautilus-${version}.tar.xz" -checksum=aa6bf376f08992362805eae01890b1bf5ad148f356aa7ccfe1f664eda88d413e +checksum=a9596ebb44fe118ab6d07c909bb3836d6ce1eed18d91520c5a805895d16333cc build_options="gir" build_options_default="gir" +pre_build() { + if [ "$CROSS_BUILD" ]; then + export GI_TYPELIB_PATH="${XBPS_CROSS_BASE}/usr/lib/girepository-1.0" + fi +} + libnautilus_package() { short_desc+=" - shared libraries" pkg_install() { From 6986114205f8b11b81903b1a1db190a31548bd1f Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 1 Apr 2026 23:35:15 -0700 Subject: [PATCH 23/25] sushi: backport patches for nautilus 50 --- srcpkgs/sushi/patches/66.patch | 173 +++++++++++++++++++++++++++++++++ srcpkgs/sushi/template | 2 +- 2 files changed, 174 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/sushi/patches/66.patch diff --git a/srcpkgs/sushi/patches/66.patch b/srcpkgs/sushi/patches/66.patch new file mode 100644 index 00000000000000..9d4cb1b48555e8 --- /dev/null +++ b/srcpkgs/sushi/patches/66.patch @@ -0,0 +1,173 @@ +From 8d36fce61821c28ce5c051e3d2558ca778bea0eb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tau=20G=C3=A4rtli?= +Date: Mon, 24 Nov 2025 22:33:17 +0100 +Subject: [PATCH 1/2] Accept activation token in `ShowFile` + +Passes an activation token when calling sushi over +D-Bus which makes it work properly with mutter's +'strict' focus mode. + +Depends on https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/1885 +Part of https://gitlab.gnome.org/GNOME/nautilus/-/issues/4058 +--- + src/org.gnome.NautilusPreviewer2.xml | 1 + + src/ui/application.js | 11 ++++++++--- + 2 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/src/org.gnome.NautilusPreviewer2.xml b/src/org.gnome.NautilusPreviewer2.xml +index faa8c58..4ff218b 100644 +--- a/src/org.gnome.NautilusPreviewer2.xml ++++ b/src/org.gnome.NautilusPreviewer2.xml +@@ -4,6 +4,7 @@ + + + ++ + + + +diff --git a/src/ui/application.js b/src/ui/application.js +index e019e7a..ac0ddfd 100644 +--- a/src/ui/application.js ++++ b/src/ui/application.js +@@ -76,8 +76,9 @@ var NautilusPreviewer2Skeleton = class extends NautilusPreviewerSkeleton { + super(application, '/org/gnome/NautilusPreviewer/org.gnome.NautilusPreviewer2.xml'); + } + +- ShowFile(uri, windowHandle, closeIfAlreadyShown) { +- this.application.showFile(uri, windowHandle, closeIfAlreadyShown); ++ ShowFile(uri, windowHandle, closeIfAlreadyShown, activationToken) { ++ this.application.showFile( ++ uri, windowHandle, closeIfAlreadyShown, activationToken); + } + } + +@@ -148,9 +149,13 @@ var Application = GObject.registerClass(class Application extends Gtk.Applicatio + 'ParentHandle', new GLib.Variant('s', handle)); + } + +- showFile(uri, windowHandle, closeIfAlreadyShown) { ++ showFile(uri, windowHandle, closeIfAlreadyShown, activationToken = "") { + this._ensureMainWindow(); + ++ if (activationToken) { ++ this._mainWindow.set_startup_id(activationToken); ++ } ++ + let file = Gio.file_new_for_uri(uri); + if (closeIfAlreadyShown && + this._mainWindow.file && +-- +GitLab + + +From 4a7449ecdde60b0d3851b03d37447db769933e36 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tau=20G=C3=A4rtli?= +Date: Tue, 2 Dec 2025 17:13:33 +0100 +Subject: [PATCH 2/2] Remove org.gnome.NautilusPreviewer interface + +Since the interface is only used by nautilus +it can now be safely removed. +--- + ...org.gnome.NautilusPreviewer.data.gresource.xml | 1 - + src/org.gnome.NautilusPreviewer.xml | 11 ----------- + src/sushi.in | 8 ++++++-- + src/ui/application.js | 15 --------------- + 4 files changed, 6 insertions(+), 29 deletions(-) + delete mode 100644 src/org.gnome.NautilusPreviewer.xml + +diff --git a/src/org.gnome.NautilusPreviewer.data.gresource.xml b/src/org.gnome.NautilusPreviewer.data.gresource.xml +index 134eec3..9682d40 100644 +--- a/src/org.gnome.NautilusPreviewer.data.gresource.xml ++++ b/src/org.gnome.NautilusPreviewer.data.gresource.xml +@@ -1,7 +1,6 @@ + + + +- org.gnome.NautilusPreviewer.xml + org.gnome.NautilusPreviewer2.xml + + +diff --git a/src/org.gnome.NautilusPreviewer.xml b/src/org.gnome.NautilusPreviewer.xml +deleted file mode 100644 +index cb5ac10..0000000 +--- a/src/org.gnome.NautilusPreviewer.xml ++++ /dev/null +@@ -1,11 +0,0 @@ +- +- +- +- +- +- +- +- +- +- +- +diff --git a/src/sushi.in b/src/sushi.in +index 05323b0..14d4992 100644 +--- a/src/sushi.in ++++ b/src/sushi.in +@@ -39,7 +39,7 @@ try { + } + + let bytes = Gio.resources_lookup_data( +- '/org/gnome/NautilusPreviewer/org.gnome.NautilusPreviewer.xml', 0); ++ '/org/gnome/NautilusPreviewer/org.gnome.NautilusPreviewer2.xml', 0); + let wrapper = Gio.DBusProxy.makeProxyWrapper(ByteArray.toString(bytes.toArray())); + + let proxy; +@@ -51,4 +51,8 @@ try { + System.exit(1); + } + +-proxy.ShowFileSync(file.get_uri(), 0, false); ++const activationToken = GLib.getenv("XDG_ACTIVATION_TOKEN") ?? ""; ++const windowHandle = ""; ++const closeIfAlreadyShown = false; ++proxy.ShowFileSync( ++ file.get_uri(), windowHandle, closeIfAlreadyShown, activationToken); +diff --git a/src/ui/application.js b/src/ui/application.js +index ac0ddfd..f3e6786 100644 +--- a/src/ui/application.js ++++ b/src/ui/application.js +@@ -60,17 +60,6 @@ var NautilusPreviewerSkeleton = class { + } + } + +-var NautilusPreviewer1Skeleton = class extends NautilusPreviewerSkeleton { +- constructor(application) { +- super(application, '/org/gnome/NautilusPreviewer/org.gnome.NautilusPreviewer.xml'); +- } +- +- ShowFile(uri, xid, closeIfAlreadyShown) { +- let handle = 'x11:%d'.format(xid); +- this.application.showFile(uri, handle, closeIfAlreadyShown); +- } +-} +- + var NautilusPreviewer2Skeleton = class extends NautilusPreviewerSkeleton { + constructor(application) { + super(application, '/org/gnome/NautilusPreviewer/org.gnome.NautilusPreviewer2.xml'); +@@ -92,17 +81,13 @@ var Application = GObject.registerClass(class Application extends Gtk.Applicatio + vfunc_dbus_register(connection, path) { + let actualPath = `/org/gnome/${pkg.name.split('.').at(-1)}`; + +- this._skeleton = new NautilusPreviewer1Skeleton(this); + this._skeleton2 = new NautilusPreviewer2Skeleton(this); +- +- this._skeleton.export(connection, actualPath); + this._skeleton2.export(connection, actualPath); + + return super.vfunc_dbus_register(connection, path); + } + + vfunc_dbus_unregister(connection, path) { +- this._skeleton.unexport(connection); + this._skeleton2.unexport(connection); + + return super.vfunc_dbus_unregister(connection, path); +-- +GitLab + diff --git a/srcpkgs/sushi/template b/srcpkgs/sushi/template index 6eff89dd2f9f1f..47adf32ba16ff6 100644 --- a/srcpkgs/sushi/template +++ b/srcpkgs/sushi/template @@ -1,7 +1,7 @@ # Template file for 'sushi' pkgname=sushi version=46.0 -revision=2 +revision=3 build_helper="gir" build_style=meson hostmakedepends="glib-devel gettext pkg-config From fe993a807039b2d38de29f3aaecb15da38baba11 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 1 Apr 2026 23:59:51 -0700 Subject: [PATCH 24/25] libgexiv2: remove conflicting file --- srcpkgs/libgexiv2/template | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/srcpkgs/libgexiv2/template b/srcpkgs/libgexiv2/template index f6b4f708fcd82d..d97dcf47e4f6e9 100644 --- a/srcpkgs/libgexiv2/template +++ b/srcpkgs/libgexiv2/template @@ -1,7 +1,7 @@ # Template file for 'libgexiv2' pkgname=libgexiv2 version=0.14.5 -revision=2 +revision=3 build_style=meson build_helper="gir" configure_args="$(vopt_bool gir introspection) $(vopt_bool vala vapi)" @@ -18,6 +18,11 @@ checksum=0913c53daabab1f1ab586afd55bb55370796f2b8abcc6e37640ab7704ad99ce1 build_options="gir vala" build_options_default="gir vala" +post_install() { + # Conflicts with libgexiv2-0.16 + rm -rf ${DESTDIR}/${py3_sitelib}/gi/overrides/GExiv2.py +} + libgexiv2-devel_package() { depends="${makedepends} ${sourcepkg}-${version}_${revision}" short_desc+=" - development files" From b2553fde8a4a04ab76ab7450a8c234e0e56574e7 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 15 Mar 2026 21:30:07 -0700 Subject: [PATCH 25/25] gnome-core: update to 50.0. --- srcpkgs/gnome-core/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template index b1e062fe702c2f..83909994c4688e 100644 --- a/srcpkgs/gnome-core/template +++ b/srcpkgs/gnome-core/template @@ -1,6 +1,6 @@ # Template file for 'gnome-core' pkgname=gnome-core -version=48.0 +version=50.0 revision=1 metapackage=yes short_desc="GNOME meta-package for Void Linux - core components" @@ -17,7 +17,7 @@ depends=" evolution-data-server>=3.56.0 folks>=0.15.9 gcr4>=4.4.0 - gdm>=${version} + gdm>=48.0 geocode-glib>=3.26.4 gjs>=1.84.1 glib-networking>=2.80.1 @@ -31,7 +31,7 @@ depends=" gnome-initial-setup>=${version} gnome-keyring>=${version} gnome-online-accounts>=3.54.1 - gnome-session>=${version} + gnome-session>=48.0 gnome-settings-daemon>=${version} gnome-shell-extensions>=${version} gnome-shell>=${version}