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

[Alexandre Filgueira]

    Date: Monday, April 25, 2016 @ 04:12:52
  Author: faidoc
Revision: 171753

upgpkg: cinnamon-settings-daemon 3.0.0-1

Modified:
  cinnamon-settings-daemon/trunk/PKGBUILD
Deleted:
  cinnamon-settings-daemon/trunk/0001-power-refresh-device-if-any-properties-changed.patch

-----------------------------------------------------------+
 0001-power-refresh-device-if-any-properties-changed.patch |   30 ------------
 PKGBUILD                                                  |   17 +-----
 2 files changed, 4 insertions(+), 43 deletions(-)

Deleted: 0001-power-refresh-device-if-any-properties-changed.patch
===================================================================
--- 0001-power-refresh-device-if-any-properties-changed.patch	2016-04-25 01:11:33 UTC (rev 171752)
+++ 0001-power-refresh-device-if-any-properties-changed.patch	2016-04-25 02:12:52 UTC (rev 171753)
@@ -1,30 +0,0 @@
-From a3276fd76a43299a0ce1f8cbd49de24cbd6bac27 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
-Date: Tue, 15 Mar 2016 23:38:59 +0100
-Subject: [PATCH] power: refresh device if any properties changed
-
-It's not enough to monitor state and warning-level.
-
-Fixes issue #111.
----
- plugins/power/csd-power-manager.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/plugins/power/csd-power-manager.c b/plugins/power/csd-power-manager.c
-index 94c6faf..4fc533b 100644
---- a/plugins/power/csd-power-manager.c
-+++ b/plugins/power/csd-power-manager.c
-@@ -1019,9 +1019,7 @@ engine_device_add (CsdPowerManager *manager, UpDevice *device)
- #if UP_CHECK_VERSION(0,99,0)
-         g_ptr_array_add (manager->priv->devices_array, g_object_ref(device));
- 
--        g_signal_connect (device, "notify::state",
--                          G_CALLBACK (device_properties_changed_cb), manager);
--        g_signal_connect (device, "notify::warning-level",
-+        g_signal_connect (device, "notify",
-                           G_CALLBACK (device_properties_changed_cb), manager);
- #endif
- 
--- 
-2.7.3
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-25 01:11:33 UTC (rev 171752)
+++ PKGBUILD	2016-04-25 02:12:52 UTC (rev 171753)
@@ -3,8 +3,8 @@
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
 pkgname=cinnamon-settings-daemon
-pkgver=2.8.4
-pkgrel=3
+pkgver=3.0.0
+pkgrel=1
 pkgdesc="The Cinnamon Settings daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,20 +15,11 @@
 options=('!emptydirs')
 install=cinnamon-settings-daemon.install
 url="https://github.com/linuxmint/cinnamon-settings-daemon"
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz"
-        "0001-power-refresh-device-if-any-properties-changed.patch")
-sha256sums=('2f7e8764a842d9b4f21c1e6d5321e4101720f1600462b5452d14a061b608c584'
-            'a6e43f32db01f452af8eaa98ff40063313388ba4b1045eff18804ccd02dae099')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz")
+sha256sums=('d29fa27b5eaf5e86f392700805f2e562d479f5a89c3e125e117e6af3a68cb42f')
 
 prepare() {
   cd $pkgname-$pkgver
-
-  # power: refresh device if any properties changed
-  # https://github.com/linuxmint/cinnamon-settings-daemon/pull/113
-  patch -Np1 -i ../0001-power-refresh-device-if-any-properties-changed.patch
-
-  # Support new libsystemd (which replaces libsystemd-login)
-  sed -i 's/libsystemd-login/libsystemd/' configure.ac
 }
 
 build() {