diff options
| author | ahze <ahze@FreeBSD.org> | 2005-03-11 02:31:38 +0800 |
|---|---|---|
| committer | ahze <ahze@FreeBSD.org> | 2005-03-11 02:31:38 +0800 |
| commit | 98393df639c69d997720d88342ce5d89d9337973 (patch) | |
| tree | e082df16b1a4697c384d0157ce2d74efd68e263a /graphics/cairo | |
| parent | 7fa685a8a2b6fefd1ee8633fceeda615b4d78e2f (diff) | |
| download | freebsd-ports-gnome-98393df639c69d997720d88342ce5d89d9337973.tar.gz freebsd-ports-gnome-98393df639c69d997720d88342ce5d89d9337973.tar.zst freebsd-ports-gnome-98393df639c69d997720d88342ce5d89d9337973.zip | |
- Remove two patch that were needed for a cvs snapshot we had on marcuscom cvs
to fix build with XFree86
PR: ports/78668
Submitted by: vs
Diffstat (limited to 'graphics/cairo')
| -rw-r--r-- | graphics/cairo/Makefile | 2 | ||||
| -rw-r--r-- | graphics/cairo/files/patch-cairo.pc.in | 10 | ||||
| -rw-r--r-- | graphics/cairo/files/patch-configure | 15 |
3 files changed, 1 insertions, 26 deletions
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index d89bb2888685..e7c86885f9e4 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -24,7 +24,7 @@ INSTALLS_SHLIB= yes CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \ +CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include" \ LDFLAGS="${PTHREAD_LIBS}" OPTIONS+= GLITZ "Enable Glitz OpenGL Support" Off diff --git a/graphics/cairo/files/patch-cairo.pc.in b/graphics/cairo/files/patch-cairo.pc.in deleted file mode 100644 index 05d0b47b682c..000000000000 --- a/graphics/cairo/files/patch-cairo.pc.in +++ /dev/null @@ -1,10 +0,0 @@ ---- cairo.pc.in.orig Thu Mar 3 03:57:38 2005 -+++ cairo.pc.in Thu Mar 3 03:57:50 2005 -@@ -7,6 +7,6 @@ - Description: Multi-platform 2D graphics library - Version: @VERSION@ - --Requires: @FREETYPE_REQUIRES@ libpixman @XRENDER_REQUIRES@ @PNG_REQUIRES@ @GLITZ_REQUIRES@ -+Requires: @FREETYPE_REQUIRES@ libpixman @PNG_REQUIRES@ @GLITZ_REQUIRES@ - Libs: @FREETYPE_LIBS@ -L${libdir} -lcairo - Cflags: @FREETYPE_CFLAGS@ -I${includedir}/cairo diff --git a/graphics/cairo/files/patch-configure b/graphics/cairo/files/patch-configure deleted file mode 100644 index 73ec0088cc0f..000000000000 --- a/graphics/cairo/files/patch-configure +++ /dev/null @@ -1,15 +0,0 @@ ---- configure.orig Thu Mar 3 03:43:20 2005 -+++ configure Thu Mar 3 03:44:40 2005 -@@ -20306,10 +20306,10 @@ - echo "${ECHO_T}$XRENDER_LIBS" >&6 - else - XRENDER_CFLAGS="" -- XRENDER_LIBS="" -+ XRENDER_LIBS="-lXrender" -+ succeeded=yes - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. -- XRENDER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xrender >= 0.6"` - - fi - |