6 files changed, 44 insertions, 90 deletions
diff --git a/deps/qt-gstreamer/qt-gstreamer.SlackBuild b/deps/polkit-qt5-1/polkit-qt5-1.SlackBuild
index 72d1c99..49725e9 100755
--- a/deps/qt-gstreamer/qt-gstreamer.SlackBuild
+++ b/deps/polkit-qt5-1/polkit-qt5-1.SlackBuild
@@ -1,7 +1,6 @@
-#!/bin/sh 
+#!/bin/sh
 
-# Copyright 2014  Patrick J. Volkerding, Sebeka, MN, USA
-# Copyright 2014  Eric Hameleers, Eindhoven, NL
+# Copyright 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +20,11 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Modified 2014 by Eric Hameleers <alien@slackware.com>
 
-PKGNAM=qt-gstreamer
-VERSION=${VERSION:-0.10.3}
+
+PKGNAM=polkit-qt5-1
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j7}
@@ -57,16 +58,22 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Avoid a version number in .la files:
+if [ -d /usr/lib${LIBDIRSUFFIX}/qt ]; then
+  QTDIR=/usr/lib${LIBDIRSUFFIX}/qt
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
-mkdir -p $TMP $PKG
+mkdir -p $TMP $PKG/usr
 cd $TMP
 rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
 cd $PKGNAM-$VERSION || exit 1
+
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -74,44 +81,30 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Autodetects the Qt version to use, preferring Qt 5 over Qt 4.
+# You can force a Qt 4 build passing -DUSE_QT4:bool=ON to CMake.
+
 mkdir -p build
 cd build
   cmake \
-    -DCMAKE_BUILD_TYPE=Release \
+    $KDE_OPT_ARGS \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DQT_VERSION=4 \
     ..
-  make $NUMJOBS || make || exit 1
-  make install DESTDIR=$PKG || exit 1
+   make $NUMJOBS || make || exit 1
+   make install DESTDIR=$PKG || exit 1
 cd -
 
-# Conditional build of Qt5 support:
-if qtpaths-qt5 --qt-version 1>/dev/null 2>/dev/null ; then
-  mkdir -p build-qt5
-  cd build-qt5
-    cmake \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-      -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-      -DQT_VERSION=5 \
-      ..
-    make $NUMJOBS || make || exit 1
-    make install DESTDIR=$PKG || exit 1
-  cd -
-fi
-
 if [ -d $PKG/usr/man ]; then
   gzip -9 $PKG/usr/man/man?/*
 fi
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  COPYING HACKING NEWS README \
+  COPYING* README* \
   $PKG/usr/doc/$PKGNAM-$VERSION
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
@@ -119,7 +112,6 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/deps/qt-gstreamer/slack-desc b/deps/qt-gstreamer/slack-desc
deleted file mode 100644
index 3ae6605..0000000
--- a/deps/qt-gstreamer/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-            |-----handy-ruler-----------------------------------------------------|
-qt-gstreamer: qt-gstreamer (C++ bindings for gstreamer)
-qt-gstreamer:
-qt-gstreamer: QtGStreamer provides C++ bindings for GStreamer with a Qt-style API,
-qt-gstreamer: plus some helper classes and elements for integrating GStreamer
-qt-gstreamer: better in Qt applications.
-qt-gstreamer: The goal of this module is to allow easy use of GStreamer for
-qt-gstreamer: applications targetting MeeGo Mobile or the KDE desktop.
-qt-gstreamer:
-qt-gstreamer: Homepage:
-qt-gstreamer:   http://gstreamer.freedesktop.org/modules/qt-gstreamer.html
-qt-gstreamer:
diff --git a/deps/qt-gstreamer1/doinst.sh.gz b/deps/qt-gstreamer1/doinst.sh.gz
deleted file mode 100644
index bedb7a0..0000000
--- a/deps/qt-gstreamer1/doinst.sh.gz
+++ /dev/null
diff --git a/deps/qt-gstreamer1/slack-desc b/deps/qt-gstreamer1/slack-desc
deleted file mode 100644
index cf20a0e..0000000
--- a/deps/qt-gstreamer1/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-            |-----handy-ruler-----------------------------------------------------|
-qt-gstreamer1: qt-gstreamer1 (C++ bindings for gstreamer1)
-qt-gstreamer1:
-qt-gstreamer1: QtGStreamer provides C++ bindings for GStreamer with a Qt-style API,
-qt-gstreamer1: plus some helper classes and elements for integrating GStreamer
-qt-gstreamer1: better in Qt applications.
-qt-gstreamer1: The goal of this module is to allow easy use of GStreamer for
-qt-gstreamer1: applications targetting MeeGo Mobile or the KDE desktop.
-qt-gstreamer1:
-qt-gstreamer1: Homepage:
-qt-gstreamer1:   http://gstreamer.freedesktop.org/modules/qt-gstreamer.html
-qt-gstreamer1:
diff --git a/deps/qt-gstreamer/doinst.sh.gz b/deps/qt5-gstreamer/doinst.sh.gz
index bedb7a0..bedb7a0 100644
--- a/deps/qt-gstreamer/doinst.sh.gz
+++ b/deps/qt5-gstreamer/doinst.sh.gz
diff --git a/deps/qt-gstreamer1/qt-gstreamer1.SlackBuild b/deps/qt5-gstreamer/qt5-gstreamer.SlackBuild
index 7294f83..12be5a4 100755
--- a/deps/qt-gstreamer1/qt-gstreamer1.SlackBuild
+++ b/deps/qt5-gstreamer/qt5-gstreamer.SlackBuild
@@ -22,9 +22,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-PKGNAM=qt-gstreamer1
+PKGNAM=qt5-gstreamer
 SRCNAM=qt-gstreamer
-VERSION=${VERSION:-1.2.0}
+VERSION=${VERSION:-0.10.3}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j7}
@@ -60,7 +60,7 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
+PKG=$TMP/package-$SRCNAM
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
@@ -75,37 +75,37 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-mkdir -p build
-cd build
+# Eventually, we need to merge qt5-gstreamer into the qt-gstreamer package.
+# When that happens, simply un-comment the section below and rename the package
+# to qt-gstreamer. It will then have both qt4 and qt5 support.
+#mkdir -p build
+#cd build
+#  cmake \
+#    -DCMAKE_BUILD_TYPE=Release \
+#    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+#    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+#    -DCMAKE_INSTALL_PREFIX=/usr \
+#    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+#    -DQT_VERSION=4 \
+#    ..
+#  make $NUMJOBS || make || exit 1
+#  make install DESTDIR=$PKG || exit 1
+#cd -
+
+mkdir -p build-qt5
+cd build-qt5
   cmake \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DQT_VERSION=4 \
+    -DQT_VERSION=5 \
     ..
   make $NUMJOBS || make || exit 1
   make install DESTDIR=$PKG || exit 1
 cd -
 
-# Conditional build of Qt5 support:
-if qtpaths-qt5 --qt-version 1>/dev/null 2>/dev/null ; then
-  mkdir -p build-qt5
-  cd build-qt5
-    cmake \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-      -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-      -DQT_VERSION=5 \
-      ..
-    make $NUMJOBS || make || exit 1
-    make install DESTDIR=$PKG || exit 1
-  cd -
-fi
-
 if [ -d $PKG/usr/man ]; then
   gzip -9 $PKG/usr/man/man?/*
 fi