summaryrefslogtreecommitdiff
path: root/graphics/librsvg2
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/librsvg2')
-rw-r--r--graphics/librsvg2/DESCR6
-rw-r--r--graphics/librsvg2/MESSAGE12
-rw-r--r--graphics/librsvg2/Makefile32
-rw-r--r--graphics/librsvg2/Makefile.common27
-rw-r--r--graphics/librsvg2/PLIST11
-rw-r--r--graphics/librsvg2/buildlink2.mk6
-rw-r--r--graphics/librsvg2/distinfo6
-rw-r--r--graphics/librsvg2/patches/patch-ab22
-rw-r--r--graphics/librsvg2/patches/patch-ac14
-rw-r--r--graphics/librsvg2/patches/patch-ad22
10 files changed, 102 insertions, 56 deletions
diff --git a/graphics/librsvg2/DESCR b/graphics/librsvg2/DESCR
index 711f5cc9b80..e28d458c32b 100644
--- a/graphics/librsvg2/DESCR
+++ b/graphics/librsvg2/DESCR
@@ -1,2 +1,4 @@
- This is the GNOME 2.0 platform development version of
-librsvg, Raph's scalable vector graphics library.
+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 librsvg2 library.
diff --git a/graphics/librsvg2/MESSAGE b/graphics/librsvg2/MESSAGE
index 24fc2fb634c..abb94ccef3d 100644
--- a/graphics/librsvg2/MESSAGE
+++ b/graphics/librsvg2/MESSAGE
@@ -1,13 +1,7 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.1 2003/06/27 23:02:51 jmmv Exp $
+$NetBSD: MESSAGE,v 1.2 2004/01/22 12:43:10 jmmv Exp $
-This package has installed new gdk-pixbuf loaders. In order to get them
-working, you should update gdk-pixbuf's configuration file. This can be
-usually done issuing the following command:
-
- ${PREFIX}/bin/gdk-pixbuf-query-loaders > \
- ${PKG_SYSCONFDIR.gtk2}/gdk-pixbuf.loaders
-
-Note that this will discard your personal changes to that file.
+You should install the librsvg2-gtk2 package, which provides an RSVG
+gdk-pixbuf loader and an RSVG theme engine for the GTK2 toolkit.
===========================================================================
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 64aa00ecc09..9e30c9c88de 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -1,33 +1,12 @@
-# $NetBSD: Makefile,v 1.19 2004/01/07 02:21:16 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/22 12:43:10 jmmv Exp $
#
-DISTNAME= librsvg-2.5.0
-PKGNAME= ${DISTNAME:S/-/2-/}
-PKGREVISION= 3
-CATEGORIES= graphics gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/librsvg/2.5/}
-EXTRACT_SUFX= .tar.bz2
+.include "Makefile.common"
-MAINTAINER= tech-pkg@NetBSD.org
-HOMEPAGE= http://librsvg.sourceforge.net/
-COMMENT= SVG library for GNOME2
+PKGNAME= ${DISTNAME:S/-/2-/}
+PKGREVISION= 4
-USE_BUILDLINK2= YES
-USE_X11= YES
-USE_LIBTOOL= YES
-GNU_CONFIGURE= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-PKGCONFIG_OVERRIDE= ${WRKSRC}/librsvg-2.0.pc.in
-
-CONFIGURE_ARGS+= --disable-gtk-doc
-CONFIGURE_ARGS+= --with-gimp=no
-CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html/librsvg2
-
-.if !defined(PKG_SYSCONFDIR.gtk2) || empty(PKG_SYSCONFDIR.gtk2)
-MESSAGE_SUBST+= PKG_SYSCONFDIR.gtk2="${PKG_SYSCONFBASEDIR}/gtk-2.0"
-.else
-MESSAGE_SUBST+= PKG_SYSCONFDIR.gtk2="${PKG_SYSCONFDIR.gtk2}"
-.endif
+CONFIGURE_ARGS+= --disable-pixbuf-loader
.include "../../graphics/freetype2/buildlink2.mk"
.include "../../graphics/libart2/buildlink2.mk"
@@ -38,5 +17,4 @@ MESSAGE_SUBST+= PKG_SYSCONFDIR.gtk2="${PKG_SYSCONFDIR.gtk2}"
.include "../../devel/pkgconfig/buildlink2.mk"
.include "../../devel/popt/buildlink2.mk"
.include "../../textproc/libcroco/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/librsvg2/Makefile.common b/graphics/librsvg2/Makefile.common
new file mode 100644
index 00000000000..5bf929461f2
--- /dev/null
+++ b/graphics/librsvg2/Makefile.common
@@ -0,0 +1,27 @@
+# $NetBSD: Makefile.common,v 1.1 2004/01/22 12:43:10 jmmv Exp $
+#
+
+DISTNAME= librsvg-2.5.0
+CATEGORIES= graphics gnome
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/librsvg/2.5/}
+EXTRACT_SUFX= .tar.bz2
+
+MAINTAINER= jmmv@NetBSD.org
+HOMEPAGE= http://librsvg.sourceforge.net/
+COMMENT= SVG library for GNOME2
+
+DISTINFO_FILE= ${.CURDIR}/../../graphics/librsvg2/distinfo
+PATCHDIR= ${.CURDIR}/../../graphics/librsvg2/patches
+
+USE_BUILDLINK2= YES
+USE_X11= YES
+USE_LIBTOOL= YES
+GNU_CONFIGURE= YES
+LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+PKGCONFIG_OVERRIDE= ${WRKSRC}/librsvg-2.0.pc.in
+
+CONFIGURE_ARGS+= --disable-gtk-doc
+CONFIGURE_ARGS+= --with-gimp=no
+CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html/librsvg2
+
+.include "../../x11/gtk2/buildlink2.mk"
diff --git a/graphics/librsvg2/PLIST b/graphics/librsvg2/PLIST
index a4d28dc774a..272ab0e3263 100644
--- a/graphics/librsvg2/PLIST
+++ b/graphics/librsvg2/PLIST
@@ -1,14 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2003/12/18 14:15:25 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/01/22 12:43:10 jmmv Exp $
bin/rsvg
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.2.0/engines/libsvg.a
-lib/gtk-2.0/2.2.0/engines/libsvg.la
-lib/gtk-2.0/2.2.0/engines/libsvg.so
-lib/gtk-2.0/2.2.0/loaders/svg_loader.a
-lib/gtk-2.0/2.2.0/loaders/svg_loader.la
-lib/gtk-2.0/2.2.0/loaders/svg_loader.so
lib/librsvg-2.a
lib/librsvg-2.la
lib/librsvg-2.so
@@ -31,8 +25,5 @@ share/doc/html/librsvg2/rsvg-creating-a-svgz-reader.html
share/doc/html/librsvg2/rsvg.html
share/doc/html/librsvg2/up.png
@dirrm share/doc/html/librsvg2
-@comment in gtk2: @dirrm lib/gtk-2.0/2.2.0/loaders
-@comment in gtk2: @dirrm lib/gtk-2.0/2.2.0/engines
-@comment in gtk2: @dirrm lib/gtk-2.0/2.2.0
@dirrm include/librsvg-2/librsvg
@dirrm include/librsvg-2
diff --git a/graphics/librsvg2/buildlink2.mk b/graphics/librsvg2/buildlink2.mk
index 5fc1dc6e1aa..2c261fe9b28 100644
--- a/graphics/librsvg2/buildlink2.mk
+++ b/graphics/librsvg2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.11 2004/01/16 02:16:24 xtraeme Exp $
+# $NetBSD: buildlink2.mk,v 1.12 2004/01/22 12:43:10 jmmv Exp $
#
# This Makefile fragment is included by packages that use librsvg2.
#
@@ -9,14 +9,12 @@
LIBRSVG2_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= librsvg2
-BUILDLINK_DEPENDS.librsvg2?= librsvg2>=2.4.0
+BUILDLINK_DEPENDS.librsvg2?= librsvg2>=2.5.0nb4
BUILDLINK_PKGSRCDIR.librsvg2?= ../../graphics/librsvg2
EVAL_PREFIX+= BUILDLINK_PREFIX.librsvg2=librsvg2
BUILDLINK_PREFIX.librsvg2_DEFAULT= ${LOCALBASE}
BUILDLINK_FILES.librsvg2+= include/librsvg-2/librsvg/*
-BUILDLINK_FILES.librsvg2+= lib/gtk-2.0/2.2.0/engines/libsvg.*
-BUILDLINK_FILES.librsvg2+= lib/gtk-2.0/2.2.0/loaders/svg_loader.*
BUILDLINK_FILES.librsvg2+= lib/librsvg-2.*
.include "../../graphics/freetype2/buildlink2.mk"
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index a6a705db6f3..118ea8c97bb 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.5 2003/12/18 14:15:25 adam Exp $
+$NetBSD: distinfo,v 1.6 2004/01/22 12:43:10 jmmv Exp $
SHA1 (librsvg-2.5.0.tar.bz2) = d52e55c872e046c3d0c85f7b8098df6b5c7d4ee5
Size (librsvg-2.5.0.tar.bz2) = 228378 bytes
SHA1 (patch-aa) = c8bf42abf7c1a862f0f7867d07ef10c590afafdf
-SHA1 (patch-ab) = 1bcb7981b06a1b5376b95459f5b072f9b4ff77cd
+SHA1 (patch-ab) = 3485670e7746ff1d4dfdacc5aee3c17744b18454
+SHA1 (patch-ac) = 1ff6ecb5322abe1e85fff8418f826e68e897a642
+SHA1 (patch-ad) = 45a3352b815c01a63b903be4692ce642b22073bc
diff --git a/graphics/librsvg2/patches/patch-ab b/graphics/librsvg2/patches/patch-ab
index 12ea6081643..aaa6effac96 100644
--- a/graphics/librsvg2/patches/patch-ab
+++ b/graphics/librsvg2/patches/patch-ab
@@ -1,7 +1,25 @@
-$NetBSD: patch-ab,v 1.2 2003/12/18 14:15:26 adam Exp $
+$NetBSD: patch-ab,v 1.3 2004/01/22 12:43:10 jmmv Exp $
---- gdk-pixbuf-loader/Makefile.in.orig 2003-12-18 12:46:17.000000000 +0000
+--- gdk-pixbuf-loader/Makefile.in.orig 2003-12-07 20:35:59.000000000 +0100
+++ gdk-pixbuf-loader/Makefile.in
+@@ -122,7 +122,7 @@ svg_loader_la_SOURCES = io-svg.c
+ svg_loader_la_LDFLAGS = -avoid-version -module $(no_undefined)
+ svg_loader_la_LIBADD = $(LIBRSVG_LIBS) \
+ $(LIBGSF_LIBS) $(LIBCROCO_LIBS)\
+- $(top_builddir)/librsvg-2.la
++ `pkg-config --libs librsvg-2.0`
+
+
+ loader_LTLIBRARIES = $(target_pixbuf_loader)
+@@ -136,7 +136,7 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I..
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+-svg_loader_la_DEPENDENCIES = $(top_builddir)/librsvg-2.la
++svg_loader_la_DEPENDENCIES =
+ svg_loader_la_OBJECTS = io-svg.lo
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -362,10 +362,6 @@ maintainer-clean-generic clean mostlycle
diff --git a/graphics/librsvg2/patches/patch-ac b/graphics/librsvg2/patches/patch-ac
new file mode 100644
index 00000000000..714a375105a
--- /dev/null
+++ b/graphics/librsvg2/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.3 2004/01/22 12:43:10 jmmv Exp $
+
+--- Makefile.in.orig 2003-12-07 20:35:55.000000000 +0100
++++ Makefile.in
+@@ -104,7 +104,8 @@ STRIP = @STRIP@
+ VERSION = @VERSION@
+ VERSION_INFO = @VERSION_INFO@
+
+-SUBDIRS = . gtk-engine gdk-pixbuf-loader doc
++# gtk-engine is built directly from the librsvg2-gtk2 package.
++SUBDIRS = . gdk-pixbuf-loader doc
+
+ bin_PROGRAMS = rsvg
+
diff --git a/graphics/librsvg2/patches/patch-ad b/graphics/librsvg2/patches/patch-ad
new file mode 100644
index 00000000000..2bad1d2794b
--- /dev/null
+++ b/graphics/librsvg2/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1 2004/01/22 12:43:10 jmmv Exp $
+
+--- gtk-engine/Makefile.in.orig 2003-12-07 20:35:56.000000000 +0100
++++ gtk-engine/Makefile.in
+@@ -130,7 +130,7 @@ libsvg_la_SOURCES = \
+
+
+ libsvg_la_LDFLAGS = -avoid-version -module $(no_undefined)
+-libsvg_la_LIBADD = $(GTK_LIBS) $(LIBRSVG_LIBS) $(LIBCROCO_LIBS) $(top_builddir)/librsvg-2.la
++libsvg_la_LIBADD = $(GTK_LIBS) $(LIBRSVG_LIBS) $(LIBCROCO_LIBS) `pkg-config --libs librsvg-2.0`
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES =
+@@ -141,7 +141,7 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I..
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+-libsvg_la_DEPENDENCIES = $(top_builddir)/librsvg-2.la
++libsvg_la_DEPENDENCIES =
+ libsvg_la_OBJECTS = svg-draw.lo svg-main.lo svg-render.lo \
+ svg-rc-style.lo
+ CFLAGS = @CFLAGS@
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-20 07:04:56 +0000