diff options
| author | Robert Noland <rnoland@FreeBSD.org> | 2009-01-25 03:30:38 +0000 |
|---|---|---|
| committer | Robert Noland <rnoland@FreeBSD.org> | 2009-01-25 03:30:38 +0000 |
| commit | d9f621e741a6d45dfef9d94c0195eb5ef6e3b764 (patch) | |
| tree | 25531b89d4eff037c9b07654e2161068a31df9d3 /x11-wm/compiz | |
| parent | - Update to 2.2 (diff) | |
Remove the dynamic test for xcb support, since it is default now.
Approved by: garga (mentor, implicit)
Notes
Notes:
svn path=/head/; revision=226822
Diffstat (limited to 'x11-wm/compiz')
| -rw-r--r-- | x11-wm/compiz/Makefile | 6 | ||||
| -rw-r--r-- | x11-wm/compiz/files/extra-patch-no-xcb | 43 |
2 files changed, 1 insertions, 48 deletions
diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile index 970e10087e3d..a199dcfb4312 100644 --- a/x11-wm/compiz/Makefile +++ b/x11-wm/compiz/Makefile @@ -7,7 +7,7 @@ PORTNAME= compiz PORTVERSION= 0.7.8 -#PORTREVISION= 1 +PORTREVISION= 1 CATEGORIES= x11-wm MAINTAINER= rnoland@FreeBSD.org @@ -76,10 +76,6 @@ post-patch: .include <bsd.port.pre.mk> -.if !exists(${LOCALBASE}/libdata/pkgconfig/x11-xcb.pc) -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-no-xcb -.endif - .if !defined(WITHOUT_RSVG) CONFIGURE_ARGS+= --enable-librsvg USE_GNOME+= librsvg2 diff --git a/x11-wm/compiz/files/extra-patch-no-xcb b/x11-wm/compiz/files/extra-patch-no-xcb deleted file mode 100644 index 8882f75054d8..000000000000 --- a/x11-wm/compiz/files/extra-patch-no-xcb +++ /dev/null @@ -1,43 +0,0 @@ ---- configure.orig 2008-07-13 13:43:53.000000000 -0400 -+++ configure 2008-07-13 13:44:58.000000000 -0400 -@@ -23100,8 +23100,7 @@ - metadatadir=$datadir/compiz - - --COMPIZ_REQUIRES="x11-xcb \ -- xcomposite \ -+COMPIZ_REQUIRES="xcomposite \ - xfixes \ - xdamage \ - xrandr \ ---- include/compiz-core.h.orig 2008-05-29 07:58:33.000000000 -0400 -+++ include/compiz-core.h 2008-07-12 14:12:53.000000000 -0400 -@@ -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> -@@ -896,8 +896,6 @@ - - CompDisplay *next; - -- xcb_connection_t *connection; -- - Display *display; - CompScreen *screens; - ---- src/display.c.orig 2008-05-29 07:58:33.000000000 -0400 -+++ src/display.c 2008-07-12 14:13:01.000000000 -0400 -@@ -2054,8 +2054,6 @@ - return FALSE; - } - -- d->connection = XGetXCBConnection (dpy); -- - if (!compInitDisplayOptionsFromMetadata (d, - &coreMetadata, - coreDisplayOptionInfo, |