Date: Mon, 20 Oct 2014 09:12:20 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371246 - in head/graphics/inkscape: . files Message-ID: <201410200912.s9K9CKQR024833@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Mon Oct 20 09:12:19 2014 New Revision: 371246 URL: https://svnweb.freebsd.org/changeset/ports/371246 QAT: https://qat.redports.org/buildarchive/r371246/ Log: Update to 0.48.5. Adobe Illustrator SVG files containing entities can be loaded again Support for Poppler 0.26 Support for Boehm-GC 7.4.0 and later Several crash bugs were fixed Remove the gnomevfs option. Install all available manpages. Deleted: head/graphics/inkscape/files/patch-Makefile.in head/graphics/inkscape/files/patch-beohm-gc-7.4 head/graphics/inkscape/files/patch-src_2geom_basic-intersection.cpp head/graphics/inkscape/files/patch-src_2geom_sbasis.h head/graphics/inkscape/files/patch-src_2geom_solve-bezier-parametric.cpp head/graphics/inkscape/files/patch-src_color-profile.cpp head/graphics/inkscape/files/patch-src_display_nr-filter-gaussian.cpp head/graphics/inkscape/files/patch-src_io_inkjar.cpp head/graphics/inkscape/files/patch-src_io_inkjar.h head/graphics/inkscape/files/patch-src_io_uristream.cpp head/graphics/inkscape/files/patch-src_io_uristream.h head/graphics/inkscape/files/patch-src_io_xsltstream.cpp head/graphics/inkscape/files/patch-src_io_xsltstream.h head/graphics/inkscape/files/patch-src_libgdl_gdl-dock-object.h head/graphics/inkscape/files/patch-src_libnr_nr-matrix.cpp head/graphics/inkscape/files/patch-src_libnrtype_FontFactory.h head/graphics/inkscape/files/patch-src_libnrtype_Layout-TNG-OutIter.cpp head/graphics/inkscape/files/patch-src_libvpsc_csolve-VPSC.h head/graphics/inkscape/files/patch-src_livarot_Path.cpp head/graphics/inkscape/files/patch-src_live_effects_lpe-perp_bisector.h head/graphics/inkscape/files/patch-src_remove-last.h head/graphics/inkscape/files/patch-src_sp-item-rm-unsatisfied-cns.cpp head/graphics/inkscape/files/patch-src_trace_potrace_inkscape-potrace.cpp head/graphics/inkscape/files/patch-src_trace_siox.cpp head/graphics/inkscape/files/patch-src_ui_dialog_inkscape-preferences.cpp head/graphics/inkscape/files/patch-src_ui_widget_registered-widget.h head/graphics/inkscape/files/patch-src_widgets_desktop-widget.h Modified: head/graphics/inkscape/Makefile head/graphics/inkscape/distinfo head/graphics/inkscape/files/patch-configure head/graphics/inkscape/files/patch-src_ui_tool_node.h head/graphics/inkscape/pkg-plist Modified: head/graphics/inkscape/Makefile ============================================================================== --- head/graphics/inkscape/Makefile Mon Oct 20 09:06:53 2014 (r371245) +++ head/graphics/inkscape/Makefile Mon Oct 20 09:12:19 2014 (r371246) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= inkscape -PORTVERSION= 0.48.4 -PORTREVISION= 8 +PORTVERSION= 0.48.5 CATEGORIES= graphics gnome MASTER_SITES= SF MASTER_SITE_SUBDIR=${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION} @@ -29,16 +28,16 @@ GNU_CONFIGURE= yes INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +CONFIGURE_ARGS= --without-gnome-vfs python_OLD_CMD?=/usr/bin/env python python_CMD?= ${LOCALBASE}/bin/python2 SHEBANG_FILES= cxxtest/cxxtestgen.pl share/extensions/*.p[lm] \ share/extensions/*.py -OPTIONS_DEFINE= GNOMEVFS POPPLER +OPTIONS_DEFINE= POPPLER OPTIONS_DEFAULT=POPPLER POPPLER_DESC= PDF preview rendering -GNOMEVFS_DESC= Use gnomevfs for loading files .include <bsd.port.options.mk> @@ -47,13 +46,6 @@ _CCVERSION!= ${CC} --version CPPFLAGS+= -Wno-mismatched-tags .endif -.if ${PORT_OPTIONS:MGNOMEVFS} -USE_GNOME+= gnomevfs2 -CONFIGURE_ARGS+= --with-gnome-vfs -.else -CONFIGURE_ARGS+= --without-gnome-vfs -.endif - .if ${PORT_OPTIONS:MPOPPLER} LIB_DEPENDS+= libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib CONFIGURE_ARGS+= --enable-poppler-cairo Modified: head/graphics/inkscape/distinfo ============================================================================== --- head/graphics/inkscape/distinfo Mon Oct 20 09:06:53 2014 (r371245) +++ head/graphics/inkscape/distinfo Mon Oct 20 09:12:19 2014 (r371246) @@ -1,2 +1,2 @@ -SHA256 (inkscape-0.48.4.tar.bz2) = 8741ad8cbb5aa5cee4f234ebc45479cff2479b16d903870693174bdede8a519d -SIZE (inkscape-0.48.4.tar.bz2) = 19712522 +SHA256 (inkscape-0.48.5.tar.bz2) = 2b6ce684f9f2a0691ab454656424555cbda131db78e13973360684bc833ad969 +SIZE (inkscape-0.48.5.tar.bz2) = 19719332 Modified: head/graphics/inkscape/files/patch-configure ============================================================================== --- head/graphics/inkscape/files/patch-configure Mon Oct 20 09:06:53 2014 (r371245) +++ head/graphics/inkscape/files/patch-configure Mon Oct 20 09:12:19 2014 (r371246) @@ -1,15 +1,6 @@ ---- configure.orig 2014-07-10 22:35:29.000000000 +0200 -+++ configure 2014-07-10 22:46:14.000000000 +0200 -@@ -7498,7 +7498,7 @@ - cc_vers_all=`expr $cc_vers_major '*' 1000000 + $cc_vers_minor '*' 1000 + $cc_vers_patch` - - if test $cc_vers_major -lt 3; then -- as_fn_error $? "gcc >= 3.0 is needed to compile inkscape" "$LINENO" 5 -+# as_fn_error $? "gcc >= 3.0 is needed to compile inkscape" "$LINENO" 5 - fi - fi - -@@ -8961,10 +8961,11 @@ +--- configure.orig 2014-10-20 01:29:05.836430783 +0200 ++++ configure 2014-10-20 01:29:05.872430406 +0200 +@@ -9046,10 +9046,11 @@ #include <stdio.h> extern unsigned GC_version; int main(void){ Modified: head/graphics/inkscape/files/patch-src_ui_tool_node.h ============================================================================== --- head/graphics/inkscape/files/patch-src_ui_tool_node.h Mon Oct 20 09:06:53 2014 (r371245) +++ head/graphics/inkscape/files/patch-src_ui_tool_node.h Mon Oct 20 09:12:19 2014 (r371246) @@ -1,30 +1,11 @@ ---- src/ui/tool/node.h.orig 2012-02-14 04:22:17.670697000 +0100 -+++ src/ui/tool/node.h 2013-10-17 12:47:44.000000000 +0200 -@@ -16,7 +16,13 @@ - #include <iosfwd> - #include <stdexcept> - #include <cstddef> -+ -+#if __cplusplus >= 201103L -+#include <functional> -+#else - #include <tr1/functional> -+#endif -+ - #include <boost/utility.hpp> - #include <boost/shared_ptr.hpp> - #include <boost/optional.hpp> -@@ -32,11 +38,13 @@ +--- src/ui/tool/node.h.orig 2014-10-20 01:38:50.972399465 +0200 ++++ src/ui/tool/node.h 2014-10-20 01:37:10.561420788 +0200 +@@ -38,7 +38,7 @@ } } +-#if __cplusplus < 201103L +#if __cplusplus < 201103L && !defined(_LIBCPP_VERSION) namespace std { namespace tr1 { template <typename N> struct hash< Inkscape::UI::NodeIterator<N> >; - } - } -+#endif - - namespace Inkscape { - namespace UI { Modified: head/graphics/inkscape/pkg-plist ============================================================================== --- head/graphics/inkscape/pkg-plist Mon Oct 20 09:06:53 2014 (r371245) +++ head/graphics/inkscape/pkg-plist Mon Oct 20 09:12:19 2014 (r371246) @@ -1,7 +1,17 @@ bin/inkscape bin/inkview +man/el/man1/inkscape.el.1.gz +man/fr/man1/inkscape.fr.1.gz +man/ja/man1/inkscape.ja.1.gz man/man1/inkscape.1.gz +man/man1/inkscape.el.1.gz +man/man1/inkscape.fr.1.gz +man/man1/inkscape.ja.1.gz +man/man1/inkscape.sk.1.gz +man/man1/inkscape.zh_TW.1.gz man/man1/inkview.1.gz +man/sk/man1/inkscape.ja.1.gz +man/zh_TW/man1/inkscape.zh_TW.1.gz share/applications/inkscape.desktop share/icons/hicolor/16x16/apps/inkscape.png share/icons/hicolor/22x22/apps/inkscape.png @@ -12,7 +22,6 @@ share/icons/hicolor/48x48/apps/inkscape. %%DATADIR%%/clipart/README %%DATADIR%%/clipart/draw-freely.ru.svg %%DATADIR%%/clipart/draw-freely.svg -%%DATADIR%%/clipart/inkscape.logo.svg %%DATADIR%%/clipart/orav.svg %%DATADIR%%/clipart/tux.svg %%DATADIR%%/examples/README
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410200912.s9K9CKQR024833>