From a793fa612e56046d6ae6e89b8596a64916515c0d Mon Sep 17 00:00:00 2001 From: su_v Date: Fri, 18 Sep 2015 01:03:43 +0200 Subject: packaging/macosx: fix for bug #1497020 (Inkscape.app (0.91) crashes when attempting to stop defunct spell checker) (bzr r14376) --- packaging/macosx/osx-app.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'packaging/macosx') diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index ad41e844a..f91a33b0d 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -252,7 +252,9 @@ if ! pkg-config --exists ImageMagick; then exit 1 fi -if [ ! -e "$LIBPREFIX/lib/aspell-0.60/en.dat" ]; then +# FIXME: retrieve aspell version from installed files (no pkg-config support) +ASPELL_VERSION="0.60" +if [ ! -e "$LIBPREFIX/lib/aspell-$ASPELL_VERSION/en.dat" ]; then echo "Missing aspell en dictionary -- please install at least 'aspell-dict-en', but" >&2 echo "preferably more dictionaries ('aspell-dict-*') and try again." >&2 exit 1 @@ -625,7 +627,8 @@ sed -e "s,IMAGEMAGICKVER,$IMAGEMAGICKVER,g" -i "" "$scrpath" sed -e "s,IMAGEMAGICKVER_MAJOR,$IMAGEMAGICKVER_MAJOR,g" -i "" "$scrpath" # Copy aspell dictionary files: -$cp_cmd -r "$LIBPREFIX/share/aspell" "$pkgresources/share/" +$cp_cmd -r "$LIBPREFIX/lib/aspell-$ASPELL_VERSION" "$pkglib/" +$cp_cmd -r "$LIBPREFIX/share/aspell" "$pkgshare/" # Copy Poppler data: $cp_cmd -r "$LIBPREFIX/share/poppler" "$pkgshare" -- cgit v1.2.3 From c8a3769ff0f8deda2e4b7889c9d61b0d9191b5b4 Mon Sep 17 00:00:00 2001 From: su_v Date: Thu, 24 Sep 2015 13:13:17 +0200 Subject: packaging/macosx: support pango >= 1.38 (modules are built-in now) (bzr r14383) --- packaging/macosx/osx-app.sh | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) (limited to 'packaging/macosx') diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index f91a33b0d..d5b547297 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -539,8 +539,15 @@ sed -e "s,__build_arch__,$_build_arch,g" -i "" "$scrpath" echo "APPLInks" > $package/Contents/PkgInfo # Pull in extra requirements for Pango and GTK -mkdir -p $pkgetc/pango -touch "$pkgetc/pango/pangorc" +PANGOVERSION=$(pkg-config --modversion pango) +PANGOVERSION_MINOR="$(cut -d. -f2 <<< $PANGOVERSION)" + +if [ $PANGOVERSION_MINOR -lt 37 ]; then + mkdir -p $pkgetc/pango + touch "$pkgetc/pango/pangorc" +else + echo "Newer pango version found, modules are built-in" +fi # We use a modified fonts.conf file so only need the dtd mkdir -p $pkgshare/xml/fontconfig @@ -552,9 +559,12 @@ $cp_cmd -r $LIBPREFIX/share/fontconfig/conf.avail $pkgshare/fontconfig/ (cd $pkgetc/fonts/conf.d && $ln_cmd ../../../share/fontconfig/conf.avail/10-autohint.conf) (cd $pkgetc/fonts/conf.d && $ln_cmd ../../../share/fontconfig/conf.avail/70-no-bitmaps.conf) -pango_version=`pkg-config --variable=pango_module_version pango` -mkdir -p $pkglib/pango/$pango_version/modules -$cp_cmd $LIBPREFIX/lib/pango/$pango_version/modules/*.so $pkglib/pango/$pango_version/modules/ +if [ $PANGOVERSION_MINOR -lt 37 ]; then + # Pull in modules + pango_mod_version=`pkg-config --variable=pango_module_version pango` + mkdir -p $pkglib/pango/$pango_mod_version/modules + $cp_cmd $LIBPREFIX/lib/pango/$pango_mod_version/modules/*.so $pkglib/pango/$pango_mod_version/modules/ +fi gtk_version=`pkg-config --variable=gtk_binary_version gtk+-2.0` mkdir -p $pkglib/gtk-2.0/$gtk_version/{engines,immodules,printbackends} @@ -573,9 +583,11 @@ sed -e "s,__gdk_pixbuf_version__,$gdk_pixbuf_version,g" -i "" "$scrpath" # recreate loaders and modules caches based on actually included modules # Pango modules -pango-querymodules "$pkglib/pango/$pango_version"/modules/*.so \ - | sed -e "s,$PWD/$pkgresources,@loader_path/..,g" \ - > "$pkgetc"/pango/pango.modules +if [ $PANGOVERSION_MINOR -lt 37 ]; then + pango-querymodules "$pkglib/pango/$pango_mod_version"/modules/*.so \ + | sed -e "s,$PWD/$pkgresources,@loader_path/..,g" \ + > "$pkgetc"/pango/pango.modules +fi # Gtk immodules gtk-query-immodules-2.0 "$pkglib/gtk-2.0/$gtk_version"/immodules/*.so \ -- cgit v1.2.3 From b3a069d14c6b7b180555e2d6ad0fdf7bba2d0bcb Mon Sep 17 00:00:00 2001 From: su_v Date: Fri, 2 Oct 2015 15:47:51 +0200 Subject: packaging/macosx: fix for bug #1502126 (support MacTeX on El Capitan) (bzr r14391) --- packaging/macosx/Resources/bin/inkscape | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packaging/macosx') diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index dd6a888b7..7dacedac9 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -43,7 +43,7 @@ if [ -z "$INK_PATH_ORIG" ]; then # Fink # MacPorts (former DarwinPorts) # LaTeX distribution for Mac OS X - PATH_OTHER="/usr/texbin:/opt/local/bin:/sw/bin/:/usr/local/bin" + PATH_OTHER="/Library/TeX/texbin:/usr/texbin:/opt/local/bin:/sw/bin/:/usr/local/bin" # Put /usr/bin at beginning of path so we make sure we use Apple's python # over one that may be installed be Macports, Fink or some other means. -- cgit v1.2.3 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/macosx') 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/macosx') 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/macosx') 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 From c7e6a7c1245797fcd8cadabf3e35236eb8a88a92 Mon Sep 17 00:00:00 2001 From: su_v Date: Sat, 21 Nov 2015 18:59:43 +0100 Subject: packaging/macosx: update scripts for potrace switch to external dependency (bzr r14482) --- packaging/macosx/osx-app.sh | 5 +++++ packaging/macosx/osx-build.sh | 1 + packaging/macosx/ports/devel/inkscape-packaging/Portfile | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) (limited to 'packaging/macosx') 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 \ -- cgit v1.2.3