From 7654273d98f61f6204de97b78b434b075245e6f0 Mon Sep 17 00:00:00 2001 From: drochner Date: Mon, 15 Nov 2010 18:31:00 +0000 Subject: [PATCH] update to 2.32.1 This switches to the gnome-2.32 release branch. pkgsrc change: don't build command line tools and UI theme (can be built as seperate pkg), remove gtk2 dependency --- graphics/librsvg/Makefile | 25 ++++--------- graphics/librsvg/PLIST | 59 +++++++++++++++++-------------- graphics/librsvg/buildlink3.mk | 5 ++- graphics/librsvg/distinfo | 10 +++--- graphics/librsvg/patches/patch-ab | 16 ++++----- 5 files changed, 54 insertions(+), 61 deletions(-) diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile index 3f410915ce41..ff8352e6ba82 100644 --- a/graphics/librsvg/Makefile +++ b/graphics/librsvg/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.44 2010/10/04 09:42:44 obache Exp $ +# $NetBSD: Makefile,v 1.45 2010/11/15 18:31:00 drochner Exp $ -DISTNAME= librsvg-2.26.3 -PKGREVISION= 2 +DISTNAME= librsvg-2.32.1 CATEGORIES= graphics gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/librsvg/2.26/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/librsvg/2.32/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org @@ -20,30 +19,20 @@ USE_LIBTOOL= yes USE_TOOLS+= pkg-config USE_LANGUAGES+= c c++ GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --disable-gtk-theme --disable-tools -PKGCONFIG_OVERRIDE= librsvg-2.0.pc.in +PKGCONFIG_OVERRIDE= librsvg.pc.in TEST_TARGET= check -CONFIGURE_ARGS+= --with-gimp=no -CONFIGURE_ARGS+= --with-tags= -CONFIGURE_ARGS+= --disable-mozilla-plugin - # Workaround for Upstream Bug#562310. # for more detail, see also PR#41475. TOOLS_NOOP+= gtkdoc-rebase -GTK2_LOADERS= yes - BUILDLINK_API_DEPENDS.cairo+= cairo>=1.2.0 -BUILDLINK_API_DEPENDS.glib2+= glib2>=2.12.0 -BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0 - -post-install: - rmdir -p ${DESTDIR}${PREFIX}/lib/mozilla/plugins || ${TRUE} +BUILDLINK_API_DEPENDS.glib2+= glib2>=2.24.0 .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/libgsf/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" @@ -51,5 +40,5 @@ post-install: BUILDLINK_API_DEPENDS.libcroco+= libcroco>=0.6.1 .include "../../textproc/libcroco/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" -.include "../../x11/gtk2/modules.mk" +.include "../../graphics/gdk-pixbuf2/loaders.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/librsvg/PLIST b/graphics/librsvg/PLIST index d119d95082c8..77825412a3e3 100644 --- a/graphics/librsvg/PLIST +++ b/graphics/librsvg/PLIST @@ -1,31 +1,36 @@ -@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:59:22 joerg Exp $ -bin/rsvg +@comment $NetBSD: PLIST,v 1.7 2010/11/15 18:31:01 drochner Exp $ bin/rsvg-convert -bin/rsvg-view -include/librsvg-2/librsvg/librsvg-enum-types.h -include/librsvg-2/librsvg/librsvg-features.h -include/librsvg-2/librsvg/rsvg-cairo.h -include/librsvg-2/librsvg/rsvg.h -lib/gtk-2.0/2.10.0/engines/libsvg.la -lib/gtk-2.0/2.10.0/loaders/svg_loader.la +include/librsvg-2.0/librsvg/librsvg-enum-types.h +include/librsvg-2.0/librsvg/librsvg-features.h +include/librsvg-2.0/librsvg/rsvg-cairo.h +include/librsvg-2.0/librsvg/rsvg.h +lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.la lib/librsvg-2.la lib/pkgconfig/librsvg-2.0.pc -man/man1/rsvg.1 -share/gtk-doc/html/rsvg/home.png -share/gtk-doc/html/rsvg/index.html -share/gtk-doc/html/rsvg/index.sgml -share/gtk-doc/html/rsvg/ix01.html -share/gtk-doc/html/rsvg/left.png -share/gtk-doc/html/rsvg/pt02.html -share/gtk-doc/html/rsvg/pt03.html -share/gtk-doc/html/rsvg/pt04.html -share/gtk-doc/html/rsvg/right.png -share/gtk-doc/html/rsvg/rsvg-Cairo.html -share/gtk-doc/html/rsvg/rsvg-Core-API.html -share/gtk-doc/html/rsvg/rsvg-GdkPixbuf.html -share/gtk-doc/html/rsvg/rsvg.devhelp -share/gtk-doc/html/rsvg/rsvg.devhelp2 -share/gtk-doc/html/rsvg/rsvg.html -share/gtk-doc/html/rsvg/style.css -share/gtk-doc/html/rsvg/up.png +share/gtk-doc/html/rsvg-2.0/RsvgHandle.html +share/gtk-doc/html/rsvg-2.0/annotation-glossary.html +share/gtk-doc/html/rsvg-2.0/api-index-2-14.html +share/gtk-doc/html/rsvg-2.0/api-index-2-22.html +share/gtk-doc/html/rsvg-2.0/api-index-2-32.html +share/gtk-doc/html/rsvg-2.0/api-index-2-4.html +share/gtk-doc/html/rsvg-2.0/api-index-2-8.html +share/gtk-doc/html/rsvg-2.0/api-index-2-9.html +share/gtk-doc/html/rsvg-2.0/api-index-deprecated.html +share/gtk-doc/html/rsvg-2.0/api-index-full.html +share/gtk-doc/html/rsvg-2.0/home.png +share/gtk-doc/html/rsvg-2.0/index.html +share/gtk-doc/html/rsvg-2.0/index.sgml +share/gtk-doc/html/rsvg-2.0/left.png +share/gtk-doc/html/rsvg-2.0/licence.html +share/gtk-doc/html/rsvg-2.0/object-tree.html +share/gtk-doc/html/rsvg-2.0/right.png +share/gtk-doc/html/rsvg-2.0/rsvg-2.0.devhelp +share/gtk-doc/html/rsvg-2.0/rsvg-2.0.devhelp2 +share/gtk-doc/html/rsvg-2.0/rsvg-Using-RSVG-with-GIO.html +share/gtk-doc/html/rsvg-2.0/rsvg-Using-RSVG-with-GdkPixbuf.html +share/gtk-doc/html/rsvg-2.0/rsvg-Using-RSVG-with-cairo.html +share/gtk-doc/html/rsvg-2.0/rsvg-Version-check-and-feature-tests.html +share/gtk-doc/html/rsvg-2.0/rsvg.html +share/gtk-doc/html/rsvg-2.0/style.css +share/gtk-doc/html/rsvg-2.0/up.png share/pixmaps/svg-viewer.svg diff --git a/graphics/librsvg/buildlink3.mk b/graphics/librsvg/buildlink3.mk index cd7355cc5797..f09a26101e73 100644 --- a/graphics/librsvg/buildlink3.mk +++ b/graphics/librsvg/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2010/09/14 11:00:59 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2010/11/15 18:31:01 drochner Exp $ BUILDLINK_TREE+= librsvg @@ -9,9 +9,8 @@ BUILDLINK_API_DEPENDS.librsvg+= librsvg>=2.12.6nb1 BUILDLINK_ABI_DEPENDS.librsvg+= librsvg>=2.26.3nb2 BUILDLINK_PKGSRCDIR.librsvg?= ../../graphics/librsvg -.include "../../devel/libgsf/buildlink3.mk" .include "../../textproc/libcroco/buildlink3.mk" -.include "../../x11/gtk2/buildlink3.mk" +.include "../../graphics/gdk-pixbuf2/buildlink3.mk" .endif # LIBRSVG_BUILDLINK3_MK BUILDLINK_TREE+= -librsvg diff --git a/graphics/librsvg/distinfo b/graphics/librsvg/distinfo index 255cfe6c5111..d5b9491ca9bb 100644 --- a/graphics/librsvg/distinfo +++ b/graphics/librsvg/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.15 2010/05/02 11:50:16 wiz Exp $ +$NetBSD: distinfo,v 1.16 2010/11/15 18:31:01 drochner Exp $ -SHA1 (librsvg-2.26.3.tar.bz2) = ef0063eaa9e638364cc8ff142aadef8a267b7af5 -RMD160 (librsvg-2.26.3.tar.bz2) = 14f51ae7997d8137e618ee117ef7980fc0ffe52c -Size (librsvg-2.26.3.tar.bz2) = 511876 bytes -SHA1 (patch-ab) = 3e995d7eb46af427f012a848f8f2b58725c94401 +SHA1 (librsvg-2.32.1.tar.bz2) = 2762cfa3a4e9c9ee845c7f23a824dbd13583ebf0 +RMD160 (librsvg-2.32.1.tar.bz2) = ac039d36667854292f2326aaadec9de6ea2873b6 +Size (librsvg-2.32.1.tar.bz2) = 517170 bytes +SHA1 (patch-ab) = 83c882bda153467c2542a1e7260528d69bc65393 diff --git a/graphics/librsvg/patches/patch-ab b/graphics/librsvg/patches/patch-ab index a1d2f461c4d1..2acbc8c2692e 100644 --- a/graphics/librsvg/patches/patch-ab +++ b/graphics/librsvg/patches/patch-ab @@ -1,15 +1,15 @@ -$NetBSD: patch-ab,v 1.7 2010/04/13 16:47:24 drochner Exp $ +$NetBSD: patch-ab,v 1.8 2010/11/15 18:31:01 drochner Exp $ ---- gdk-pixbuf-loader/Makefile.in.orig 2010-03-30 05:34:10.000000000 +0000 +--- gdk-pixbuf-loader/Makefile.in.orig 2010-11-13 10:52:20.000000000 +0000 +++ gdk-pixbuf-loader/Makefile.in -@@ -598,10 +598,6 @@ uninstall-am: uninstall-loaderLTLIBRARIE +@@ -624,10 +624,6 @@ uninstall-am: uninstall-gdk_pixbuf_modul - install-data-hook: -- if [ -z "$(DESTDIR)" ] ; then \ -- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \ -- $(QUERYLOADERS) > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \ -- fi + @ENABLE_PIXBUF_LOADER_TRUE@install-data-hook: +-@ENABLE_PIXBUF_LOADER_TRUE@ if test -z "$(DESTDIR)"; then \ +-@ENABLE_PIXBUF_LOADER_TRUE@ $(mkinstalldirs) $(DESTDIR)$(gdk_pixbuf_binarydir) ; \ +-@ENABLE_PIXBUF_LOADER_TRUE@ $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \ +-@ENABLE_PIXBUF_LOADER_TRUE@ fi # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded.