packages: emerald/emerald.spec, emerald/emerald-no-gdk_display.patch (NEW) ...

[august84]

Author: august84                     Date: Wed Oct 27 15:59:12 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added no-gdk_display patch

---- Files affected:
packages/emerald:
   emerald.spec (1.41 -> 1.42) , emerald-no-gdk_display.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/emerald/emerald.spec
diff -u packages/emerald/emerald.spec:1.41 packages/emerald/emerald.spec:1.42
--- packages/emerald/emerald.spec:1.41	Wed Sep  8 18:28:22 2010
+++ packages/emerald/emerald.spec	Wed Oct 27 17:59:07 2010
@@ -11,6 +11,7 @@
 # Source0-md5:	e92fbe8252ea393206d98ed6ae9af4ec
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-gtk+2_2_20.patch
+Patch2:		%{name}-no-gdk_display.patch
 URL:		http://www.compiz.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake >= 1:1.9
@@ -74,6 +75,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__glib_gettextize}
@@ -149,6 +151,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.42  2010/10/27 15:59:07  august84
+- added no-gdk_display patch
+
 Revision 1.41  2010/09/08 16:28:22  jareq
 - added emerald-gtk+2_2_20.patch (fix build with gtk+2 2.20)
 - rel 2

================================================================
Index: packages/emerald/emerald-no-gdk_display.patch
diff -u /dev/null packages/emerald/emerald-no-gdk_display.patch:1.1
--- /dev/null	Wed Oct 27 17:59:12 2010
+++ packages/emerald/emerald-no-gdk_display.patch	Wed Oct 27 17:59:07 2010
@@ -0,0 +1,72 @@
+--- emerald-0.8.4/src/main.c.orig	2010-10-27 23:09:01.000000000 +0200
++++ emerald-0.8.4/src/main.c	2010-10-27 23:08:34.000000000 +0200
+@@ -2457,7 +2457,7 @@
+     gdk_error_trap_push();
+ 
+     type = None;
+-    result = XGetWindowProperty(gdk_display,
++    result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+ 				xwindow,
+ 				atom,
+ 				0, G_MAXLONG,
+@@ -4243,13 +4243,14 @@
+ 
+ static void force_quit_dialog_realize(GtkWidget * dialog, void *data)
+ {
++    Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+     WnckWindow *win = data;
+ 
+     gdk_error_trap_push();
+-    XSetTransientForHint(gdk_display,
++    XSetTransientForHint(xdisplay,
+ 			 GDK_WINDOW_XID(dialog->window),
+ 			 wnck_window_get_xid(win));
+-    XSync(gdk_display, FALSE);
++    XSync(xdisplay, FALSE);
+     gdk_error_trap_pop();
+ }
+ 
+@@ -4261,12 +4262,13 @@
+     unsigned char *sstr = NULL;
+     int format, result;
+     char *retval;
++    Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+ 
+-    atom = XInternAtom(gdk_display, "WM_CLIENT_MACHINE", FALSE);
++    atom = XInternAtom(xdisplay, "WM_CLIENT_MACHINE", FALSE);
+ 
+     gdk_error_trap_push();
+ 
+-    result = XGetWindowProperty(gdk_display,
++    result = XGetWindowProperty(xdisplay,
+ 				xwindow, atom,
+ 				0, G_MAXLONG,
+ 				FALSE, XA_STRING, &type, &format, &nitems,
+@@ -4293,6 +4295,8 @@
+ 
+ static void kill_window(WnckWindow * win)
+ {
++    GdkDisplay      *gdk_display = gdk_display_get_default ();
++    Display         *xdisplay    = GDK_DISPLAY_XDISPLAY (gdk_display);
+     WnckApplication *app;
+ 
+     app = wnck_window_get_application(win);
+@@ -4318,7 +4322,7 @@
+     }
+ 
+     gdk_error_trap_push();
+-    XKillClient(gdk_display, wnck_window_get_xid(win));
++    XKillClient(xdisplay, wnck_window_get_xid(win));
+     XSync(gdk_display, FALSE);
+     gdk_error_trap_pop();
+ }
+@@ -4739,7 +4743,8 @@
+ 
+ static int update_shadow(frame_settings * fs)
+ {
+-    Display *xdisplay = gdk_display;
++    GdkDisplay *display = gdk_display_get_default ();
++    Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);
+     XRenderPictFormat *format;
+     GdkPixmap *pixmap;
+     Picture src, dst, tmp;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/emerald/emerald.spec?r1=1.41&r2=1.42&f=u