From 0d628a20af393a75b81c4cb59b3076d20e1c0855 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sat, 24 Aug 2019 22:15:22 +0000
Subject: libreoffice: KDE4 support was removed in 6.3.x

---
 libreoffice/build/libreoffice.SlackBuild | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'libreoffice/build/libreoffice.SlackBuild')

diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild
index 89984744..cdac4ab5 100755
--- a/libreoffice/build/libreoffice.SlackBuild
+++ b/libreoffice/build/libreoffice.SlackBuild
@@ -313,16 +313,9 @@ PRGNAM6=l10n
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
-# Either add support for KDE4, or for KDE5:
-ADD_KDE4=${ADD_KDE4:-"NO"}
-ADD_KDE4=$(echo $ADD_KDE4 | tr 'a-z' 'A-Z')
+# Add support for KDE5:
 ADD_KDE5=${ADD_KDE5:-"YES"}
 ADD_KDE5=$(echo $ADD_KDE5 | tr 'a-z' 'A-Z')
-if [ "${ADD_KDE4}" = "YES" -a "${ADD_KDE5}" = "YES" ]; then
-  echo "** Support for KDE4 and KDE5 can not be enabled at the same time!"
-  echo "** Disabling KDE4 support now..."
-  ADD_KDE4="NO"
-fi
 
 # SRCVER is the variable you control. It can be one of:
 # "HEAD" - in which case a new git # snapshot will be pulled,
@@ -1208,12 +1201,10 @@ fi
 # as long as you actually install a Qt5 package!
 #
 # Add KDE related arguments:
-if [ "${ADD_KDE4}" = "YES" ]; then
-  KDEOPTS="--enable-kde4 --disable-gtk3-kde5"
-elif [ "${ADD_KDE5}" = "YES" ]; then
-  KDEOPTS="--disable-kde4 --enable-kde5 --enable-gtk3-kde5"
+if [ "${ADD_KDE5}" = "YES" ]; then
+  KDEOPTS="--enable-kde5 --enable-gtk3-kde5"
 else
-  KDEOPTS="--disable-kde4 --disable-kde5 --disable-gtk3-kde5"
+  KDEOPTS="--disable-kde5 --disable-gtk3-kde5"
 fi
 # Add Qt5 related arguments:
 if $(pkg-config Qt5 --exists) || $(pkg-config Qt5Core --exists) ; then
@@ -1467,7 +1458,7 @@ cd $OUTPUT
 cd -
 cat $TMP/package-${PRGNAM}-sdkdoc/install/slack-desc | grep "^${PRGNAM}-sdkdoc" > $OUTPUT/${PRGNAM}-sdkdoc-${LOVER}${VERSION}${PKG_SUBVER}-noarch-${BUILD}${TAG}.txt
 
-if [ "${ADD_KDE4}" = "YES" -o "${ADD_KDE5}" = "YES" ]; then
+if [ "${ADD_KDE5}" = "YES" ]; then
   # Move the KDE integration libraries into a separate package so that people
   # have a choice to leave these libraries out:
   echo "Starting split-off of KDE integration libraries from main $PRGNAM package..."
-- 
cgit v1.2.3