[arch-commits] Commit in cinnamon-settings-daemon/trunk (2 files)

[Christian Hesse]

    Date: Friday, December 13, 2019 @ 12:24:22
  Author: eworm
Revision: 537514

upgpkg: cinnamon-settings-daemon 4.4.0-2

D-Bus policy in /usr/share/dbus-1/system.d instead of /etc/dbus-1/system.d

Added:
  cinnamon-settings-daemon/trunk/0001-dbus-sys-dir.patch
Modified:
  cinnamon-settings-daemon/trunk/PKGBUILD

-------------------------+
 0001-dbus-sys-dir.patch |   13 +++++++++++++
 PKGBUILD                |   14 ++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

Added: 0001-dbus-sys-dir.patch
===================================================================
--- 0001-dbus-sys-dir.patch	                        (rev 0)
+++ 0001-dbus-sys-dir.patch	2019-12-13 12:24:22 UTC (rev 537514)
@@ -0,0 +1,13 @@
+diff --git a/plugins/datetime/Makefile.am b/plugins/datetime/Makefile.am
+index f3f49f6..f59d2b8 100644
+--- a/plugins/datetime/Makefile.am
++++ b/plugins/datetime/Makefile.am
+@@ -1,7 +1,7 @@
+ plugin_name = datetime
+ 
+ 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.cinnamon.SettingsDaemon.DateTimeMechanism.service.in

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-13 12:00:19 UTC (rev 537513)
+++ PKGBUILD	2019-12-13 12:24:22 UTC (rev 537514)
@@ -4,7 +4,7 @@
 
 pkgname=cinnamon-settings-daemon
 pkgver=4.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The Cinnamon Settings daemon"
 arch=('x86_64')
 url="https://github.com/linuxmint/${pkgname}"
@@ -15,13 +15,18 @@
 optdepends=('cinnamon-translations: i18n')
 makedepends=('autoconf-archive' 'intltool' 'python' 'xf86-input-wacom')
 options=('!emptydirs')
-source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz")
-sha256sums=('6797a0bb73ea2345580a43fe8c75c70f48634b82b0a3518f48cc603f084bf012')
-b2sums=('ef0666864a4735ff32d57a584004176c74d0f0ad4b077d3439e135c1d24c8d0606221a1b1693a0189972b462055478680b03917a6acfcdfdc80649f7ee0fc224')
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz"
+        '0001-dbus-sys-dir.patch')
+sha256sums=('6797a0bb73ea2345580a43fe8c75c70f48634b82b0a3518f48cc603f084bf012'
+            'a075aa599f1b0a4718723fcd5ee550da9e7a8d980efc31a8261240956fc8cdd5')
+b2sums=('ef0666864a4735ff32d57a584004176c74d0f0ad4b077d3439e135c1d24c8d0606221a1b1693a0189972b462055478680b03917a6acfcdfdc80649f7ee0fc224'
+        'ce13cf885dda6ed3839c4e33770144abb482b49dc991a71276a097695ed3184e1a1a4559d73e9f2ba464f9ccfe1bfbcf33e64fa3b128dfa0a4c5a69b93a604d1')
 
 prepare() {
     cd "${srcdir}"/${pkgname}-${pkgver}
 
+    patch -Np1 < ../0001-dbus-sys-dir.patch
+
     autoreconf -fi
 }
 
@@ -32,6 +37,7 @@
                 --sysconfdir=/etc \
                 --localstatedir=/var \
                 --libexecdir="/usr/lib/${pkgname}" \
+                --with-dbus-sys="/usr/share/dbus-1/system.d" \
                 --enable-systemd \
                 --enable-polkit