4 files changed, 37 insertions, 18 deletions
diff --git a/network/qupzilla/README b/network/qupzilla/README
index 002e00852c..90859d3f3a 100644
--- a/network/qupzilla/README
+++ b/network/qupzilla/README
@@ -1,5 +1,2 @@
 QupZilla is a lightweight cross-platform web browser,
 based on WebKit and Qt.
-
-This script builds a Slackware package from the official
-binary tarballs distributed by the upstream developers.
diff --git a/network/qupzilla/qupzilla.SlackBuild b/network/qupzilla/qupzilla.SlackBuild
index e3019a1b79..84217193f0 100644
--- a/network/qupzilla/qupzilla.SlackBuild
+++ b/network/qupzilla/qupzilla.SlackBuild
@@ -29,7 +29,7 @@ TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i386 ;;
+    i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,25 +40,47 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i386" ]; then
-  ORIG_ARCH=$ARCH
+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
-  ORIG_ARCH="amd64"
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
-  printf "\n\n$ARCH is not supported...\n"
-  exit 1
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
+DOCS="AUTHORS COPYRIGHT FAQ GPLv3 README.md TODO"
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-tar xvf $CWD/${PRGNAM}_${VERSION}_$ORIG_ARCH.tar.gz -C $PKG
-chown -R root:root $PKG
+cd $TMP
+rm -fR $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+cd $PRGNAM-$VERSION
+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 {} \;
+
+export USE_LIBPATH="/usr/lib${LIBDIRSUFFIX}"
+qmake QMAKE_CXXFLAGS="$SLKCFLAGS"
+make
+make install INSTALL_ROOT=$PKG
+
+find $PKG -print0 | xargs -0 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
-mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/usr/share/doc
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/qupzilla/qupzilla.info b/network/qupzilla/qupzilla.info
index 108c46d3fc..e38945b2b7 100644
--- a/network/qupzilla/qupzilla.info
+++ b/network/qupzilla/qupzilla.info
@@ -1,10 +1,10 @@
 PRGNAM="qupzilla"
 VERSION="1.3.1"
 HOMEPAGE="http://www.qupzilla.com"
-DOWNLOAD="https://github.com/downloads/QupZilla/qupzilla/qupzilla_1.3.1_i386.tar.gz"
-MD5SUM="4f602474d4f225d44a016c90eee60bf0"
-DOWNLOAD_x86_64="https://github.com/downloads/QupZilla/qupzilla/qupzilla_1.3.1_amd64.tar.gz"
-MD5SUM_x86_64="ec8de7fb110fb941b5213aeb378962f2"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/qupzilla-1.3.1.tar.xz"
+MD5SUM="2099385f5599ec56b73ae3519e6b9081"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Fridrich von Stauffenberg"
 EMAIL="cancellor2@gmail.com"
diff --git a/network/qupzilla/slack-desc b/network/qupzilla/slack-desc
index bc702c7c5b..4c751dcb4b 100644
--- a/network/qupzilla/slack-desc
+++ b/network/qupzilla/slack-desc
@@ -9,7 +9,7 @@
 qupzilla: qupzilla (lightweight web browser)
 qupzilla:
 qupzilla: QupZilla is a lightweight cross-platform web browser, based on
-qupzilla: WebKit and Qt. This is a repackaging of the official binary build.
+qupzilla: WebKit and Qt.
 qupzilla:
 qupzilla: Homepage: http://www.qupzilla.com
 qupzilla: