6 files changed, 7 insertions, 67 deletions

diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 878bfab32259..0bded2f141f1 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -3,8 +3,7 @@
 #   $MCom: ports/trunk/graphics/cairo/Makefile 18928 2013-11-30 02:00:25Z marcus $
 
 PORTNAME=	cairo
-PORTVERSION=	1.12.16
-PORTREVISION=	1
+PORTVERSION=	1.12.18
 PORTEPOCH=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
@@ -26,8 +25,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR} \
 		--disable-directfb \
 		--enable-tee
-USES+=		libtool:keepla pathfix pkgconfig
-USE_XORG=	pixman xext
+USES+=		libtool pathfix pkgconfig
+USE_XORG=	pixman
 USE_GNOME=	referencehack
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
@@ -45,7 +44,7 @@ OPTIONS_DEFAULT=XCB GLIB X11
 XCB_DESC=	Enable XCB (X C-language Binding) Support
 GLIB_DESC=	Enable GObject Functions Feature
 OPTIONS_SUB=	yes
-X11_USE=	xorg=xrender
+X11_USE=	xorg=xrender,xext
 X11_CONFIGURE_ENABLE=xlib
 OPENGL_USE=	gl=gl xorg=glproto:both,dri2proto:both
 OPENGL_CONFIGURE_ENABLE=gl
@@ -56,7 +55,7 @@ XCB_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x1
 XCB_CONFIGURE_ENABLE=	xcb
 # this has another option --enable-xlib-xcb=auto but it is buggy.
 
-PLIST_SUB+=	LIBVER=2.11200.16
+PLIST_SUB+=	LIBVER=2.11200.18
 
 .include <bsd.port.options.mk>
 
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo
index 20509015d18c..b72288014a55 100644
--- a/graphics/cairo/distinfo
+++ b/graphics/cairo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cairo-1.12.16.tar.xz) = 2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846
-SIZE (cairo-1.12.16.tar.xz) = 35889824
+SHA256 (cairo-1.12.18.tar.xz) = dc59f0b7ac945ce4e138a03c227a29260915a8b05a4226c1f6f1be586ba7f5b6
+SIZE (cairo-1.12.18.tar.xz) = 38276736
diff --git a/graphics/cairo/files/patch-src_cairo-wideint-type-private.h b/graphics/cairo/files/patch-src_cairo-wideint-type-private.h
deleted file mode 100644
index 00f10fb6aea4..000000000000
--- a/graphics/cairo/files/patch-src_cairo-wideint-type-private.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/cairo-wideint-type-private.h.orig	2010-11-26 02:41:47.000000000 -0500
-+++ src/cairo-wideint-type-private.h	2010-11-26 02:42:07.000000000 -0500
-@@ -121,6 +121,11 @@ typedef struct _cairo_quorem64 {
-     cairo_int64_t	rem;
- } cairo_quorem64_t;
- 
-+/* Intrinsic __uint128_t support is broken on gcc 3.4/sparc. */
-+#if __GNUC__ == 3 && __GNUC_MINOR__ == 4
-+#undef HAVE___UINT128_T
-+#endif
-+
- /* gcc has a non-standard name. */
- #if HAVE___UINT128_T && !HAVE_UINT128_T
- typedef __uint128_t uint128_t;
diff --git a/graphics/cairo/files/patch-src_cairo-xcb-surface-render.c b/graphics/cairo/files/patch-src_cairo-xcb-surface-render.c
deleted file mode 100644
index 63d5c8d403de..000000000000
--- a/graphics/cairo/files/patch-src_cairo-xcb-surface-render.c
+++ /dev/null
@@ -1,25 +0,0 @@
-From 18b3cce2f5812c357e4b6310e72d72dd9ec92ed4 Mon Sep 17 00:00:00 2001
-From: Bryce Harrington <b.harrington@samsung.com>
-Date: Tue, 06 May 2014 17:18:19 +0000
-Subject: Fix segfault in firefox when scrolling on certain pages
-
-Bug discovered by thorsten <fly_a320@gmx.de>
-
-Patch from Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-xcb-surface-render.c b/src/cairo-xcb-surface-render.c
-index 9625953..75455e5 100644
---- src/cairo-xcb-surface-render.c
-+++ src/cairo-xcb-surface-render.c
-@@ -3121,6 +3121,9 @@ _clip_and_composite_boxes (cairo_xcb_surface_t *dst,
- 
- 	clip = _cairo_clip_copy (extents->clip);
- 	clip = _cairo_clip_intersect_boxes (clip, boxes);
-+	if (_cairo_clip_is_all_clipped (clip))
-+		return CAIRO_INT_STATUS_NOTHING_TO_DO;
-+
- 	status = _cairo_clip_get_polygon (clip, &polygon,
- 					  &fill_rule, &antialias);
- 	_cairo_clip_path_destroy (clip->path);
---
-cgit v0.9.0.2-2-gbebe
diff --git a/graphics/cairo/files/patch-src_cairoint.h b/graphics/cairo/files/patch-src_cairoint.h
deleted file mode 100644
index a9b3ce480918..000000000000
--- a/graphics/cairo/files/patch-src_cairoint.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/cairoint.h.orig	Sun Oct 15 18:02:35 2006
-+++ src/cairoint.h	Sun Oct 15 18:10:11 2006
-@@ -50,6 +50,11 @@
- #include "config.h"
- #endif
- 
-+#ifndef INT16_MAX
-+#define INT16_MAX 0x7fff
-+#define INT16_MIN (-0x7fff-1)
-+#endif
-+
- #include <assert.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/graphics/cairo/pkg-plist b/graphics/cairo/pkg-plist
index f71b518ea649..c2305df06d90 100644
--- a/graphics/cairo/pkg-plist
+++ b/graphics/cairo/pkg-plist
@@ -17,32 +17,26 @@ include/cairo/cairo-version.h
 %%X11%%include/cairo/cairo-xlib.h
 include/cairo/cairo.h
 lib/cairo/cairo-fdr.a
-lib/cairo/cairo-fdr.la
 lib/cairo/cairo-fdr.so
 lib/cairo/cairo-fdr.so.0
 lib/cairo/cairo-fdr.so.0.0.0
 lib/cairo/cairo-sphinx.a
-lib/cairo/cairo-sphinx.la
 lib/cairo/cairo-sphinx.so
 lib/cairo/cairo-sphinx.so.0
 lib/cairo/cairo-sphinx.so.0.0.0
 lib/cairo/libcairo-trace.a
-lib/cairo/libcairo-trace.la
 lib/cairo/libcairo-trace.so
 lib/cairo/libcairo-trace.so.0
 lib/cairo/libcairo-trace.so.0.0.0
 %%GLIB%%lib/libcairo-gobject.a
-%%GLIB%%lib/libcairo-gobject.la
 %%GLIB%%lib/libcairo-gobject.so
 %%GLIB%%lib/libcairo-gobject.so.2
 %%GLIB%%lib/libcairo-gobject.so.%%LIBVER%%
 lib/libcairo-script-interpreter.a
-lib/libcairo-script-interpreter.la
 lib/libcairo-script-interpreter.so
 lib/libcairo-script-interpreter.so.2
 lib/libcairo-script-interpreter.so.%%LIBVER%%
 lib/libcairo.a
-lib/libcairo.la
 lib/libcairo.so
 lib/libcairo.so.2
 lib/libcairo.so.%%LIBVER%%