[arch-commits] Commit in mate-applets/trunk (0001-dbus-sys-dir.patch PKGBUILD)

[Christian Hesse]

    Date: Friday, December 13, 2019 @ 14:22:03
  Author: eworm
Revision: 537548

upgpkg: mate-applets 1.22.2-3

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

Added:
  mate-applets/trunk/0001-dbus-sys-dir.patch
Modified:
  mate-applets/trunk/PKGBUILD

-------------------------+
 0001-dbus-sys-dir.patch |   35 +++++++++++++++++++++++++++++++++++
 PKGBUILD                |   19 +++++++++++++++----
 2 files changed, 50 insertions(+), 4 deletions(-)

Added: 0001-dbus-sys-dir.patch
===================================================================
--- 0001-dbus-sys-dir.patch	                        (rev 0)
+++ 0001-dbus-sys-dir.patch	2019-12-13 14:22:03 UTC (rev 537548)
@@ -0,0 +1,35 @@
+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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-13 13:57:04 UTC (rev 537547)
+++ PKGBUILD	2019-12-13 14:22:03 UTC (rev 537548)
@@ -3,20 +3,30 @@
 
 pkgname=mate-applets
 pkgver=1.22.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Applets for MATE panel"
 arch=('x86_64')
 url="https://mate-desktop.org"
 license=('GPL')
 depends=('cpupower' 'gtksourceview3' 'libgtop' 'libnotify' 'mate-panel' 'polkit' 'upower' 'wireless_tools')
-makedepends=('intltool' 'itstool' 'gucharmap')
+makedepends=('intltool' 'itstool' 'gucharmap' 'yelp-tools')
 optdepends=('fortune-mod: for displaying fortune cookies in the Wanda the Fish applet' 'gucharmap: character picker applet')
 groups=('mate-extra')
 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")
-sha256sums=('0c47d69fdecda40231d021cb72594c479e01a4d4b7f49c9550731a9fe7cc62b0')
+source=("https://pub.mate-desktop.org/releases/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
+        '0001-dbus-sys-dir.patch')
+sha256sums=('0c47d69fdecda40231d021cb72594c479e01a4d4b7f49c9550731a9fe7cc62b0'
+            'e4812eba493333c688ae431dc0ae35b58f1ff107bbc795ea812dd99a1a1b7283')
 
+prepare() {
+    	cd "${pkgname}-${pkgver}"
+
+    	patch -Np1 < ../0001-dbus-sys-dir.patch
+
+    	autoreconf -fi
+}
+
 build() {
     	cd "${pkgname}-${pkgver}"
     	./configure \
@@ -23,6 +33,7 @@
         	--prefix=/usr \
         	--sysconfdir=/etc \
         	--libexecdir=/usr/lib/${pkgname} \
+        	--with-dbus-sys="/usr/share/dbus-1/system.d" \
         	--enable-polkit \
         	--enable-ipv6
     	make