pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics Update librsvg2 to 2.12.6.
details: https://anonhg.NetBSD.org/pkgsrc/rev/5ddd27db8506
branches: trunk
changeset: 500550:5ddd27db8506
user: jmmv <jmmv%pkgsrc.org@localhost>
date: Mon Oct 10 13:58:59 2005 +0000
description:
Update librsvg2 to 2.12.6.
While doing this, merge the librsvg2-gtk package into librsvg2. The reason
is that from now on the core library (librsvg) uses gdk, so there is no
gain in separating both things (the GTK+ dependency is needed anyway).
Also enable gnome-vfs support, as one of our dependents (libgsf) is already
pulling it in (so the new dependency is not "bloat"). For completeness,
enable libgnomeprint* support too.
2005-10-06 Dom Lachowicz <cinamod%hotmail.com@localhost>
* autogen.sh: Let librsvg build out of srcdir. Bug #158331
* test-display.c: Populate save dialogs with the SVG's name. Bug #318010.
* configure.in: Ditto
* rsvg-structure.c: Related to bug #318025, don't set has_width or has_height unless they are > 0.
* rsvg.c: Bug #168567, mega hack to make multiImage sort-of work.
* configure.in: 2.12.6
2005-10-06 Dom Lachowicz <cinamod%hotmail.com@localhost>
* rsvg-paint-server.c: Backport Caleb's patch to 317871, fixing a crash
inside of libart for some gradients.
* rsvg-art-paint-server.c: Ditto
2005-10-04 Dom Lachowicz <cinamod%hotmail.com@localhost>
* rsvg-shapes.c: Fix problems in non-C locales. Bug #317615
* configure.in: 2.12.5
2005-10-01 Dom Lachowicz <cinamod%hotmail.com@localhost>
* configure.in: 2.12.4
* gdk-pixbuf-loader/io-svg.c: Because bug 308021 was fixed, and bug 317225 still
exists (although possibly not within librsvg itself), I've re-enabled a match for
"<?xml", with a priority of "1".
2005-10-01 Dom Lachowicz <cinamod%hotmail.com@localhost>
* configure.in: bug 314593, support firefox-config
2005-09-29 Dom Lachowicz <cinamod%hotmail.com@localhost>
* rsvg-filter.c: Fix bug #317549
* configure.in: 2.12.3
2005-09-25 Dom Lachowicz <cinamod%hotmail.com@localhost>
* rsvg.c: Bug 309660 - signedness issues
* configure.in: 2.12.2
2005-09-25 Dom Lachowicz <cinamod%hotmail.com@localhost>
* 2.12.1
* rsvg-structure.c:
* rsvg-shapes.c: Bug 371148 - C89 fixes
* gdk-pixbuf-loader/Makefile.am
* gtk-engine/Makefile.am: Bug 316803 - Win32 mingw build fixes
* moz-plugin/Makefile.am: Bug 316588 - add glib cflags to INCLUDES
* librsvg.spec.in: Backport from HEAD branch
2005-09-22 Rodney Dawes <dobey%novell.com@localhost>
* configure.in: GNOME_REQUIRE_PKGCONFIG doesn't exist, so remove it
so that we don't get a weird warning when running configure
2005-09-16 Dom Lachowicz <cinamod%hotmail.com@localhost>
* gdk-pixbuf-loader/io-svg.c: Scan the first 1024 chars for <svg. 100
Wasn't sufficient for a lot of icon themes.
2005-09-15 Dom Lachowicz <cinamod%hotmail.com@localhost>
* 2.12.0
2005-08-29 Christian Schaller <uraeus%gnome.org@localhost>
* Do 2.11.1 release
2005-08-26 Dom Lachowicz <cinamod%hotmail.com@localhost>
* rsvg.[ch]: Unbreak dpi API. See bug 314628
* test-rsvg.c: Ditto
* test-display.c: Ditto
* gdk-pixbuf-loader/io-svg.c: Backport for the GdkPixbufLoader module
API changes, sot hat it does better pattern recognition.
2005-08-25 Caleb Moore <c.moore%student.unsw.edu.au@localhost>
* rsvg.c: disabled char nodes. Chopped off namespaces.
* configure.in: bumped version number to 2.11.0
diffstat:
graphics/librsvg2-gtk2/DESCR | 5 -----
graphics/librsvg2-gtk2/Makefile | 18 ------------------
graphics/librsvg2-gtk2/PLIST | 5 -----
graphics/librsvg2/DESCR | 5 +++--
graphics/librsvg2/MESSAGE | 7 -------
graphics/librsvg2/Makefile | 37 ++++++++++++++++++++++++++++++-------
graphics/librsvg2/Makefile.common | 27 ---------------------------
graphics/librsvg2/PLIST | 7 +++++--
graphics/librsvg2/buildlink3.mk | 9 +--------
graphics/librsvg2/distinfo | 17 +++++++----------
graphics/librsvg2/patches/patch-aa | 27 ++++++---------------------
graphics/librsvg2/patches/patch-ab | 24 +++---------------------
graphics/librsvg2/patches/patch-ac | 8 ++++----
graphics/librsvg2/patches/patch-ad | 22 ----------------------
graphics/librsvg2/patches/patch-ae | 16 ----------------
graphics/librsvg2/patches/patch-af | 16 ----------------
16 files changed, 59 insertions(+), 191 deletions(-)
diffs (truncated from 377 to 300 lines):
diff -r 27bdfaa0bbcc -r 5ddd27db8506 graphics/librsvg2-gtk2/DESCR
--- a/graphics/librsvg2-gtk2/DESCR Mon Oct 10 13:57:40 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-librsvg is Raph's scalable vector graphics library. It provides support for
-SVG graphics, and is used by the GNOME 2 desktop.
-
-This package provides the RSVG pixbuf loader and the RSVG theme engine for
-the GTK2 toolkit.
diff -r 27bdfaa0bbcc -r 5ddd27db8506 graphics/librsvg2-gtk2/Makefile
--- a/graphics/librsvg2-gtk2/Makefile Mon Oct 10 13:57:40 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2005/03/22 16:04:44 jmmv Exp $
-#
-
-.include "../../graphics/librsvg2/Makefile.common"
-
-PKGNAME= ${DISTNAME:S/-/2-gtk2-/}
-COMMENT+= (GTK2 modules)
-
-CONFIGURE_ARGS+= --enable-pixbuf-loader
-
-BUILD_DIRS= ${WRKSRC}/gtk-engine ${WRKSRC}/gdk-pixbuf-loader
-INSTALL_DIRS= ${WRKSRC}/gtk-engine ${WRKSRC}/gdk-pixbuf-loader
-
-GTK2_LOADERS= YES
-
-.include "../../graphics/librsvg2/buildlink3.mk"
-.include "../../x11/gtk2/modules.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 27bdfaa0bbcc -r 5ddd27db8506 graphics/librsvg2-gtk2/PLIST
--- a/graphics/librsvg2-gtk2/PLIST Mon Oct 10 13:57:40 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:36 jlam Exp $
-lib/gtk-2.0/2.4.0/engines/libsvg.la
-lib/gtk-2.0/2.4.0/loaders/svg_loader.la
-@comment in gtk2: @dirrm lib/gtk-2.0/2.4.0/loaders
-@comment in gtk2: @dirrm lib/gtk-2.0/2.4.0/engines
diff -r 27bdfaa0bbcc -r 5ddd27db8506 graphics/librsvg2/DESCR
--- a/graphics/librsvg2/DESCR Mon Oct 10 13:57:40 2005 +0000
+++ b/graphics/librsvg2/DESCR Mon Oct 10 13:58:59 2005 +0000
@@ -1,4 +1,5 @@
librsvg is Raph's scalable vector graphics library. It provides support for
-SVG graphics, and is used by the GNOME 2 desktop.
+SVG graphics, and is used by the GNOME desktop.
-This package provides the librsvg2 library.
+This package provides the librsvg2 library as well as some addons -- a pixbuf
+loader and a theme engine -- for the GTK+ toolkit.
diff -r 27bdfaa0bbcc -r 5ddd27db8506 graphics/librsvg2/MESSAGE
--- a/graphics/librsvg2/MESSAGE Mon Oct 10 13:57:40 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2004/01/22 12:43:10 jmmv Exp $
-
-You should install the librsvg2-gtk2 package, which provides an RSVG
-gdk-pixbuf loader and an RSVG theme engine for the GTK2 toolkit.
-
-===========================================================================
diff -r 27bdfaa0bbcc -r 5ddd27db8506 graphics/librsvg2/Makefile
--- a/graphics/librsvg2/Makefile Mon Oct 10 13:57:40 2005 +0000
+++ b/graphics/librsvg2/Makefile Mon Oct 10 13:58:59 2005 +0000
@@ -1,23 +1,46 @@
-# $NetBSD: Makefile,v 1.33 2005/03/22 16:04:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.34 2005/10/10 13:58:59 jmmv Exp $
#
-.include "Makefile.common"
+DISTNAME= librsvg-2.12.6
+PKGNAME= ${DISTNAME:S/-/2-/}
+CATEGORIES= graphics gnome
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/librsvg/2.12/}
+EXTRACT_SUFX= .tar.bz2
-PKGNAME= ${DISTNAME:S/-/2-/}
+MAINTAINER= jmmv%NetBSD.org@localhost
+HOMEPAGE= http://librsvg.sourceforge.net/
+COMMENT= SVG library for GNOME2
+
+CONFLICTS+= librsvg2-gtk-[0-9]*
+GNU_CONFIGURE= YES
USE_DIRS+= xdg-1.1
+USE_LIBTOOL= YES
+USE_TOOLS+= pkg-config
-CONFIGURE_ARGS+= --disable-pixbuf-loader
+PKGCONFIG_OVERRIDE= librsvg-2.0.pc.in
+
+CONFIGURE_ARGS+= --disable-gtk-doc
+CONFIGURE_ARGS+= --with-gimp=no
+CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/librsvg2
+CONFIGURE_ARGS+= --with-tags=
CFLAGS.Darwin+= -flat_namespace -undefined suppress
LDFLAGS.Darwin+= -lfreetype -lfontconfig
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
+GTK2_LOADERS= YES
+
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libgsf/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/libart2/buildlink3.mk"
+.include "../../print/libgnomeprint/buildlink3.mk"
+.include "../../print/libgnomeprintui/buildlink3.mk"
+.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../textproc/libcroco/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/gtk2/modules.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 27bdfaa0bbcc -r 5ddd27db8506 graphics/librsvg2/Makefile.common
--- a/graphics/librsvg2/Makefile.common Mon Oct 10 13:57:40 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile.common,v 1.13 2005/08/10 20:56:18 jlam Exp $
-#
-
-DISTNAME= librsvg-2.9.5
-CATEGORIES= graphics gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/librsvg/2.9/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= jmmv%NetBSD.org@localhost
-HOMEPAGE= http://librsvg.sourceforge.net/
-COMMENT= SVG library for GNOME2
-
-DISTINFO_FILE= ${.CURDIR}/../../graphics/librsvg2/distinfo
-PATCHDIR= ${.CURDIR}/../../graphics/librsvg2/patches
-
-USE_TOOLS+= pkg-config
-USE_LIBTOOL= YES
-GNU_CONFIGURE= YES
-PKGCONFIG_OVERRIDE= librsvg-2.0.pc.in
-
-CONFIGURE_ARGS+= --disable-gnome-vfs
-CONFIGURE_ARGS+= --disable-gtk-doc
-CONFIGURE_ARGS+= --with-gimp=no
-CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/librsvg2
-CONFIGURE_ARGS+= --with-tags=
-
-.include "../../x11/gtk2/buildlink3.mk"
diff -r 27bdfaa0bbcc -r 5ddd27db8506 graphics/librsvg2/PLIST
--- a/graphics/librsvg2/PLIST Mon Oct 10 13:57:40 2005 +0000
+++ b/graphics/librsvg2/PLIST Mon Oct 10 13:58:59 2005 +0000
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.10 2005/03/22 16:04:44 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.11 2005/10/10 13:58:59 jmmv Exp $
bin/rsvg
bin/rsvg-view
include/librsvg-2/librsvg/librsvg-enum-types.h
include/librsvg-2/librsvg/librsvg-features.h
-include/librsvg-2/librsvg/rsvg-gz.h
include/librsvg-2/librsvg/rsvg.h
+lib/gtk-2.0/2.4.0/engines/libsvg.la
+lib/gtk-2.0/2.4.0/loaders/svg_loader.la
lib/librsvg-2.la
lib/pkgconfig/librsvg-2.0.pc
man/man1/rsvg.1
@@ -26,5 +27,7 @@
share/pixmaps/svg-viewer.svg
@comment in xdg-dirs: @dirrm share/pixmaps
@dirrm share/doc/librsvg2
+@comment in gtk2: @dirrm lib/gtk-2.0/2.4.0/loaders
+@comment in gtk2: @dirrm lib/gtk-2.0/2.4.0/engines
@dirrm include/librsvg-2/librsvg
@dirrm include/librsvg-2
diff -r 27bdfaa0bbcc -r 5ddd27db8506 graphics/librsvg2/buildlink3.mk
--- a/graphics/librsvg2/buildlink3.mk Mon Oct 10 13:57:40 2005 +0000
+++ b/graphics/librsvg2/buildlink3.mk Mon Oct 10 13:58:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/09/21 16:51:01 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2005/10/10 13:58:59 jmmv Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBRSVG2_BUILDLINK3_MK:= ${LIBRSVG2_BUILDLINK3_MK}+
@@ -16,13 +16,6 @@
.endif # LIBRSVG2_BUILDLINK3_MK
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libgsf/buildlink3.mk"
-.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/popt/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
-.include "../../textproc/libcroco/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 27bdfaa0bbcc -r 5ddd27db8506 graphics/librsvg2/distinfo
--- a/graphics/librsvg2/distinfo Mon Oct 10 13:57:40 2005 +0000
+++ b/graphics/librsvg2/distinfo Mon Oct 10 13:58:59 2005 +0000
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.13 2005/04/07 09:28:42 rillig Exp $
+$NetBSD: distinfo,v 1.14 2005/10/10 13:58:59 jmmv Exp $
-SHA1 (librsvg-2.9.5.tar.bz2) = 502338a1b42ec36fbca895b97a166e398e7e3018
-RMD160 (librsvg-2.9.5.tar.bz2) = 5c7d6ad1a543b4880d7c3bb02da7126ed9f5aa5e
-Size (librsvg-2.9.5.tar.bz2) = 392785 bytes
-SHA1 (patch-aa) = b7e6a6989a49125e40c0cdadd0ed032068b0c658
-SHA1 (patch-ab) = 6f6d376192e6cf2f8c223be2270cbb932173449a
-SHA1 (patch-ac) = 11939435e00f04b58412b3d769297caa9ee585b9
-SHA1 (patch-ad) = e72e1e884a366199be9feeacde05815627393f1f
-SHA1 (patch-ae) = ddbe928fe1e12229d3c8d6c4dd7cf64217b7c0ca
-SHA1 (patch-af) = 8f80ea032a3b22a9637b5d92a7b668c1754fea1f
+SHA1 (librsvg-2.12.6.tar.bz2) = 62ea7458c861d48beaf91135312c67c72ee39dbf
+RMD160 (librsvg-2.12.6.tar.bz2) = 1e945f492fedd1e776331d86cec5f69798c970d9
+Size (librsvg-2.12.6.tar.bz2) = 396894 bytes
+SHA1 (patch-aa) = c99a4b1c2c7f89fdc354be1b0a508356daf4667b
+SHA1 (patch-ab) = 579f5311f3ad7ab10a3a8204ea485f68b6ff9f28
+SHA1 (patch-ac) = 8bd0fcf196bffb758e232cf06a81fb5541c88616
diff -r 27bdfaa0bbcc -r 5ddd27db8506 graphics/librsvg2/patches/patch-aa
--- a/graphics/librsvg2/patches/patch-aa Mon Oct 10 13:57:40 2005 +0000
+++ b/graphics/librsvg2/patches/patch-aa Mon Oct 10 13:58:59 2005 +0000
@@ -1,27 +1,12 @@
-$NetBSD: patch-aa,v 1.7 2005/04/02 13:01:28 jmmv Exp $
+$NetBSD: patch-aa,v 1.8 2005/10/10 13:59:00 jmmv Exp $
---- configure.orig 2005-01-19 01:14:43.000000000 +0000
+--- configure.orig 2005-10-07 04:33:21.000000000 +0200
+++ configure
-@@ -21874,11 +21874,14 @@ echo "${ECHO_T}$GNOME_PRINT_LIBS" >&6
- \
- have_gnome_print=no
- fi
-+ have_gnome_print=no
-
-
- if test "x$have_gnome_print" = "xyes"; then
- GNOME_PRINT_CFLAGS="$GNOME_PRINT_CFLAGS -DHAVE_GNOME_PRINT=1"
- fi
-+GNOME_PRINT_CFLAGS=
-+GNOME_PRINT_LIBS=
-
-
-
-@@ -23633,6 +23636,7 @@ build_mozilla_plugin=no
- if test "x$MOZILLA_CFLAGS" != "x"; then
- build_mozilla_plugin=yes
+@@ -23834,6 +23837,7 @@ echo "$as_me: WARNING: mozilla-config no
+ build_mozilla_plugin=yes
+ fi
fi
+build_mozilla_plugin=no
- if test "x$build_mozilla_plugin" = "xyes"; then
+
diff -r 27bdfaa0bbcc -r 5ddd27db8506 graphics/librsvg2/patches/patch-ab
--- a/graphics/librsvg2/patches/patch-ab Mon Oct 10 13:57:40 2005 +0000
+++ b/graphics/librsvg2/patches/patch-ab Mon Oct 10 13:58:59 2005 +0000
@@ -1,26 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2005/03/22 16:04:44 jmmv Exp $
+$NetBSD: patch-ab,v 1.6 2005/10/10 13:59:00 jmmv Exp $
---- gdk-pixbuf-loader/Makefile.in.orig 2005-01-19 02:14:41.000000000 +0100
+--- gdk-pixbuf-loader/Makefile.in.orig 2005-10-07 04:33:38.000000000 +0200
+++ gdk-pixbuf-loader/Makefile.in
-@@ -220,7 +220,7 @@ svg_loader_la_LDFLAGS = -avoid-version -
- svg_loader_la_LIBADD = $(LIBRSVG_LIBS) \
- $(LIBGNOME_VFS_LIBS) \
- $(LIBGSF_LIBS) $(LIBCROCO_LIBS) \
-- $(top_builddir)/librsvg-2.la
-+ `pkg-config --libs librsvg-2.0`
-
-
- loader_LTLIBRARIES = $(target_pixbuf_loader)
-@@ -231,7 +231,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(loader_LTLIBRARIES)
-
--svg_loader_la_DEPENDENCIES = $(top_builddir)/librsvg-2.la
-+svg_loader_la_DEPENDENCIES =
- am_svg_loader_la_OBJECTS = io-svg.lo
- svg_loader_la_OBJECTS = $(am_svg_loader_la_OBJECTS)
-
-@@ -522,10 +522,6 @@ uninstall-am: uninstall-info-am uninstal
+@@ -528,10 +528,6 @@ uninstall-am: uninstall-info-am uninstal
install-data-hook:
diff -r 27bdfaa0bbcc -r 5ddd27db8506 graphics/librsvg2/patches/patch-ac
--- a/graphics/librsvg2/patches/patch-ac Mon Oct 10 13:57:40 2005 +0000
+++ b/graphics/librsvg2/patches/patch-ac Mon Oct 10 13:58:59 2005 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.6 2005/03/22 16:04:44 jmmv Exp $
+$NetBSD: patch-ac,v 1.7 2005/10/10 13:59:00 jmmv Exp $
---- Makefile.in.orig 2005-01-19 02:14:40.000000000 +0100
+--- Makefile.in.orig 2005-10-07 04:33:20.000000000 +0200
+++ Makefile.in
Home |
Main Index |
Thread Index |
Old Index