development/kdiff3: Updated for version 1.10.5.

Signed-off-by: Erich Ritz <erich.public@protonmail.com>
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 26 insertions, 71 deletions

diff --git a/development/kdiff3/README b/development/kdiff3/README
index 758e159960..8f2dae59fc 100644
--- a/development/kdiff3/README
+++ b/development/kdiff3/README
@@ -1,17 +1,13 @@
 KDiff3 is a file and folder diff and merge tool which
 
-  * compares and merges two or three text input files or folders,
-  * shows the differences line by line and character by character(!),
-  * provides an automatic merge-facility,
-  * has an editor for comfortable solving of merge-conflicts,
-  * provides network transparency via KIO,
-  * option for highlight or hide changes in white-space or comments,
-  * supports Unicode, UTF-8 and other file encodings,
-  * prints differences,
-  * supports version control keyword and history merging.
+  * compares and merges two or three input files or directories,
+  * shows the differences line by line and character by character (!),
+  * provides an automatic merge-facility and
+  * an integrated editor for comfortable solving of merge-conflicts
+  * has support for KDE-KIO (ftp, sftp, http, fish, smb),
+  * has an intuitive graphical user interface,
+  * provides a context menu for KDE-Dolphin and Windows-Explorer,
+  * Support for many encodings and Unicode.
 
 KDiff3 is a KDE Application
 KDiff3 requires KDE Frameworks packages provided by Slackware
-
-NOTE: The historical Qt4-only build has not been ported to Qt5.
-
diff --git a/development/kdiff3/kdiff3.SlackBuild b/development/kdiff3/kdiff3.SlackBuild
index e697acc6c0..fef5039cf7 100644
--- a/development/kdiff3/kdiff3.SlackBuild
+++ b/development/kdiff3/kdiff3.SlackBuild
@@ -6,8 +6,6 @@
 # Copyright 2023 Erich Ritz, Jenks, Oklahoma, USA
 # All rights reserved.
 #
-# QT4ONLY option courtesy of Ekin Akoglu, adapted by Ricardo J. Barberis
-#
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
@@ -28,7 +26,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=kdiff3
-VERSION=${VERSION:-1.9.6}
+VERSION=${VERSION:-1.10.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -49,7 +47,6 @@ fi
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
-QT4ONLY=${QT4ONLY:-no}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
@@ -80,58 +77,20 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-if [ "${QT4ONLY}" == "no" ] ; then
-    mkdir build
-    cd build
-      cmake \
-        -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-        -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-        -DMAN_INSTALL_DIR=/usr/man \
-        -DKDE_INSTALL_DOCBUNDLEDIR=/usr/doc/HTML \
-        -DCMAKE_BUILD_TYPE=Release ..
-
-    make VERBOSE=1
-    make install VERBOSE=1 DESTDIR=$PKG
-    cd ..
-else
-    sed -i 's/%i -caption "%c"//g' src-QT4/kdiff3.desktop
-
-    mkdir releaseQt
-    cd releaseQt
-    CFLAGS="$SLKCFLAGS" \
-	CXXFLAGS="$SLKCFLAGS" \
-	qmake ../src-QT4/kdiff3.pro
-
-    sed -i "s,/usr/local,$PKG/usr,g" Makefile
-    make VERBOSE=1
-    make install VERBOSE=1 #INSTALL_ROOT=$PKG
-
-    cd ../po
-    for i in `ls` ; do
-	if [ -s $i/kdiff3.po ]; then
-	    mkdir -p $PKG/usr/share/locale/$i/LC_MESSAGES
-	fi
-    done
-    mkdir -p $PKG/usr/share/locale
-    sed -i -e "s,/usr/share/locale/,$PKG/usr/share/locale/," create_qm_files
-    sh create_qm_files install
-    cd ..
-
-    mkdir -p $PKG/usr/share/{applications,icons,pixmaps}
-    cp -a src-QT4/kdiff3.desktop $PKG/usr/share/applications
-    cp -a src-QT4/hi32-app-kdiff3.png $PKG/usr/share/pixmaps/kdiff3.png
-
-    mkdir -p $PKG/usr/share/icons/hicolor/16x16
-    mkdir $PKG/usr/share/icons/hicolor/32x32
-    mkdir -p $PKG/usr/share/icons/locolor/16x16
-    mkdir $PKG/usr/share/icons/locolor/32x32
-    cp -a src-QT4/hi16-app-kdiff3.png $PKG/usr/share/icons/hicolor/16x16
-    cp -a src-QT4/hi32-app-kdiff3.png $PKG/usr/share/icons/hicolor/32x32
-    cp -a src-QT4/lo16-app-kdiff3.png $PKG/usr/share/icons/locolor/16x16
-    cp -a src-QT4/lo32-app-kdiff3.png $PKG/usr/share/icons/locolor/32x32
-fi
+mkdir build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DKDE_INSTALL_DOCBUNDLEDIR=/usr/doc/HTML \
+    -DCMAKE_BUILD_TYPE=Release ..
+
+make VERBOSE=1
+make install VERBOSE=1 DESTDIR=$PKG
+cd ..
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/development/kdiff3/kdiff3.info b/development/kdiff3/kdiff3.info
index 01d30b4e73..8e8c1aebcf 100644
--- a/development/kdiff3/kdiff3.info
+++ b/development/kdiff3/kdiff3.info
@@ -1,8 +1,8 @@
 PRGNAM="kdiff3"
-VERSION="1.9.6"
+VERSION="1.10.5"
 HOMEPAGE="https://apps.kde.org/kdiff3/"
-DOWNLOAD="https://download.kde.org/stable/kdiff3/kdiff3-1.9.6.tar.xz"
-MD5SUM="b00a17a0289b9c56c5944264265f12a0"
+DOWNLOAD="https://download.kde.org/stable/kdiff3/kdiff3-1.10.5.tar.xz"
+MD5SUM="2389742d844add1668c0d434a0a1a738"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""