development/kdiff3: Updated for version 0.9.98 + new maintainer.

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

3 files changed, 68 insertions, 20 deletions

diff --git a/development/kdiff3/README b/development/kdiff3/README
index f945d8dce90d..5cfbd2756776 100644
--- a/development/kdiff3/README
+++ b/development/kdiff3/README
@@ -13,3 +13,9 @@ KDiff3 is a program that
     * Windows-Explorer integration Diff-Ext-for-KDiff3 - shell extension 
       included in installer (originally by Sergey Zorin: see also Diff Ext)
     * Read what else is special in a short abstract (PDF).
+
+
+NOTE: By default, a KDE version is compiled. If you prefer a Qt4-only
+version, pass the script QT4ONLY=yes, like:
+
+QT4ONLY=yes ./kdiff3.SlackBuild
diff --git a/development/kdiff3/kdiff3.SlackBuild b/development/kdiff3/kdiff3.SlackBuild
index 585a00ea68fc..b567914d1dda 100644
--- a/development/kdiff3/kdiff3.SlackBuild
+++ b/development/kdiff3/kdiff3.SlackBuild
@@ -2,8 +2,11 @@
 
 # Slackware build script for: kdiff3
 # Copyright 2007-2011  Michiel van Wessem, Manchester, United Kingdom
+# Copyright (c) 2017 Ricardo J. Barberis <ricardo.barberis@gmail.com>
 # 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:
 #
@@ -22,13 +25,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=kdiff3
-VERSION=${VERSION:-0.9.97}
+VERSION=${VERSION:-0.9.98}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -38,9 +41,10 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
+QT4ONLY=${QT4ONLY:-no}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -68,25 +72,63 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-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 \
-    -DCMAKE_BUILD_TYPE=Release ..
+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 \
+	-DCMAKE_BUILD_TYPE=Release ..
 
     make VERBOSE=1
     make install VERBOSE=1 DESTDIR=$PKG
-cd ..
+    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
 
 find $PKG | xargs 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
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+cp -a AUTHORS COPYING ChangeLog README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
diff --git a/development/kdiff3/kdiff3.info b/development/kdiff3/kdiff3.info
index a4c1f039f12d..7dbb3a6be138 100644
--- a/development/kdiff3/kdiff3.info
+++ b/development/kdiff3/kdiff3.info
@@ -1,10 +1,10 @@
 PRGNAM="kdiff3"
-VERSION="0.9.97"
+VERSION="0.9.98"
 HOMEPAGE="http://kdiff3.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/kdiff3/kdiff3-0.9.97.tar.gz"
-MD5SUM="30a71b474956c369ed7b38c6db080fc4"
+DOWNLOAD="http://downloads.sourceforge.net/kdiff3/kdiff3-0.9.98.tar.gz"
+MD5SUM="b52f99f2cf2ea75ed5719315cbf77446"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Michiel van Wessem"
-EMAIL="michiel@slackbuilds.org"
+MAINTAINER="Ricardo J. Barberis"
+EMAIL="ricardo.barberis@gmail.com"