[132570] trunk/dports/graphics/inkscape

4 Feb 2015

Revision: 132570
          https://trac.macports.org/changeset/132570
Author:   devans@macports.org
Date:     2015-02-04 15:36:03 -0800 (Wed, 04 Feb 2015)
Log Message:
-----------
inkscape: update to new major release 0.91, update descriptions, master_sites, dependencies, drop python variants and just use python27, new variants +gtk3 +strict +svg2.

Modified Paths:
--------------
    trunk/dports/graphics/inkscape/Portfile

Added Paths:
-----------
    trunk/dports/graphics/inkscape/files/autogen.sh

Removed Paths:
-------------
    trunk/dports/graphics/inkscape/files/patch-poppler-0.29.0.diff
    trunk/dports/graphics/inkscape/files/patch-python-configure.ac.diff
    trunk/dports/graphics/inkscape/files/patch-r10041-thru-r10043.diff

Modified: trunk/dports/graphics/inkscape/Portfile
===================================================================

--- trunk/dports/graphics/inkscape/Portfile	2015-02-04 21:56:24 UTC (rev 132569)
+++ trunk/dports/graphics/inkscape/Portfile	2015-02-04 23:36:03 UTC (rev 132570)
@@ -5,31 +5,29 @@
 
 name                inkscape
 conflicts           inkscape-devel
-version             0.48.5
-revision            7
+version             0.91
 license             GPL-2 LGPL-2.1
 maintainers         devans
 categories          graphics gnome
 platforms           darwin
 homepage            http://www.inkscape.org/
 
-description         Inkscape is an open source SVG editor.
+description         Inkscape is an multi-platform, Open-Source Vector Graphics Editor \
+                    that uses SVG as its native file format.
 
-long_description    Inkscape is an open source SVG editor with \
-                    capabilities similar to Illustrator, CorelDraw, \
-                    Visio, etc. Supported SVG features include basic \
-                    shapes, paths, text, alpha blending, transforms, \
-                    gradients, node editing, svg-to-png export, \
-                    grouping, and more.
+long_description    ${description}
 
+master_sites        https://inkscape.global.ssl.fastly.net/media/resources/file/
+
 use_bzip2           yes
 
-master_sites        sourceforge:project/inkscape/inkscape/${version}
+checksums           rmd160  77421bcb96c6ad4fe17e775e86b77d576b90cf32 \
+                    sha256  4d901f8a9e1924404e797ad23b8b0c495a9d155448816d95a55974314e1f141b
 
-checksums           rmd160  c05e861dd458245193373f40790035339aac3e01 \
-                    sha256  2b6ce684f9f2a0691ab454656424555cbda131db78e13973360684bc833ad969
-
 depends_build       port:pkgconfig \
+                    port:autoconf \
+                    port:automake \
+                    port:libtool \
                     port:intltool \
                     path:bin/perl:perl5
 
@@ -38,25 +36,57 @@
                     path:lib/libgc.dylib:boehmgc \
                     port:gsl \
                     port:gtkmm \
-                    port:lcms \
-                    port:libpng \
+                    port:dbus-glib \
+                    port:lcms2 \
                     port:poppler \
                     port:boost \
                     port:ImageMagick \
-                    port:libwpg \
-                    port:gtkspell2
+                    port:libcdr-0.1 \
+                    port:libexif \
+                    port:libvisio-0.1 \
+                    port:libwpg-0.3 \
+                    port:gtkspell2 \
+                    port:py27-lxml \
+                    port:py27-numpy
 
-patchfiles          patch-python-configure.ac.diff \
-                    patch-r10041-thru-r10043.diff \
-                    patch-poppler-0.29.0.diff
+post-patch {
+    xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+    reinplace "s|\"python-interpreter\", \"python\"|\"python-interpreter\", \"python2.7\"|g" ${worksrcpath}/src/extension/implementation/script.cpp
+    reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.h
+    reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.cpp
+}
 
-use_autoreconf      yes
-autoreconf.args     -fvi
+variant gtk3 description {Enable experimental GTK+ 3 build} {
+    depends_lib-delete \
+                    port:gtkspell2 \
+                    port:gtk2 \
+                    port:gtkmm
 
+    depends_lib-append \
+                    port:gtkspell3 \
+                    port:gtk3 \
+                    port:gtkmm3 \
+                    port:gdl3
+
+    configure.args-append \
+                    --enable-gtk3-experimental
+}
+
+variant svg2 description {Enable experimental SVG level 2 proposed features} {
+    configure.cppflags-append \
+                    "-DWITH_MESH -DWITH_CSSBLEND -DWITH_CSSCOMPOSITE -DWITH_SVG2"
+}
+
+configure.cmd       ./autogen.sh && ./configure
+
+configure.python    ${prefix}/bin/python2.7
+
 configure.args      --without-gnome-vfs \
-                    --without-python \
                     --enable-lcms \
-                    --enable-poppler-cairo
+                    --enable-poppler-cairo \
+                    --enable-dbusapi \
+                    --disable-silent-rules \
+                    --disable-strict-build
 
 configure.cppflags-append \
                     -I${worksrcpath}/src/extension/script
@@ -65,33 +95,16 @@
     configure.cxxflags-append -std=c++11
 }
 
-variant python27 description {Configure to use Python version 2.7} {
-    depends_lib-append \
-        port:py27-lxml \
-        port:py27-numpy
-
-    post-patch {
-        reinplace "s|@@MP_PYTHON_VERSION@@|2.7|" configure.ac
-        reinplace "s|\"python-interpreter\", \"python\"|\"python-interpreter\", \"python2.7\"|g" ${worksrcpath}/src/extension/implementation/script.cpp
-        reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.h
-        reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.cpp
-    }
-
-    configure.python \
-        ${prefix}/bin/python2.7
-    
-    configure.args-replace \
-        --without-python --with-python
+variant strict description {Enable strict build} {
+    configure.args-replace  --disable-strict-build --enable-strict-build
 }
 
-# enable optional python support by default
+default_variants    +strict
 
-default_variants +python27
-
 #
 # the following dummy variants are used
 # to identify this port's binary dependencies
-# based on the variant of gtkmm used for the build
+# based on which variant of gtkmm is used for the build
 #
 
 variant x11 conflicts quartz {}
@@ -101,11 +114,18 @@
     default_variants +x11
 }
 
-post-activate {
-   system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
-   system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
+if {[variant_isset gtk3]} {
+    post-activate {
+        system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
+        system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
+    }
+} else {
+    post-activate {
+        system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
+        system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
+    }
 }
 
 livecheck.type      regex
-livecheck.url       http://sourceforge.net/projects/inkscape/files/inkscape/
-livecheck.regex     "${name}/(\\d+(?:\\.\\d+)*)/"
+livecheck.url       https://inkscape.org/en/download/
+livecheck.regex     "Stable release \.*>(\\d+(?:\\.\\d+)*)<"

Added: trunk/dports/graphics/inkscape/files/autogen.sh
===================================================================
--- trunk/dports/graphics/inkscape/files/autogen.sh	                        (rev 0)
+++ trunk/dports/graphics/inkscape/files/autogen.sh	2015-02-04 23:36:03 UTC (rev 132570)
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+# This script does all the magic calls to automake/autoconf and
+# friends that are needed to configure a cvs checkout.  As described in
+# the file HACKING you need a couple of extra tools to run this script
+# successfully.
+#
+# If you are compiling from a released tarball you don't need these
+# tools and you shouldn't use this script.  Just call ./configure
+# directly.
+
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
+
+olddir=`pwd`
+cd $srcdir
+
+WHICH_AUTORECONF=`which autoreconf`
+if test -z $WHICH_AUTORECONF; then
+        echo "*** No autoreconf found, please install it ***"
+        exit 1
+fi
+
+WHICH_INTLTOOLIZE=`which intltoolize`
+if test -z $WHICH_INTLTOOLIZE; then
+        echo "*** No intltoolize found, please install the intltool package ***"
+        exit 1
+fi
+
+WHICH_AUTOPOINT=`which autopoint`
+if test -z $WHICH_AUTOPOINT; then
+	echo "*** No autopoint found, please install the autopoint package ***"
+	exit 1
+fi
+
+autopoint --force
+AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose
+
+# Patch the generated po/Makefile.in.in file so that locale files are installed
+# in the correct location on OS X and Free-BSD systems.  This is a workaround
+# for a bug in intltool.  See https://launchpad.net/bugs/398571
+#
+# The issue should be fixed in intltool 0.51.0.
+#
+# TODO: Drop this hack, and bump our intltool version requirement once the issue
+#       is fixed in intltool
+sed 's/itlocaledir = $(prefix)\/$(DATADIRNAME)\/locale/itlocaledir = $(datarootdir)\/locale/' < po/Makefile.in.in > po/Makefile.in.in.tmp
+mv po/Makefile.in.in.tmp po/Makefile.in.in
+
+echo ""
+echo "Done!  Please run './configure' now."

Deleted: trunk/dports/graphics/inkscape/files/patch-poppler-0.29.0.diff
===================================================================
--- trunk/dports/graphics/inkscape/files/patch-poppler-0.29.0.diff	2015-02-04 21:56:24 UTC (rev 132569)
+++ trunk/dports/graphics/inkscape/files/patch-poppler-0.29.0.diff	2015-02-04 23:36:03 UTC (rev 132570)
@@ -1,98 +0,0 @@
-=== modified file 'configure.ac'
---- configure.ac	2014-06-20 21:38:59 +0000
-+++ configure.ac	2014-12-10 20:32:33 +0000
-@@ -593,6 +593,11 @@
- 	AC_DEFINE(POPPLER_EVEN_NEWER_COLOR_SPACE_API, 1, [Use even newer color space API from Poppler >= 0.26.0])
- fi
- 
-+PKG_CHECK_MODULES(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, poppler >= 0.29.0, popplernewernewcolorspaceapi=yes, popplernewernewcolorspaceapi=no)
-+if test "x$popplernewernewcolorspaceapi" = "xyes"; then
-+	AC_DEFINE(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, 1, [Use even newer new color space API from Poppler >= 0.29.0])
-+fi
-+
- # Poppler's b604a008 commit changes this
- AC_MSG_CHECKING([whether Poppler's GfxPatch no longer uses GfxColor])
- popplergfxcolor="no"
-=== modified file 'src/extension/internal/pdfinput/pdf-parser.cpp'
---- src/extension/internal/pdfinput/pdf-parser.cpp	2014-06-03 15:44:09 +0000
-+++ src/extension/internal/pdfinput/pdf-parser.cpp	2014-12-10 20:32:30 +0000
-@@ -860,7 +860,9 @@
- 	  blendingColorSpace = NULL;
- 	  isolated = knockout = gFalse;
- 	  if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
--#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
-+	    blendingColorSpace = GfxColorSpace::parse(NULL, &obj5, NULL, NULL);
-+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
- 	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL);
- #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- 	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
-@@ -1085,7 +1087,13 @@
- 
-   state->setFillPattern(NULL);
-   res->lookupColorSpace(args[0].getName(), &obj);
--#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
-+  if (obj.isNull()) {
-+    colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL);
-+  } else {
-+    colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL);
-+  }
-+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-   if (obj.isNull()) {
-     colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
-   } else {
-@@ -1126,7 +1134,13 @@
- 
-   state->setStrokePattern(NULL);
-   res->lookupColorSpace(args[0].getName(), &obj);
--#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
-+  if (obj.isNull()) {
-+    colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL);
-+  } else {
-+    colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL);
-+  }
-+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-   if (obj.isNull()) {
-     colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
-   } else {
-@@ -2756,8 +2770,10 @@
-       }
-     }
-     if (!obj1.isNull()) {
--#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
--            colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
-+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
-+      colorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL);
-+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+      colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
- #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-       colorSpace = GfxColorSpace::parse(&obj1, NULL);
- #else
-@@ -2847,8 +2863,10 @@
- 	  obj2.free();
- 	}
-       }
--#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
--            GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
-+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
-+      GfxColorSpace *maskColorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL);
-+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+      GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
- #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-       maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
- #else
-@@ -3040,7 +3058,9 @@
-     if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
-       transpGroup = gTrue;
-       if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
--#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
-+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
-+	blendingColorSpace = GfxColorSpace::parse(NULL, &obj3, NULL, NULL);
-+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
- 	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL);
- #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- 	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
-
-

Deleted: trunk/dports/graphics/inkscape/files/patch-python-configure.ac.diff
===================================================================
--- trunk/dports/graphics/inkscape/files/patch-python-configure.ac.diff	2015-02-04 21:56:24 UTC (rev 132569)
+++ trunk/dports/graphics/inkscape/files/patch-python-configure.ac.diff	2015-02-04 23:36:03 UTC (rev 132570)
@@ -1,16 +0,0 @@
---- configure.ac.orig	2013-11-13 13:32:49.000000000 -0800
-+++ configure.ac	2013-11-13 13:32:50.000000000 -0800
-@@ -434,11 +434,11 @@
-             [with_python=$withval], [with_python=skipped])
- 
- if test "x$with_python" = "xyes"; then
--    checkPYTHON_CFLAGS=`python -c "import distutils.sysconfig ; print '-I%s' % distutils.sysconfig.get_config_var('INCLUDEPY')" 2>/dev/null`
-+    checkPYTHON_CFLAGS=`${prefix}/bin/python@@MP_PYTHON_VERSION@@ -c "import distutils.sysconfig ; print '-I%s' % distutils.sysconfig.get_config_var('INCLUDEPY')" 2>/dev/null`
-     if test "$?" -gt "0"; then
-         with_python="no"
-     else
--        checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
-+        checkPYTHON_LIBS=-lpython@@MP_PYTHON_VERSION@@
-         if test "$?" -gt "0"; then
-             with_python="no"
-         else

Deleted: trunk/dports/graphics/inkscape/files/patch-r10041-thru-r10043.diff
===================================================================
--- trunk/dports/graphics/inkscape/files/patch-r10041-thru-r10043.diff	2015-02-04 21:56:24 UTC (rev 132569)
+++ trunk/dports/graphics/inkscape/files/patch-r10041-thru-r10043.diff	2015-02-04 23:36:03 UTC (rev 132570)
@@ -1,47 +0,0 @@
-=== modified file 'src/color-profile.cpp'
---- src/color-profile.cpp	2014-03-18 11:45:34 +0000
-+++ src/color-profile.cpp	2014-10-30 18:35:32 +0000
-@@ -13,6 +13,7 @@
- #include <gtk/gtk.h>
- #endif // DEBUG_LCMS
- 
-+#include <unistd.h>
- #include <cstring>
- #include <string>
- #include <io/sys.h>
-
-=== modified file 'src/io/inkjar.cpp'
---- src/io/inkjar.cpp	2013-11-12 20:52:11 +0000
-+++ src/io/inkjar.cpp	2014-09-12 15:05:40 +0000
-@@ -107,7 +107,7 @@
- 
- bool JarFile::open()
- {
--    if ((fd = fopen(_filename, O_RDONLY)) < 0) {
-+    if (!(fd = fopen(_filename, "r"))) {
- 	fprintf(stderr, "open failed.\n");
- 	return false;
-     }
-@@ -119,7 +119,7 @@
- 
- bool JarFile::close()
- {
--    if (fd >= 0 && !fclose(fd)) {
-+    if (fd && !fclose(fd)) {
- 	inflateEnd(&_zs);
- 	return true;
-     }
-
-=== modified file 'src/object-snapper.cpp'
---- src/object-snapper.cpp	2010-07-19 06:51:04 +0000
-+++ src/object-snapper.cpp	2014-09-12 15:05:40 +0000
-@@ -561,7 +561,7 @@
-                         // When it's within snapping range, then return it
-                         // (within snapping range == between p_min_on_cl and p_max_on_cl == 0 < ta < 1)
-                         Geom::Coord dist = Geom::L2(_snapmanager->getDesktop()->dt2doc(p_proj_on_cl) - p_inters);
--                        SnappedPoint s(_snapmanager->getDesktop()->doc2dt(p_inters), p.getSourceType(), p.getSourceNum(), k->target_type, dist, getSnapperTolerance(), getSnapperAlwaysSnap(), true, k->target_bbox);
-+                        SnappedPoint s(_snapmanager->getDesktop()->doc2dt(p_inters), p.getSourceType(), p.getSourceNum(), k->target_type, dist, getSnapperTolerance(), getSnapperAlwaysSnap(), true, false, k->target_bbox);
-                         sc.points.push_back(s);
-                     }
-                 }
-

    

[132570] trunk/dports/graphics/inkscape

devans＠macports.org