pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Fix to instal cairo-quartz-font.pc.
details: https://anonhg.NetBSD.org/pkgsrc/rev/be4f1b276ae8
branches: trunk
changeset: 542376:be4f1b276ae8
user: obache <obache%pkgsrc.org@localhost>
date: Wed May 14 15:26:14 2008 +0000
description:
Fix to instal cairo-quartz-font.pc.
(and while here, enable quartz-image)
Then atsui support for pango again.
Bump pkgrevision.
diffstat:
devel/pango/Makefile | 9 +++++++--
devel/pango/PLIST | 4 +++-
graphics/cairo/Makefile | 6 ++++--
graphics/cairo/PLIST | 5 ++++-
graphics/cairo/distinfo | 4 ++--
graphics/cairo/patches/patch-aa | 23 ++++++++++++++++++++---
6 files changed, 40 insertions(+), 11 deletions(-)
diffs (148 lines):
diff -r 01f7054d1cb6 -r be4f1b276ae8 devel/pango/Makefile
--- a/devel/pango/Makefile Wed May 14 14:02:19 2008 +0000
+++ b/devel/pango/Makefile Wed May 14 15:26:14 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.112 2008/04/22 12:15:38 tron Exp $
+# $NetBSD: Makefile,v 1.113 2008/05/14 15:26:14 obache Exp $
DISTNAME= pango-1.20.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel fonts
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pango/1.20/}
EXTRACT_SUFX= .tar.bz2
@@ -39,6 +39,11 @@
CHECK_FILES_SKIP+= ${PREFIX}/libdata/pango/pango.modules
+PLIST_VARS+= carbon
+.if exists(/System/Library/Frameworks/Carbon.framework)
+PLIST.carbon= yes
+.endif
+
.include "options.mk"
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.14.0
diff -r 01f7054d1cb6 -r be4f1b276ae8 devel/pango/PLIST
--- a/devel/pango/PLIST Wed May 14 14:02:19 2008 +0000
+++ b/devel/pango/PLIST Wed May 14 15:26:14 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.39 2008/04/22 12:15:38 tron Exp $
+@comment $NetBSD: PLIST,v 1.40 2008/05/14 15:26:14 obache Exp $
bin/pango-querymodules
${PLIST.x11}bin/pango-view
include/pango-1.0/pango/pango-attributes.h
@@ -26,6 +26,7 @@
include/pango-1.0/pango/pango-types.h
include/pango-1.0/pango/pango-utils.h
include/pango-1.0/pango/pango.h
+${PLIST.carbon}include/pango-1.0/pango/pangoatsui.h
include/pango-1.0/pango/pangocairo.h
include/pango-1.0/pango/pangofc-decoder.h
include/pango-1.0/pango/pangofc-font.h
@@ -41,6 +42,7 @@
${PLIST.x11}lib/libpangoxft-1.0.la
lib/pango/1.6.0/modules/pango-arabic-fc.la
lib/pango/1.6.0/modules/pango-arabic-lang.la
+${PLIST.carbon}lib/pango/1.6.0/modules/pango-basic-atsui.la
lib/pango/1.6.0/modules/pango-basic-fc.la
${PLIST.x11}lib/pango/1.6.0/modules/pango-basic-x.la
lib/pango/1.6.0/modules/pango-hangul-fc.la
diff -r 01f7054d1cb6 -r be4f1b276ae8 graphics/cairo/Makefile
--- a/graphics/cairo/Makefile Wed May 14 14:02:19 2008 +0000
+++ b/graphics/cairo/Makefile Wed May 14 15:26:14 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2008/04/28 15:09:16 tnn Exp $
+# $NetBSD: Makefile,v 1.64 2008/05/14 15:26:14 obache Exp $
DISTNAME= cairo-1.6.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/releases/
@@ -25,6 +25,8 @@
PLIST_VARS+= carbon
.if exists(/System/Library/Frameworks/Carbon.framework)
CONFIGURE_ARGS+= --enable-quartz
+CONFIGURE_ARGS+= --enable-quartz-font
+CONFIGURE_ARGS+= --enable-quartz-image
PLIST.carbon= yes
.endif
diff -r 01f7054d1cb6 -r be4f1b276ae8 graphics/cairo/PLIST
--- a/graphics/cairo/PLIST Wed May 14 14:02:19 2008 +0000
+++ b/graphics/cairo/PLIST Wed May 14 15:26:14 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2008/04/22 10:23:09 tron Exp $
+@comment $NetBSD: PLIST,v 1.21 2008/05/14 15:26:14 obache Exp $
include/cairo/cairo-deprecated.h
include/cairo/cairo-features.h
include/cairo/cairo-ft.h
@@ -6,6 +6,7 @@
include/cairo/cairo-pdf.h
include/cairo/cairo-ps.h
${PLIST.carbon}include/cairo/cairo-quartz.h
+${PLIST.carbon}include/cairo/cairo-quartz-image.h
include/cairo/cairo-svg.h
${PLIST.x11}include/cairo/cairo-xlib-xrender.h
${PLIST.x11}include/cairo/cairo-xlib.h
@@ -16,6 +17,8 @@
lib/pkgconfig/cairo-pdf.pc
lib/pkgconfig/cairo-png.pc
lib/pkgconfig/cairo-ps.pc
+${PLIST.carbon}lib/pkgconfig/cairo-quartz-font.pc
+${PLIST.carbon}lib/pkgconfig/cairo-quartz-image.pc
${PLIST.carbon}lib/pkgconfig/cairo-quartz.pc
lib/pkgconfig/cairo-svg.pc
${PLIST.x11}lib/pkgconfig/cairo-xlib-xrender.pc
diff -r 01f7054d1cb6 -r be4f1b276ae8 graphics/cairo/distinfo
--- a/graphics/cairo/distinfo Wed May 14 14:02:19 2008 +0000
+++ b/graphics/cairo/distinfo Wed May 14 15:26:14 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.41 2008/05/05 06:53:00 yyamano Exp $
+$NetBSD: distinfo,v 1.42 2008/05/14 15:26:14 obache Exp $
SHA1 (cairo-1.6.4.tar.gz) = 9d990fe39a125ceb07221623c237cd7015855d5c
RMD160 (cairo-1.6.4.tar.gz) = ccae736a40d985b72bda7c2f0a98a0838020658e
Size (cairo-1.6.4.tar.gz) = 5042623 bytes
-SHA1 (patch-aa) = a6e95dc17dd316236dd7197f5e743c733e57587d
+SHA1 (patch-aa) = 92b1a9746f4f22ceb2f548eca2cfcf14481fae2a
SHA1 (patch-ab) = 2a0a99846fab962b552efa79c9261927de792dfd
SHA1 (patch-ac) = 8baca078827ebc7c03eecc14c575a440239c3f03
diff -r 01f7054d1cb6 -r be4f1b276ae8 graphics/cairo/patches/patch-aa
--- a/graphics/cairo/patches/patch-aa Wed May 14 14:02:19 2008 +0000
+++ b/graphics/cairo/patches/patch-aa Wed May 14 15:26:14 2008 +0000
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.11 2008/04/21 11:29:33 tnn Exp $
+$NetBSD: patch-aa,v 1.12 2008/05/14 15:26:14 obache Exp $
---- src/Makefile.in.orig 2008-04-11 23:33:41.000000000 +0200
+--- src/Makefile.in.orig 2008-04-11 21:33:41.000000000 +0000
+++ src/Makefile.in
-@@ -288,9 +288,9 @@ AUTOHEADER = @AUTOHEADER@
+@@ -81,6 +81,7 @@ host_triplet = @host@
+ @CAIRO_HAS_FT_FONT_TRUE@am__append_45 = $(ft_headers)
+ @CAIRO_HAS_FT_FONT_TRUE@am__append_46 = $(ft_sources)
+ @CAIRO_HAS_FT_FONT_TRUE@am__append_47 = cairo-ft.pc
++@CAIRO_HAS_QUARTZ_FONT_TRUE@am__append_48 = cairo-quartz-font.pc
+ subdir = src
+ DIST_COMMON = $(am__cairoinclude_HEADERS_DIST) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/cairo.pc.in
+@@ -288,9 +289,9 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CAIROPERF_LIBS = @CAIROPERF_LIBS@
@@ -14,3 +22,12 @@
CAIRO_NONPKGCONFIG_CFLAGS = @CAIRO_NONPKGCONFIG_CFLAGS@
CAIRO_NONPKGCONFIG_LIBS = @CAIRO_NONPKGCONFIG_LIBS@
CAIRO_REQUIRES = @CAIRO_REQUIRES@
+@@ -456,7 +457,7 @@ backend_pkgconfigs = $(am__append_4) $(a
+ $(am__append_21) $(am__append_24) $(am__append_26) \
+ $(am__append_31) $(am__append_33) $(am__append_36) \
+ $(am__append_38) $(am__append_41) $(am__append_44) \
+- $(am__append_47)
++ $(am__append_47) $(am__append_48)
+ cairo_base_headers = cairo.h
+ cairo_base_sources = \
+ cairo.c \
Home |
Main Index |
Thread Index |
Old Index