Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=3eb36582b3756471f05a339dc2f2ba0a0736e841
commit 3eb36582b3756471f05a339dc2f2ba0a0736e841
Author: bouleetbil <bouleet...@frogdev.info>
Date: Thu Sep 1 14:12:04 2011 +0200
gnome-settings-daemon-3.1.90-3-x86_64
*backport some patchs
diff --git a/source/gnome/gnome-settings-daemon/FrugalBuild
b/source/gnome/gnome-settings-daemon/FrugalBuild
index 3d56169..4480e52 100644
--- a/source/gnome/gnome-settings-daemon/FrugalBuild
+++ b/source/gnome/gnome-settings-daemon/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=gnome-settings-daemon
pkgver=3.1.90
-pkgrel=2
+pkgrel=3
pkgdesc="Utility library for accessing gnome-settings-daemon over DBUS"
depends=('libxml2>=2.7.8' 'libgnomekbd>=3.0.0' 'esd'
'gst-plugins-base>=0.10.22-2' 'libxxf86misc' \
'gnome-desktop>=3.1.90' 'alsa-lib' 'pulseaudio' 'gsettings-desktop-schemas'
'libxtst' 'libnotify' \
@@ -16,9 +16,14 @@ _F_gnome_glib="y"
_F_gnome_scrollkeeper="y"
_F_gnome_iconcache="y"
Finclude gnome gnome-scriptlet
-source=($source upower.diff)
+source=($source upower.diff upower_crash.diff xsettings1.diff xsettings.diff
typo.diff)
sha1sums=('6d6dc3d7a6238546b0b863e19cc74d0a1ead5403' \
- '25ff7b6dd5872270b8331f05a153137e43c3c0ec')
+ '25ff7b6dd5872270b8331f05a153137e43c3c0ec' \
+ '421c5cc7a1df009310e84bfaace951f3ebc65bec' \
+ '3a9d8abd89b639484b975603cbbdc5025b7b13c2' \
+ 'ace19b1521c8ed4277d7bd43de2b1aab6685815e' \
+ '8b846887619d35206185e96af7c35c690292bc80')
+
Fconfopts="${Fconfopts[@]} --disable-static"
build() {
diff --git a/source/gnome/gnome-settings-daemon/typo.diff
b/source/gnome/gnome-settings-daemon/typo.diff
new file mode 100644
index 0000000..cb26126
--- /dev/null
+++ b/source/gnome/gnome-settings-daemon/typo.diff
@@ -0,0 +1,23 @@
+From 3e6e4421a8bedcd9cf374025e3fac1412036bc95 Mon Sep 17 00:00:00 2001
+From: Owen W. Taylor <otay...@fishsoup.net>
+Date: Tue, 30 Aug 2011 18:17:19 +0000
+Subject: Fix a stray brace
+
+A recent commit introduced an unclosed brace for an if statement
+---
+diff --git a/plugins/xsettings/gsd-xsettings-gtk.c
b/plugins/xsettings/gsd-xsettings-gtk.c
+index 0ce4db7..c2a043c 100644
+--- a/plugins/xsettings/gsd-xsettings-gtk.c
++++ b/plugins/xsettings/gsd-xsettings-gtk.c
+@@ -76,7 +76,7 @@ cond_setting_changed (GSettings *settings,
+
+ enabled = g_settings_get_boolean (settings, key);
+ if (enabled != FALSE) {
+- if (gtk->priv->dir_modules == NULL) {
++ if (gtk->priv->dir_modules == NULL)
+ gtk->priv->dir_modules = g_hash_table_new_full
(g_str_hash, g_str_equal, g_free, NULL);
+ g_hash_table_insert (gtk->priv->dir_modules, g_strdup
(module_name), NULL);
+ } else if (gtk->priv->dir_modules != NULL) {
+--
+cgit v0.9.0.2
+
diff --git a/source/gnome/gnome-settings-daemon/upower_crash.diff
b/source/gnome/gnome-settings-daemon/upower_crash.diff
new file mode 100644
index 0000000..19373c7
--- /dev/null
+++ b/source/gnome/gnome-settings-daemon/upower_crash.diff
@@ -0,0 +1,78 @@
+From 825e08d6baab8856d8cfda1ecbdc196bedc57fe4 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <had...@hadess.net>
+Date: Tue, 30 Aug 2011 16:34:14 +0100
+Subject: [PATCH] power: Fix impossible to hit error paths
+
+guint is always positive, so "value < 0" will never catch errors,
+and might cause crashers.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=657364
+---
+ plugins/power/gsd-power-manager.c | 20 ++++++++------------
+ 1 files changed, 8 insertions(+), 12 deletions(-)
+
+diff --git a/plugins/power/gsd-power-manager.c
b/plugins/power/gsd-power-manager.c
+index f983890..80040cd 100644
+--- a/plugins/power/gsd-power-manager.c
++++ b/plugins/power/gsd-power-manager.c
+@@ -2221,13 +2221,13 @@ out:
+ * Return value: the signed integer value from the helper, or -1
+ * for failure. If -1 then @error is set.
+ **/
+-static gint
++static gint64
+ backlight_helper_get_value (const gchar *argument, GError **error)
+ {
+ gboolean ret;
+ gchar *stdout_data = NULL;
+ gint exit_status = 0;
+- guint64 value = -1;
++ gint64 value = -1;
+ gchar *command = NULL;
+ gchar *endptr = NULL;
+
+@@ -2254,7 +2254,7 @@ backlight_helper_get_value (const gchar *argument,
GError **error)
+ g_debug ("executed %s retval: %i", command, exit_status);
+
+ /* parse */
+- value = g_ascii_strtoull (stdout_data, &endptr, 10);
++ value = g_ascii_strtoll (stdout_data, &endptr, 10);
+
+ /* parsing error */
+ if (endptr == stdout_data) {
+@@ -2329,28 +2329,24 @@ static gint
+ backlight_get_abs (GsdPowerManager *manager, GError **error)
+ {
+ GnomeRROutput *output;
+- guint value;
+
+ /* prefer xbacklight */
+ output = get_primary_output (manager);
+ if (output != NULL) {
+- value = gnome_rr_output_get_backlight (output,
+- error);
+- goto out;
++ return gnome_rr_output_get_backlight (output,
++ error);
+ }
+
+ /* fall back to the polkit helper */
+- value = backlight_helper_get_value ("get-brightness", error);
+-out:
+- return value;
++ return backlight_helper_get_value ("get-brightness", error);
+ }
+
+ static gint
+ backlight_get_percentage (GsdPowerManager *manager, GError **error)
+ {
+ GnomeRROutput *output;
+- guint now;
+- guint value = -1;
++ gint now;
++ gint value = -1;
+ gint min = 0;
+ gint max;
+
+--
+1.7.6
diff --git a/source/gnome/gnome-settings-daemon/xsettings.diff
b/source/gnome/gnome-settings-daemon/xsettings.diff
new file mode 100644
index 0000000..0640d20
--- /dev/null
+++ b/source/gnome/gnome-settings-daemon/xsettings.diff
@@ -0,0 +1,28 @@
+From 9054d2321acb592cb8223e76b591ce232a91a77e Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <had...@hadess.net>
+Date: Tue, 30 Aug 2011 14:51:57 +0000
+Subject: xsettings: Don't poke at an empty hashtable
+
+We might not like the result.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=657464
+---
+diff --git a/plugins/xsettings/gsd-xsettings-gtk.c
b/plugins/xsettings/gsd-xsettings-gtk.c
+index 494ac77..0ce4db7 100644
+--- a/plugins/xsettings/gsd-xsettings-gtk.c
++++ b/plugins/xsettings/gsd-xsettings-gtk.c
+@@ -76,8 +76,10 @@ cond_setting_changed (GSettings *settings,
+
+ enabled = g_settings_get_boolean (settings, key);
+ if (enabled != FALSE) {
++ if (gtk->priv->dir_modules == NULL) {
++ gtk->priv->dir_modules = g_hash_table_new_full
(g_str_hash, g_str_equal, g_free, NULL);
+ g_hash_table_insert (gtk->priv->dir_modules, g_strdup
(module_name), NULL);
+- } else {
++ } else if (gtk->priv->dir_modules != NULL) {
+ g_hash_table_remove (gtk->priv->dir_modules, module_name);
+ }
+
+--
+cgit v0.9.0.2
+
diff --git a/source/gnome/gnome-settings-daemon/xsettings1.diff
b/source/gnome/gnome-settings-daemon/xsettings1.diff
new file mode 100644
index 0000000..fc68194
--- /dev/null
+++ b/source/gnome/gnome-settings-daemon/xsettings1.diff
@@ -0,0 +1,54 @@
+From 7967b6eb4ec78f5553a02eb97236ef3b91d80998 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <had...@hadess.net>
+Date: Tue, 30 Aug 2011 14:21:49 +0000
+Subject: xsettings: Handle rgba-order key
+
+Seeing as we have a key to set that up, let's hook it up.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=657525
+---
+diff --git a/plugins/xsettings/gsd-xsettings-manager.c
b/plugins/xsettings/gsd-xsettings-manager.c
+index c5980f8..645d3c7 100644
+--- a/plugins/xsettings/gsd-xsettings-manager.c
++++ b/plugins/xsettings/gsd-xsettings-manager.c
+@@ -246,10 +246,12 @@ xft_settings_get (GnomeXSettingsManager *manager,
+ {
+ GsdFontAntialiasingMode antialiasing;
+ GsdFontHinting hinting;
++ GsdFontRgbaOrder order;
+ gboolean use_rgba = FALSE;
+
+ antialiasing = g_settings_get_enum (manager->priv->plugin_settings,
FONT_ANTIALIASING_KEY);
+ hinting = g_settings_get_enum (manager->priv->plugin_settings,
FONT_HINTING_KEY);
++ order = g_settings_get_enum (manager->priv->plugin_settings,
FONT_RGBA_ORDER_KEY);
+
+ settings->antialias = (antialiasing !=
GSD_FONT_ANTIALIASING_MODE_NONE);
+ settings->hinting = (hinting != GSD_FONT_HINTING_NONE);
+@@ -272,6 +274,24 @@ xft_settings_get (GnomeXSettingsManager *manager,
+ break;
+ }
+
++ switch (order) {
++ case GSD_FONT_RGBA_ORDER_RGBA:
++ settings->rgba = "rgba";
++ break;
++ case GSD_FONT_RGBA_ORDER_RGB:
++ settings->rgba = "rgb";
++ break;
++ case GSD_FONT_RGBA_ORDER_BGR:
++ settings->rgba = "bgr";
++ break;
++ case GSD_FONT_RGBA_ORDER_VRGB:
++ settings->rgba = "vrgb";
++ break;
++ case GSD_FONT_RGBA_ORDER_VBGR:
++ settings->rgba = "vbgr";
++ break;
++ }
++
+ switch (antialiasing) {
+ case GSD_FONT_ANTIALIASING_MODE_NONE:
+ settings->antialias = 0;
+--
+cgit v0.9.0.2
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
