Update to 0.15

1 files changed, 35 insertions, 16 deletions

diff --git a/psi/build/psi.SlackBuild b/psi/build/psi.SlackBuild
index 0a0caa36..079e4ec9 100755
--- a/psi/build/psi.SlackBuild
+++ b/psi/build/psi.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2007, 2011 Eric Hameleers, Eindhoven, NL
+# Copyright 2007, 2011, 2013 Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -56,23 +56,25 @@
 #              (qca is part of Slackware 12.0)
 # 0.14-1:    18/aug/2011 by Eric Hameleers <alien@slackware.com>
 #            * Updated the SlackBuild script for a Slackware 13.37 package.
+# 0.15-1:    15/oct/2013 by Eric Hameleers <alien@slackware.com>
+#            * Update.
 # 
-# Run 'sh psi.SlackBuild --cleanup' to build a Slackware package.
-# The package (.tgz) plus descriptive .txt file are created in /tmp .
-# Install using 'installpkg'. 
+# Run 'sh psi.SlackBuild' to build a Slackware package.
+# The package (.tgz) and .txt file as well as build logs are created in /tmp .
+# Install it using 'installpkg'. 
 #
 # -----------------------------------------------------------------------------
 
 # Set initial variables:
 
 PRGNAM=psi
-VERSION=${VERSION:-0.14}
-ARCH=${ARCH:-i486}
+VERSION=${VERSION:-0.15}
 BUILD=${BUILD:-1}
+NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
 
 # We are going to download and add the following language packs for psi:
-LANG="be cs de es fr it ja mk pl pt_BR ru sl sv ur_PK zh_TW"
+LANG="be cs de eo es es_ES fr it ja mk pl pt_BR ru sl sv uk ur_PK vi zh_CN zh_TW"
 LANGURLBASE="http://psi-im.org/download/lang/"
 
 DOCS="COPYING ChangeLog README TODO"
@@ -85,7 +87,6 @@ TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Make sure you edit SRCURL when you change the program's VERSION
 SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.bz2"
 SRCURL="http://downloads.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tar.bz2"
 
@@ -94,12 +95,15 @@ SRCURL="http://downloads.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tar.bz2"
 ##
 
 # Automatically determine the architecture we're building on:
+MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
+  case "$MARCH" in
+    i?86)    export ARCH=i486 ;;
+    armv7hl) export ARCH=$MARCH ;;
+    armv6hl) export ARCH=$MARCH ;;
+    arm*)    export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
+    *)       export ARCH=$MARCH ;;
   esac
 fi
 
@@ -110,7 +114,13 @@ case "$ARCH" in
   x86_64)    SLKCFLAGS="-O2 -fPIC"
              SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
              ;;
-  *)         SLKCFLAGS="-O2"
+  armv7hl)   SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  armv6hl)   SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+   *)         SLKCFLAGS="-O2"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
 esac
@@ -153,9 +163,10 @@ if ! [ -f ${SOURCE} ]; then
   fi
 fi
 
+mkdir -p ${SRCDIR}/lang
 for lang in $LANG ; do
   LANGURL="${LANGURLBASE}/${PRGNAM}_${lang}.qm"
-  LANGSRC="${SRCDIR}/${PRGNAM}_${lang}.qm"
+  LANGSRC="${SRCDIR}/lang/${PRGNAM}_${lang}.qm"
   if ! [ -f ${LANGSRC} ]; then
     # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
     [ -w "$SRCDIR" ] || ${LANGSRC}="$OUTPUT/`basename ${LANGSRC}`"
@@ -193,14 +204,22 @@ LDFLAGS="$SLKLDFLAGS" \
 CFLAGS="$SLKCFLAGS" \
 ./configure --prefix=/usr \
             2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
-make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+
+# More optimal compiler flags:
+cat <<EOT >> conf.pri
+DEFINES += QT_NO_DEBUG
+*-g++*:QMAKE_CFLAGS += $SLKCFLAGS
+*-g++*:QMAKE_CXXFLAGS += $SLKCFLAGS
+EOT
+
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 
 # Install all the needed stuff to the package dir
 make INSTALL_ROOT=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
 
 # Not only KDE wants a pixmap
 mkdir -p $PKG/usr/share/pixmaps/
-cp $PKG/usr/share/icons/hicolor/32x32/apps/psi.png $PKG/usr/share/pixmaps/
+cp $PKG/usr/share/icons/hicolor/48x48/apps/psi.png $PKG/usr/share/pixmaps/
 
 # Update the desktop database:
 mkdir -p $PKG/install