Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Oct 2013 18:45:34 GMT
From:      Boris Samorodov <bsam@FreeBSD.org>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/182953: [patch] graphics/cairo: update to version 1.12.16, support STAGE and more
Message-ID:  <201310131845.r9DIjYPZ085307@oldred.freebsd.org>
Resent-Message-ID: <201310131850.r9DIo015011996@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         182953
>Category:       ports
>Synopsis:       [patch] graphics/cairo: update to version 1.12.16, support STAGE and more
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 13 18:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Boris Samorodov
>Release:        FreeBSD 10-amd64
>Organization:
BSDprint
>Environment:
FreeBSD srv.bb.tel.ru 10.0-CURRENT FreeBSD 10.0-CURRENT #8 r254955: Tue Aug 27 20:04:38 SAMT 2013     bsam@srv.bb.tel.ru:/usr/obj/usr/src/sys/BB64X  amd64
>Description:
A new version is available.
>How-To-Repeat:

>Fix:
. update to version 1.12.16;
. support STAGE;
. use new LIB_DEPENDS syntax.

Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 330238)
+++ Makefile	(working copy)
@@ -3,8 +3,7 @@
 #   $MCom: ports/graphics/cairo/Makefile,v 1.101 2010/10/29 15:40:04 kwm Exp $
 
 PORTNAME=	cairo
-PORTVERSION=	1.10.2
-PORTREVISION=	6
+PORTVERSION=	1.12.16
 PORTEPOCH?=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
@@ -14,15 +13,16 @@
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2 \
-		png15:${PORTSDIR}/graphics/png \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 
 CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR} \
 		--disable-directfb \
 		--enable-tee
 USES=		pathfix pkgconfig
-USE_XORG=	pixman
+USE_XZ=		yes
+USE_XORG=	pixman xext
 USE_GNOME=	ltverhack referencehack
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
@@ -35,7 +35,6 @@
 XCB_DESC=	Enable XCB (X C-language Binding) Support
 GLIB_DESC=	Enable GObject Functions Feature
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "arm"
Index: distinfo
===================================================================
--- distinfo	(revision 330238)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (cairo-1.10.2.tar.gz) = 32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41
-SIZE (cairo-1.10.2.tar.gz) = 23558405
+SHA256 (cairo-1.12.16.tar.xz) = 2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846
+SIZE (cairo-1.12.16.tar.xz) = 35889824
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 330238)
+++ pkg-plist	(working copy)
@@ -1,3 +1,4 @@
+bin/cairo-sphinx
 bin/cairo-trace
 include/cairo/cairo-deprecated.h
 include/cairo/cairo-features.h
@@ -7,6 +8,7 @@
 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
@@ -14,6 +16,14 @@
 %%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-sphinx.a
+lib/cairo/cairo-sphinx.la
+lib/cairo/cairo-sphinx.so
+lib/cairo/cairo-sphinx.so.0
 lib/cairo/libcairo-trace.a
 lib/cairo/libcairo-trace.la
 lib/cairo/libcairo-trace.so
@@ -30,7 +40,6 @@
 lib/libcairo.la
 lib/libcairo.so
 lib/libcairo.so.2
-libdata/pkgconfig/cairo.pc
 libdata/pkgconfig/cairo-fc.pc
 libdata/pkgconfig/cairo-ft.pc
 %%GL%%libdata/pkgconfig/cairo-gl.pc
@@ -39,6 +48,7 @@
 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
@@ -46,5 +56,6 @@
 %%X11%%libdata/pkgconfig/cairo-xlib.pc
 @comment %%X11%%%%XCB%%libdata/pkgconfig/cairo-xlib-xcb.pc
 %%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc
+libdata/pkgconfig/cairo.pc
 @dirrm include/cairo
 @dirrm lib/cairo


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310131845.r9DIjYPZ085307>