From 3b2bcb676b77f2018eba4f99076156d4db85fb7d Mon Sep 17 00:00:00 2001 From: jane400 Date: Sun, 23 Jun 2024 18:14:50 +0200 Subject: [PATCH] systemd/gnome-settings-daemon: add systemd subpkg (MR 5377) (MR 5563) also remove the elogind specific patch to use systemd for brightness changes Co-authored-by: Clayton Craft Note: the user services that the -systemd split pkg installs are not enabled by default using systemd presets. None of them have 'Install' sections, they appear to be mostly/all dbus activated instead. [ci:ignore-count] [ci:skip-build]: already built successfully in CI --- .../systemd/gnome-settings-daemon/APKBUILD | 10 ++++++---- ...dont-use-logind-for-brightness-changing.patch | 16 ---------------- 2 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 extra-repos/systemd/gnome-settings-daemon/dont-use-logind-for-brightness-changing.patch diff --git a/extra-repos/systemd/gnome-settings-daemon/APKBUILD b/extra-repos/systemd/gnome-settings-daemon/APKBUILD index 5347a4d16..c23d5cff4 100644 --- a/extra-repos/systemd/gnome-settings-daemon/APKBUILD +++ b/extra-repos/systemd/gnome-settings-daemon/APKBUILD @@ -3,7 +3,7 @@ pkgname=gnome-settings-daemon pkgver=99946.0 _pkgver=46.0 -pkgrel=0 +pkgrel=1 pkgdesc="GNOME settings daemon" url="https://gitlab.gnome.org/GNOME/gnome-settings-daemon" arch="all" @@ -47,9 +47,12 @@ checkdepends=" py3-gobject3 umockdev-dev " -subpackages="$pkgname-dev $pkgname-lang" +subpackages=" + $pkgname-dev + $pkgname-lang + $pkgname-systemd + " source="https://download.gnome.org/sources/gnome-settings-daemon/${_pkgver%.*}/gnome-settings-daemon-$_pkgver.tar.xz - dont-use-logind-for-brightness-changing.patch " builddir="$srcdir/gnome-settings-daemon-$_pkgver" @@ -71,5 +74,4 @@ package() { sha512sums=" 445e9ee4709af7a67ded55733d4041357995fe9746bcf00fa81f52f6dddc2071e7114e9bf836bcf464bc0f04da3b3c08be04c1942963c1910d1a14b4434f6633 gnome-settings-daemon-46.0.tar.xz -fd80b939a14bbc5dd502afda0bc6511f2d9c045018680e5ae7fbec32efadb564c5060ec91d374330f246d70571aad5979ce8c175175a29b5ccec3443c8286dc6 dont-use-logind-for-brightness-changing.patch " diff --git a/extra-repos/systemd/gnome-settings-daemon/dont-use-logind-for-brightness-changing.patch b/extra-repos/systemd/gnome-settings-daemon/dont-use-logind-for-brightness-changing.patch deleted file mode 100644 index 2abf58216..000000000 --- a/extra-repos/systemd/gnome-settings-daemon/dont-use-logind-for-brightness-changing.patch +++ /dev/null @@ -1,16 +0,0 @@ -Brightness control is currently broken with elogind, so fall back to -the previous codepath which doesn't use elogind. -See https://github.com/elogind/elogind/issues/158 -diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c -index ca5f272..59048d9 100644 ---- a/plugins/power/gsd-backlight.c -+++ b/plugins/power/gsd-backlight.c -@@ -482,7 +482,7 @@ gsd_backlight_set_brightness_val_async (GsdBacklight *backlight, - if (backlight->udev_device != NULL) { - BacklightHelperData *task_data; - -- if (backlight->logind_proxy) { -+ if (0) { - g_dbus_proxy_call (backlight->logind_proxy, - "SetBrightness", - g_variant_new ("(ssu)",