Date: Tuesday, February 25, 2020 @ 19:31:32 Author: cesura Revision: 581925
upgpkg: mate-settings-daemon 1.24.0-1: Updated to version 1.24.0 Modified: mate-settings-daemon/trunk/PKGBUILD Deleted: mate-settings-daemon/trunk/0001-dbus-sys-dir.patch -------------------------+ 0001-dbus-sys-dir.patch | 68 ---------------------------------------------- PKGBUILD | 24 ++++------------ 2 files changed, 6 insertions(+), 86 deletions(-) Deleted: 0001-dbus-sys-dir.patch =================================================================== --- 0001-dbus-sys-dir.patch 2020-02-25 19:30:13 UTC (rev 581924) +++ 0001-dbus-sys-dir.patch 2020-02-25 19:31:32 UTC (rev 581925) @@ -1,68 +0,0 @@ -From 474cc44934eb915f97dd8ba876e2256c40b4ea9a Mon Sep 17 00:00:00 2001 -From: worldofpeace <[email protected]> -Date: Fri, 13 Dec 2019 10:45:27 -0500 -Subject: [PATCH 1/3] Default DBUS_SYS_DIR to ${datadir}/dbus-1/system.d - -Since D-Bus 1.9.18 configuration files installed by third-party should -go in share/dbus-1/system.d. The old location is for sysadmin overrides. ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 2b847d5..4deeb78 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -128,7 +128,7 @@ AC_ARG_WITH(dbus-services, - if ! test -z "$with_dbus_sys" ; then - DBUS_SYS_DIR="$with_dbus_sys" - else -- DBUS_SYS_DIR='${sysconfdir}/dbus-1/system.d' -+ DBUS_SYS_DIR='${datadir}/dbus-1/system.d' - fi - AC_SUBST(DBUS_SYS_DIR) - -From 77d41dd146f9ad64656fab9f3fc9a983b8109f25 Mon Sep 17 00:00:00 2001 -From: Christian Hesse <[email protected]> -Date: Thu, 9 Jan 2020 00:27:23 +0100 -Subject: [PATCH 2/3] Merge pull request #303 from eworm-de/dbus-dir - -actually use the configured dbus directory ---- - plugins/datetime/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/datetime/Makefile.am b/plugins/datetime/Makefile.am -index d705b60..fed59df 100644 ---- a/plugins/datetime/Makefile.am -+++ b/plugins/datetime/Makefile.am -@@ -1,5 +1,5 @@ - dbus_servicesdir = $(datadir)/dbus-1/system-services --dbus_confdir = $(sysconfdir)/dbus-1/system.d -+dbus_confdir = $(DBUS_SYS_DIR) - polkitdir = $(datadir)/polkit-1/actions - - dbus_services_in_files = org.mate.SettingsDaemon.DateTimeMechanism.service.in -From c1519c5669112499b889fe4c1d5373aaa633b0d6 Mon Sep 17 00:00:00 2001 -From: monsta <[email protected]> -Date: Fri, 10 Jan 2020 14:09:28 +0300 -Subject: [PATCH 3/3] require DBUS >= 1.10.0 - -needed after 474cc44934eb915f97dd8ba876e2256c40b4ea9a ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 4deeb78..094ac04 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -318,7 +318,7 @@ AC_SUBST(NSS_DATABASE) - # --------------------------------------------------------------------------- - - POLKIT_REQUIRED=0.97 --DBUS_REQUIRED=1.1.2 -+DBUS_REQUIRED=1.10.0 - - # PolicyKit detection; defaults to 'auto' (use it if it's available) - # Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-02-25 19:30:13 UTC (rev 581924) +++ PKGBUILD 2020-02-25 19:31:32 UTC (rev 581925) @@ -2,35 +2,23 @@ # Contributor: Martin Wimpress <[email protected]> pkgname=mate-settings-daemon -pkgver=1.22.1 -pkgrel=2 +pkgver=1.24.0 +pkgrel=1 pkgdesc="The MATE Settings daemon" url="https://mate-desktop.org"; arch=('x86_64') license=('GPL') depends=('dbus-glib' 'libcanberra' 'libmatekbd' 'libmatemixer' 'libnotify' - 'mate-desktop' 'nss' 'polkit') -makedepends=('intltool' 'python') + 'mate-desktop' 'nss' 'polkit' 'gettext') +makedepends=('python') optdepends=('libcanberra-pulse: PulseAudio support' 'pulseaudio-alsa: PulseAudio support') groups=('mate') conflicts=('mate-settings-daemon-gtk3') replaces=('mate-settings-daemon-gtk3') -source=("https://pub.mate-desktop.org/releases/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"; - '0001-dbus-sys-dir.patch') -sha256sums=('37122a5aec96ebff25789be90e0a0f749eac096e8441babbbbe0c508be00bc45' - '8552412fa035e87929cb89db27286a96c5d7a7688847aebabe13e6bd465c36a2') +source=("https://pub.mate-desktop.org/releases/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz";) +sha256sums=('89bf518d9c87e0bffe2e1ddeb154072179a44580c1e647454c5b5ecccd5085c1') -prepare() { - cd "${pkgname}-${pkgver}" - - # D-Bus policy in /usr/share/dbus-1/system.d instead of /etc/dbus-1/system.d - # https://www.archlinux.org/todo/d-bus-policy-in-usrsharedbus-1systemd-instead-of-etcdbus-1systemd/ - patch -Np1 < ../0001-dbus-sys-dir.patch - - autoreconf -fi -} - build() { cd "${pkgname}-${pkgver}" ./configure \
