summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2015-11-21 17:59:43 +0000
committer~suv <suv-sf@users.sourceforge.net>2015-11-21 17:59:43 +0000
commitc7e6a7c1245797fcd8cadabf3e35236eb8a88a92 (patch)
treed2617d7f193ba0803acc6968a5d027d0a9e5ae49 /packaging
parentsrc/Makefile.am: Rm notes about tests that have been fixed (diff)
downloadinkscape-c7e6a7c1245797fcd8cadabf3e35236eb8a88a92.tar.gz
inkscape-c7e6a7c1245797fcd8cadabf3e35236eb8a88a92.zip
packaging/macosx: update scripts for potrace switch to external dependency
(bzr r14482)
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/macosx/osx-app.sh5
-rwxr-xr-xpackaging/macosx/osx-build.sh1
-rw-r--r--packaging/macosx/ports/devel/inkscape-packaging/Portfile3
3 files changed, 8 insertions, 1 deletions
diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh
index d4bfee285..2a6e9ed15 100755
--- a/packaging/macosx/osx-app.sh
+++ b/packaging/macosx/osx-app.sh
@@ -247,6 +247,11 @@ if ! pkg-config --exists poppler; then
exit 1
fi
+if [ ! -e "$LIBPREFIX/lib/libpotrace.dylib" ]; then
+ echo "Missing potrace -- please install potrace and try again." >&2
+ exit 1
+fi
+
if ! pkg-config --exists ImageMagick; then
echo "Missing ImageMagick -- please install ImageMagick and try again." >&2
exit 1
diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh
index d5e428a0c..048523143 100755
--- a/packaging/macosx/osx-build.sh
+++ b/packaging/macosx/osx-build.sh
@@ -395,6 +395,7 @@ Included dependency versions (build or runtime):
LibWPG $(checkversion libwpg-0.2 libwpg)
Libcdr $(checkversion libcdr-0.0 libcdr)
Libvisio $(checkversion libvisio-0.0 libvisio)
+ Potrace $(checkversion potrace potrace)
Included python modules:
lxml $(checkversion py27-lxml py27-lxml)
numpy $(checkversion py27-numpy py27-numpy)
diff --git a/packaging/macosx/ports/devel/inkscape-packaging/Portfile b/packaging/macosx/ports/devel/inkscape-packaging/Portfile
index 57d682cc3..de5d9ef35 100644
--- a/packaging/macosx/ports/devel/inkscape-packaging/Portfile
+++ b/packaging/macosx/ports/devel/inkscape-packaging/Portfile
@@ -51,7 +51,8 @@ depends_build-append port:popt \
port:ImageMagick \
port:gtkspell2 \
port:aspell-dict-en \
- port:poppler
+ port:poppler \
+ port:potrace
# ports for Inkscape.app
depends_build-append port:gnome-icon-theme \