Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions common/shlibs
Original file line number Diff line number Diff line change
Expand Up @@ -3015,11 +3015,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
Expand Down
13 changes: 7 additions & 6 deletions srcpkgs/NetworkManager/template
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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)"
Expand All @@ -33,9 +33,9 @@ short_desc="Network Management daemon"
maintainer="Enno Boland <gottox@voidlinux.org>"
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
Expand Down Expand Up @@ -90,6 +90,7 @@ libnm_package() {
fi
}
}

NetworkManager-devel_package() {
depends="dbus-glib-devel libnm-${version}_${revision}"
short_desc+=" - development files"
Expand Down
4 changes: 2 additions & 2 deletions srcpkgs/adwaita-fonts/template
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -9,5 +9,5 @@ maintainer="oreo639 <oreo6391@gmail.com>"
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/"
4 changes: 2 additions & 2 deletions srcpkgs/adwaita-icon-theme/template
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand Down
14 changes: 14 additions & 0 deletions srcpkgs/gdm/patches/gsd-50.patch
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion srcpkgs/gdm/template
Original file line number Diff line number Diff line change
@@ -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="
Expand Down
4 changes: 2 additions & 2 deletions srcpkgs/gnome-backgrounds/template
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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
14 changes: 9 additions & 5 deletions srcpkgs/gnome-control-center/template
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -22,13 +22,17 @@ short_desc="GNOME control center"
maintainer="Orphaned <orphan@voidlinux.org>"
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
}
Expand Down
6 changes: 3 additions & 3 deletions srcpkgs/gnome-core/template
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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
Expand All @@ -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}
Expand Down
6 changes: 3 additions & 3 deletions srcpkgs/gnome-initial-setup/template
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
4 changes: 2 additions & 2 deletions srcpkgs/gnome-keyring/template
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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
4 changes: 2 additions & 2 deletions srcpkgs/gnome-online-accounts/template
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand Down
29 changes: 29 additions & 0 deletions srcpkgs/gnome-session/patches/drop-gsd-wacom.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From c03bb5387687028fa113338fb62077a8c74c2b55 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
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: <https://gitlab.gnome.org/GNOME/gnome-session/-/merge_requests/148>
Signed-off-by: Achill Gilgenast <achill@achill.org>
---
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

2 changes: 1 addition & 1 deletion srcpkgs/gnome-session/template
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
105 changes: 105 additions & 0 deletions srcpkgs/gnome-settings-daemon/patches/desktop-files.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
From 90732cdef6db316a8d9fbbcb18da85a766fef3fe Mon Sep 17 00:00:00 2001
From: Achill Gilgenast <achill@achill.org>
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 <achill@achill.org>
---
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

Loading