diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2014-08-20 03:13:01 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2014-08-20 03:13:01 +0000 |
| commit | c65f6a562ec06e045ad352b952ee19f738deddb6 (patch) | |
| tree | add1b7d0995dd5cbe2130bd6e55606d88363ca6e /packaging | |
| parent | ScriptExec: cleanup (remove defined but not used function) (diff) | |
| download | inkscape-c65f6a562ec06e045ad352b952ee19f738deddb6.tar.gz inkscape-c65f6a562ec06e045ad352b952ee19f738deddb6.zip | |
macosx packaging: a few minor changes
(bzr r13506.1.17)
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/macosx/Resources/bin/inkscape | 12 | ||||
| -rwxr-xr-x | packaging/macosx/osx-app.sh | 10 | ||||
| -rwxr-xr-x | packaging/macosx/osx-build.sh | 3 |
3 files changed, 8 insertions, 17 deletions
diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index 510e91e32..ea52602a2 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -88,9 +88,9 @@ if [ "x$LANGSTR" == "x" -o "x$LANGSTR" == "xroot" ] then LANGSTR=`defaults read .GlobalPreferences AppleLocale 2>/dev/null | \ sed 's/_.*//'` - echo "Setting LANGSTR from AppleLocale: $LANGSTR" 1>&2 + [ $_DEBUG ] && echo "Setting LANGSTR from AppleLocale: $LANGSTR" 1>&2 else - echo "Setting LANGSTR from AppleCollationOrder: $LANGSTR" 1>&2 + [ $_DEBUG ] && echo "Setting LANGSTR from AppleCollationOrder: $LANGSTR" 1>&2 fi # NOTE: Have to add ".UTF-8" to the LANG since omitting causes Inkscape @@ -98,7 +98,7 @@ fi if [ "x$LANGSTR" == "x" ] then # override broken script - echo "Overriding empty LANGSTR" 1>&2 + [ $_DEBUG ] && echo "Overriding empty LANGSTR" 1>&2 export LANG="en_US.UTF-8" else tmpLANG="`grep \"\`echo $LANGSTR\`_\" /usr/share/locale/locale.alias | \ @@ -106,14 +106,14 @@ else if [ "x$tmpLANG" == "x" ] then # override broken script - echo "Overriding empty LANG from /usr/share/locale/locale.alias" 1>&2 + [ $_DEBUG ] && echo "Overriding empty LANG from /usr/share/locale/locale.alias" 1>&2 export LANG="en_US.UTF-8" else - echo "Setting LANG from /usr/share/locale/locale.alias" 1>&2 + [ $_DEBUG ] && echo "Setting LANG from /usr/share/locale/locale.alias" 1>&2 export LANG="$tmpLANG.UTF-8" fi fi -echo "Setting Language: $LANG" 1>&2 +[ $_DEBUG ] && echo "Setting Language: $LANG" 1>&2 export LC_ALL="$LANG" sed 's|${HOME}|'"$HOME|g" "$TOP/etc/pango/pangorc" > "$PREFDIR/pangorc" diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 5b147cb8e..c3af0f5d2 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -225,16 +225,6 @@ mkdir -p "$pkgshare" mkdir -p "$pkglocale" mkdir -p "$pkgpython" -mkdir -p "$pkgresources/Dutch.lprj" -mkdir -p "$pkgresources/English.lprj" -mkdir -p "$pkgresources/French.lprj" -mkdir -p "$pkgresources/German.lprj" -mkdir -p "$pkgresources/Italian.lprj" -mkdir -p "$pkgresources/Spanish.lprj" -mkdir -p "$pkgresources/fi.lprj" -mkdir -p "$pkgresources/no.lprj" -mkdir -p "$pkgresources/sv.lprj" - # Build and add the launcher #---------------------------------------------------------- ( diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index a3e87c0e7..e0b5e955a 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -183,6 +183,7 @@ fi REVISION=$(bzr revno) ARCH=$(arch) TARGETVERSION=$(/usr/bin/sw_vers | fgrep ProductVersion | tr -d \ | cut -d: -f2) +TARGETARCH=$ARCH NEWNAME="Inkscape-r$REVISION-$TARGETVERSION-$TARGETARCH" DMGFILE="$NEWNAME.dmg" @@ -320,7 +321,7 @@ Included dependency versions: Poppler `checkversion poppler-cairo` LittleCMS `checkversion lcms` GnomeVFS `checkversion gnome-vfs-2.0` - LibWPG `checkversion libwpg-0.1` + LibWPG `checkversion libwpg-0.2` Configure options: $CONFFLAGS" > $INFOFILE if [[ "$STRIP" == "t" ]]; then |