From 7377a842b6cb87acaa2b61034b66a446791b2dd5 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 24 Jan 2015 10:22:03 +0100 Subject: [PATCH] cinnamon-settings-daemon: update to 2.4.3. --- .../power-manager-upower-0.99-support.patch | 59 ------------------- .../xrandr-manager-upower-0.99-support.patch | 30 ---------- srcpkgs/cinnamon-settings-daemon/template | 16 ++--- 3 files changed, 6 insertions(+), 99 deletions(-) delete mode 100644 srcpkgs/cinnamon-settings-daemon/patches/power-manager-upower-0.99-support.patch delete mode 100644 srcpkgs/cinnamon-settings-daemon/patches/xrandr-manager-upower-0.99-support.patch diff --git a/srcpkgs/cinnamon-settings-daemon/patches/power-manager-upower-0.99-support.patch b/srcpkgs/cinnamon-settings-daemon/patches/power-manager-upower-0.99-support.patch deleted file mode 100644 index 61102ecee9d..00000000000 --- a/srcpkgs/cinnamon-settings-daemon/patches/power-manager-upower-0.99-support.patch +++ /dev/null @@ -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 diff --git a/srcpkgs/cinnamon-settings-daemon/patches/xrandr-manager-upower-0.99-support.patch b/srcpkgs/cinnamon-settings-daemon/patches/xrandr-manager-upower-0.99-support.patch deleted file mode 100644 index df9191d8a0f..00000000000 --- a/srcpkgs/cinnamon-settings-daemon/patches/xrandr-manager-upower-0.99-support.patch +++ /dev/null @@ -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); diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template index 79b0ec8414f..79660fda6db 100644 --- a/srcpkgs/cinnamon-settings-daemon/template +++ b/srcpkgs/cinnamon-settings-daemon/template @@ -1,14 +1,14 @@ # Template file for 'cinnamon-settings-daemon' pkgname=cinnamon-settings-daemon -version=2.2.4 -revision=4 -patch_args="-Np1" +version=2.4.3 +revision=1 short_desc="The Cinnamon Settings Daemon" +build_options="systemd" build_style=gnu-configure configure_args=" --disable-static --disable-schemas-compile --disable-gconf $(vopt_enable systemd)" hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection - gettext-devel intltool xmlto docbook-xml git" + gettext-devel glib-devel intltool xmlto docbook-xml" makedepends="gtk+3-devel dbus-devel upower0-devel json-glib-devel libSM-devel libnotify-devel cinnamon-desktop-devel lcms2-devel ibus-devel nss-devel pulseaudio-devel libcanberra-devel colord-devel cups-devel polkit-devel @@ -17,12 +17,8 @@ depends="desktop-file-utils hicolor-icon-theme" maintainer="Juan RP " license="GPL-3" homepage="http://cinnamon.linuxmint.com/" - -build_options="systemd" - -do_fetch() { - git clone -b ${version} git://github.com/linuxmint/${pkgname} ${pkgname}-${version} -} +distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" +checksum=1d3c47aad65f9c5064686352012cf1783e51440fa45f4ee030bb33ac66304fd2 pre_configure() { NOCONFIGURE=1 ./autogen.sh