diff options
| author | pho <pho@pkgsrc.org> | 2014-05-27 08:43:55 +0000 |
|---|---|---|
| committer | pho <pho@pkgsrc.org> | 2014-05-27 08:43:55 +0000 |
| commit | 6c1d7314d6d02cfe2d63470789f9533534601bb4 (patch) | |
| tree | 44cc10da189d0fb8f8c1b09b37d63068788e8535 /graphics/cairo | |
| parent | 6f1a9693b625044cead2d5ebc4254475fb0dddfe (diff) | |
| download | pkgsrc-6c1d7314d6d02cfe2d63470789f9533534601bb4.tar.gz | |
Disable Quartz backend on Darwin
Quartz backend interacts badly with our library stack. The most notable
issue is that when quartz-font is enabled, cairo will never use fontconfig
but instead uses CoreGraphics API to find fonts in system-default font
paths; as a result, any fonts installed with pkgsrc will never be found.
OTOH fontconfig by default searches for fonts in MacOS X system-default
paths too so sticking with it will not cause a problem.
Diffstat (limited to 'graphics/cairo')
| -rw-r--r-- | graphics/cairo/Makefile | 4 | ||||
| -rw-r--r-- | graphics/cairo/Makefile.common | 24 | ||||
| -rw-r--r-- | graphics/cairo/PLIST | 7 |
3 files changed, 15 insertions, 20 deletions
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index 3864f38dc0f..b119bc88bea 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.133 2014/05/05 00:47:54 ryoon Exp $ +# $NetBSD: Makefile,v 1.134 2014/05/27 08:43:55 pho Exp $ .include "../../graphics/cairo/Makefile.common" -PKGREVISION= 2 +PKGREVISION= 3 TEST_TARGET= check diff --git a/graphics/cairo/Makefile.common b/graphics/cairo/Makefile.common index 3eb3e8ee9b5..fc42d531da8 100644 --- a/graphics/cairo/Makefile.common +++ b/graphics/cairo/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1 2013/08/31 22:19:32 adam Exp $ +# $NetBSD: Makefile.common,v 1.2 2014/05/27 08:43:55 pho Exp $ # # used by graphics/cairo/Makefile # used by graphics/cairo-gobject/Makefile @@ -29,20 +29,20 @@ CONFIGURE_ARGS+= --enable-pdf CONFIGURE_ARGS+= --enable-ps CONFIGURE_ARGS+= --enable-tee +# Darwin: Quartz backend interacts badly with our library stack. The +# most notable issue is that when quartz-font is enabled, cairo will +# never use fontconfig but instead uses CoreGraphics API to find fonts +# in system-default font paths; as a result, any fonts installed with +# pkgsrc will never be found. OTOH fontconfig by default searches for +# fonts in MacOS X system-default paths too so sticking with it will +# not cause a problem. +CONFIGURE_ARGS+= --disable-quartz +CONFIGURE_ARGS+= --disable-quartz-font +CONFIGURE_ARGS+= --disable-quartz-image + PKGCONFIG_OVERRIDE+= src/cairo.pc.in PKGCONFIG_OVERRIDE+= src/cairo-features.pc.in -.include "../../mk/bsd.prefs.mk" - -PLIST_VARS+= quartz - -.if ${OPSYS} == "Darwin" -CONFIGURE_ARGS+= --enable-quartz -CONFIGURE_ARGS+= --enable-quartz-font -CONFIGURE_ARGS+= --enable-quartz-image -PLIST.quartz= yes -.endif - # For snprintf() and ctime_r() CPPFLAGS.SunOS+= -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS diff --git a/graphics/cairo/PLIST b/graphics/cairo/PLIST index 135ba6814aa..33d91584078 100644 --- a/graphics/cairo/PLIST +++ b/graphics/cairo/PLIST @@ -1,12 +1,10 @@ -@comment $NetBSD: PLIST,v 1.34 2013/08/31 22:19:32 adam Exp $ +@comment $NetBSD: PLIST,v 1.35 2014/05/27 08:43:55 pho Exp $ bin/cairo-trace include/cairo/cairo-deprecated.h include/cairo/cairo-features.h include/cairo/cairo-ft.h include/cairo/cairo-pdf.h include/cairo/cairo-ps.h -${PLIST.quartz}include/cairo/cairo-quartz.h -${PLIST.quartz}include/cairo/cairo-quartz-image.h include/cairo/cairo-script-interpreter.h include/cairo/cairo-script.h include/cairo/cairo-svg.h @@ -25,9 +23,6 @@ lib/pkgconfig/cairo-ft.pc lib/pkgconfig/cairo-pdf.pc lib/pkgconfig/cairo-png.pc lib/pkgconfig/cairo-ps.pc -${PLIST.quartz}lib/pkgconfig/cairo-quartz-font.pc -${PLIST.quartz}lib/pkgconfig/cairo-quartz-image.pc -${PLIST.quartz}lib/pkgconfig/cairo-quartz.pc lib/pkgconfig/cairo-script.pc lib/pkgconfig/cairo-svg.pc lib/pkgconfig/cairo-tee.pc |