From f766b94a7f302e679036cddae4220583a1977173 Mon Sep 17 00:00:00 2001 From: marcus Date: Wed, 9 Jun 2004 05:41:08 +0000 Subject: Update to 2.7.2. Note: this adds a new dependency on gnomevfs2. Also, the Mozilla plug-in still seems horribly broken. Sorry. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2376 df743ca5-7f9a-e211-a948-0013205c9059 --- graphics/librsvg2/Makefile | 16 ++++++++++------ graphics/librsvg2/distinfo | 4 ++-- graphics/librsvg2/files/patch-configure | 11 +++++++++++ graphics/librsvg2/files/patch-librsvg-2.0.pc.in | 10 ++++++++++ graphics/librsvg2/files/patch-rsvg-filter.c | 13 +++++++++++++ graphics/librsvg2/files/patch-rsvg-styles.c | 21 --------------------- graphics/librsvg2/pkg-plist | 1 + 7 files changed, 47 insertions(+), 29 deletions(-) create mode 100644 graphics/librsvg2/files/patch-configure create mode 100644 graphics/librsvg2/files/patch-librsvg-2.0.pc.in create mode 100644 graphics/librsvg2/files/patch-rsvg-filter.c delete mode 100644 graphics/librsvg2/files/patch-rsvg-styles.c (limited to 'graphics/librsvg2') diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index 04446e6a4..6fdd5aac5 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -6,8 +6,7 @@ # PORTNAME= librsvg2 -PORTVERSION= 2.7.1 -PORTREVISION= 1 +PORTVERSION= 2.7.2 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.7 @@ -20,22 +19,27 @@ COMMENT= Library for parsing and rendering SVG vector-graphic files BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ popt.0:${PORTSDIR}/devel/popt \ - croco.3:${PORTSDIR}/textproc/libcroco -RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.4.0/engines/libmetal.so:${PORTSDIR}/x11-themes/gtk-engines2 + croco-${CROCO_VERSION}.3:${PORTSDIR}/textproc/libcroco +RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/${GTK_VERSION}/engines/libmetal.so:${PORTSDIR}/x11-themes/gtk-engines2 USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes INSTALLS_SHLIB= yes USE_LIBTOOL_VER=13 -USE_GNOME= gnomehack lthack gtk20 libartlgpl2 libxml2 libgsf +USE_GNOME= gnomehack gnomeprefix lthack libartlgpl2 libgsf gnomevfs2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-svgz \ --disable-gtk-doc \ --without-gimp \ + --enable-gnome-vfs \ --with-croco -PLIST_SUB= GTK_VERSION="2.4.0" + +CROCO_VERSION= 0.6 +GTK_VERSION= 2.4.0 + +PLIST_SUB= GTK_VERSION=${GTK_VERSION} MAN1= rsvg.1 diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo index c7afdc4fb..aaacd1c53 100644 --- a/graphics/librsvg2/distinfo +++ b/graphics/librsvg2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/librsvg-2.7.1.tar.bz2) = bfdb8ef48923fcfbb38cf7dd2ec848f8 -SIZE (gnome2/librsvg-2.7.1.tar.bz2) = 272156 +MD5 (gnome2/librsvg-2.7.2.tar.bz2) = c9377b685ca6e9a8892301a86724e4a7 +SIZE (gnome2/librsvg-2.7.2.tar.bz2) = 362870 diff --git a/graphics/librsvg2/files/patch-configure b/graphics/librsvg2/files/patch-configure new file mode 100644 index 000000000..38c33bc6c --- /dev/null +++ b/graphics/librsvg2/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Wed Jun 9 01:30:07 2004 ++++ configure Wed Jun 9 01:30:24 2004 +@@ -22052,7 +22052,7 @@ + if test "x$with_html_dir" = "x" ; then + HTML_DIR='${datadir}/doc/librsvg/html' + else +- HTML_DIR=$with_html_dir ++ HTML_DIR=${with_html_dir}/librsvg/html + fi + + diff --git a/graphics/librsvg2/files/patch-librsvg-2.0.pc.in b/graphics/librsvg2/files/patch-librsvg-2.0.pc.in new file mode 100644 index 000000000..f0e655ec2 --- /dev/null +++ b/graphics/librsvg2/files/patch-librsvg-2.0.pc.in @@ -0,0 +1,10 @@ +--- librsvg-2.0.pc.in.orig Wed Jun 9 01:35:56 2004 ++++ librsvg-2.0.pc.in Wed Jun 9 01:36:06 2004 +@@ -6,6 +6,6 @@ + Name: librsvg + Description: library that renders svg files + Version: @VERSION@ +-Requires: glib-2.0 gdk-pixbuf-2.0 ++Requires: glib-2.0 gdk-pixbuf-2.0 gnome-vfs-2.0 + Libs: -L${libdir} -lrsvg-2 + Cflags: -I${includedir}/librsvg-2 diff --git a/graphics/librsvg2/files/patch-rsvg-filter.c b/graphics/librsvg2/files/patch-rsvg-filter.c new file mode 100644 index 000000000..4c762be8b --- /dev/null +++ b/graphics/librsvg2/files/patch-rsvg-filter.c @@ -0,0 +1,13 @@ +--- rsvg-filter.c.orig Wed Jun 9 01:24:25 2004 ++++ rsvg-filter.c Wed Jun 9 01:24:32 2004 +@@ -484,9 +484,9 @@ + rsvg_filter_store_output(GString * name, RsvgFilterPrimitiveOutput result, + RsvgFilterContext * ctx) + { ++ RsvgFilterPrimitiveOutput * store; + g_object_unref (G_OBJECT (ctx->lastresult.result)); + +- RsvgFilterPrimitiveOutput * store; + + store = g_new(RsvgFilterPrimitiveOutput, 1); + *store = result; diff --git a/graphics/librsvg2/files/patch-rsvg-styles.c b/graphics/librsvg2/files/patch-rsvg-styles.c deleted file mode 100644 index 7c5733ae5..000000000 --- a/graphics/librsvg2/files/patch-rsvg-styles.c +++ /dev/null @@ -1,21 +0,0 @@ ---- rsvg-styles.c.orig Tue Jun 1 18:10:27 2004 -+++ rsvg-styles.c Tue Jun 1 18:11:11 2004 -@@ -839,16 +839,16 @@ - if (status != CR_OK) - { - g_warning (_("Error setting CSS SAC handler")); -- cr_parser_destroy (parser); - cr_doc_handler_destroy (css_handler); -+ cr_parser_destroy (parser); - return; - } - - status = cr_parser_set_use_core_grammar (parser, FALSE); - status = cr_parser_parse (parser); - -- cr_parser_destroy (parser); - cr_doc_handler_destroy (css_handler); -+ cr_parser_destroy (parser); - } - - #else /* !HAVE_LIBCROCO */ diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist index 3f27274bb..dd250f612 100644 --- a/graphics/librsvg2/pkg-plist +++ b/graphics/librsvg2/pkg-plist @@ -23,6 +23,7 @@ share/doc/librsvg/html/rsvg-core-api.html share/doc/librsvg/html/rsvg-creating-a-svgz-reader.html share/doc/librsvg/html/rsvg.html share/doc/librsvg/html/up.png +share/gnome/pixmaps/svg-viewer.svg @dirrm share/doc/librsvg/html @dirrm share/doc/librsvg @dirrm include/librsvg-2/librsvg -- cgit v1.2.3