diff options
author | drochner <drochner@pkgsrc.org> | 2011-02-12 13:40:53 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2011-02-12 13:40:53 +0000 |
commit | 517492a5adee7c5a6078fa754f7230446ecbc8ad (patch) | |
tree | 000a831140c95a0fbbf97b3dc578e47c5c8fbdb5 /graphics/cairo | |
parent | 4905be9f1d0776449f5985f2b75eaf68c37ad14e (diff) | |
download | pkgsrc-517492a5adee7c5a6078fa754f7230446ecbc8ad.tar.gz |
put the cairo gobject into its own pkg to avoid the heavy glib dependency
in the base pkg
Diffstat (limited to 'graphics/cairo')
-rw-r--r-- | graphics/cairo/Makefile | 3 | ||||
-rw-r--r-- | graphics/cairo/PLIST | 5 | ||||
-rw-r--r-- | graphics/cairo/distinfo | 3 | ||||
-rw-r--r-- | graphics/cairo/patches/patch-ab | 22 |
4 files changed, 26 insertions, 7 deletions
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index 05254f16a67..7495dc0ab68 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.89 2011/02/12 12:08:06 obache Exp $ +# $NetBSD: Makefile,v 1.90 2011/02/12 13:40:53 drochner Exp $ DISTNAME= cairo-1.10.2 PKGREVISION= 2 @@ -43,7 +43,6 @@ TEST_TARGET= check CONFIGURE_ENV+= ac_cv_type___uint128_t=no .endif -.include "../../devel/glib2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.9 diff --git a/graphics/cairo/PLIST b/graphics/cairo/PLIST index 135a9e16761..905fa088d80 100644 --- a/graphics/cairo/PLIST +++ b/graphics/cairo/PLIST @@ -1,10 +1,9 @@ -@comment $NetBSD: PLIST,v 1.29 2011/02/12 12:08:06 obache Exp $ +@comment $NetBSD: PLIST,v 1.30 2011/02/12 13:40:53 drochner Exp $ bin/cairo-trace include/cairo/cairo-deprecated.h include/cairo/cairo-features.h include/cairo/cairo-ft.h ${PLIST.x11}include/cairo/cairo-gl.h -include/cairo/cairo-gobject.h include/cairo/cairo-pdf.h include/cairo/cairo-ps.h ${PLIST.carbon}include/cairo/cairo-quartz.h @@ -17,14 +16,12 @@ ${PLIST.x11}include/cairo/cairo-xlib-xrender.h ${PLIST.x11}include/cairo/cairo-xlib.h include/cairo/cairo.h lib/cairo/libcairo-trace.la -lib/libcairo-gobject.la lib/libcairo-script-interpreter.la lib/libcairo.la lib/pkgconfig/cairo-fc.pc lib/pkgconfig/cairo-ft.pc ${PLIST.x11}lib/pkgconfig/cairo-gl.pc ${PLIST.x11}lib/pkgconfig/cairo-glx.pc -lib/pkgconfig/cairo-gobject.pc lib/pkgconfig/cairo-pdf.pc lib/pkgconfig/cairo-png.pc lib/pkgconfig/cairo-ps.pc diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo index bcdc7788695..da408a44cd1 100644 --- a/graphics/cairo/distinfo +++ b/graphics/cairo/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.56 2010/12/26 14:58:44 wiz Exp $ +$NetBSD: distinfo,v 1.57 2011/02/12 13:40:53 drochner Exp $ SHA1 (cairo-1.10.2.tar.gz) = ccce5ae03f99c505db97c286a0c9a90a926d3c6e RMD160 (cairo-1.10.2.tar.gz) = 8c8de00120398fe2b3a60a08ff59a464b2eebf47 Size (cairo-1.10.2.tar.gz) = 23558405 bytes SHA1 (patch-aa) = f211b2a5fce4ff65f280f79fbb78e1a530b9b165 +SHA1 (patch-ab) = 03a6199a0e0de1fe3701900ea76ce3f0bfdddca0 diff --git a/graphics/cairo/patches/patch-ab b/graphics/cairo/patches/patch-ab new file mode 100644 index 00000000000..ffa3cf056ac --- /dev/null +++ b/graphics/cairo/patches/patch-ab @@ -0,0 +1,22 @@ +$NetBSD: patch-ab,v 1.15 2011/02/12 13:40:53 drochner Exp $ + +--- util/cairo-gobject/Makefile.in.orig 2010-12-25 14:22:55.000000000 +0000 ++++ util/cairo-gobject/Makefile.in +@@ -91,7 +91,7 @@ am__base_list = \ + am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cairoincludedir)" + LTLIBRARIES = $(lib_LTLIBRARIES) + am__DEPENDENCIES_1 = +-libcairo_gobject_la_DEPENDENCIES = $(top_builddir)/src/libcairo.la \ ++libcairo_gobject_la_DEPENDENCIES = \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + am_libcairo_gobject_la_OBJECTS = \ + libcairo_gobject_la-cairo-gobject-enums.lo \ +@@ -357,7 +357,7 @@ libcairo_gobject_la_SOURCES = \ + + libcairo_gobject_la_CFLAGS = $(CAIRO_CFLAGS) $(GOBJECT_CFLAGS) + libcairo_gobject_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols) +-libcairo_gobject_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) $(GOBJECT_LIBS) ++libcairo_gobject_la_LIBADD = $(prefix)/lib/libcairo.la $(CAIRO_LIBS) $(GOBJECT_LIBS) + all: all-am + + .SUFFIXES: |