Mon Apr 21 11:29:33 2008 UTC ()
Update to cairo-1.6.4.
Major changes between the 1.4 and 1.6 branch:
- Now uses external "pixman" library instead of a bundled one.
- Improvements to PDF, SVG and PostScript output
- New support for arbitrary X server visuals
  (the 8-bit display support patch (patch-ae in pkgsrc) is integrated)
- rendering backend improvements
- various new API additions, while maintaining ABI compatibility
- New Quartz backend
- bug fixes


(tnn)
diff -r1.60 -r1.61 pkgsrc/graphics/cairo/Makefile
diff -r1.18 -r1.19 pkgsrc/graphics/cairo/PLIST
diff -r1.26 -r1.27 pkgsrc/graphics/cairo/buildlink3.mk
diff -r1.39 -r1.40 pkgsrc/graphics/cairo/distinfo
diff -r1.10 -r1.11 pkgsrc/graphics/cairo/patches/patch-aa
diff -r1.8 -r1.9 pkgsrc/graphics/cairo/patches/patch-ab
diff -r1.9 -r0 pkgsrc/graphics/cairo/patches/patch-ae
cvs diff -r1.60 -r1.61 pkgsrc/graphics/cairo/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/cairo/Makefile 2008/04/12 22:43:01 1.60
+++ pkgsrc/graphics/cairo/Makefile 2008/04/21 11:29:33 1.61
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.60 2008/04/12 22:43:01 jlam Exp $ 1# $NetBSD: Makefile,v 1.61 2008/04/21 11:29:33 tnn Exp $
2 2
3DISTNAME= cairo-1.4.14 3DISTNAME= cairo-1.6.4
4CATEGORIES= graphics 4CATEGORIES= graphics
5MASTER_SITES= http://cairographics.org/releases/ 5MASTER_SITES= http://cairographics.org/releases/
6 6
7MAINTAINER= recht@NetBSD.org 7MAINTAINER= recht@NetBSD.org
8HOMEPAGE= http://cairographics.org/ 8HOMEPAGE= http://cairographics.org/
9COMMENT= Vector graphics library with cross-device output support 9COMMENT= Vector graphics library with cross-device output support
10 10
11PKG_DESTDIR_SUPPORT= user-destdir 11PKG_DESTDIR_SUPPORT= user-destdir
12 12
13USE_LANGUAGES+= c99 13USE_LANGUAGES+= c99
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15USE_PKGLOCALEDIR= yes 15USE_PKGLOCALEDIR= yes
16USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
@@ -21,26 +21,28 @@ CONFIGURE_ARGS+= --enable-glitz @@ -21,26 +21,28 @@ CONFIGURE_ARGS+= --enable-glitz
21CONFIGURE_ARGS+= --enable-pdf 21CONFIGURE_ARGS+= --enable-pdf
22CONFIGURE_ARGS+= --enable-ps 22CONFIGURE_ARGS+= --enable-ps
23 23
24PLIST_VARS+= carbon 24PLIST_VARS+= carbon
25.if exists(/System/Library/Frameworks/Carbon.framework) 25.if exists(/System/Library/Frameworks/Carbon.framework)
26CONFIGURE_ARGS+= --enable-quartz 26CONFIGURE_ARGS+= --enable-quartz
27CONFIGURE_ARGS+= --enable-atsui 27CONFIGURE_ARGS+= --enable-atsui
28PLIST.carbon= yes 28PLIST.carbon= yes
29.endif 29.endif
30 30
31.include "options.mk" 31.include "options.mk"
32 32
33BUILDLINK_API_DEPENDS.glitz+= glitz>=0.5.1 33BUILDLINK_API_DEPENDS.glitz+= glitz>=0.5.1
 34BUILDLINK_API_DEPENDS.pixman+= pixman>=0.10.0
34 35
35# For snprintf() 36# For snprintf()
36CPPFLAGS.SunOS+= -D__EXTENSIONS__ 37CPPFLAGS.SunOS+= -D__EXTENSIONS__
37 38
38TEST_TARGET= check 39TEST_TARGET= check
39 40
40.include "../../devel/zlib/buildlink3.mk" 41.include "../../devel/zlib/buildlink3.mk"
41.include "../../fonts/fontconfig/buildlink3.mk" 42.include "../../fonts/fontconfig/buildlink3.mk"
42.include "../../graphics/freetype2/buildlink3.mk" 43.include "../../graphics/freetype2/buildlink3.mk"
43.include "../../graphics/glitz/buildlink3.mk" 44.include "../../graphics/glitz/buildlink3.mk"
44.include "../../graphics/png/buildlink3.mk" 45.include "../../graphics/png/buildlink3.mk"
45.include "../../mk/pthread.buildlink3.mk" 46.include "../../mk/pthread.buildlink3.mk"
 47.include "../../x11/pixman/buildlink3.mk"
46.include "../../mk/bsd.pkg.mk" 48.include "../../mk/bsd.pkg.mk"
cvs diff -r1.18 -r1.19 pkgsrc/graphics/cairo/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/cairo/PLIST 2008/04/12 22:43:01 1.18
+++ pkgsrc/graphics/cairo/PLIST 2008/04/21 11:29:33 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.18 2008/04/12 22:43:01 jlam Exp $ 1@comment $NetBSD: PLIST,v 1.19 2008/04/21 11:29:33 tnn Exp $
2${PLIST.carbon}include/cairo/cairo-atsui.h 2${PLIST.carbon}include/cairo/cairo-atsui.h
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
6include/cairo/cairo-glitz.h 6include/cairo/cairo-glitz.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
10include/cairo/cairo-svg.h 10include/cairo/cairo-svg.h
11${PLIST.x11}include/cairo/cairo-xlib-xrender.h 11${PLIST.x11}include/cairo/cairo-xlib-xrender.h
12${PLIST.x11}include/cairo/cairo-xlib.h 12${PLIST.x11}include/cairo/cairo-xlib.h
13include/cairo/cairo.h 13include/cairo/cairo.h
14lib/libcairo.la 14lib/libcairo.la
@@ -35,43 +35,44 @@ share/gtk-doc/html/cairo/bindings-path.h @@ -35,43 +35,44 @@ share/gtk-doc/html/cairo/bindings-path.h
35share/gtk-doc/html/cairo/bindings-patterns.html 35share/gtk-doc/html/cairo/bindings-patterns.html
36share/gtk-doc/html/cairo/bindings-return-values.html 36share/gtk-doc/html/cairo/bindings-return-values.html
37share/gtk-doc/html/cairo/bindings-streams.html 37share/gtk-doc/html/cairo/bindings-streams.html
38share/gtk-doc/html/cairo/bindings-surfaces.html 38share/gtk-doc/html/cairo/bindings-surfaces.html
39share/gtk-doc/html/cairo/cairo-Error-Handling.html 39share/gtk-doc/html/cairo/cairo-Error-Handling.html
40share/gtk-doc/html/cairo/cairo-Font-Options.html 40share/gtk-doc/html/cairo/cairo-Font-Options.html
41share/gtk-doc/html/cairo/cairo-FreeType-Fonts.html 41share/gtk-doc/html/cairo/cairo-FreeType-Fonts.html
42share/gtk-doc/html/cairo/cairo-Image-Surfaces.html 42share/gtk-doc/html/cairo/cairo-Image-Surfaces.html
43share/gtk-doc/html/cairo/cairo-PDF-Surfaces.html 43share/gtk-doc/html/cairo/cairo-PDF-Surfaces.html
44share/gtk-doc/html/cairo/cairo-PNG-Support.html 44share/gtk-doc/html/cairo/cairo-PNG-Support.html
45share/gtk-doc/html/cairo/cairo-Paths.html 45share/gtk-doc/html/cairo/cairo-Paths.html
46share/gtk-doc/html/cairo/cairo-Patterns.html 46share/gtk-doc/html/cairo/cairo-Patterns.html
47share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html 47share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html
 48share/gtk-doc/html/cairo/cairo-Quartz-Fonts.html
 49share/gtk-doc/html/cairo/cairo-Quartz-Surfaces.html
48share/gtk-doc/html/cairo/cairo-SVG-Surfaces.html 50share/gtk-doc/html/cairo/cairo-SVG-Surfaces.html
49share/gtk-doc/html/cairo/cairo-Scaled-Fonts.html 51share/gtk-doc/html/cairo/cairo-Scaled-Fonts.html
50share/gtk-doc/html/cairo/cairo-Text.html 52share/gtk-doc/html/cairo/cairo-Text.html
51share/gtk-doc/html/cairo/cairo-Transformations.html 53share/gtk-doc/html/cairo/cairo-Transformations.html
52share/gtk-doc/html/cairo/cairo-Types.html 54share/gtk-doc/html/cairo/cairo-Types.html
53share/gtk-doc/html/cairo/cairo-Version-Information.html 55share/gtk-doc/html/cairo/cairo-Version-Information.html
54share/gtk-doc/html/cairo/cairo-Win32-Fonts.html 56share/gtk-doc/html/cairo/cairo-Win32-Fonts.html
55share/gtk-doc/html/cairo/cairo-Win32-Surfaces.html 57share/gtk-doc/html/cairo/cairo-Win32-Surfaces.html
56share/gtk-doc/html/cairo/cairo-XLib-Surfaces.html 58share/gtk-doc/html/cairo/cairo-XLib-Surfaces.html
57share/gtk-doc/html/cairo/cairo-cairo-font-face-t.html 59share/gtk-doc/html/cairo/cairo-cairo-font-face-t.html
58share/gtk-doc/html/cairo/cairo-cairo-matrix-t.html 60share/gtk-doc/html/cairo/cairo-cairo-matrix-t.html
59share/gtk-doc/html/cairo/cairo-cairo-surface-t.html 61share/gtk-doc/html/cairo/cairo-cairo-surface-t.html
60share/gtk-doc/html/cairo/cairo-cairo-t.html 62share/gtk-doc/html/cairo/cairo-cairo-t.html
61share/gtk-doc/html/cairo/cairo.devhelp 63share/gtk-doc/html/cairo/cairo.devhelp
62share/gtk-doc/html/cairo/cairo.devhelp2 64share/gtk-doc/html/cairo/cairo.devhelp2
63share/gtk-doc/html/cairo/home.png 65share/gtk-doc/html/cairo/home.png
64share/gtk-doc/html/cairo/index.html 66share/gtk-doc/html/cairo/index.html
65share/gtk-doc/html/cairo/index.sgml 67share/gtk-doc/html/cairo/index.sgml
66share/gtk-doc/html/cairo/index-1.2.html 68share/gtk-doc/html/cairo/index-1.2.html
67share/gtk-doc/html/cairo/index-1.4.html 69share/gtk-doc/html/cairo/index-1.4.html
 70share/gtk-doc/html/cairo/index-1.6.html
68share/gtk-doc/html/cairo/ix01.html 71share/gtk-doc/html/cairo/ix01.html
69share/gtk-doc/html/cairo/language-bindings.html 72share/gtk-doc/html/cairo/language-bindings.html
70share/gtk-doc/html/cairo/left.png 73share/gtk-doc/html/cairo/left.png
71share/gtk-doc/html/cairo/pt01.html 
72share/gtk-doc/html/cairo/pt02.html 
73share/gtk-doc/html/cairo/right.png 74share/gtk-doc/html/cairo/right.png
74share/gtk-doc/html/cairo/style.css 75share/gtk-doc/html/cairo/style.css
75share/gtk-doc/html/cairo/up.png 76share/gtk-doc/html/cairo/up.png
76@dirrm share/gtk-doc/html/cairo 77@dirrm share/gtk-doc/html/cairo
77@dirrm include/cairo 78@dirrm include/cairo
cvs diff -r1.26 -r1.27 pkgsrc/graphics/cairo/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/graphics/cairo/buildlink3.mk 2007/05/30 08:54:30 1.26
+++ pkgsrc/graphics/cairo/buildlink3.mk 2008/04/21 11:29:33 1.27
@@ -1,36 +1,37 @@ @@ -1,36 +1,37 @@
1# $NetBSD: buildlink3.mk,v 1.26 2007/05/30 08:54:30 rillig Exp $ 1# $NetBSD: buildlink3.mk,v 1.27 2008/04/21 11:29:33 tnn Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4CAIRO_BUILDLINK3_MK:= ${CAIRO_BUILDLINK3_MK}+ 4CAIRO_BUILDLINK3_MK:= ${CAIRO_BUILDLINK3_MK}+
5 5
6.if ${BUILDLINK_DEPTH} == "+" 6.if ${BUILDLINK_DEPTH} == "+"
7BUILDLINK_DEPENDS+= cairo 7BUILDLINK_DEPENDS+= cairo
8.endif 8.endif
9 9
10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncairo} 10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncairo}
11BUILDLINK_PACKAGES+= cairo 11BUILDLINK_PACKAGES+= cairo
12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cairo 12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cairo
13 13
14.if ${CAIRO_BUILDLINK3_MK} == "+" 14.if ${CAIRO_BUILDLINK3_MK} == "+"
15BUILDLINK_API_DEPENDS.cairo+= cairo>=1.0.0nb2 15BUILDLINK_API_DEPENDS.cairo+= cairo>=1.6.4
16BUILDLINK_ABI_DEPENDS.cairo?= cairo>=1.0.4nb1 16BUILDLINK_ABI_DEPENDS.cairo?= cairo>=1.0.4nb1
17BUILDLINK_PKGSRCDIR.cairo?= ../../graphics/cairo 17BUILDLINK_PKGSRCDIR.cairo?= ../../graphics/cairo
18 18
19BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8 19BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8
20.endif # CAIRO_BUILDLINK3_MK 20.endif # CAIRO_BUILDLINK3_MK
21 21
22.include "../../mk/bsd.fast.prefs.mk" 22.include "../../mk/bsd.fast.prefs.mk"
23 23
24pkgbase := cairo 24pkgbase := cairo
25.include "../../mk/pkg-build-options.mk" 25.include "../../mk/pkg-build-options.mk"
26 26
27.if !empty(PKG_BUILD_OPTIONS.cairo:Mx11) 27.if !empty(PKG_BUILD_OPTIONS.cairo:Mx11)
28.include "../../x11/libXrender/buildlink3.mk" 28.include "../../x11/libXrender/buildlink3.mk"
29.endif 29.endif
30 30
31.include "../../fonts/fontconfig/buildlink3.mk" 31.include "../../fonts/fontconfig/buildlink3.mk"
32.include "../../graphics/freetype2/buildlink3.mk" 32.include "../../graphics/freetype2/buildlink3.mk"
33.include "../../graphics/glitz/buildlink3.mk" 33.include "../../graphics/glitz/buildlink3.mk"
34.include "../../graphics/png/buildlink3.mk" 34.include "../../graphics/png/buildlink3.mk"
 35.include "../../x11/pixman/buildlink3.mk"
35 36
36BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 37BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
cvs diff -r1.39 -r1.40 pkgsrc/graphics/cairo/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/cairo/distinfo 2008/03/12 20:48:11 1.39
+++ pkgsrc/graphics/cairo/distinfo 2008/04/21 11:29:33 1.40
@@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
1$NetBSD: distinfo,v 1.39 2008/03/12 20:48:11 drochner Exp $ 1$NetBSD: distinfo,v 1.40 2008/04/21 11:29:33 tnn Exp $
2 2
3SHA1 (cairo-1.4.14.tar.gz) = 63310243ba8af949060b06c01fc28ee5471ed5a4 3SHA1 (cairo-1.6.4.tar.gz) = 9d990fe39a125ceb07221623c237cd7015855d5c
4RMD160 (cairo-1.4.14.tar.gz) = 9e7c87a292c889b06b29e9622be0a7daa3ddd6fd 4RMD160 (cairo-1.6.4.tar.gz) = ccae736a40d985b72bda7c2f0a98a0838020658e
5Size (cairo-1.4.14.tar.gz) = 3283608 bytes 5Size (cairo-1.6.4.tar.gz) = 5042623 bytes
6SHA1 (patch-aa) = 79c04674fde56522e1f09e5896fcef4c6b6a0d36 6SHA1 (patch-aa) = a6e95dc17dd316236dd7197f5e743c733e57587d
7SHA1 (patch-ab) = c6b98417270f7165aa3499d92d0ca9c19bdd4318 7SHA1 (patch-ab) = 2a0a99846fab962b552efa79c9261927de792dfd
8SHA1 (patch-ae) = 0b5c35720f9b675f132ca4da8c7e6e2b69c2f1a1 
cvs diff -r1.10 -r1.11 pkgsrc/graphics/cairo/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/graphics/cairo/patches/patch-aa 2007/06/08 07:20:53 1.10
+++ pkgsrc/graphics/cairo/patches/patch-aa 2008/04/21 11:29:33 1.11
@@ -1,22 +1,16 @@ @@ -1,22 +1,16 @@
1$NetBSD: patch-aa,v 1.10 2007/06/08 07:20:53 wiz Exp $ 1$NetBSD: patch-aa,v 1.11 2008/04/21 11:29:33 tnn Exp $
2 2
3--- src/Makefile.in.orig 2007-05-01 20:25:14.000000000 +0000 3--- src/Makefile.in.orig 2008-04-11 23:33:41.000000000 +0200
4+++ src/Makefile.in 4+++ src/Makefile.in
5@@ -244,7 +244,7 @@ CAIRO_CAN_TEST_PDF_SURFACE_FALSE = @CAIR 5@@ -288,9 +288,9 @@ AUTOHEADER = @AUTOHEADER@
6 CAIRO_CAN_TEST_PDF_SURFACE_TRUE = @CAIRO_CAN_TEST_PDF_SURFACE_TRUE@ 6 AUTOMAKE = @AUTOMAKE@
7 CAIRO_CAN_TEST_SVG_SURFACE_FALSE = @CAIRO_CAN_TEST_SVG_SURFACE_FALSE@ 7 AWK = @AWK@
8 CAIRO_CAN_TEST_SVG_SURFACE_TRUE = @CAIRO_CAN_TEST_SVG_SURFACE_TRUE@ 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_HAS_ATSUI_FONT_FALSE = @CAIRO_HAS_ATSUI_FONT_FALSE@ 
12 CAIRO_HAS_ATSUI_FONT_TRUE = @CAIRO_HAS_ATSUI_FONT_TRUE@ 
13 CAIRO_HAS_BEOS_SURFACE_FALSE = @CAIRO_HAS_BEOS_SURFACE_FALSE@ 
14@@ -282,7 +282,7 @@ CAIRO_HAS_XLIB_SURFACE_TRUE = @CAIRO_HAS 
15 CAIRO_HAS_XLIB_XRENDER_SURFACE_FALSE = @CAIRO_HAS_XLIB_XRENDER_SURFACE_FALSE@ 
16 CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE = @CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@ 
17 CAIRO_LDADD = @CAIRO_LDADD@ 11 CAIRO_LDADD = @CAIRO_LDADD@
18-CAIRO_LIBS = @CAIRO_LIBS@ 12-CAIRO_LIBS = @CAIRO_LIBS@
19+CAIRO_LIBS = @CAIRO_LIBS@ ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} 13+CAIRO_LIBS = @CAIRO_LIBS@ ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
20 CAIRO_NONPKGCONFIG_CFLAGS = @CAIRO_NONPKGCONFIG_CFLAGS@ 14 CAIRO_NONPKGCONFIG_CFLAGS = @CAIRO_NONPKGCONFIG_CFLAGS@
21 CAIRO_NONPKGCONFIG_LIBS = @CAIRO_NONPKGCONFIG_LIBS@ 15 CAIRO_NONPKGCONFIG_LIBS = @CAIRO_NONPKGCONFIG_LIBS@
22 CAIRO_REQUIRES = @CAIRO_REQUIRES@ 16 CAIRO_REQUIRES = @CAIRO_REQUIRES@
cvs diff -r1.8 -r1.9 pkgsrc/graphics/cairo/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/graphics/cairo/patches/patch-ab 2007/07/06 18:19:43 1.8
+++ pkgsrc/graphics/cairo/patches/patch-ab 2008/04/21 11:29:33 1.9
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ab,v 1.8 2007/07/06 18:19:43 drochner Exp $ 1$NetBSD: patch-ab,v 1.9 2008/04/21 11:29:33 tnn Exp $
2 2
3--- test/Makefile.in.orig 2007-06-27 23:06:21.000000000 +0200 3--- test/Makefile.in.orig 2008-04-11 23:33:42.000000000 +0200
4+++ test/Makefile.in 4+++ test/Makefile.in
5@@ -54,7 +54,7 @@ check_PROGRAMS = imagediff$(EXEEXT) png- 5@@ -59,7 +59,7 @@ host_triplet = @host@
6 $(am__EXEEXT_13) $(am__EXEEXT_14) 6 @CAIRO_HAS_PDF_SURFACE_TRUE@@CAIRO_HAS_PS_SURFACE_TRUE@@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_10 = fallback-resolution$(EXEEXT)
7 EXTRA_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_11) \ 7 check_PROGRAMS = imagediff$(EXEEXT) png-flatten$(EXEEXT) \
8 $(am__EXEEXT_12) 8 $(am__EXEEXT_1) $(am__EXEEXT_2)
9-@HAVE_PTHREAD_TRUE@am__append_9 = -lpthread 9-@HAVE_PTHREAD_TRUE@am__append_11 = -lpthread
10+@HAVE_PTHREAD_TRUE@am__append_9 = ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} 10+@HAVE_PTHREAD_TRUE@am__append_11 = ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
11 @CAIRO_CAN_TEST_PDF_SURFACE_TRUE@am__append_10 = pdf2png 11 @CAIRO_CAN_TEST_PDF_SURFACE_TRUE@am__append_12 = pdf2png
12 @CAIRO_CAN_TEST_PDF_SURFACE_TRUE@@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_11 = pdf2svg$(EXEEXT) 12 @CAIRO_CAN_TEST_SVG_SURFACE_TRUE@am__append_13 = svg2png
13 @CAIRO_CAN_TEST_SVG_SURFACE_TRUE@am__append_12 = svg2png 13 subdir = test
File Deleted: pkgsrc/graphics/cairo/patches/Attic/patch-ae