diff options
Diffstat (limited to 'graphics/librsvg2')
-rw-r--r-- | graphics/librsvg2/Makefile | 7 | ||||
-rw-r--r-- | graphics/librsvg2/distinfo | 4 | ||||
-rw-r--r-- | graphics/librsvg2/files/patch-moz-plugin_Makefile.in | 22 | ||||
-rw-r--r-- | graphics/librsvg2/files/patch-rsvg-paint-server.c | 14 | ||||
-rw-r--r-- | graphics/librsvg2/files/patch-rsvg-shapes.c | 29 | ||||
-rw-r--r-- | graphics/librsvg2/files/patch-rsvg-structure.c | 12 | ||||
-rw-r--r-- | graphics/librsvg2/pkg-plist | 16 |
7 files changed, 44 insertions, 60 deletions
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index 6ea3cfc11..c35034667 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -3,15 +3,14 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/librsvg2/Makefile,v 1.55 2005/08/19 06:04:02 mezz Exp $ +# $MCom: ports/graphics/librsvg2/Makefile,v 1.56 2005/08/23 16:54:19 marcus Exp $ # PORTNAME= librsvg2 -PORTVERSION= 2.9.5 -PORTREVISION= 4 +PORTVERSION= 2.11.0 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.9 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.11 DISTNAME= librsvg-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo index 40f8c84a5..56c5283be 100644 --- a/graphics/librsvg2/distinfo +++ b/graphics/librsvg2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/librsvg-2.9.5.tar.bz2) = 44799d75e940eb4150acdae4f63cbe2a -SIZE (gnome2/librsvg-2.9.5.tar.bz2) = 392785 +MD5 (gnome2/librsvg-2.11.0.tar.bz2) = d64df7603785440c8af39a338753bdf4 +SIZE (gnome2/librsvg-2.11.0.tar.bz2) = 379647 diff --git a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in index 97a0a3fd2..9855a82fa 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 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) +--- moz-plugin/Makefile.in.orig Thu Aug 25 22:29:28 2005 ++++ moz-plugin/Makefile.in Thu Aug 25 22:30:43 2005 +@@ -281,15 +281,15 @@ + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(plugindir) +- test -z "$(plugindir)" || $(mkdir_p) "$(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) -+# $(mkinstalldirs) $(DESTDIR)$(plugindir) ++# test -z "$(plugindir)" || $(mkdir_p) "$(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-rsvg-paint-server.c b/graphics/librsvg2/files/patch-rsvg-paint-server.c deleted file mode 100644 index f6e05c030..000000000 --- a/graphics/librsvg2/files/patch-rsvg-paint-server.c +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 index 2642a2539..d91bf5083 100644 --- a/graphics/librsvg2/files/patch-rsvg-shapes.c +++ b/graphics/librsvg2/files/patch-rsvg-shapes.c @@ -1,14 +1,17 @@ ---- 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); +--- rsvg-shapes.c.orig Thu Aug 25 22:32:03 2005 ++++ rsvg-shapes.c Thu Aug 25 22:32:13 2005 +@@ -145,12 +145,12 @@ _rsvg_node_poly_draw(RsvgNode * self, Rs + int dominate) + { + RsvgNodePoly * poly = (RsvgNodePoly *)self; ++ gsize i; ++ GString * d = g_string_new (""); + /* represent as a "moveto, lineto*, close" path */ + if (poly->pointlist_len < 2) + return; - if (rsvg_property_bag_size (atts)) +- gsize i; +- GString * d = g_string_new (""); + g_string_append_printf (d, "M %f %f ", poly->pointlist[0], poly->pointlist[1] ); + + for (i = 2; i < poly->pointlist_len; i += 2) diff --git a/graphics/librsvg2/files/patch-rsvg-structure.c b/graphics/librsvg2/files/patch-rsvg-structure.c new file mode 100644 index 000000000..a72080a1b --- /dev/null +++ b/graphics/librsvg2/files/patch-rsvg-structure.c @@ -0,0 +1,12 @@ +--- rsvg-structure.c.orig Thu Aug 25 22:32:30 2005 ++++ rsvg-structure.c Thu Aug 25 22:32:38 2005 +@@ -360,8 +360,8 @@ rsvg_node_use_set_atts (RsvgNode * self, + { + const char *value = NULL, *klazz = NULL, *id = NULL; + double font_size; +- font_size = rsvg_state_current_font_size(ctx); + RsvgNodeUse * use; ++ font_size = rsvg_state_current_font_size(ctx); + + use = (RsvgNodeUse *)self; + if (rsvg_property_bag_size(atts)) diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist index 2b1df2907..349064112 100644 --- a/graphics/librsvg2/pkg-plist +++ b/graphics/librsvg2/pkg-plist @@ -2,7 +2,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 %%PLUGIN%%lib/browser_plugins/libmozsvgdec.so lib/gtk-2.0/%%GTK_VERSION%%/engines/libsvg.so @@ -11,21 +10,6 @@ lib/librsvg-2.a lib/librsvg-2.so lib/librsvg-2.so.2 libdata/pkgconfig/librsvg-2.0.pc -share/doc/librsvg/html/home.png -share/doc/librsvg/html/index.html -share/doc/librsvg/html/index.sgml -share/doc/librsvg/html/ix01.html -share/doc/librsvg/html/left.png -share/doc/librsvg/html/right.png -share/doc/librsvg/html/rn01.html -share/doc/librsvg/html/rn02.html -share/doc/librsvg/html/rn03.html -share/doc/librsvg/html/rsvg-Convenience-Functions.html -share/doc/librsvg/html/rsvg-Core-API.html -share/doc/librsvg/html/rsvg-Creating-a-SVGZ-reader.html -share/doc/librsvg/html/rsvg.devhelp -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 |