mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-04-16 11:12:08 +02:00
community/gnome-settings-daemon: upgrade to 50.1
This commit is contained in:
Achill Gilgenast
parent
6820e289e4
commit
f736fcb32e
@ -1,7 +1,7 @@
|
||||
# Contributor: Rasmus Thomsen <oss@cogitri.dev>
|
||||
maintainer="team/gnome <achill@achill.org>"
|
||||
pkgname=gnome-settings-daemon
|
||||
pkgver=50.0
|
||||
pkgver=50.1
|
||||
pkgrel=0
|
||||
pkgdesc="GNOME settings daemon"
|
||||
url="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
|
||||
@ -52,7 +52,6 @@ subpackages="
|
||||
$pkgname-udev
|
||||
"
|
||||
source="https://download.gnome.org/sources/gnome-settings-daemon/${pkgver%.*}/gnome-settings-daemon-$pkgver.tar.xz
|
||||
systemd-units-opt.patch
|
||||
desktop-files.patch
|
||||
"
|
||||
|
||||
@ -75,7 +74,6 @@ package() {
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
47628f6f3375607f838759d9c46490f3d576e53a40dd859f20104bfede75af472d752e7164308595266e4691e3b7b74da720730fa56292d47dffdff486c683c7 gnome-settings-daemon-50.0.tar.xz
|
||||
949e8fe9a85eac2d39cedd716242e32fe6333e935859420a07fe7ebcab5b01974b461b8ff152a374a4b601b07dc53b51c1afa31e7b0330bcfce9cc76d892bcf5 systemd-units-opt.patch
|
||||
c9b8f1d23a2933535f08db02ba2d12cf226bd86fabfddeddeb4d2028bd97ab6d973bf140ef9696dfb12a32aced3b1e0ba4bbaede8580c24d3ed03495133dd878 gnome-settings-daemon-50.1.tar.xz
|
||||
d39388615fa253d2b062289a40fb87dd707d1401e39463274b62db44bb99d20d06a8d53879e25e00b173986f647ad33bad06c22bba34e361af7bc00c233731f1 desktop-files.patch
|
||||
"
|
||||
|
||||
@ -1,126 +0,0 @@
|
||||
From 649e389ebf2792ca3b48a9f5bae4f2f1f7bb5831 Mon Sep 17 00:00:00 2001
|
||||
From: Achill Gilgenast <achill@achill.org>
|
||||
Date: Sun, 15 Mar 2026 10:49:33 +0100
|
||||
Subject: [PATCH 1/2] build: Remove outdated workaround
|
||||
|
||||
See e53f0f65bd9c ("plugins: Mask old target names on non-release builds")
|
||||
from 6 years ago.
|
||||
---
|
||||
plugins/meson.build | 11 -----------
|
||||
1 file changed, 11 deletions(-)
|
||||
|
||||
diff --git a/plugins/meson.build b/plugins/meson.build
|
||||
index fae3fc9e6..c01b51cb8 100644
|
||||
--- a/plugins/meson.build
|
||||
+++ b/plugins/meson.build
|
||||
@@ -141,17 +141,6 @@ foreach plugin: all_plugins
|
||||
install_dir: systemd_userunitdir
|
||||
)
|
||||
|
||||
- # Wipe out old target names if our prefix differes from the
|
||||
- # systemd one, i.e. we are probably in a virtual environment and
|
||||
- # may be picking up old units from a system installation.
|
||||
- # This saves a lot of pain when running a new g-s-d inside
|
||||
- # jhbuild on an old host.
|
||||
- # TODO: Should be deleted once we can assume developers have 3.38
|
||||
- # installed on their machines.
|
||||
- if gsd_prefix != systemd_dep.get_variable(pkgconfig: 'prefix')
|
||||
- meson.add_install_script('sh', '-c', 'ln -vfs /dev/null "${DESTDIR:-}$1"', 'sh', systemd_userunitdir / 'gsd-@0@.target'.format(plugin_name))
|
||||
- endif
|
||||
-
|
||||
foreach target: gates_all
|
||||
meson.add_install_script('meson-add-wants.sh', systemd_userunitdir, target + '.wants/', user_service)
|
||||
endforeach
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
From eb69a147b70fdd5524d298621658bea441af0d8e Mon Sep 17 00:00:00 2001
|
||||
From: Achill Gilgenast <achill@achill.org>
|
||||
Date: Sun, 15 Mar 2026 10:49:13 +0100
|
||||
Subject: [PATCH 2/2] build: Decouple libsystemd from systemd unit installation
|
||||
|
||||
Currently enabling the systemd units is binded to using libsystemd for
|
||||
the sharing-plugin. However in the end they have less in common, and we
|
||||
can e.g. use the units without using systemd for the sharing-plugin.
|
||||
|
||||
Effectively allows installation of systemd services without libsystemd installed.
|
||||
Useful for Alpine Linux where systemd services are allowed to be subpackaged
|
||||
(e.g. for postmarketOS) but hasn't systemd in it's repos.
|
||||
|
||||
It has no change in existing default behavior, but now needs explict option-disabling
|
||||
if -Dsystemd=false was set and systemd units are not wished.
|
||||
---
|
||||
meson.build | 13 +++++++++----
|
||||
meson_options.txt | 1 +
|
||||
plugins/meson.build | 2 +-
|
||||
3 files changed, 11 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index b1d5c53c6..79433fd9e 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -110,19 +110,24 @@ polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.114')
|
||||
upower_glib_dep = dependency('upower-glib', version: '>= 0.99.12')
|
||||
|
||||
enable_systemd = get_option('systemd')
|
||||
+enable_systemd_units = get_option('systemd-units')
|
||||
enable_elogind = get_option('elogind')
|
||||
|
||||
if enable_systemd and enable_elogind
|
||||
error('Only systemd or elogind support should be activated')
|
||||
elif enable_systemd
|
||||
- systemd_dep = dependency('systemd', version: '>= 243', required: true)
|
||||
libsystemd_dep = dependency('libsystemd', version: '>= 243', required: true)
|
||||
- systemd_userunitdir = systemd_dep.get_variable(pkgconfig: 'systemduserunitdir',
|
||||
- pkgconfig_define: ['prefix', gsd_prefix])
|
||||
elif enable_elogind
|
||||
elogind_dep = dependency('libelogind', version: '>= 209', required: true)
|
||||
endif
|
||||
|
||||
+if enable_systemd_units
|
||||
+ systemd_dep = dependency('systemd', version: '>= 243', required: false)
|
||||
+ systemd_userunitdir = systemd_dep.get_variable(pkgconfig: 'systemduserunitdir',
|
||||
+ pkgconfig_define: ['prefix', gsd_prefix],
|
||||
+ default_value: gsd_prefix / gsd_libdir / 'systemd/user')
|
||||
+endif
|
||||
+
|
||||
config_h.set10('HAVE_SYSTEMD_LIB', enable_systemd or enable_elogind)
|
||||
|
||||
m_dep = cc.find_library('m')
|
||||
@@ -282,7 +287,7 @@ output += ' Smartcard support: ' + enable_smartcard.to_string() +
|
||||
output += ' USB Protection support: ' + enable_usb_protection.to_string() + '\n'
|
||||
output += ' Cups support: ' + enable_cups.to_string() + '\n'
|
||||
output += ' RFKill support: ' + enable_rfkill.to_string() + '\n'
|
||||
-if enable_systemd
|
||||
+if enable_systemd_units
|
||||
output += ' Systemd user unit dir: ' + systemd_userunitdir + '\n'
|
||||
endif
|
||||
if enable_rfkill
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index c19ece3fe..372571416 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -1,5 +1,6 @@
|
||||
option('udev_dir', type: 'string', value: '', description: 'Absolute path of the udev base directory')
|
||||
option('systemd', type: 'boolean', value: true, description: 'Enable systemd integration')
|
||||
+option('systemd-units', type: 'boolean', value: true, description: 'Enable systemd unit installation')
|
||||
option('elogind', type: 'boolean', value: false, description: 'Use elogind')
|
||||
option('alsa', type: 'boolean', value: true, description: 'build with ALSA support (not optional on Linux platforms)')
|
||||
option('gudev', type: 'boolean', value: true, description: 'build with gudev device support (not optional on Linux platforms)')
|
||||
diff --git a/plugins/meson.build b/plugins/meson.build
|
||||
index c01b51cb8..d8881029c 100644
|
||||
--- a/plugins/meson.build
|
||||
+++ b/plugins/meson.build
|
||||
@@ -127,7 +127,7 @@ foreach plugin: all_plugins
|
||||
endif
|
||||
unit_conf.set('plugin_gate_units_section', '\n'.join(gate_unit_section))
|
||||
|
||||
- if enable_systemd
|
||||
+ if enable_systemd_units
|
||||
configure_file(
|
||||
input: 'gsd.service.in',
|
||||
output: user_service,
|
||||
--
|
||||
GitLab
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user