aboutsummaryrefslogtreecommitdiff
path: root/graphics/librsvg2
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/librsvg2')
-rw-r--r--graphics/librsvg2/Makefile31
-rw-r--r--graphics/librsvg2/distinfo4
-rw-r--r--graphics/librsvg2/files/extra-patch-Makefile.in10
-rw-r--r--graphics/librsvg2/files/patch-moz-plugin_Makefile.in22
-rw-r--r--graphics/librsvg2/files/patch-moz-plugin_moz-plugin.c15
-rw-r--r--graphics/librsvg2/files/patch-rsvg-paint-server.c14
-rw-r--r--graphics/librsvg2/files/patch-rsvg-shapes.c14
-rw-r--r--graphics/librsvg2/pkg-plist3
8 files changed, 75 insertions, 38 deletions
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index b936beb8cb5b..d13ef9beb3cd 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= librsvg2
-PORTVERSION= 2.8.1
+PORTVERSION= 2.9.5
PORTREVISION= 1
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.8
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.9
DISTNAME= librsvg-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -29,13 +29,13 @@ USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
USE_LIBTOOL_VER=15
USE_REINPLACE= yes
-USE_GNOME= gnomehack gnomeprefix libartlgpl2 libgsf gnomevfs2
+WANT_GNOME= yes
+USE_GNOME= gnomehack gnomeprefix libartlgpl2 libgsf gtk20
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-svgz \
--disable-gtk-doc \
--without-gimp \
- --enable-gnome-vfs \
--with-croco
CROCO_VERSION= 0.6
@@ -47,8 +47,20 @@ MAN1= rsvg.1
OPTIONS= MOZILLA_PLUGIN "Enable the RSVG browser plug-in" no
+.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
+.undef WITHOUT_GNOME
+WITH_GNOME= yes
+.endif
+
.include <bsd.port.pre.mk>
+.if ${HAVE_GNOME:Mgnomevfs2}!=""
+USE_GNOME+= gnomevfs2
+CONFIGURE_ARGS+=--enable-gnome-vfs
+.else
+CONFIGURE_ARGS+=--disable-gnome-vfs
+.endif
+
.if defined(WITH_MOZILLA_PLUGIN)
.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="firefox"
BUILD_DEPENDS+= ${X11BASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox
@@ -81,6 +93,14 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Makefile.in
PLIST_SUB+= PLUGIN="@comment "
.endif
+.if ${OSVERSION} < 500000
+.if defined(WITH_MOZILLA)
+.if ${WITH_MOZILLA}=="mozilla-devel"
+USE_GCC= 3.4
+.endif
+.endif
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
${WRKSRC}/librsvg-2.0.pc.in
@@ -93,6 +113,9 @@ post-patch:
.endif
.endif
+pre-build:
+ @${REINPLACE_CMD} -E -e 's|O2|O|g' ${WRKSRC}/Makefile
+
.if defined(WITH_MOZILLA_PLUGIN)
post-install:
${MKDIR} ${PREFIX}/lib/browser_plugins
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index 567866d8a371..40f8c84a55e4 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/librsvg-2.8.1.tar.bz2) = 01c14f6adcf3a71be2b808879e1223a0
-SIZE (gnome2/librsvg-2.8.1.tar.bz2) = 361446
+MD5 (gnome2/librsvg-2.9.5.tar.bz2) = 44799d75e940eb4150acdae4f63cbe2a
+SIZE (gnome2/librsvg-2.9.5.tar.bz2) = 392785
diff --git a/graphics/librsvg2/files/extra-patch-Makefile.in b/graphics/librsvg2/files/extra-patch-Makefile.in
index 27c8fcd2988f..6bcb7ef6882e 100644
--- a/graphics/librsvg2/files/extra-patch-Makefile.in
+++ b/graphics/librsvg2/files/extra-patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig Fri Sep 3 00:54:51 2004
-+++ Makefile.in Fri Sep 3 00:55:00 2004
-@@ -307,7 +307,7 @@
+--- Makefile.in.orig Wed Jan 26 04:47:10 2005
++++ Makefile.in Wed Jan 26 04:47:24 2005
+@@ -199,7 +199,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUBDIRS = . gtk-engine gdk-pixbuf-loader moz-plugin doc data
+SUBDIRS = . gtk-engine gdk-pixbuf-loader doc data
- @HAVE_GTK_FALSE@target_rsvg_view =
+
@HAVE_GTK_TRUE@target_rsvg_view = rsvg-view
- man_MANS = rsvg.1
+ @HAVE_GTK_FALSE@target_rsvg_view =
diff --git a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
index 1f570b2472c2..97a0a3fd20e0 100644
--- a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
+++ b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
@@ -1,25 +1,25 @@
---- moz-plugin/Makefile.in.orig Fri Sep 3 01:07:24 2004
-+++ moz-plugin/Makefile.in Fri Sep 3 01:08:00 2004
-@@ -282,15 +282,15 @@
- $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+--- moz-plugin/Makefile.in.orig Tue Jan 25 23:31:56 2005
++++ moz-plugin/Makefile.in Tue Jan 25 23:32:32 2005
+@@ -252,15 +252,15 @@
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ pluginLTLIBRARIES_INSTALL = $(INSTALL)
install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-- test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
+- $(mkinstalldirs) $(DESTDIR)$(plugindir)
- @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
+- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \
+- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \
- else :; fi; \
- done
+# @$(NORMAL_INSTALL)
-+# test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
++# $(mkinstalldirs) $(DESTDIR)$(plugindir)
+# @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+# if test -f $$p; then \
+# f="`echo $$p | sed -e 's|^.*/||'`"; \
-+# echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
-+# $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
++# echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \
++# $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \
+# else :; fi; \
+# done
diff --git a/graphics/librsvg2/files/patch-moz-plugin_moz-plugin.c b/graphics/librsvg2/files/patch-moz-plugin_moz-plugin.c
deleted file mode 100644
index f75959a2a4ef..000000000000
--- a/graphics/librsvg2/files/patch-moz-plugin_moz-plugin.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- moz-plugin/moz-plugin.c.orig Fri Sep 3 00:48:45 2004
-+++ moz-plugin/moz-plugin.c Fri Sep 3 00:49:35 2004
-@@ -26,9 +26,12 @@
- #include <config.h>
-
- #include <stdio.h>
-+#ifdef HAVE_STDINT_H
- #include <stdint.h>
-+#endif
- #include <unistd.h>
- #include <sys/wait.h>
-+#include <signal.h>
-
- #include <X11/Xlib.h>
- #include <X11/Intrinsic.h>
diff --git a/graphics/librsvg2/files/patch-rsvg-paint-server.c b/graphics/librsvg2/files/patch-rsvg-paint-server.c
new file mode 100644
index 000000000000..f6e05c030dc4
--- /dev/null
+++ b/graphics/librsvg2/files/patch-rsvg-paint-server.c
@@ -0,0 +1,14 @@
+--- rsvg-paint-server.c.orig Tue Jan 25 23:39:10 2005
++++ rsvg-paint-server.c Tue Jan 25 23:39:19 2005
+@@ -84,10 +84,10 @@
+ const RsvgPSCtx *ctx)
+ {
+ RsvgPaintServerSolid *z = (RsvgPaintServerSolid *)self;
++ ArtPixMaxDepth color[3];
+ guint32 rgb = z->rgb;
+ if (z->currentcolour)
+ rgb = rsvg_state_current(ctx->ctx)->current_color;
+- ArtPixMaxDepth color[3];
+
+ color[0] = ART_PIX_MAX_FROM_8 (rgb >> 16);
+ color[1] = ART_PIX_MAX_FROM_8 ((rgb >> 8) & 0xff);
diff --git a/graphics/librsvg2/files/patch-rsvg-shapes.c b/graphics/librsvg2/files/patch-rsvg-shapes.c
new file mode 100644
index 000000000000..2642a2539b36
--- /dev/null
+++ b/graphics/librsvg2/files/patch-rsvg-shapes.c
@@ -0,0 +1,14 @@
+--- rsvg-shapes.c.orig Tue Jan 25 23:43:50 2005
++++ rsvg-shapes.c Tue Jan 25 23:44:01 2005
+@@ -2579,10 +2579,10 @@
+ const char * id, *value;
+ double vbox_x = 0, vbox_y = 0, vbox_w = 0, vbox_h = 0;
+ gboolean has_vbox = FALSE, overflow = 0;
+- id = NULL;
+ RsvgDefsDrawableSvg * svg;
+ RsvgDefsDrawableGroup * group;
+ RsvgState state;
++ id = NULL;
+ rsvg_state_init(&state);
+
+ if (rsvg_property_bag_size (atts))
diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist
index ef193121ef5f..5604203a5e03 100644
--- a/graphics/librsvg2/pkg-plist
+++ b/graphics/librsvg2/pkg-plist
@@ -1,5 +1,6 @@
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
@@ -8,7 +9,7 @@ lib/gtk-2.0/%%GTK_VERSION%%/engines/libsvg.so
lib/gtk-2.0/%%GTK_VERSION%%/loaders/svg_loader.so
lib/librsvg-2.a
lib/librsvg-2.so
-lib/librsvg-2.so.10
+lib/librsvg-2.so.11
libdata/pkgconfig/librsvg-2.0.pc
share/doc/librsvg/html/home.png
share/doc/librsvg/html/index.html
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 12:58:12 +0000