Attachment 147615 Details for Bug 193625 – graphics/cairo

[patch] graphics/cairo

cairo.svndif (text/plain), 4.39 KB, created by Anonymized Account on 2014-09-23 19:45:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anonymized Account

Created: 2014-09-23 19:45:41 UTC

Size: 4.39 KB

patch

obsolete

>Index: graphics/cairo/Makefile
>===================================================================
>--- graphics/cairo/Makefile	(revision 368159)
>+++ graphics/cairo/Makefile	(working copy)
>@@ -4,8 +4,7 @@
> 
> PORTNAME=	cairo
> PORTVERSION=	1.12.16
>-PORTREVISION=	1
>-PORTEPOCH=	2
>+PORTEPOCH?=	2
> CATEGORIES=	graphics
> MASTER_SITES=	http://cairographics.org/releases/
> 
>@@ -27,7 +26,7 @@
> 		--disable-directfb \
> 		--enable-tee
> USES+=		libtool:keepla pathfix pkgconfig
>-USE_XORG=	pixman xext
>+USE_XORG=	pixman
> USE_GNOME=	referencehack
> USE_LDCONFIG=	yes
> INSTALL_TARGET=	install-strip
>@@ -60,6 +59,43 @@
> 
> .include <bsd.port.options.mk>
> 
>+.if ${PORT_OPTIONS:MX11}
>+USE_XORG+=	xrender
>+PLIST_SUB+=	X11=""
>+.else
>+CONFIGURE_ARGS+=--disable-xlib
>+PLIST_SUB+=	X11="@comment "
>+.endif
>+
>+.if ${PORT_OPTIONS:MOPENGL}
>+USE_GL=		gl
>+USE_XORG+=	glproto:both dri2proto:both
>+CONFIGURE_ARGS+=	--enable-gl
>+PLIST_SUB+=	GL=""
>+.else
>+CONFIGURE_ARGS+=	--disable-gl
>+PLIST_SUB+=	GL="@comment "
>+.endif
>+
>+.if ${PORT_OPTIONS:MXCB}
>+BUILD_DEPENDS+=		${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util-renderutil
>+RUN_DEPENDS+=		${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util-renderutil
>+CONFIGURE_ARGS+=	--enable-xcb
>+# this option exposes a bug --enable-xlib-xcb=auto
>+PLIST_SUB+=		XCB=""
>+.else
>+CONFIGURE_ARGS+=	--disable-xcb
>+PLIST_SUB+=		XCB="@comment "
>+.endif
>+
>+.if ${PORT_OPTIONS:MGLIB}
>+USE_GNOME+=	glib20
>+PLIST_SUB+=	GLIB=""
>+.else
>+CONFIGURE_ARGS+=	--enable-gobject=no
>+PLIST_SUB+=	GLIB="@comment "
>+.endif
>+
> post-patch:
> 	@${REINPLACE_CMD} -e '/test/s/==/=/g' \
> 		-e '/LIBS/s/-lrt//'  -e '/LIBS/s|-ldld||' \
>Index: graphics/cairo/files/patch-src_cairo-xlib-display.c
>===================================================================
>--- graphics/cairo/files/patch-src_cairo-xlib-display.c	(revision 368159)
>+++ graphics/cairo/files/patch-src_cairo-xlib-display.c	(working copy)
>@@ -1,6 +1,6 @@
>---- src/cairo-xlib-display.c.orig	2010-11-21 14:41:31.000000000 -0500
>-+++ src/cairo-xlib-display.c	2010-11-21 14:42:12.000000000 -0500
>-@@ -353,11 +353,7 @@ _cairo_xlib_device_create (Display *dpy)
>+--- src/cairo-xlib-display.c.orig	2013-08-26 21:07:21.000000000 +0600
>++++ src/cairo-xlib-display.c
>+@@ -263,11 +263,7 @@ _cairo_xlib_device_create (Display *dpy)
>      /* Prior to Render 0.10, there is no protocol support for gradients and
>       * we call function stubs instead, which would silently consume the drawing.
>       */
>Index: graphics/cairo/files/patch-src_cairoint.h
>===================================================================
>--- graphics/cairo/files/patch-src_cairoint.h	(revision 368159)
>+++ graphics/cairo/files/patch-src_cairoint.h	(working copy)
>@@ -1,5 +1,5 @@
>---- src/cairoint.h.orig	Sun Oct 15 18:02:35 2006
>-+++ src/cairoint.h	Sun Oct 15 18:10:11 2006
>+--- src/cairoint.h.orig	2013-08-26 21:07:21.000000000 +0600
>++++ src/cairoint.h
> @@ -50,6 +50,11 @@
>  #include "config.h"
>  #endif
>@@ -9,6 +9,6 @@
> +#define INT16_MIN (-0x7fff-1)
> +#endif
> +
>- #include <assert.h>
>- #include <stdlib.h>
>- #include <string.h>
>+ #ifdef _MSC_VER
>+ #define cairo_public __declspec(dllexport)
>+ #endif
>Index: graphics/cairo/pkg-plist
>===================================================================
>--- graphics/cairo/pkg-plist	(revision 368159)
>+++ graphics/cairo/pkg-plist	(working copy)
>@@ -35,17 +35,17 @@
> %%GLIB%%lib/libcairo-gobject.la
> %%GLIB%%lib/libcairo-gobject.so
> %%GLIB%%lib/libcairo-gobject.so.2
>-%%GLIB%%lib/libcairo-gobject.so.%%LIBVER%%
>+%%GLIB%%lib/libcairo-gobject.so.2.11200.16
> 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-script-interpreter.so.2.11200.16
> lib/libcairo.a
> lib/libcairo.la
> lib/libcairo.so
> lib/libcairo.so.2
>-lib/libcairo.so.%%LIBVER%%
>+lib/libcairo.so.2.11200.16
> libdata/pkgconfig/cairo.pc
> libdata/pkgconfig/cairo-fc.pc
> libdata/pkgconfig/cairo-ft.pc
>@@ -58,10 +58,9 @@
> libdata/pkgconfig/cairo-script.pc
> libdata/pkgconfig/cairo-svg.pc
> libdata/pkgconfig/cairo-tee.pc
>+%%XCB%%libdata/pkgconfig/cairo-xcb-shm.pc
> %%XCB%%libdata/pkgconfig/cairo-xcb.pc
>-%%XCB%%libdata/pkgconfig/cairo-xcb-shm.pc
>+%%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc
> %%X11%%libdata/pkgconfig/cairo-xlib.pc
>-@comment %%X11%%%%XCB%%libdata/pkgconfig/cairo-xlib-xcb.pc
>-%%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc
> @dirrm include/cairo
> @dirrm lib/cairo

Actions: View | Diff

Attachments on bug 193625: 147292 | 147299 | 147302 | 147615 | 147616 | 147617 | 147618 | 147620 | 147621 | 147622 | 147623 | 147726 | 147981 | 148304 | 148462 | 148852 | 148853 | 148854 | 148855 | 148856 | 148857 | 148858 | 148859 | 149838 | 149839 | 149840 | 149841