From 42da853ff26febed523b9dfddbff0d0a7f56704d Mon Sep 17 00:00:00 2001 From: su_v Date: Mon, 2 Nov 2015 11:14:45 +0100 Subject: packaging/macosx: facilitate launching inkscape from interactive debug shell (bzr r14441) --- packaging/macosx/Resources/bin/inkscape | 1 + 1 file changed, 1 insertion(+) (limited to 'packaging') 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" "$@" -- cgit v1.2.3 From e8ac2702bbc01c13611b0ec3014fd3c0a687296f Mon Sep 17 00:00:00 2001 From: su_v Date: Mon, 2 Nov 2015 16:01:32 +0100 Subject: packaging/macosx: include pySerial (for HPGL plotting) in application bundle; (TODO: add portfiles for py25 and py26 - no longer provided by MacPorts) (bzr r14442) --- packaging/macosx/osx-app.sh | 6 +++++- packaging/macosx/ports/devel/inkscape-packaging/Portfile | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'packaging') diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index d5b547297..d9e317bed 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" @@ -495,6 +497,8 @@ if [ ${add_python} = "true" ]; then $cp_cmd -RL "$packages_path/../../../share/pygtk" "$pkgshare" $cp_cmd -RL "$packages_path/pygtk.pth" "$pkgpython" $cp_cmd -RL "$packages_path/pygtk.py" "$pkgpython" + # ReportLab (for inkscape-hocrpdf, experimental) + $cp_cmd -RL "$packages_path/reportlab" "$pkgpython" # cleanup python modules find "$pkgpython" -name *.pyc -print0 | xargs -0 rm -f find "$pkgpython" -name *.pyo -print0 | xargs -0 rm -f 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} { -- cgit v1.2.3 From 660c8aa42f6e1c838eb32f58993322c7e03c6bd0 Mon Sep 17 00:00:00 2001 From: su_v Date: Mon, 2 Nov 2015 16:12:40 +0100 Subject: packaging/macosx: revert change included in last commit by mistake (py-reportlab is not required) (bzr r14443) --- packaging/macosx/osx-app.sh | 2 -- 1 file changed, 2 deletions(-) (limited to 'packaging') diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index d9e317bed..d4bfee285 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -497,8 +497,6 @@ if [ ${add_python} = "true" ]; then $cp_cmd -RL "$packages_path/../../../share/pygtk" "$pkgshare" $cp_cmd -RL "$packages_path/pygtk.pth" "$pkgpython" $cp_cmd -RL "$packages_path/pygtk.py" "$pkgpython" - # ReportLab (for inkscape-hocrpdf, experimental) - $cp_cmd -RL "$packages_path/reportlab" "$pkgpython" # cleanup python modules find "$pkgpython" -name *.pyc -print0 | xargs -0 rm -f find "$pkgpython" -name *.pyo -print0 | xargs -0 rm -f -- cgit v1.2.3