[arch-commits] Commit in cinnamon-settings-daemon/trunk (3 files)
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
===
--- PKGBUILD2014-11-01 18:10:45 UTC (rev 121662)
+++ PKGBUILD2014-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);
-
[arch-commits] Commit in cinnamon-settings-daemon/trunk (3 files)
Date: Thursday, July 31, 2014 @ 18:55:44
Author: bgyorgy
Revision: 116647
upgpkg: cinnamon-settings-daemon 2.2.4-2
Apply compatibility fixes for upower-0.99 (from Debian)
Added:
cinnamon-settings-daemon/trunk/power-manager-upower-0.99-support.patch
cinnamon-settings-daemon/trunk/xrandr-manager-upower-0.99-support.patch
Modified:
cinnamon-settings-daemon/trunk/PKGBUILD
--+
PKGBUILD | 14 +-
power-manager-upower-0.99-support.patch | 59 +
xrandr-manager-upower-0.99-support.patch | 30 ++
3 files changed, 100 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-07-31 16:55:35 UTC (rev 116646)
+++ PKGBUILD2014-07-31 16:55:44 UTC (rev 116647)
@@ -4,7 +4,7 @@
pkgname=cinnamon-settings-daemon
pkgver=2.2.4
-pkgrel=1
+pkgrel=2
pkgdesc=The Cinnamon Settings daemon
arch=('i686' 'x86_64')
license=('GPL')
@@ -14,11 +14,19 @@
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;)
-sha256sums=('5ee1f3d3af20fdadd5a6b948be667a0968c94f99f7b5a1992f03be0e876ff414')
+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')
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() {
Added: power-manager-upower-0.99-support.patch
===
--- power-manager-upower-0.99-support.patch (rev 0)
+++ power-manager-upower-0.99-support.patch 2014-07-31 16:55:44 UTC (rev
116647)
@@ -0,0 +1,59 @@
+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
Added:
[arch-commits] Commit in cinnamon-settings-daemon/trunk (3 files)
Date: Friday, April 11, 2014 @ 07:02:42
Author: bgyorgy
Revision: 109178
upgpkg: cinnamon-settings-daemon 2.0.8-5
Rebuild for upower 0.99
Added:
cinnamon-settings-daemon/trunk/cinnamon-settings-daemon-2.0.6-upower_deprecated.patch
cinnamon-settings-daemon/trunk/remove_obsolete_battery_recall_code.patch
Modified:
cinnamon-settings-daemon/trunk/PKGBUILD
+
PKGBUILD | 10
cinnamon-settings-daemon-2.0.6-upower_deprecated.patch | 91 +
remove_obsolete_battery_recall_code.patch | 242 +++
3 files changed, 342 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-04-11 03:52:27 UTC (rev 109177)
+++ PKGBUILD2014-04-11 05:02:42 UTC (rev 109178)
@@ -4,7 +4,7 @@
pkgname=cinnamon-settings-daemon
pkgver=2.0.8
-pkgrel=4
+pkgrel=5
pkgdesc=The Cinnamon Settings daemon
arch=('i686' 'x86_64')
license=('GPL')
@@ -16,11 +16,15 @@
source=(${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz;
keyboard.patch
systemd-support.patch
+cinnamon-settings-daemon-2.0.6-upower_deprecated.patch
+remove_obsolete_battery_recall_code.patch
automount-plugin.patch
dpms.patch)
sha256sums=('6889f021acab93d146c78fe8aa540a83a12260232e1ea5f697037a7c94c877fd'
'3c05b978cb414c8fc1530f211bab58627a64ac9c156630c9d486f5926a85109c'
'28c002628bc97e8b4a2aa7e8a8141bcc8388b250a6c3ebc09a640e110ae815a9'
+'291855ec208974a0a59ce24707820dcb9ff04868421f185b42d86d1dc52eb0d6'
+'4c1d917a7a70e16a5307f767c1494fa59cbc5168d9293ad66b56e17a74e8baf1'
'4fc2b3a354b53d41d92d7f95d175a6a18382330353a0579d29c2d33b9400a837'
'194cc704320a2d6be636191e96f62514f2b5f97655c200991b5690fbf3006026')
@@ -33,6 +37,10 @@
# Add systemd support for power and media-keys plugins
patch -Np1 -i ../systemd-support.patch
+ # Port to upower 0.99
+ patch -Np1 -i ../cinnamon-settings-daemon-2.0.6-upower_deprecated.patch
+ patch -Np1 -i ../remove_obsolete_battery_recall_code.patch
+
# Turn automount helper into a plugin
patch -Np1 -i ../automount-plugin.patch
Added: cinnamon-settings-daemon-2.0.6-upower_deprecated.patch
===
--- cinnamon-settings-daemon-2.0.6-upower_deprecated.patch
(rev 0)
+++ cinnamon-settings-daemon-2.0.6-upower_deprecated.patch 2014-04-11
05:02:42 UTC (rev 109178)
@@ -0,0 +1,91 @@
+diff -Naur
cinnamon-settings-daemon-2.0.8.orig/plugins/power/csd-power-manager.c
cinnamon-settings-daemon-2.0.8/plugins/power/csd-power-manager.c
+--- cinnamon-settings-daemon-2.0.8.orig/plugins/power/csd-power-manager.c
2014-04-11 06:00:33.852563000 +0200
cinnamon-settings-daemon-2.0.8/plugins/power/csd-power-manager.c
2014-04-11 06:52:24.516345019 +0200
+@@ -1171,6 +1171,7 @@
+ gboolean ret;
+ GError *error = NULL;
+
++#if ! UP_CHECK_VERSION(0,99,0)
+ /* get devices from UPower */
+ ret = up_client_enumerate_devices_sync (manager-priv-up_client,
NULL, error);
+ if (!ret) {
+@@ -1178,6 +1179,7 @@
+ g_error_free (error);
+ goto out;
+ }
++#endif
+
+ /* connected mobile phones */
+ gpm_phone_coldplug (manager-priv-phone);
+@@ -1317,7 +1319,7 @@
+ gboolean is_ups)
+ {
+ CsdPowerActionType policy;
+-
++#if ! UP_CHECK_VERSION(0,99,0)
+ policy = g_settings_get_enum (manager-priv-settings,
critical-battery-action);
+ if (policy == CSD_POWER_ACTION_SUSPEND) {
+ if (is_ups == FALSE
+@@ -1329,7 +1331,17 @@
+ return policy;
+ return CSD_POWER_ACTION_SHUTDOWN;
+ }
++#else
++char *action;
+
++action = up_client_get_critical_action (manager-priv-up_client);
++/* We don't make the difference between HybridSleep and Hibernate */
++if (g_strcmp0 (action, PowerOff) == 0)
++policy = GSD_POWER_ACTION_SHUTDOWN;
++else
++policy = GSD_POWER_ACTION_HIBERNATE;
++g_free (action);
++#endif
+ return policy;
+ }
+
+@@ -2314,6 +2326,7 @@
+lid-close-ac-action);
+ }
+
++#if ! UP_CHECK_VERSION(0,99,0)
+ /* check we won't melt when the lid is closed */
+ if (action_type != CSD_POWER_ACTION_SUSPEND
+ action_type != CSD_POWER_ACTION_HIBERNATE) {
+@@ -2326,6 +2339,7 @@
+ lock_screensaver (manager);
+ }
+ }
++#endif
+
+ /* ensure we turn the panel back on after resume */
+ ret = gnome_rr_screen_set_dpms_mode
[arch-commits] Commit in cinnamon-settings-daemon/trunk (3 files)
Date: Wednesday, October 9, 2013 @ 03:18:07 Author: bgyorgy Revision: 98355 upgpkg: cinnamon-settings-daemon 2.0.1-2 - Cleanup dependencies - Fix crasher - Turn automount helper into a plugin Added: cinnamon-settings-daemon/trunk/automount-plugin.patch cinnamon-settings-daemon/trunk/keyboard.patch Modified: cinnamon-settings-daemon/trunk/PKGBUILD + PKGBUILD | 28 automount-plugin.patch | 447 keyboard.patch | 4728 +++ 3 files changed, 5195 insertions(+), 8 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 98354:98355 to see the changes.
