Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7379f537f8e0dc7bbc42fd0a3276b82265122840
commit 7379f537f8e0dc7bbc42fd0a3276b82265122840
Author: bouleetbil <bouleet...@frogdev.info>
Date: Mon Aug 22 22:07:40 2011 +0200
gnome-session-3.0.2-2-x86_64
*check if XGetWindowProperty failed before use it
*after will check this XGetWindowProperty into libx11
*now gnome-shell can start
diff --git a/source/gnome/gnome-session/FrugalBuild
b/source/gnome/gnome-session/FrugalBuild
index 1240523..9eaf6ec 100644
--- a/source/gnome/gnome-session/FrugalBuild
+++ b/source/gnome/gnome-session/FrugalBuild
@@ -5,7 +5,7 @@ USE_DEBUG=${USE_DEBUG:-"n"}
pkgname=gnome-session
pkgver=3.0.2
-pkgrel=1
+pkgrel=2
pkgdesc="GNOME session manager"
depends=('libxml2>=2.7.8' 'gnome-desktop>=3.0.2' 'polkit' 'upower' 'gconf-gtk'
'usermode' \
'dbus-glib>=0.76' 'gnome-control-center>=3.0.0' 'libnotify'
'gnome-keyring>=3.0.0' \
@@ -20,7 +20,9 @@ _F_gnome_iconcache="y"
_F_gnome_desktop="y"
Finclude gnome gnome-scriptlet
Fconfopts="$Fconfopts --with-gtk=3.0"
-sha1sums=('5559a71ef3134f3aaa48b7f06e2123714f71756f')
+source=($source check_XGetWindowProperty.diff)
+sha1sums=('5559a71ef3134f3aaa48b7f06e2123714f71756f' \
+ '32a9743c3797a29355b605dcf7a78f73190c8249')
build() {
Fcd
diff --git a/source/gnome/gnome-session/check_XGetWindowProperty.diff
b/source/gnome/gnome-session/check_XGetWindowProperty.diff
new file mode 100644
index 0000000..ce4ee39
--- /dev/null
+++ b/source/gnome/gnome-session/check_XGetWindowProperty.diff
@@ -0,0 +1,19 @@
+--- gnome-session/tools/gnome-session-check-accelerated.c.old 2011-08-22
21:00:33.324631102 +0200
++++ gnome-session/tools/gnome-session-check-accelerated.c 2011-08-22
21:55:52.018141725 +0200
+@@ -122,13 +122,14 @@
+
+ read:
+ gdk_x11_display_error_trap_push (display);
+- XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), rootwin,
++ int i = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display),
rootwin,
+ is_accelerated_atom,
+ 0, G_MAXLONG, False, XA_CARDINAL, &type,
&format, &nitems,
+ &bytes_after, &data);
++
+ gdk_x11_display_error_trap_pop_ignored (display);
+
+- if (type == XA_CARDINAL) {
++ if ((type == XA_CARDINAL) && (i>0)) {
+ glong *is_accelerated_ptr = (glong*) data;
+
+ if (*is_accelerated_ptr == ACCEL_CHECK_RUNNING) {
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
