From ddfdebbe9bad6eeb4328fd23f657b86bb9fc0fb9 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sat, 14 Sep 2019 13:08:13 +0200
Subject: Deps: updated for the upcoming release

The qt5 and qt5-speech packages have been updated to 5.13.1,
PyQt5 was updated to 5.13.0.
There's a new official polkit-qt5-1 version too: 0.113.0.
The cryfs package was updated to 0.10.2.
Tthe phonon layer is now Qt5-only:
  phonon 4.11.0, phonon-gstreamer 4.10.0, phonon-vlc 0.11.0.
---
 deps/phonon/.deps             |  1 +
 deps/phonon/.url              |  2 +-
 deps/phonon/phonon.SlackBuild | 43 ++++++++-----------------------------------
 3 files changed, 10 insertions(+), 36 deletions(-)
 create mode 100644 deps/phonon/.deps

(limited to 'deps/phonon')

diff --git a/deps/phonon/.deps b/deps/phonon/.deps
new file mode 100644
index 0000000..bc90dbd
--- /dev/null
+++ b/deps/phonon/.deps
@@ -0,0 +1 @@
+extra-cmake-modules
diff --git a/deps/phonon/.url b/deps/phonon/.url
index fdf4e32..ae5d0bf 100644
--- a/deps/phonon/.url
+++ b/deps/phonon/.url
@@ -1 +1 @@
-https://download.kde.org/stable/phonon/4.10.2/phonon-4.10.2.tar.xz.sig
+https://download.kde.org/stable/phonon/4.11.0/phonon-4.11.0.tar.xz
diff --git a/deps/phonon/phonon.SlackBuild b/deps/phonon/phonon.SlackBuild
index 6104457..51893a8 100755
--- a/deps/phonon/phonon.SlackBuild
+++ b/deps/phonon/phonon.SlackBuild
@@ -27,11 +27,9 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=phonon
-VERSION=${VERSION:-4.10.2}
+VERSION=${VERSION:-4.11.0}
 BUILD=${BUILD:-1}
 
-NUMJOBS=${NUMJOBS:-"-j$(nproc)"}
-
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$(uname -m)" in
@@ -43,10 +41,7 @@ if [ -z "$ARCH" ]; then
   export ARCH
 fi
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i586" ]; then
+if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
@@ -71,6 +66,8 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   exit 0
 fi
 
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-phonon
 
@@ -95,8 +92,9 @@ else
   DOPULSE="OFF"
 fi
 
-mkdir build
-cd build
+# Qt5 is the only supported version as of 4.11.0:
+mkdir build-qt5
+cd build-qt5
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
@@ -107,37 +105,12 @@ cd build
     -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX/qt/plugins/designer \
     -DWITH_QZeitgeist=BOOL:OFF \
     -DWITH_PulseAudio=BOOL:${DOPULSE} \
+    -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt5 \
     ..
   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 build-qt5
-  cd build-qt5
-    cmake \
-      -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-      -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DMAN_INSTALL_DIR=/usr/man \
-      -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-      -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=ON \
-      -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX/qt/plugins/designer \
-      -DWITH_QZeitgeist=BOOL:OFF \
-      -DWITH_PulseAudio=BOOL:${DOPULSE} \
-      -DPHONON_BUILD_PHONON4QT5=ON \
-      -D__KDE_HAVE_GCC_VISIBILITY=NO \
-      -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt5 \
-      ..
-    make $NUMJOBS || make || exit 1
-    make install DESTDIR=$PKG || exit 1
-  cd -
-fi
-
-# PyQT won't find the header files otherwise:
-sed -i -e 's#{includedir}$#& -I\${includedir}/phonon#' $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/phonon.pc
-
 # Compress and link manpages, if any:
 if [ -d $PKG/usr/man ]; then
   ( cd $PKG/usr/man
-- 
cgit v1.2.3