Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (f0710315e95c1e93f628ff7e86a12d04d1f06b75)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pol Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (f0710315e95c1e93f628ff7e86a12d04d1f06b75)
  • Date: Thu, 23 Dec 2010 19:17:28 -0600

GIT changes to master grimoire by Pol Vinogradov <vin.public AT gmail.com>:

compiz-fusion/emerald/HISTORY | 3 +
compiz-fusion/emerald/gtk2.20.patch | 61
++++++++++++++++++++++++++++++++++--
xorg-app/compiz/HISTORY | 3 +
xorg-app/compiz/PRE_BUILD | 4 ++
4 files changed, 68 insertions(+), 3 deletions(-)

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 @@

static void hide_tooltip(void)
@@ -31,4 +40,50 @@ diff -urN emerald-0.8.4/libengine/themer.c
emerald-0.8.4.new/libengine/themer.c
g_get_current_time(&tooltip_last_popdown);

gtk_widget_hide(tip_window);
-
+@@ -4246,10 +4246,10 @@
+ WnckWindow *win = data;
+
+ gdk_error_trap_push();
+- XSetTransientForHint(gdk_display,
++ XSetTransientForHint(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+ GDK_WINDOW_XID(dialog->window),
+ wnck_window_get_xid(win));
+- XSync(gdk_display, FALSE);
++ XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
+ gdk_error_trap_pop();
+ }
+
+@@ -4262,11 +4262,11 @@
+ int format, result;
+ char *retval;
+
+- atom = XInternAtom(gdk_display, "WM_CLIENT_MACHINE", FALSE);
++ atom = XInternAtom(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
"WM_CLIENT_MACHINE", FALSE);
+
+ gdk_error_trap_push();
+
+- result = XGetWindowProperty(gdk_display,
++ result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY
(gdk_display_get_default ()),
+ xwindow, atom,
+ 0, G_MAXLONG,
+ FALSE, XA_STRING, &type, &format, &nitems,
+@@ -4318,8 +4318,8 @@
+ }
+
+ gdk_error_trap_push();
+- XKillClient(gdk_display, wnck_window_get_xid(win));
+- XSync(gdk_display, FALSE);
++ XKillClient(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
wnck_window_get_xid(win));
++ XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
+ gdk_error_trap_pop();
+ }
+
+@@ -4739,7 +4739,7 @@
+
+ static int update_shadow(frame_settings * fs)
+ {
+- Display *xdisplay = gdk_display;
++ Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+ XRenderPictFormat *format;
+ GdkPixmap *pixmap;
+ Picture src, dst, tmp;
diff --git a/xorg-app/compiz/HISTORY b/xorg-app/compiz/HISTORY
index 1e4fef4..18a1d4b 100644
--- a/xorg-app/compiz/HISTORY
+++ b/xorg-app/compiz/HISTORY
@@ -1,3 +1,6 @@
+2010-12-23 Pol Vinogradov <vin.public AT gmail.com>
+ * PRE_BUILD: added to fix compiling with gtk
+
2010-04-19 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 0.8.6

diff --git a/xorg-app/compiz/PRE_BUILD b/xorg-app/compiz/PRE_BUILD
new file mode 100755
index 0000000..872625e
--- /dev/null
+++ b/xorg-app/compiz/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+sed -i 's/gdk_display\([,;]\)/GDK_DISPLAY_XDISPLAY (gdk_display_get_default
())\1/g' gtk/window-decorator/gtk-window-decorator.c



  • [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (f0710315e95c1e93f628ff7e86a12d04d1f06b75), Pol Vinogradov, 12/23/2010

Archive powered by MHonArc 2.6.24.

Top of Page