[patch] Backported patch from git to eliminate dependency on x11-libs/libX11 being bulit with xcb

compiz-0.7.2-disable-libx11-xcb-support.patch (text/plain), 1.83 KB, created by John W Eckhart on 2008-03-20 18:16:33 UTC

diff -Naur work.orig/compiz-0.7.2/configure work/compiz-0.7.2/configure
--- work.orig/compiz-0.7.2/configure	2008-03-06 18:13:08.000000000 +0000
+++ work/compiz-0.7.2/configure	2008-03-20 18:08:14.151896134 +0000
@@ -23110,8 +23110,7 @@
 metadatadir=$datadir/compiz
 
 
-COMPIZ_REQUIRES="x11-xcb    \
-		 xcomposite \
+COMPIZ_REQUIRES="xcomposite \
 		 xfixes	    \
 		 xdamage    \
 		 xrandr	    \
diff -Naur work.orig/compiz-0.7.2/configure.ac work/compiz-0.7.2/configure.ac
--- work.orig/compiz-0.7.2/configure.ac	2008-03-06 18:11:42.000000000 +0000
+++ work/compiz-0.7.2/configure.ac	2008-03-20 18:08:02.351898782 +0000
@@ -118,8 +118,7 @@
 metadatadir=$datadir/compiz
 AC_SUBST(metadatadir)
 
-COMPIZ_REQUIRES="x11-xcb    \
-		 xcomposite \
+COMPIZ_REQUIRES="xcomposite \
 		 xfixes	    \
 		 xdamage    \
 		 xrandr	    \
diff -Naur work.orig/compiz-0.7.2/include/compiz-core.h work/compiz-0.7.2/include/compiz-core.h
--- work.orig/compiz-0.7.2/include/compiz-core.h	2008-03-06 17:52:26.000000000 +0000
+++ work/compiz-0.7.2/include/compiz-core.h	2008-03-20 18:09:20.319913520 +0000
@@ -33,7 +33,7 @@
 #include <stdio.h>
 #include <sys/time.h>
 
-#include <X11/Xlib-xcb.h>
+#include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/Xdamage.h>
 #include <X11/extensions/Xcomposite.h>
@@ -901,8 +901,6 @@
 
     CompDisplay *next;
 
-    xcb_connection_t *connection;
-
     Display    *display;
     CompScreen *screens;
 
diff -Naur work.orig/compiz-0.7.2/src/display.c work/compiz-0.7.2/src/display.c
--- work.orig/compiz-0.7.2/src/display.c	2008-03-06 17:52:26.000000000 +0000
+++ work/compiz-0.7.2/src/display.c	2008-03-20 18:09:34.580898381 +0000
@@ -2040,8 +2040,6 @@
 	return FALSE;
     }
 
-    d->connection = XGetXCBConnection (dpy);
-
     if (!compInitDisplayOptionsFromMetadata (d,
 					     &coreMetadata,
 					     coreDisplayOptionInfo,