[arch-commits] Commit in mate-applets/trunk (3 files)

[Christian Hesse]

    Date: Friday, January 10, 2020 @ 18:50:06
  Author: eworm
Revision: 551782

use upstream patch and add comment

Added:
  mate-applets/trunk/0001-make-the-dbus-directory-configurable.patch
Modified:
  mate-applets/trunk/PKGBUILD
Deleted:
  mate-applets/trunk/0001-dbus-sys-dir.patch

-------------------------------------------------+
 0001-dbus-sys-dir.patch                         |   35 -----------------
 0001-make-the-dbus-directory-configurable.patch |   44 ++++++++++++++++++++++
 PKGBUILD                                        |    8 ++--
 3 files changed, 49 insertions(+), 38 deletions(-)

Deleted: 0001-dbus-sys-dir.patch
===================================================================
--- 0001-dbus-sys-dir.patch	2020-01-10 18:11:16 UTC (rev 551781)
+++ 0001-dbus-sys-dir.patch	2020-01-10 18:50:06 UTC (rev 551782)
@@ -1,35 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index af66e0e..0a0c391 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -133,6 +133,17 @@ fi
- AC_SUBST(LIBNOTIFY_CFLAGS)
- AC_SUBST(LIBNOTIFY_LIBS)
- 
-+dnl -- Check for D-Bus -----------------------------------------
-+AC_ARG_WITH(dbus-sys,
-+        [AC_HELP_STRING([--with-dbus-sys=<dir>],
-+        [where D-BUS system.d directory is])])
-+if ! test -z "$with_dbus_sys" ; then
-+        DBUS_SYS_DIR="$with_dbus_sys"
-+else
-+        DBUS_SYS_DIR='${sysconfdir}/dbus-1/system.d'
-+fi
-+AC_SUBST(DBUS_SYS_DIR)
-+
- dnl -- check for glib/gobject (required) --------------------------------------
- PKG_CHECK_MODULES(CPUFREQ_SELECTOR, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED)
- AC_SUBST(CPUFREQ_SELECTOR_CFLAGS)
-diff --git a/cpufreq/src/cpufreq-selector/Makefile.am b/cpufreq/src/cpufreq-selector/Makefile.am
-index 27dfac6..52f2d6e 100644
---- a/cpufreq/src/cpufreq-selector/Makefile.am
-+++ b/cpufreq/src/cpufreq-selector/Makefile.am
-@@ -50,7 +50,7 @@ dbus_services_in_files = org.mate.CPUFreqSelector.service.in
- polkit_in_files = org.mate.cpufreqselector.policy.in
- 
- dbus_servicesdir = $(datadir)/dbus-1/system-services
--dbus_confdir = $(sysconfdir)/dbus-1/system.d
-+dbus_confdir = $(DBUS_SYS_DIR)
- polkitdir = $(datadir)/polkit-1/actions
- 
- if HAVE_POLKIT

Added: 0001-make-the-dbus-directory-configurable.patch
===================================================================
--- 0001-make-the-dbus-directory-configurable.patch	                        (rev 0)
+++ 0001-make-the-dbus-directory-configurable.patch	2020-01-10 18:50:06 UTC (rev 551782)
@@ -0,0 +1,44 @@
+From 9714c20d062af14e9b6cbf4cf3c9374acc6b9101 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at eworm.de>
+Date: Fri, 13 Dec 2019 15:11:44 +0100
+Subject: [PATCH] make the dbus directory configurable
+---
+ configure.ac                             | 11 +++++++++++
+ cpufreq/src/cpufreq-selector/Makefile.am |  2 +-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1709f512..3c5e19a3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -133,6 +133,17 @@ fi
+ AC_SUBST(LIBNOTIFY_CFLAGS)
+ AC_SUBST(LIBNOTIFY_LIBS)
+ 
++dnl -- Check for D-Bus -----------------------------------------
++AC_ARG_WITH(dbus-sys,
++        [AC_HELP_STRING([--with-dbus-sys=<dir>],
++        [where D-BUS system.d directory is])])
++if ! test -z "$with_dbus_sys" ; then
++        DBUS_SYS_DIR="$with_dbus_sys"
++else
++        DBUS_SYS_DIR='${sysconfdir}/dbus-1/system.d'
++fi
++AC_SUBST(DBUS_SYS_DIR)
++
+ dnl -- check for glib/gobject (required) --------------------------------------
+ PKG_CHECK_MODULES(CPUFREQ_SELECTOR, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED)
+ AC_SUBST(CPUFREQ_SELECTOR_CFLAGS)
+diff --git a/cpufreq/src/cpufreq-selector/Makefile.am b/cpufreq/src/cpufreq-selector/Makefile.am
+index dc913c70..b75a26c4 100644
+--- a/cpufreq/src/cpufreq-selector/Makefile.am
++++ b/cpufreq/src/cpufreq-selector/Makefile.am
+@@ -50,7 +50,7 @@ dbus_services_in_files = org.mate.CPUFreqSelector.service.in
+ polkit_in_files = org.mate.cpufreqselector.policy.in
+ 
+ dbus_servicesdir = $(datadir)/dbus-1/system-services
+-dbus_confdir = $(sysconfdir)/dbus-1/system.d
++dbus_confdir = $(DBUS_SYS_DIR)
+ polkitdir = $(datadir)/polkit-1/actions
+ 
+ if HAVE_POLKIT

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-10 18:11:16 UTC (rev 551781)
+++ PKGBUILD	2020-01-10 18:50:06 UTC (rev 551782)
@@ -15,14 +15,16 @@
 conflicts=('mate-applets-gtk3' 'mate-netspeed' 'mate-netspeed-gtk3')
 replaces=('mate-applets-gtk3' 'mate-netspeed' 'mate-netspeed-gtk3')
 source=("https://pub.mate-desktop.org/releases/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
-        '0001-dbus-sys-dir.patch')
+        '0001-make-the-dbus-directory-configurable.patch')
 sha256sums=('0c47d69fdecda40231d021cb72594c479e01a4d4b7f49c9550731a9fe7cc62b0'
-            'e4812eba493333c688ae431dc0ae35b58f1ff107bbc795ea812dd99a1a1b7283')
+            '86c62a2a4df68582e758c7b9ead62d55dc673bbbda841d9bd6f324fb0d53685b')
 
 prepare() {
     	cd "${pkgname}-${pkgver}"
 
-    	patch -Np1 < ../0001-dbus-sys-dir.patch
+	# 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-make-the-dbus-directory-configurable.patch
 
     	autoreconf -fi
 }