diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-03-12 10:39:38 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-03-12 10:39:38 +0000 |
commit | 190418a078b1eb7ea3c5d38a08bdab3cbd422086 (patch) | |
tree | bb336ccecde7052d26d3d8d8c97238744a373aad /graphics | |
parent | 6b0c40606cac591d75b88d05c7276bd16c369035 (diff) | |
download | ports-190418a078b1eb7ea3c5d38a08bdab3cbd422086.tar.gz ports-190418a078b1eb7ea3c5d38a08bdab3cbd422086.zip |
Notes
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/eog/Makefile | 7 | ||||
-rw-r--r-- | graphics/eog/distinfo | 4 | ||||
-rw-r--r-- | graphics/eog/pkg-plist | 7 | ||||
-rw-r--r-- | graphics/gpdf/Makefile | 7 | ||||
-rw-r--r-- | graphics/gpdf/distinfo | 4 | ||||
-rw-r--r-- | graphics/gpdf/pkg-plist | 2 | ||||
-rw-r--r-- | graphics/libgnomecanvas/Makefile | 4 | ||||
-rw-r--r-- | graphics/libgnomecanvas/distinfo | 4 | ||||
-rw-r--r-- | graphics/libgnomecanvas/pkg-plist | 64 | ||||
-rw-r--r-- | graphics/librsvg2/Makefile | 31 | ||||
-rw-r--r-- | graphics/librsvg2/distinfo | 4 | ||||
-rw-r--r-- | graphics/librsvg2/files/extra-patch-Makefile.in | 10 | ||||
-rw-r--r-- | graphics/librsvg2/files/patch-moz-plugin_Makefile.in | 22 | ||||
-rw-r--r-- | graphics/librsvg2/files/patch-moz-plugin_moz-plugin.c | 15 | ||||
-rw-r--r-- | graphics/librsvg2/files/patch-rsvg-paint-server.c | 14 | ||||
-rw-r--r-- | graphics/librsvg2/files/patch-rsvg-shapes.c | 14 | ||||
-rw-r--r-- | graphics/librsvg2/pkg-plist | 3 |
17 files changed, 127 insertions, 89 deletions
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile index ffe019d9203e..e62f13025254 100644 --- a/graphics/eog/Makefile +++ b/graphics/eog/Makefile @@ -6,11 +6,10 @@ # PORTNAME= eog -PORTVERSION= 2.8.2 -PORTREVISION= 1 +PORTVERSION= 2.9.0 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 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -19,7 +18,7 @@ COMMENT= The Eye Of Gnome image viewer USE_BZIP2= yes USE_GMAKE= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier intlhack libgnomeprintui \ +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprintui \ librsvg2 desktopfileutils libgnomeui USE_X_PREFIX= yes INSTALLS_OMF= yes diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo index 224d1571117e..99853195931e 100644 --- a/graphics/eog/distinfo +++ b/graphics/eog/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/eog-2.8.2.tar.bz2) = 1edf5f0e48fe17468c2d67c56e14c437 -SIZE (gnome2/eog-2.8.2.tar.bz2) = 849212 +MD5 (gnome2/eog-2.9.0.tar.bz2) = be4c2b1dcb1457069d03bf282fccf54b +SIZE (gnome2/eog-2.9.0.tar.bz2) = 843143 diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist index 61b80e5a1daa..52a7dd9f2196 100644 --- a/graphics/eog/pkg-plist +++ b/graphics/eog/pkg-plist @@ -1,8 +1,8 @@ bin/eog share/gnome/applications/eog.desktop @exec update-desktop-database > /dev/null || /usr/bin/true +share/gnome/eog/eog-gtk-ui.xml share/gnome/eog/glade/eog.glade -share/gnome/gnome-2.0/ui/eog-gtk-ui.xml share/gnome/help/eog/C/eog.xml share/gnome/help/eog/C/figures/eog_save_as_window.png share/gnome/help/eog/C/figures/eog_start_window.png @@ -128,9 +128,6 @@ share/locale/vi/LC_MESSAGES/eog.mo share/locale/wa/LC_MESSAGES/eog.mo share/locale/zh_CN/LC_MESSAGES/eog.mo share/locale/zh_TW/LC_MESSAGES/eog.mo -share/locale/zu/LC_MESSAGES/eog.mo -@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/zu 2> /dev/null || true @dirrm share/gnome/pixmaps/eog @dirrm share/gnome/omf/eog @dirrm share/gnome/help/eog/zh_TW/figures @@ -158,6 +155,4 @@ share/locale/zu/LC_MESSAGES/eog.mo @dirrm share/gnome/help/eog @dirrm share/gnome/eog/glade @dirrm share/gnome/eog -@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/zu 2> /dev/null || true @unexec update-desktop-database > /dev/null || /usr/bin/true diff --git a/graphics/gpdf/Makefile b/graphics/gpdf/Makefile index 27f483028ba2..f9a9e248b18e 100644 --- a/graphics/gpdf/Makefile +++ b/graphics/gpdf/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gpdf -PORTVERSION= 2.8.3 -PORTREVISION= 1 +PORTVERSION= 2.10.0 CATEGORIES= graphics print gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -29,6 +28,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GCONF_SCHEMAS= gpdf.schemas post-install: - @-update-desktop-database > /dev/null + @-update-desktop-database .include <bsd.port.mk> diff --git a/graphics/gpdf/distinfo b/graphics/gpdf/distinfo index 7c747257c1e0..9eb8b6dfa555 100644 --- a/graphics/gpdf/distinfo +++ b/graphics/gpdf/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gpdf-2.8.3.tar.bz2) = c12d3cbf57611286ab80ee4febe2afdd -SIZE (gnome2/gpdf-2.8.3.tar.bz2) = 1055393 +MD5 (gnome2/gpdf-2.10.0.tar.bz2) = 9278cd3b9d06e3b1d364452f0e512fa9 +SIZE (gnome2/gpdf-2.10.0.tar.bz2) = 1079944 diff --git a/graphics/gpdf/pkg-plist b/graphics/gpdf/pkg-plist index b5c1ad62aaa7..0a67e02da255 100644 --- a/graphics/gpdf/pkg-plist +++ b/graphics/gpdf/pkg-plist @@ -46,6 +46,7 @@ share/locale/en_CA/LC_MESSAGES/gpdf.mo share/locale/en_GB/LC_MESSAGES/gpdf.mo share/locale/eo/LC_MESSAGES/gpdf.mo share/locale/es/LC_MESSAGES/gpdf.mo +share/locale/et/LC_MESSAGES/gpdf.mo share/locale/eu/LC_MESSAGES/gpdf.mo share/locale/fa/LC_MESSAGES/gpdf.mo share/locale/fi/LC_MESSAGES/gpdf.mo @@ -70,6 +71,7 @@ share/locale/ml/LC_MESSAGES/gpdf.mo share/locale/mn/LC_MESSAGES/gpdf.mo share/locale/ms/LC_MESSAGES/gpdf.mo share/locale/nb/LC_MESSAGES/gpdf.mo +share/locale/ne/LC_MESSAGES/gpdf.mo share/locale/nl/LC_MESSAGES/gpdf.mo share/locale/nn/LC_MESSAGES/gpdf.mo share/locale/no/LC_MESSAGES/gpdf.mo diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile index a7c0c549d1e2..a1f2ab8690c5 100644 --- a/graphics/libgnomecanvas/Makefile +++ b/graphics/libgnomecanvas/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libgnomecanvas -PORTVERSION= 2.8.0 +PORTVERSION= 2.10.0 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo index ddc4ebce2feb..4743842c100f 100644 --- a/graphics/libgnomecanvas/distinfo +++ b/graphics/libgnomecanvas/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnomecanvas-2.8.0.tar.bz2) = 2bf10396a92777e7b64b6052a8a232f1 -SIZE (gnome2/libgnomecanvas-2.8.0.tar.bz2) = 578849 +MD5 (gnome2/libgnomecanvas-2.10.0.tar.bz2) = 88aac06c8dfd24671db3fe3bf881b5fc +SIZE (gnome2/libgnomecanvas-2.10.0.tar.bz2) = 575503 diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist index 642eafb250db..5e48d93c6b44 100644 --- a/graphics/libgnomecanvas/pkg-plist +++ b/graphics/libgnomecanvas/pkg-plist @@ -15,36 +15,37 @@ include/libgnomecanvas-2.0/libgnomecanvas/libgnomecanvas.h lib/libglade/2.0/libcanvas.so lib/libgnomecanvas-2.a lib/libgnomecanvas-2.so -lib/libgnomecanvas-2.so.800 +lib/libgnomecanvas-2.so.1000 libdata/pkgconfig/libgnomecanvas-2.0.pc -share/doc/libgnomecanvas/GnomeCanvas.html -share/doc/libgnomecanvas/GnomeCanvasBpath.html -share/doc/libgnomecanvas/GnomeCanvasClipgroup.html -share/doc/libgnomecanvas/GnomeCanvasEllipse.html -share/doc/libgnomecanvas/GnomeCanvasGroup.html -share/doc/libgnomecanvas/GnomeCanvasItem.html -share/doc/libgnomecanvas/GnomeCanvasLine.html -share/doc/libgnomecanvas/GnomeCanvasPixbuf.html -share/doc/libgnomecanvas/GnomeCanvasPolygon.html -share/doc/libgnomecanvas/GnomeCanvasRE.html -share/doc/libgnomecanvas/GnomeCanvasRect.html -share/doc/libgnomecanvas/GnomeCanvasRichText.html -share/doc/libgnomecanvas/GnomeCanvasShape.html -share/doc/libgnomecanvas/GnomeCanvasText.html -share/doc/libgnomecanvas/GnomeCanvasWidget.html -share/doc/libgnomecanvas/ch01.html -share/doc/libgnomecanvas/ch02.html -share/doc/libgnomecanvas/home.png -share/doc/libgnomecanvas/index.html -share/doc/libgnomecanvas/index.sgml -share/doc/libgnomecanvas/left.png -share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-path-def.html -share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-util.html -share/doc/libgnomecanvas/libgnomecanvas.devhelp -share/doc/libgnomecanvas/right.png -share/doc/libgnomecanvas/style.css -share/doc/libgnomecanvas/up.png +%%DOCSDIR%%/GnomeCanvas.html +%%DOCSDIR%%/GnomeCanvasBpath.html +%%DOCSDIR%%/GnomeCanvasClipgroup.html +%%DOCSDIR%%/GnomeCanvasEllipse.html +%%DOCSDIR%%/GnomeCanvasGroup.html +%%DOCSDIR%%/GnomeCanvasItem.html +%%DOCSDIR%%/GnomeCanvasLine.html +%%DOCSDIR%%/GnomeCanvasPixbuf.html +%%DOCSDIR%%/GnomeCanvasPolygon.html +%%DOCSDIR%%/GnomeCanvasRE.html +%%DOCSDIR%%/GnomeCanvasRect.html +%%DOCSDIR%%/GnomeCanvasRichText.html +%%DOCSDIR%%/GnomeCanvasShape.html +%%DOCSDIR%%/GnomeCanvasText.html +%%DOCSDIR%%/GnomeCanvasWidget.html +%%DOCSDIR%%/ch01.html +%%DOCSDIR%%/ch02.html +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/libgnomecanvas-gnome-canvas-path-def.html +%%DOCSDIR%%/libgnomecanvas-gnome-canvas-util.html +%%DOCSDIR%%/libgnomecanvas.devhelp +%%DOCSDIR%%/right.png +%%DOCSDIR%%/style.css +%%DOCSDIR%%/up.png share/locale/am/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/ang/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ar/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/az/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/be/LC_MESSAGES/libgnomecanvas-2.0.mo @@ -108,10 +109,15 @@ share/locale/tr/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/uk/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/vi/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/wa/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/xh/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/yi/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/zh_CN/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/zh_TW/LC_MESSAGES/libgnomecanvas-2.0.mo -@dirrm share/doc/libgnomecanvas +@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/xh 2> /dev/null || true +@unexec rmdir %D/share/locale/ang/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ang 2> /dev/null || true +@dirrm %%DOCSDIR%% @dirrm lib/libglade/2.0 @dirrm lib/libglade @dirrm include/libgnomecanvas-2.0/libgnomecanvas 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 |