Date: Saturday, November 1, 2014 @ 19:18:06 Author: faidoc Revision: 121663
upgpkg: cinnamon-settings-daemon 2.4.1-1 Modified: cinnamon-settings-daemon/trunk/PKGBUILD Deleted: cinnamon-settings-daemon/trunk/power-manager-upower-0.99-support.patch cinnamon-settings-daemon/trunk/xrandr-manager-upower-0.99-support.patch ------------------------------------------+ PKGBUILD | 15 +------ power-manager-upower-0.99-support.patch | 59 ----------------------------- xrandr-manager-upower-0.99-support.patch | 30 -------------- 3 files changed, 4 insertions(+), 100 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-11-01 18:10:45 UTC (rev 121662) +++ PKGBUILD 2014-11-01 18:18:06 UTC (rev 121663) @@ -3,8 +3,8 @@ # Contributor: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> pkgname=cinnamon-settings-daemon -pkgver=2.2.4 -pkgrel=3 +pkgver=2.4.1 +pkgrel=1 pkgdesc="The Cinnamon Settings daemon" arch=('i686' 'x86_64') license=('GPL') @@ -14,19 +14,12 @@ 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" - "power-manager-upower-0.99-support.patch" - "xrandr-manager-upower-0.99-support.patch") -sha256sums=('5ee1f3d3af20fdadd5a6b948be667a0968c94f99f7b5a1992f03be0e876ff414' - 'f62cd7f2cc6aa4843686ab2b11e290ab83838fcf5d1c63596c618ee08c478e70' - 'c7918224605b84c484915ab91307112d4978c32b78d9bd027dc788865e762ebf') +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz") +sha256sums=('e36522e04b6309e24c486caa9ee1eb2f3830bdf52aede5258402ec1e81499256') prepare() { cd $pkgname-$pkgver - # Compatibility fixes for upower-0.99 (from Debian) - patch -Np1 -i ../power-manager-upower-0.99-support.patch - patch -Np1 -i ../xrandr-manager-upower-0.99-support.patch } build() { Deleted: power-manager-upower-0.99-support.patch =================================================================== --- power-manager-upower-0.99-support.patch 2014-11-01 18:10:45 UTC (rev 121662) +++ power-manager-upower-0.99-support.patch 2014-11-01 18:18:06 UTC (rev 121663) @@ -1,59 +0,0 @@ -Index: cinnamon-settings-daemon/plugins/power/csd-power-manager.c -=================================================================== ---- cinnamon-settings-daemon.orig/plugins/power/csd-power-manager.c 2014-07-26 21:44:58.490885083 +0200 -+++ cinnamon-settings-daemon/plugins/power/csd-power-manager.c 2014-07-26 22:11:41.186589948 +0200 -@@ -236,6 +236,10 @@ - static void lock_screensaver (CsdPowerManager *manager); - static void kill_lid_close_safety_timer (CsdPowerManager *manager); - -+#if UP_CHECK_VERSION(0,99,0) -+static void device_properties_changed_cb (UpDevice *device, GParamSpec *pspec, CsdPowerManager *manager); -+#endif -+ - G_DEFINE_TYPE (CsdPowerManager, csd_power_manager, G_TYPE_OBJECT) - - static gpointer manager_object = NULL; -@@ -990,6 +994,16 @@ - "engine-state-old", - GUINT_TO_POINTER(state)); - } -+ -+#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_CALLBACK (device_properties_changed_cb), manager); -+#endif -+ - } - - static gboolean -@@ -1714,7 +1728,11 @@ - } - - static void -+#if UP_CHECK_VERSION(0,99,0) -+device_properties_changed_cb (UpDevice *device, GParamSpec *pspec, CsdPowerManager *manager) -+#else - engine_device_changed_cb (UpClient *client, UpDevice *device, CsdPowerManager *manager) -+#endif - { - UpDeviceKind kind; - UpDeviceState state; -@@ -3986,12 +4004,12 @@ - G_CALLBACK (engine_device_added_cb), manager); - g_signal_connect (manager->priv->up_client, "device-removed", - G_CALLBACK (engine_device_removed_cb), manager); -- g_signal_connect (manager->priv->up_client, "device-changed", -- G_CALLBACK (engine_device_changed_cb), manager); - #if UP_CHECK_VERSION(0,99,0) - g_signal_connect_after (manager->priv->up_client, "notify::lid-is-closed", - G_CALLBACK (lid_state_changed_cb), manager); - #else -+ g_signal_connect (manager->priv->up_client, "device-changed", -+ G_CALLBACK (engine_device_changed_cb), manager); - g_signal_connect_after (manager->priv->up_client, "changed", - G_CALLBACK (up_client_changed_cb), manager); - #endif Deleted: xrandr-manager-upower-0.99-support.patch =================================================================== --- xrandr-manager-upower-0.99-support.patch 2014-11-01 18:10:45 UTC (rev 121662) +++ xrandr-manager-upower-0.99-support.patch 2014-11-01 18:18:06 UTC (rev 121663) @@ -1,30 +0,0 @@ -Index: cinnamon-settings-daemon/plugins/xrandr/csd-xrandr-manager.c -=================================================================== ---- cinnamon-settings-daemon.orig/plugins/xrandr/csd-xrandr-manager.c 2014-04-26 22:10:54.543862563 +0200 -+++ cinnamon-settings-daemon/plugins/xrandr/csd-xrandr-manager.c 2014-07-13 19:55:03.293418349 +0200 -@@ -1979,7 +1979,11 @@ - } - - static void -+#if UP_CHECK_VERSION(0,99,0) -+lid_state_changed_cb (UpClient *client, GParamSpec *pspec, gpointer data) -+#else - power_client_changed_cb (UpClient *client, gpointer data) -+#endif - { - CsdXrandrManager *manager = data; - CsdXrandrManagerPrivate *priv = manager->priv; -@@ -2029,8 +2033,13 @@ - - manager->priv->upower_client = up_client_new (); - manager->priv->laptop_lid_is_closed = up_client_get_lid_is_closed (manager->priv->upower_client); -+#if UP_CHECK_VERSION(0,99,0) -+ g_signal_connect (manager->priv->upower_client, "notify::lid-is-closed", -+ G_CALLBACK (lid_state_changed_cb), manager); -+#else - g_signal_connect (manager->priv->upower_client, "changed", - G_CALLBACK (power_client_changed_cb), manager); -+#endif - - log_msg ("State of screen at startup:\n"); - log_screen (manager->priv->rw_screen);