New version for GNOME 2.26. Port to devicekit-power.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

2 files changed, 130 insertions, 0 deletions

diff --git a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.26.0-gcc44-options.patch b/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.26.0-gcc44-options.patch
new file mode 100644
index 000000000000..7a2905f6480b
--- /dev/null
+++ b/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.26.0-gcc44-options.patch
@@ -0,0 +1,37 @@
+---
+ Author: Gilles Dartiguelongue <eva@gentoo.org>
+
+ Make warning and deprecation cflags optional, this is especially important for downstream.
+
+ https://bugs.gentoo.org/show_bug.cgi?id=263078
+
+ configure.ac |    9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,6 +21,9 @@ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genma
+ dnl ---------------------------------------------------------------------------
+ dnl - Extra verbose warning switches
+ dnl ---------------------------------------------------------------------------
++
++case "$enable_compile_warnings" in
++	yes|maximum|error)
+ #CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
+ CPPFLAGS="$CPPFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED"
+ #CPPFLAGS="$CPPFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE"
+@@ -59,6 +62,12 @@ else
+ 	WARNINGFLAGS=""
+ 	WARNINGFLAGS=""
+ fi
++	;;
++	*)
++	WARNINGFLAGS=""
++	WARNINGFLAGS=""
++	;;
++esac
+ AC_SUBST(WARNINGFLAGS)
+ AC_SUBST(WARNINGFLAGS)
+ 
diff --git a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.26.1-fix-xrandr-1.3-detection.patch b/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.26.1-fix-xrandr-1.3-detection.patch
new file mode 100644
index 000000000000..192047f9e71e
--- /dev/null
+++ b/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.26.1-fix-xrandr-1.3-detection.patch
@@ -0,0 +1,93 @@
+From 383f735200a5f838ee93eb137df65df7e266fc4c Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Mon, 11 May 2009 13:11:45 +0000
+Subject: Check whether xrandr-1.3 features are really supported by xorg-server.
+
+Fixes #582142.
+---
+diff --git a/src/gpm-brightness-xrandr.c b/src/gpm-brightness-xrandr.c
+index d6fb595..b7a5515 100644
+--- a/src/gpm-brightness-xrandr.c
++++ b/src/gpm-brightness-xrandr.c
+@@ -60,8 +60,11 @@ struct GpmBrightnessXRandRPrivate
+ 	Display			*dpy;
+ 	guint			 shared_value;
+ 	gboolean		 has_extension;
++#if (RANDR_MAJOR == 1 && RANDR_MINOR >= 3)
++	gboolean		 has_randr13;
++#endif
+ 	gboolean		 hw_changed;
+-	/* An cache of XRRScreenResources is used as XRRGetScreenResources is expensive */
++	/* A cache of XRRScreenResources is used as XRRGetScreenResources is expensive */
+ 	GPtrArray		*resources;
+ };
+ 
+@@ -170,6 +173,34 @@ gpm_brightness_xrandr_setup_display (GpmBrightnessXRandR *brightness)
+ 	return TRUE;
+ }
+ 
++#if (RANDR_MAJOR == 1 && RANDR_MINOR >= 3)
++/**
++ * gpm_brightness_xrandr_setup_version: Check whether xserver really supports xrandr-1.3 features.
++ **/
++static gboolean
++gpm_brightness_xrandr_setup_version (GpmBrightnessXRandR *brightness)
++{
++	gint major, minor;
++
++	g_return_val_if_fail (GPM_IS_BRIGHTNESS_XRANDR (brightness), FALSE);
++
++	/* get the display */
++	brightness->priv->dpy = GDK_DISPLAY();
++	if (!brightness->priv->dpy) {
++		egg_error ("Cannot open display");
++		return FALSE;
++	}
++	if (!XRRQueryVersion (brightness->priv->dpy, &major, &minor)) {
++		return FALSE;
++	}
++	if (major == 1 && minor < 3) {
++		egg_debug ("RandR version %d.%d does not support XRRGetScreenResourcesCurrent", major, minor);
++		return FALSE;
++	}
++	return TRUE;
++}
++#endif
++
+ /**
+  * gpm_brightness_xrandr_output_get_limits:
+  **/
+@@ -616,9 +647,14 @@ gpm_brightness_xrandr_update_cache (GpmBrightnessXRandR *brightness)
+ 		root = RootWindow (brightness->priv->dpy, screen);
+ 		/* XRRGetScreenResourcesCurrent is less expensive than
+ 		   XRRGetScreenResources, however it is available only
+-		   in RandR 1.3 or higher */
++		   in RandR 1.3 or higher and of course xserver needs
++		   to support it.
++		*/
+ #if (RANDR_MAJOR == 1 && RANDR_MINOR >= 3)
+-		resource = XRRGetScreenResourcesCurrent (brightness->priv->dpy, root);
++		if (brightness->priv->has_randr13)
++			resource = XRRGetScreenResourcesCurrent (brightness->priv->dpy, root);
++		else
++			resource = XRRGetScreenResources (brightness->priv->dpy, root);
+ #else
+ 		resource = XRRGetScreenResources (brightness->priv->dpy, root);
+ #endif
+@@ -684,8 +720,13 @@ gpm_brightness_xrandr_init (GpmBrightnessXRandR *brightness)
+ 
+ 	/* can we do this */
+ 	brightness->priv->has_extension = gpm_brightness_xrandr_setup_display (brightness);
+-	if (brightness->priv->has_extension == FALSE)
++	if (brightness->priv->has_extension == FALSE) {
++		egg_debug ("no XRANDR extension, so aborting init");
+ 		return;
++	}
++#if (RANDR_MAJOR == 1 && RANDR_MINOR >= 3)
++	brightness->priv->has_randr13 = gpm_brightness_xrandr_setup_version (brightness);
++#endif
+ 
+ 	screen = gdk_screen_get_default ();
+ 	window = gdk_screen_get_root_window (screen);
+--
+cgit v0.8.2