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

[Eli Schwartz]

    Date: Thursday, May 14, 2020 @ 02:36:54
  Author: eschwartz
Revision: 627810

upgpkg: cinnamon-settings-daemon 4.6.0-1: upstream release

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

-------------------------+
 0001-dbus-sys-dir.patch |   13 -------------
 PKGBUILD                |   16 +++++-----------
 2 files changed, 5 insertions(+), 24 deletions(-)

Deleted: 0001-dbus-sys-dir.patch
===================================================================
--- 0001-dbus-sys-dir.patch	2020-05-14 02:14:29 UTC (rev 627809)
+++ 0001-dbus-sys-dir.patch	2020-05-14 02:36:54 UTC (rev 627810)
@@ -1,13 +0,0 @@
-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	2020-05-14 02:14:29 UTC (rev 627809)
+++ PKGBUILD	2020-05-14 02:36:54 UTC (rev 627810)
@@ -3,8 +3,8 @@
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
 pkgname=cinnamon-settings-daemon
-pkgver=4.4.0
-pkgrel=2
+pkgver=4.6.0
+pkgrel=1
 pkgdesc="The Cinnamon Settings daemon"
 arch=('x86_64')
 url="https://github.com/linuxmint/${pkgname}"
@@ -15,19 +15,13 @@
 optdepends=('cinnamon-translations: i18n')
 makedepends=('autoconf-archive' 'intltool' 'python' 'xf86-input-wacom')
 options=('!emptydirs')
-source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz"
-        '0001-dbus-sys-dir.patch')
-sha256sums=('6797a0bb73ea2345580a43fe8c75c70f48634b82b0a3518f48cc603f084bf012'
-            'a075aa599f1b0a4718723fcd5ee550da9e7a8d980efc31a8261240956fc8cdd5')
-b2sums=('ef0666864a4735ff32d57a584004176c74d0f0ad4b077d3439e135c1d24c8d0606221a1b1693a0189972b462055478680b03917a6acfcdfdc80649f7ee0fc224'
-        'ce13cf885dda6ed3839c4e33770144abb482b49dc991a71276a097695ed3184e1a1a4559d73e9f2ba464f9ccfe1bfbcf33e64fa3b128dfa0a4c5a69b93a604d1')
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz")
+sha256sums=('36eaeb3457d253c97a26fec2e471a7ab99c931e7930b42a38e4d64fb02480230')
+b2sums=('51a3fc96e41704584274cdfb664d1d0dc1019c480d00fa8aa026426e00e93fea68a707c2862f7a8f60f749bfb5786b4abad7b2ed26acf1753c2b114b51459550')
 
 prepare() {
     cd "${srcdir}"/${pkgname}-${pkgver}
 
-    # this should really get fixed properly by https://github.com/linuxmint/cinnamon-settings-daemon/pull/249
-    patch -Np1 < ../0001-dbus-sys-dir.patch
-
     autoreconf -fi
 }