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

[Brad Fanella]

    Date: Tuesday, February 25, 2020 @ 19:14:22
  Author: cesura
Revision: 581886

upgpkg: mate-applets 1.24.0-1: Updated to version 1.24.0

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

-------------------------------------------------+
 0001-make-the-dbus-directory-configurable.patch |   44 ----------------------
 PKGBUILD                                        |   20 ++--------
 2 files changed, 4 insertions(+), 60 deletions(-)

Deleted: 0001-make-the-dbus-directory-configurable.patch
===================================================================
--- 0001-make-the-dbus-directory-configurable.patch	2020-02-25 19:14:20 UTC (rev 581885)
+++ 0001-make-the-dbus-directory-configurable.patch	2020-02-25 19:14:22 UTC (rev 581886)
@@ -1,44 +0,0 @@
-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-02-25 19:14:20 UTC (rev 581885)
+++ PKGBUILD	2020-02-25 19:14:22 UTC (rev 581886)
@@ -2,8 +2,8 @@
 # Contributor: Martin Wimpress <code at flexion.org>
 
 pkgname=mate-applets
-pkgver=1.22.2
-pkgrel=3
+pkgver=1.24.0
+pkgrel=1
 pkgdesc="Applets for MATE panel"
 arch=('x86_64')
 url="https://mate-desktop.org"
@@ -14,21 +14,9 @@
 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"
-        '0001-make-the-dbus-directory-configurable.patch')
-sha256sums=('0c47d69fdecda40231d021cb72594c479e01a4d4b7f49c9550731a9fe7cc62b0'
-            '86c62a2a4df68582e758c7b9ead62d55dc673bbbda841d9bd6f324fb0d53685b')
+source=("https://pub.mate-desktop.org/releases/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
+sha256sums=('b84feb195b3deb8ef7a973d6e66ba30f0c411cf2e9af1a76afa8903d5655a35a')
 
-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-make-the-dbus-directory-configurable.patch
-
-    	autoreconf -fi
-}
-
 build() {
     	cd "${pkgname}-${pkgver}"
     	./configure \