Index: head/graphics/cairo/Makefile =================================================================== --- head/graphics/cairo/Makefile (revision 374360) +++ head/graphics/cairo/Makefile (revision 374361) @@ -1,82 +1,81 @@ # Created by: Michael Johnson # $FreeBSD$ # $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/ MAINTAINER= gnome@FreeBSD.org COMMENT= Vector graphics library with cross-device output support USES= tar:xz .if !defined(REFERENCE_PORT) LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ libpng15.so:${PORTSDIR}/graphics/png \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig PORTSCOUT= skipv:5c-1.1,5c-1.2,5c-1.5 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 CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \ --disable-directfb \ --disable-gallium \ --disable-glesv2 \ --disable-wgl \ --disable-egl \ --enable-tee OPTIONS_DEFINE= OPENGL XCB GLIB X11 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 GLIB_USE= gnome=glib20 GLIB_CONFIGURE_ENABLE= gobject XCB_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util-renderutil XCB_RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util-renderutil 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 post-patch: @${REINPLACE_CMD} -e '/test/s/==/=/g' \ -e '/LIBS/s/-lrt//' -e '/LIBS/s|-ldld||' \ -e '/LIBS/s|-ldl||' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-lcairo|-lcairo ${PTHREAD_LIBS}|' \ ${WRKSRC}/src/*.pc.in @${REINPLACE_CMD} -e '/@CAIRO_HAS_PNG_FUNCTIONS_TRUE@.*=/d' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|-ldl||g' \ ${WRKSRC}/util/*/Makefile.in \ ${WRKSRC}/boilerplate/Makefile.in .if ${PORT_OPTIONS:MOPENGL} @${REINPLACE_CMD} 's|@CAIRO_CFLAGS@|-I$$(top_srcdir)/src/glew &|' \ ${WRKSRC}/src/Makefile.in .endif .include .endif Index: head/graphics/cairo/distinfo =================================================================== --- head/graphics/cairo/distinfo (revision 374360) +++ head/graphics/cairo/distinfo (revision 374361) @@ -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 Index: head/graphics/cairo/files/patch-src_cairo-wideint-type-private.h =================================================================== --- head/graphics/cairo/files/patch-src_cairo-wideint-type-private.h (revision 374360) +++ head/graphics/cairo/files/patch-src_cairo-wideint-type-private.h (nonexistent) @@ -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; Property changes on: head/graphics/cairo/files/patch-src_cairo-wideint-type-private.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/cairo/files/patch-src_cairoint.h =================================================================== --- head/graphics/cairo/files/patch-src_cairoint.h (revision 374360) +++ head/graphics/cairo/files/patch-src_cairoint.h (nonexistent) @@ -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 - #include - #include Property changes on: head/graphics/cairo/files/patch-src_cairoint.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/cairo/files/patch-src_cairo-xcb-surface-render.c =================================================================== --- head/graphics/cairo/files/patch-src_cairo-xcb-surface-render.c (revision 374360) +++ head/graphics/cairo/files/patch-src_cairo-xcb-surface-render.c (nonexistent) @@ -1,25 +0,0 @@ -From 18b3cce2f5812c357e4b6310e72d72dd9ec92ed4 Mon Sep 17 00:00:00 2001 -From: Bryce Harrington -Date: Tue, 06 May 2014 17:18:19 +0000 -Subject: Fix segfault in firefox when scrolling on certain pages - -Bug discovered by thorsten - -Patch from Chris Wilson ---- -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 Property changes on: head/graphics/cairo/files/patch-src_cairo-xcb-surface-render.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: mcom:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/cairo/pkg-plist =================================================================== --- head/graphics/cairo/pkg-plist (revision 374360) +++ head/graphics/cairo/pkg-plist (revision 374361) @@ -1,65 +1,59 @@ bin/cairo-sphinx bin/cairo-trace include/cairo/cairo-deprecated.h include/cairo/cairo-features.h include/cairo/cairo-ft.h %%OPENGL%%include/cairo/cairo-gl.h %%GLIB%%include/cairo/cairo-gobject.h include/cairo/cairo-pdf.h include/cairo/cairo-ps.h include/cairo/cairo-script-interpreter.h include/cairo/cairo-script.h include/cairo/cairo-svg.h include/cairo/cairo-tee.h include/cairo/cairo-version.h %%XCB%%include/cairo/cairo-xcb.h %%X11%%include/cairo/cairo-xlib-xrender.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%% libdata/pkgconfig/cairo.pc libdata/pkgconfig/cairo-fc.pc libdata/pkgconfig/cairo-ft.pc %%OPENGL%%libdata/pkgconfig/cairo-gl.pc %%OPENGL%%libdata/pkgconfig/cairo-glx.pc %%GLIB%%libdata/pkgconfig/cairo-gobject.pc libdata/pkgconfig/cairo-pdf.pc libdata/pkgconfig/cairo-png.pc libdata/pkgconfig/cairo-ps.pc libdata/pkgconfig/cairo-script.pc libdata/pkgconfig/cairo-svg.pc libdata/pkgconfig/cairo-tee.pc %%XCB%%libdata/pkgconfig/cairo-xcb.pc %%XCB%%libdata/pkgconfig/cairo-xcb-shm.pc %%X11%%libdata/pkgconfig/cairo-xlib.pc @comment %%X11%%%%XCB%%libdata/pkgconfig/cairo-xlib-xcb.pc %%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc