Fri Sep 7 15:24:03 2012 UTC ()
Changes 1.12.2:
After such a long gestation period for the release of Cairo 1.12, we
inevitably accumulated a few bugs that were flushed out by broadening the
test base. Thanks to everybody who tried the release, apologies to any one
unfortunate enough to encounter a bug and many thanks for reporting it.


(adam)
diff -r1.4 -r1.5 pkgsrc/graphics/cairo/DESCR
diff -r1.100 -r1.101 pkgsrc/graphics/cairo/Makefile
diff -r1.31 -r1.32 pkgsrc/graphics/cairo/PLIST
diff -r1.39 -r1.40 pkgsrc/graphics/cairo/buildlink3.mk
diff -r1.59 -r1.60 pkgsrc/graphics/cairo/distinfo
diff -r1.6 -r1.7 pkgsrc/graphics/cairo/options.mk
diff -r1.7 -r1.8 pkgsrc/graphics/cairo-gobject/Makefile
diff -r1.14 -r1.15 pkgsrc/graphics/cairo/patches/patch-aa
diff -r1.15 -r1.16 pkgsrc/graphics/cairo/patches/patch-ab
diff -r1.1 -r0 pkgsrc/graphics/cairo/patches/patch-src_cairo-quartz-font.c
diff -r1.1 -r0 pkgsrc/graphics/cairo/patches/patch-src_cairo-quartz.h
cvs diff -r1.4 -r1.5 pkgsrc/graphics/cairo/DESCR (expand / switch to unified diff)

--- pkgsrc/graphics/cairo/DESCR 2011/12/16 18:40:28 1.4
+++ pkgsrc/graphics/cairo/DESCR 2012/09/07 15:24:03 1.5
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1Cairo is a 2D graphics library with support for multiple output 1Cairo is a 2D graphics library with support for multiple output
2devices. Currently supported output targets include the X Window 2devices. Currently supported output targets include the X Window
3System, Quartz, Win32, image buffers, PostScript, PDF, and SVG file 3System, Quartz, Win32, image buffers, PostScript, PDF, and SVG file
4output. 4output.
5 5
6Cairo is designed to produce consistent output on all output media 6Cairo is designed to produce consistent output on all output media
7while taking advantage of display hardware acceleration when 7while taking advantage of display hardware acceleration when
8available (eg. through the X Render Extension). 8available (eg. through the X Render Extension).
9 9
10The cairo API provides operations similar to the drawing operators 10The cairo API provides operations similar to the drawing operators
11of PostScript and PDF. Operations in cairo including stroking and 11of PostScript and PDF. Operations in cairo including stroking and
12filling cubic Bézier splines, transforming and compositing 12filling cubic Bezier splines, transforming and compositing
13translucent images, and antialiased text rendering. All drawing 13translucent images, and antialiased text rendering. All drawing
14operations can be transformed by any affine transformation (scale, 14operations can be transformed by any affine transformation (scale,
15rotation, shear, etc.) 15rotation, shear, etc.)
16 16
17Cairo is implemented as a library written in the C programming 17Cairo is implemented as a library written in the C programming
18language, but bindings are available for several different programming 18language, but bindings are available for several different programming
19languages. 19languages.
cvs diff -r1.100 -r1.101 pkgsrc/graphics/cairo/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/cairo/Makefile 2012/06/14 19:53:07 1.100
+++ pkgsrc/graphics/cairo/Makefile 2012/09/07 15:24:03 1.101
@@ -1,59 +1,56 @@ @@ -1,59 +1,56 @@
1# $NetBSD: Makefile,v 1.100 2012/06/14 19:53:07 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.101 2012/09/07 15:24:03 adam Exp $
2 2
3DISTNAME= cairo-1.10.2 3DISTNAME= cairo-1.12.2
4PKGREVISION= 5 
5CATEGORIES= graphics 4CATEGORIES= graphics
6MASTER_SITES= http://cairographics.org/releases/ 5MASTER_SITES= http://cairographics.org/releases/
 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://cairographics.org/ 9HOMEPAGE= http://cairographics.org/
10COMMENT= Vector graphics library with cross-device output support 10COMMENT= Vector graphics library with cross-device output support
11LICENSE= gnu-lgpl-v2.1 AND mpl-1.1 11LICENSE= gnu-lgpl-v2.1 AND mpl-1.1
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15USE_LANGUAGES+= c99 15USE_LANGUAGES= c99
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_PKGLOCALEDIR= yes 17USE_PKGLOCALEDIR= yes
18USE_TOOLS+= pkg-config 18USE_TOOLS+= pkg-config
19PKGCONFIG_OVERRIDE+= src/cairo.pc.in \ 
20 src/cairo-features.pc.in 
21 
22GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
23CONFIGURE_ARGS+= --enable-gl 20CONFIGURE_ARGS+= --enable-gl
24CONFIGURE_ARGS+= --enable-pdf 21CONFIGURE_ARGS+= --enable-pdf
25CONFIGURE_ARGS+= --enable-ps 22CONFIGURE_ARGS+= --enable-ps
26CONFIGURE_ARGS+= --enable-tee 23CONFIGURE_ARGS+= --enable-tee
27 24
28PLIST_VARS+= carbon 25PKGCONFIG_OVERRIDE+= src/cairo.pc.in
 26PKGCONFIG_OVERRIDE+= src/cairo-features.pc.in
 27
 28.include "options.mk"
 29
29.if exists(/System/Library/Frameworks/Carbon.framework) 30.if exists(/System/Library/Frameworks/Carbon.framework)
30CONFIGURE_ARGS+= --enable-quartz 31CONFIGURE_ARGS+= --enable-quartz
31CONFIGURE_ARGS+= --enable-quartz-font 32CONFIGURE_ARGS+= --enable-quartz-font
32CONFIGURE_ARGS+= --enable-quartz-image 33CONFIGURE_ARGS+= --enable-quartz-image
33PLIST.carbon= yes 
34.endif 34.endif
35 35
36.include "options.mk" 
37 
38# For snprintf() and ctime_r() 36# For snprintf() and ctime_r()
39CPPFLAGS.SunOS+= -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS 37CPPFLAGS.SunOS+= -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
40 38
41TEST_TARGET= check 39TEST_TARGET= check
42 40
43# PR#43928 41# PR#43928
44.include "../../mk/compiler.mk" 42.include "../../mk/compiler.mk"
45.if ${MACHINE_PLATFORM:MDragonFly-*-x86_64} && ${CC_VERSION:Mgcc-4.1.*} 43.if ${MACHINE_PLATFORM:MDragonFly-*-x86_64} && ${CC_VERSION:Mgcc-4.1.*}
46CONFIGURE_ENV+= ac_cv_type___uint128_t=no 44CONFIGURE_ENV+= ac_cv_type___uint128_t=no
47.endif 45.endif
48 46
49.include "../../devel/zlib/buildlink3.mk" 47.include "../../devel/zlib/buildlink3.mk"
50.include "../../fonts/fontconfig/buildlink3.mk" 48.include "../../fonts/fontconfig/buildlink3.mk"
51BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.9 49BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.9
52.include "../../graphics/freetype2/buildlink3.mk" 50.include "../../graphics/freetype2/buildlink3.mk"
53.include "../../graphics/png/buildlink3.mk" 51.include "../../graphics/png/buildlink3.mk"
54# include? 52# include?
55#.include "../../print/libspectre/buildlink3.mk" 53#.include "../../print/libspectre/buildlink3.mk"
56.include "../../x11/pixman/buildlink3.mk" 54.include "../../x11/pixman/buildlink3.mk"
57 
58.include "../../mk/pthread.buildlink3.mk" 55.include "../../mk/pthread.buildlink3.mk"
59.include "../../mk/bsd.pkg.mk" 56.include "../../mk/bsd.pkg.mk"
cvs diff -r1.31 -r1.32 pkgsrc/graphics/cairo/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/cairo/PLIST 2012/02/23 14:00:43 1.31
+++ pkgsrc/graphics/cairo/PLIST 2012/09/07 15:24:03 1.32
@@ -1,95 +1,101 @@ @@ -1,95 +1,101 @@
1@comment $NetBSD: PLIST,v 1.31 2012/02/23 14:00:43 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.32 2012/09/07 15:24:03 adam Exp $
2bin/cairo-trace 2bin/cairo-trace
3include/cairo/cairo-deprecated.h 3include/cairo/cairo-deprecated.h
4include/cairo/cairo-features.h 4include/cairo/cairo-features.h
5include/cairo/cairo-ft.h 5include/cairo/cairo-ft.h
6${PLIST.x11}include/cairo/cairo-gl.h 6${PLIST.x11}include/cairo/cairo-gl.h
7include/cairo/cairo-pdf.h 7include/cairo/cairo-pdf.h
8include/cairo/cairo-ps.h 8include/cairo/cairo-ps.h
9${PLIST.carbon}include/cairo/cairo-quartz.h 9${PLIST.carbon}include/cairo/cairo-quartz.h
10${PLIST.carbon}include/cairo/cairo-quartz-image.h 10${PLIST.carbon}include/cairo/cairo-quartz-image.h
11include/cairo/cairo-script-interpreter.h 11include/cairo/cairo-script-interpreter.h
 12include/cairo/cairo-script.h
12include/cairo/cairo-svg.h 13include/cairo/cairo-svg.h
13include/cairo/cairo-tee.h 14include/cairo/cairo-tee.h
14include/cairo/cairo-version.h 15include/cairo/cairo-version.h
15${PLIST.xcb}include/cairo/cairo-xcb.h 16${PLIST.xcb}include/cairo/cairo-xcb.h
16${PLIST.x11}include/cairo/cairo-xlib-xrender.h 17${PLIST.x11}include/cairo/cairo-xlib-xrender.h
17${PLIST.x11}include/cairo/cairo-xlib.h 18${PLIST.x11}include/cairo/cairo-xlib.h
18include/cairo/cairo.h 19include/cairo/cairo.h
 20lib/cairo/cairo-fdr.la
19lib/cairo/libcairo-trace.la 21lib/cairo/libcairo-trace.la
20lib/libcairo-script-interpreter.la 22lib/libcairo-script-interpreter.la
21lib/libcairo.la 23lib/libcairo.la
22lib/pkgconfig/cairo-fc.pc 24lib/pkgconfig/cairo-fc.pc
23lib/pkgconfig/cairo-ft.pc 25lib/pkgconfig/cairo-ft.pc
24${PLIST.x11}lib/pkgconfig/cairo-gl.pc 26${PLIST.x11}lib/pkgconfig/cairo-gl.pc
25${PLIST.x11}lib/pkgconfig/cairo-glx.pc 27${PLIST.x11}lib/pkgconfig/cairo-glx.pc
26lib/pkgconfig/cairo-pdf.pc 28lib/pkgconfig/cairo-pdf.pc
27lib/pkgconfig/cairo-png.pc 29lib/pkgconfig/cairo-png.pc
28lib/pkgconfig/cairo-ps.pc 30lib/pkgconfig/cairo-ps.pc
29${PLIST.carbon}lib/pkgconfig/cairo-quartz-font.pc 31${PLIST.carbon}lib/pkgconfig/cairo-quartz-font.pc
30${PLIST.carbon}lib/pkgconfig/cairo-quartz-image.pc 32${PLIST.carbon}lib/pkgconfig/cairo-quartz-image.pc
31${PLIST.carbon}lib/pkgconfig/cairo-quartz.pc 33${PLIST.carbon}lib/pkgconfig/cairo-quartz.pc
 34lib/pkgconfig/cairo-script.pc
32lib/pkgconfig/cairo-svg.pc 35lib/pkgconfig/cairo-svg.pc
33lib/pkgconfig/cairo-tee.pc 36lib/pkgconfig/cairo-tee.pc
34${PLIST.xcb}lib/pkgconfig/cairo-xcb-shm.pc 37${PLIST.xcb}lib/pkgconfig/cairo-xcb-shm.pc
35${PLIST.xcb}lib/pkgconfig/cairo-xcb.pc 38${PLIST.xcb}lib/pkgconfig/cairo-xcb.pc
36${PLIST.x11}lib/pkgconfig/cairo-xlib-xrender.pc 39${PLIST.x11}lib/pkgconfig/cairo-xlib-xrender.pc
37${PLIST.x11}lib/pkgconfig/cairo-xlib.pc 40${PLIST.x11}lib/pkgconfig/cairo-xlib.pc
38lib/pkgconfig/cairo.pc 41lib/pkgconfig/cairo.pc
39share/gtk-doc/html/cairo/bindings-errors.html 42share/gtk-doc/html/cairo/bindings-errors.html
40share/gtk-doc/html/cairo/bindings-fonts.html 43share/gtk-doc/html/cairo/bindings-fonts.html
41share/gtk-doc/html/cairo/bindings-memory.html 44share/gtk-doc/html/cairo/bindings-memory.html
42share/gtk-doc/html/cairo/bindings-overloading.html 45share/gtk-doc/html/cairo/bindings-overloading.html
43share/gtk-doc/html/cairo/bindings-path.html 46share/gtk-doc/html/cairo/bindings-path.html
44share/gtk-doc/html/cairo/bindings-patterns.html 47share/gtk-doc/html/cairo/bindings-patterns.html
45share/gtk-doc/html/cairo/bindings-return-values.html 48share/gtk-doc/html/cairo/bindings-return-values.html
46share/gtk-doc/html/cairo/bindings-streams.html 49share/gtk-doc/html/cairo/bindings-streams.html
47share/gtk-doc/html/cairo/bindings-surfaces.html 50share/gtk-doc/html/cairo/bindings-surfaces.html
48share/gtk-doc/html/cairo/cairo-Error-handling.html 51share/gtk-doc/html/cairo/cairo-Error-handling.html
49share/gtk-doc/html/cairo/cairo-FreeType-Fonts.html 52share/gtk-doc/html/cairo/cairo-FreeType-Fonts.html
50share/gtk-doc/html/cairo/cairo-Image-Surfaces.html 53share/gtk-doc/html/cairo/cairo-Image-Surfaces.html
51share/gtk-doc/html/cairo/cairo-PDF-Surfaces.html 54share/gtk-doc/html/cairo/cairo-PDF-Surfaces.html
52share/gtk-doc/html/cairo/cairo-PNG-Support.html 55share/gtk-doc/html/cairo/cairo-PNG-Support.html
53share/gtk-doc/html/cairo/cairo-Paths.html 56share/gtk-doc/html/cairo/cairo-Paths.html
54share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html 57share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html
55share/gtk-doc/html/cairo/cairo-Quartz-(CGFont)-Fonts.html 58share/gtk-doc/html/cairo/cairo-Quartz-(CGFont)-Fonts.html
56share/gtk-doc/html/cairo/cairo-Quartz-Surfaces.html 59share/gtk-doc/html/cairo/cairo-Quartz-Surfaces.html
 60share/gtk-doc/html/cairo/cairo-Raster-Sources.html
57share/gtk-doc/html/cairo/cairo-Recording-Surfaces.html 61share/gtk-doc/html/cairo/cairo-Recording-Surfaces.html
58share/gtk-doc/html/cairo/cairo-Regions.html 62share/gtk-doc/html/cairo/cairo-Regions.html
59share/gtk-doc/html/cairo/cairo-SVG-Surfaces.html 63share/gtk-doc/html/cairo/cairo-SVG-Surfaces.html
 64share/gtk-doc/html/cairo/cairo-Script-Surfaces.html
60share/gtk-doc/html/cairo/cairo-Transformations.html 65share/gtk-doc/html/cairo/cairo-Transformations.html
61share/gtk-doc/html/cairo/cairo-Types.html 66share/gtk-doc/html/cairo/cairo-Types.html
62share/gtk-doc/html/cairo/cairo-User-Fonts.html 67share/gtk-doc/html/cairo/cairo-User-Fonts.html
63share/gtk-doc/html/cairo/cairo-Version-Information.html 
64share/gtk-doc/html/cairo/cairo-Win32-Fonts.html 68share/gtk-doc/html/cairo/cairo-Win32-Fonts.html
65share/gtk-doc/html/cairo/cairo-Win32-Surfaces.html 69share/gtk-doc/html/cairo/cairo-Win32-Surfaces.html
 70share/gtk-doc/html/cairo/cairo-XCB-Surfaces.html
66share/gtk-doc/html/cairo/cairo-XLib-Surfaces.html 71share/gtk-doc/html/cairo/cairo-XLib-Surfaces.html
 72share/gtk-doc/html/cairo/cairo-XLib-XRender-Backend.html
67share/gtk-doc/html/cairo/cairo-cairo-device-t.html 73share/gtk-doc/html/cairo/cairo-cairo-device-t.html
68share/gtk-doc/html/cairo/cairo-cairo-font-face-t.html 74share/gtk-doc/html/cairo/cairo-cairo-font-face-t.html
69share/gtk-doc/html/cairo/cairo-cairo-font-options-t.html 75share/gtk-doc/html/cairo/cairo-cairo-font-options-t.html
70share/gtk-doc/html/cairo/cairo-cairo-matrix-t.html 76share/gtk-doc/html/cairo/cairo-cairo-matrix-t.html
71share/gtk-doc/html/cairo/cairo-cairo-pattern-t.html 77share/gtk-doc/html/cairo/cairo-cairo-pattern-t.html
72share/gtk-doc/html/cairo/cairo-cairo-scaled-font-t.html 78share/gtk-doc/html/cairo/cairo-cairo-scaled-font-t.html
73share/gtk-doc/html/cairo/cairo-cairo-surface-t.html 79share/gtk-doc/html/cairo/cairo-cairo-surface-t.html
74share/gtk-doc/html/cairo/cairo-cairo-t.html 80share/gtk-doc/html/cairo/cairo-cairo-t.html
75share/gtk-doc/html/cairo/cairo-drawing.html 81share/gtk-doc/html/cairo/cairo-drawing.html
76share/gtk-doc/html/cairo/cairo-fonts.html 82share/gtk-doc/html/cairo/cairo-fonts.html
77share/gtk-doc/html/cairo/cairo-support.html 83share/gtk-doc/html/cairo/cairo-support.html
78share/gtk-doc/html/cairo/cairo-surfaces.html 84share/gtk-doc/html/cairo/cairo-surfaces.html
79share/gtk-doc/html/cairo/cairo-text.html 85share/gtk-doc/html/cairo/cairo-text.html
80share/gtk-doc/html/cairo/cairo.devhelp 
81share/gtk-doc/html/cairo/cairo.devhelp2 86share/gtk-doc/html/cairo/cairo.devhelp2
82share/gtk-doc/html/cairo/home.png 87share/gtk-doc/html/cairo/home.png
83share/gtk-doc/html/cairo/index-1.10.html 88share/gtk-doc/html/cairo/index-1.10.html
 89share/gtk-doc/html/cairo/index-1.12.html
84share/gtk-doc/html/cairo/index-1.2.html 90share/gtk-doc/html/cairo/index-1.2.html
85share/gtk-doc/html/cairo/index-1.4.html 91share/gtk-doc/html/cairo/index-1.4.html
86share/gtk-doc/html/cairo/index-1.6.html 92share/gtk-doc/html/cairo/index-1.6.html
87share/gtk-doc/html/cairo/index-1.8.html 93share/gtk-doc/html/cairo/index-1.8.html
88share/gtk-doc/html/cairo/index-all.html 94share/gtk-doc/html/cairo/index-all.html
89share/gtk-doc/html/cairo/index.html 95share/gtk-doc/html/cairo/index.html
90share/gtk-doc/html/cairo/index.sgml 96share/gtk-doc/html/cairo/index.sgml
91share/gtk-doc/html/cairo/language-bindings.html 97share/gtk-doc/html/cairo/language-bindings.html
92share/gtk-doc/html/cairo/left.png 98share/gtk-doc/html/cairo/left.png
93share/gtk-doc/html/cairo/right.png 99share/gtk-doc/html/cairo/right.png
94share/gtk-doc/html/cairo/style.css 100share/gtk-doc/html/cairo/style.css
95share/gtk-doc/html/cairo/up.png 101share/gtk-doc/html/cairo/up.png
cvs diff -r1.39 -r1.40 pkgsrc/graphics/cairo/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/graphics/cairo/buildlink3.mk 2011/11/01 06:01:26 1.39
+++ pkgsrc/graphics/cairo/buildlink3.mk 2012/09/07 15:24:03 1.40
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: buildlink3.mk,v 1.39 2011/11/01 06:01:26 sbd Exp $ 1# $NetBSD: buildlink3.mk,v 1.40 2012/09/07 15:24:03 adam Exp $
2 2
3BUILDLINK_TREE+= cairo 3BUILDLINK_TREE+= cairo
4 4
5.if !defined(CAIRO_BUILDLINK3_MK) 5.if !defined(CAIRO_BUILDLINK3_MK)
6CAIRO_BUILDLINK3_MK:= 6CAIRO_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.cairo+= cairo>=1.0.0nb2 8BUILDLINK_API_DEPENDS.cairo+= cairo>=1.0.0nb2
9BUILDLINK_ABI_DEPENDS.cairo+= cairo>=1.10.2nb2 9BUILDLINK_ABI_DEPENDS.cairo+= cairo>=1.12.2
10BUILDLINK_PKGSRCDIR.cairo?= ../../graphics/cairo 10BUILDLINK_PKGSRCDIR.cairo?= ../../graphics/cairo
11 11
12BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8 12BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8
13BUILDLINK_API_DEPENDS.pixman+= pixman>=0.18.4 13BUILDLINK_API_DEPENDS.pixman+= pixman>=0.18.4
14 14
15.include "../../mk/bsd.fast.prefs.mk" 15.include "../../mk/bsd.fast.prefs.mk"
16 16
17pkgbase := cairo 17pkgbase := cairo
18.include "../../mk/pkg-build-options.mk" 18.include "../../mk/pkg-build-options.mk"
19 19
20.if !empty(PKG_BUILD_OPTIONS.cairo:Mxcb) 20.if !empty(PKG_BUILD_OPTIONS.cairo:Mxcb)
21.include "../../x11/libxcb/buildlink3.mk" 21.include "../../x11/libxcb/buildlink3.mk"
22.endif 22.endif
cvs diff -r1.59 -r1.60 pkgsrc/graphics/cairo/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/cairo/distinfo 2012/06/16 20:52:18 1.59
+++ pkgsrc/graphics/cairo/distinfo 2012/09/07 15:24:03 1.60
@@ -1,10 +1,8 @@ @@ -1,10 +1,8 @@
1$NetBSD: distinfo,v 1.59 2012/06/16 20:52:18 tron Exp $ 1$NetBSD: distinfo,v 1.60 2012/09/07 15:24:03 adam Exp $
2 2
3SHA1 (cairo-1.10.2.tar.gz) = ccce5ae03f99c505db97c286a0c9a90a926d3c6e 3SHA1 (cairo-1.12.2.tar.xz) = bc2ee50690575f16dab33af42a2e6cdc6451e3f9
4RMD160 (cairo-1.10.2.tar.gz) = 8c8de00120398fe2b3a60a08ff59a464b2eebf47 4RMD160 (cairo-1.12.2.tar.xz) = 0174a5110f5f4c9ff15da984e0602dfd04643a63
5Size (cairo-1.10.2.tar.gz) = 23558405 bytes 5Size (cairo-1.12.2.tar.xz) = 42051584 bytes
6SHA1 (patch-aa) = f211b2a5fce4ff65f280f79fbb78e1a530b9b165 6SHA1 (patch-aa) = 474f44c1c8d4017137fe59b160afca8f16ad7287
7SHA1 (patch-ab) = 03a6199a0e0de1fe3701900ea76ce3f0bfdddca0 7SHA1 (patch-ab) = 62ff361d52742bba0f49c6a32149269b958fa24a
8SHA1 (patch-ac) = 151c682245004902cf42ba141e3743592691dfb9 8SHA1 (patch-ac) = 151c682245004902cf42ba141e3743592691dfb9
9SHA1 (patch-src_cairo-quartz-font.c) = 0a4bb75c3d2382020e1f491ff99985993a02bbc6 
10SHA1 (patch-src_cairo-quartz.h) = 089ce2fe351724a06986512b2080ae4dc2543b9a 
cvs diff -r1.6 -r1.7 pkgsrc/graphics/cairo/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/cairo/options.mk 2010/10/13 00:11:21 1.6
+++ pkgsrc/graphics/cairo/options.mk 2012/09/07 15:24:03 1.7
@@ -1,33 +1,37 @@ @@ -1,33 +1,37 @@
1# $NetBSD: options.mk,v 1.6 2010/10/13 00:11:21 spz Exp $ 1# $NetBSD: options.mk,v 1.7 2012/09/07 15:24:03 adam Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.cairo 3PKG_OPTIONS_VAR= PKG_OPTIONS.cairo
4PKG_SUPPORTED_OPTIONS= x11 xcb 4PKG_SUPPORTED_OPTIONS= x11 xcb
5PKG_SUGGESTED_OPTIONS= x11 xcb 5PKG_SUGGESTED_OPTIONS= x11 xcb
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= x11 xcb 9PLIST_VARS+= carbon x11 xcb
10 10
11### 11###
12### X11 and XCB support (XCB implies X11) 12### X11 and XCB support (XCB implies X11)
13### 13###
14.if !empty(PKG_OPTIONS:Mx11) || !empty(PKG_OPTIONS:Mxcb) 14.if !empty(PKG_OPTIONS:Mx11) || !empty(PKG_OPTIONS:Mxcb)
15CONFIGURE_ARGS+= --enable-xlib --enable-xlib-xrender 15CONFIGURE_ARGS+= --enable-xlib
 16CONFIGURE_ARGS+= --enable-xlib-xrender
 17PLIST.gl= yes
16PLIST.x11= yes 18PLIST.x11= yes
17.include "../../graphics/MesaLib/buildlink3.mk" 19.include "../../graphics/MesaLib/buildlink3.mk"
18.include "../../x11/libXext/buildlink3.mk" 20.include "../../x11/libXext/buildlink3.mk"
19.include "../../x11/libXft/buildlink3.mk" 21.include "../../x11/libXft/buildlink3.mk"
20.include "../../x11/libXrender/buildlink3.mk" 22.include "../../x11/libXrender/buildlink3.mk"
21.include "../../x11/libX11/buildlink3.mk" 23.include "../../x11/libX11/buildlink3.mk"
22BUILDLINK_DEPMETHOD.libXt?= build # only for configure 24BUILDLINK_DEPMETHOD.libXt?= build # only for configure
23.include "../../x11/libXt/buildlink3.mk" 25.include "../../x11/libXt/buildlink3.mk"
24 26
25.if !empty(PKG_OPTIONS:Mxcb) 27. if !empty(PKG_OPTIONS:Mxcb)
26CONFIGURE_ARGS+= --enable-xcb 28CONFIGURE_ARGS+= --enable-xcb
27PLIST.xcb= yes 29PLIST.xcb= yes
28.include "../../x11/libxcb/buildlink3.mk" 30. include "../../x11/libxcb/buildlink3.mk"
29.endif 31. endif
30 32
31.else 33.else
32CONFIGURE_ARGS+= --disable-xlib --disable-xlib-xrender --disable-gl 34CONFIGURE_ARGS+= --disable-gl
 35CONFIGURE_ARGS+= --disable-xlib
 36CONFIGURE_ARGS+= --disable-xlib-xrender
33.endif 37.endif
cvs diff -r1.7 -r1.8 pkgsrc/graphics/cairo-gobject/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/cairo-gobject/Makefile 2012/03/03 00:12:05 1.7
+++ pkgsrc/graphics/cairo-gobject/Makefile 2012/09/07 15:24:03 1.8
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.7 2012/03/03 00:12:05 wiz Exp $ 1# $NetBSD: Makefile,v 1.8 2012/09/07 15:24:03 adam Exp $
2 2
3DISTNAME= cairo-1.10.2 3DISTNAME= cairo-1.12.2
4PKGNAME= cairo-gobject-1.10.2 4PKGNAME= ${DISTNAME:S/-/-gobject-/}
5PKGREVISION= 4 
6CATEGORIES= graphics 5CATEGORIES= graphics
7MASTER_SITES= http://cairographics.org/releases/ 6MASTER_SITES= http://cairographics.org/releases/
 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://cairographics.org/ 10HOMEPAGE= http://cairographics.org/
11COMMENT= Vector graphics library with cross-device output support 11COMMENT= Vector graphics library with cross-device output support
12LICENSE= gnu-lgpl-v2.1 AND mpl-1.1 12LICENSE= gnu-lgpl-v2.1 AND mpl-1.1
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15PATCHDIR= ${.CURDIR}/../../graphics/cairo/patches 15PATCHDIR= ${.CURDIR}/../../graphics/cairo/patches
16DISTINFO_FILE= ${.CURDIR}/../../graphics/cairo/distinfo 16DISTINFO_FILE= ${.CURDIR}/../../graphics/cairo/distinfo
17BUILD_DIRS= util/cairo-gobject 17BUILD_DIRS= util/cairo-gobject
18INSTALL_DIRS= util/cairo-gobject 18INSTALL_DIRS= util/cairo-gobject
19 19
20USE_LANGUAGES+= c99 20USE_LANGUAGES+= c99
cvs diff -r1.14 -r1.15 pkgsrc/graphics/cairo/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/graphics/cairo/patches/patch-aa 2010/09/13 12:23:01 1.14
+++ pkgsrc/graphics/cairo/patches/patch-aa 2012/09/07 15:24:03 1.15
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-aa,v 1.14 2010/09/13 12:23:01 wiz Exp $ 1$NetBSD: patch-aa,v 1.15 2012/09/07 15:24:03 adam Exp $
2 2
3--- src/Makefile.in.orig 2010-09-06 16:16:41.000000000 +0000 3--- src/Makefile.in.orig 2012-04-29 18:49:55.000000000 +0000
4+++ src/Makefile.in 4+++ src/Makefile.in
5@@ -821,9 +821,9 @@ AWK = @AWK@ 5@@ -928,9 +928,9 @@ AUTOMAKE = @AUTOMAKE@
 6 AWK = @AWK@
6 BFD_LIBS = @BFD_LIBS@ 7 BFD_LIBS = @BFD_LIBS@
7 CAIROBOILERPLATE_LIBS = @CAIROBOILERPLATE_LIBS@ 8 CAIROBOILERPLATE_LIBS = @CAIROBOILERPLATE_LIBS@
8 CAIROPERF_LIBS = @CAIROPERF_LIBS@ 
9-CAIRO_CFLAGS = @CAIRO_CFLAGS@ 9-CAIRO_CFLAGS = @CAIRO_CFLAGS@
10+CAIRO_CFLAGS = @CAIRO_CFLAGS@ ${PTHREAD_CFLAGS} 10+CAIRO_CFLAGS = @CAIRO_CFLAGS@ ${PTHREAD_CFLAGS}
11 CAIRO_LDFLAGS = @CAIRO_LDFLAGS@ 11 CAIRO_LDFLAGS = @CAIRO_LDFLAGS@
12-CAIRO_LIBS = @CAIRO_LIBS@ 12-CAIRO_LIBS = @CAIRO_LIBS@
13+CAIRO_LIBS = @CAIRO_LIBS@ ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} 13+CAIRO_LIBS = @CAIRO_LIBS@ ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
14 CAIRO_LIBTOOL_VERSION_INFO = @CAIRO_LIBTOOL_VERSION_INFO@ 14 CAIRO_LIBTOOL_VERSION_INFO = @CAIRO_LIBTOOL_VERSION_INFO@
15 CAIRO_NONPKGCONFIG_CFLAGS = @CAIRO_NONPKGCONFIG_CFLAGS@ 15 CAIRO_NONPKGCONFIG_CFLAGS = @CAIRO_NONPKGCONFIG_CFLAGS@
16 CAIRO_NONPKGCONFIG_LIBS = @CAIRO_NONPKGCONFIG_LIBS@ 16 CAIRO_NONPKGCONFIG_LIBS = @CAIRO_NONPKGCONFIG_LIBS@
cvs diff -r1.15 -r1.16 pkgsrc/graphics/cairo/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/graphics/cairo/patches/patch-ab 2011/02/12 13:40:53 1.15
+++ pkgsrc/graphics/cairo/patches/patch-ab 2012/09/07 15:24:03 1.16
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-ab,v 1.15 2011/02/12 13:40:53 drochner Exp $ 1$NetBSD: patch-ab,v 1.16 2012/09/07 15:24:03 adam Exp $
2 2
3--- util/cairo-gobject/Makefile.in.orig 2010-12-25 14:22:55.000000000 +0000 3--- util/cairo-gobject/Makefile.in.orig 2012-04-29 18:49:57.000000000 +0000
4+++ util/cairo-gobject/Makefile.in 4+++ util/cairo-gobject/Makefile.in
5@@ -91,7 +91,7 @@ am__base_list = \ 5@@ -114,7 +114,7 @@ am__uninstall_files_from_dir = { \
6 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cairoincludedir)" 6 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cairoincludedir)"
7 LTLIBRARIES = $(lib_LTLIBRARIES) 7 LTLIBRARIES = $(lib_LTLIBRARIES)
8 am__DEPENDENCIES_1 = 8 am__DEPENDENCIES_1 =
9-libcairo_gobject_la_DEPENDENCIES = $(top_builddir)/src/libcairo.la \ 9-libcairo_gobject_la_DEPENDENCIES = $(top_builddir)/src/libcairo.la \
10+libcairo_gobject_la_DEPENDENCIES = \ 10+libcairo_gobject_la_DEPENDENCIES = \
11 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) 11 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
12 am_libcairo_gobject_la_OBJECTS = \ 12 am_libcairo_gobject_la_OBJECTS = \
13 libcairo_gobject_la-cairo-gobject-enums.lo \ 13 libcairo_gobject_la-cairo-gobject-enums.lo \
14@@ -357,7 +357,7 @@ libcairo_gobject_la_SOURCES = \ 14@@ -385,7 +385,7 @@ libcairo_gobject_la_SOURCES = \
15  15
16 libcairo_gobject_la_CFLAGS = $(CAIRO_CFLAGS) $(GOBJECT_CFLAGS) 16 libcairo_gobject_la_CFLAGS = $(CAIRO_CFLAGS) $(GOBJECT_CFLAGS)
17 libcairo_gobject_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols) 17 libcairo_gobject_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols)
18-libcairo_gobject_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) $(GOBJECT_LIBS) 18-libcairo_gobject_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) $(GOBJECT_LIBS)
19+libcairo_gobject_la_LIBADD = $(prefix)/lib/libcairo.la $(CAIRO_LIBS) $(GOBJECT_LIBS) 19+libcairo_gobject_la_LIBADD = $(prefix)/lib/libcairo.la $(CAIRO_LIBS) $(GOBJECT_LIBS)
20 all: all-am 20 all: all-am
21  21
22 .SUFFIXES: 22 .SUFFIXES:
File Deleted: pkgsrc/graphics/cairo/patches/Attic/patch-src_cairo-quartz-font.c
File Deleted: pkgsrc/graphics/cairo/patches/Attic/patch-src_cairo-quartz.h