network/skype4pidgin: Updated for version r654.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

2 files changed, 55 insertions, 22 deletions

diff --git a/network/skype4pidgin/skype4pidgin.SlackBuild b/network/skype4pidgin/skype4pidgin.SlackBuild
index a9d9c83e62..98093dcc59 100644
--- a/network/skype4pidgin/skype4pidgin.SlackBuild
+++ b/network/skype4pidgin/skype4pidgin.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for ejabberd
+# Slackware build script for skype4pidgin
 
-# Copyright (c) 2010  Roberto Metere. All rights reserved.
+# Copyright (c) 2013  Roberto Metere. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -23,41 +23,76 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by Willy Sudiarto Raharjo <willysr@slackware-id.org>
-# Modified by Robby Workman for ARCH=i486 hardcoded
-
 PRGNAM=skype4pidgin
-VERSION=${VERSION:-r639}
+VERSION=${VERSION:-r654}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-ARCH=i486
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
+ar x $CWD/$PRGNAM.deb
 mkdir -p $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
-
+tar -xvf ../data.tar.gz
 chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+chmod -R u+w,go+r-w,a-s .
+
+# Create target directory tree
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/purple-2/
+for i in 16 22 48
+do
+	mkdir -p $PKG/usr/share/pixmaps/pidgin/protocols/$i/
+done
+mkdir -p $PKG/usr/share/pixmaps/pidgin/emotes/skype/
 
-mkdir -p $PKG/usr/lib/purple-2/
+# Install files
+install -m 664 usr/share/pixmaps/pidgin/emotes/skype/theme $PKG/usr/share/pixmaps/pidgin/emotes/skype/
+for i in 16 22 48
+do
+	install -m 664 usr/share/pixmaps/pidgin/protocols/$i/skypeout.png $PKG/usr/share/pixmaps/pidgin/protocols/$i/
+	install -m 664 usr/share/pixmaps/pidgin/protocols/$i/skype.png $PKG/usr/share/pixmaps/pidgin/protocols/$i/
+done
+if [ $ARCH == "arm" ]
+then
+	install -m 664 usr/lib/purple-2/libskypearm.so $PKG/usr/lib/purple-2/
+else
+	install -m 664 usr/lib/purple-2/libskype_dbus${LIBDIRSUFFIX}.so $PKG/usr/lib${LIBDIRSUFFIX}/purple-2/
+	install -m 664 usr/lib/purple-2/libskype${LIBDIRSUFFIX}.so $PKG/usr/lib${LIBDIRSUFFIX}/purple-2/
+fi
 
-mv $CWD/libskype.so $PKG/usr/lib/purple-2/
-mv $CWD/libskype_dbus.so $PKG/usr/lib/purple-2/
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/network/skype4pidgin/skype4pidgin.info b/network/skype4pidgin/skype4pidgin.info
index 7c34de4ea0..e66a95a148 100644
--- a/network/skype4pidgin/skype4pidgin.info
+++ b/network/skype4pidgin/skype4pidgin.info
@@ -1,11 +1,9 @@
 PRGNAM="skype4pidgin"
-VERSION="r639"
+VERSION="r654"
 HOMEPAGE="https://code.google.com/p/skype4pidgin/"
-DOWNLOAD="https://skype4pidgin.googlecode.com/svn/downloads/libskype.so \
-          https://skype4pidgin.googlecode.com/svn/downloads/libskype_dbus.so"
-MD5SUM="b3755b1c801da40298fd68fd5c5ac246 \
-        361bf21c6fa1425a4638344978d795f8"
-DOWNLOAD_x86_64="UNSUPPORTED"
+DOWNLOAD="http://eion.robbmob.com/skype4pidgin.deb"
+MD5SUM="964ef2bae9c2e6cda70096a75466d120"
+DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="skype"
 MAINTAINER="Roberto Metere"