New commits:
commit f0710315e95c1e93f628ff7e86a12d04d1f06b75
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>
compiz-fusion/emerald: more fixes for compiling with gtk
commit 9fc2d80351a13533152d9fd0f8d2ed0258a2fdd7
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>
xorg-apps/compiz: added PRE_BUILD to fix compiling with gtk
diff --git a/compiz-fusion/emerald/HISTORY b/compiz-fusion/emerald/HISTORY
index e552974..469381b 100644
--- a/compiz-fusion/emerald/HISTORY
+++ b/compiz-fusion/emerald/HISTORY
@@ -1,3 +1,6 @@
+2010-12-23 Pol Vinogradov <vin.public AT gmail.com>
+ * gtk2.20.patch: more fixes for compiling with gtk
+
2010-04-26 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Apply gtk2.20.patch
* gtk2.20.patch: Fix compilation with gtk+2 2.20 (Bug #15693)
diff --git a/compiz-fusion/emerald/gtk2.20.patch
b/compiz-fusion/emerald/gtk2.20.patch
index 5da5e12..07ecf6e 100644
--- a/compiz-fusion/emerald/gtk2.20.patch
+++ b/compiz-fusion/emerald/gtk2.20.patch
@@ -20,8 +20,17 @@ diff -urN emerald-0.8.4/libengine/themer.c
emerald-0.8.4.new/libengine/themer.c
gtk_spin_button_set_value((GtkSpinButton *)item->widget, f);
}
else {
---- emerald-0.8.4/src/main.c.old 2010-03-29 19:49:30.420710030 -0700
-+++ emerald-0.8.4/src/main.c 2010-03-29 19:52:33.654024944 -0700
+--- emerald-0.8.4/src/main.c.old 2010-12-23 20:03:51.083703858 -0500
++++ emerald-0.8.4/src/main.c 2010-12-23 19:56:19.657703857 -0500
+@@ -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,
@@ -3757,7 +3757,7 @@