diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-11-03 22:09:05 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2015-11-03 22:09:05 +0000 |
| commit | 1b90d636ef6b73663af2c1457aeceb97565bd5f5 (patch) | |
| tree | c77c0491e5cceb7dffb760434fb715fe1a2011b1 | |
| parent | update to trunk (diff) | |
| parent | packaging/macosx: revert change included in last commit by mistake (py-report... (diff) | |
| download | inkscape-1b90d636ef6b73663af2c1457aeceb97565bd5f5.tar.gz inkscape-1b90d636ef6b73663af2c1457aeceb97565bd5f5.zip | |
update to trunk
(bzr r14422.1.40)
| -rwxr-xr-x | packaging/macosx/Resources/bin/inkscape | 1 | ||||
| -rwxr-xr-x | packaging/macosx/osx-app.sh | 4 | ||||
| -rw-r--r-- | packaging/macosx/ports/devel/inkscape-packaging/Portfile | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index 7dacedac9..85c9f8eba 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -167,6 +167,7 @@ esac unset INK_DEBUG # ignore for recursive calls if [ "x$INK_DEBUG_SHELL" != "x" ]; then + unset INK_DEBUG_SHELL # ignore for recursive calls exec bash else $EXEC "$CWD/inkscape-bin" "$@" diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index d5b547297..d4bfee285 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -486,7 +486,9 @@ if [ ${add_python} = "true" ]; then fi $cp_cmd -RL "$packages_path/sk1libs" "$pkgpython" $cp_cmd -RL "$packages_path/uniconvertor" "$pkgpython" - # PyGTK (Sozi) + # pySerial for HPGL plotting + $cp_cmd -RL "$packages_path/serial" "$pkgpython" + # PyGTK (optional) $cp_cmd -RL "$packages_path/cairo" "$pkgpython" $cp_cmd -RL "$packages_path/glib" "$pkgpython" $cp_cmd -RL "$packages_path/gobject" "$pkgpython" diff --git a/packaging/macosx/ports/devel/inkscape-packaging/Portfile b/packaging/macosx/ports/devel/inkscape-packaging/Portfile index b3e2bfe4a..57d682cc3 100644 --- a/packaging/macosx/ports/devel/inkscape-packaging/Portfile +++ b/packaging/macosx/ports/devel/inkscape-packaging/Portfile @@ -66,6 +66,7 @@ depends_build-append port:py27-lxml \ port:py27-numpy \ port:py27-Pillow \ port:py27-uniconvertor \ + port:py27-serial \ port:py27-pygtk if {${os.major} <= 10} { |