Date: Friday, January 10, 2020 @ 18:54:28
Author: eworm
Revision: 551783
use upstream patches and add comment
Modified:
mate-settings-daemon/trunk/0001-dbus-sys-dir.patch
mate-settings-daemon/trunk/PKGBUILD
-------------------------+
0001-dbus-sys-dir.patch | 59 +++++++++++++++++++++++++++++++++++++++++++++-
PKGBUILD | 5 ++-
2 files changed, 61 insertions(+), 3 deletions(-)
Modified: 0001-dbus-sys-dir.patch
===================================================================
--- 0001-dbus-sys-dir.patch 2020-01-10 18:50:06 UTC (rev 551782)
+++ 0001-dbus-sys-dir.patch 2020-01-10 18:54:28 UTC (rev 551783)
@@ -1,5 +1,39 @@
+From 474cc44934eb915f97dd8ba876e2256c40b4ea9a Mon Sep 17 00:00:00 2001
+From: worldofpeace <worldofpe...@protonmail.ch>
+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 <m...@eworm.de>
+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 7c3b76a..161ed5a 100644
+index d705b60..fed59df 100644
--- a/plugins/datetime/Makefile.am
+++ b/plugins/datetime/Makefile.am
@@ -1,5 +1,5 @@
@@ -9,3 +43,26 @@
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 <mon...@inbox.ru>
+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-01-10 18:50:06 UTC (rev 551782)
+++ PKGBUILD 2020-01-10 18:54:28 UTC (rev 551783)
@@ -19,11 +19,13 @@
source=("https://pub.mate-desktop.org/releases/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz";
'0001-dbus-sys-dir.patch')
sha256sums=('37122a5aec96ebff25789be90e0a0f749eac096e8441babbbbe0c508be00bc45'
- '8d1d02ce3545fd3fcda6a919844722623d393bb2bd526bd827eefc694fb5ade2')
+ '8552412fa035e87929cb89db27286a96c5d7a7688847aebabe13e6bd465c36a2')
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
@@ -35,7 +37,6 @@
--prefix=/usr \
--libexecdir=/usr/lib/${pkgname} \
--sysconfdir=/etc \
- --with-dbus-sys="/usr/share/dbus-1/system.d" \
--enable-polkit \
--enable-pulse
