5 files changed, 30 insertions, 44 deletions
diff --git a/multimedia/kaffeine/CMakeLists.patch b/multimedia/kaffeine/CMakeLists.patch
deleted file mode 100644
index d70973660e..0000000000
--- a/multimedia/kaffeine/CMakeLists.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 4a1a90ee1b2b4d13302046f043adf1c2a1de758d Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date: Thu, 26 Nov 2015 15:36:26 +0100
-Subject: [PATCH] Explicitly include CheckIncludeFiles.
-
-This fixes the build with CMake 3.4.0. We were calling check_include_files()
-and implicitly relying on CheckIncludeFiles being included.
----
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d9be8db..b74b44d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -21,6 +21,7 @@ if(STRICT_BUILD)
-                   -DQT_NO_URL_CAST_FROM_STRING -DQT_STRICT_ITERATORS)
- endif(STRICT_BUILD)
- 
-+include(CheckIncludeFiles)
- check_include_files(${CMAKE_CURRENT_SOURCE_DIR}/include/frontend.h HAVE_DVB)
- 
- if(NOT HAVE_DVB)
-
diff --git a/multimedia/kaffeine/README b/multimedia/kaffeine/README
index 8779f8987e..7b44c0eded 100644
--- a/multimedia/kaffeine/README
+++ b/multimedia/kaffeine/README
@@ -1,3 +1,11 @@
-Kaffeine is a full featured Multimedia-Player for KDE.
+Kaffeine is a media player. What makes it different from the others is
+its excellent support of digital TV (DVB). Kaffeine has user-friendly
+interface, so that even first time users can start immediately playing
+their movies: from DVD (including DVD menus, titles, chapters, etc.),
+VCD, or a file.
+
+Kaffeine is a KDE Application
+Kaffeine requires KDE Frameworks packages provided by Slackware
+
 Kaffeine is free software distributed under the terms of the
 GNU General Public Licence.
diff --git a/multimedia/kaffeine/kaffeine.SlackBuild b/multimedia/kaffeine/kaffeine.SlackBuild
index c095ad81ae..68e42ef000 100644
--- a/multimedia/kaffeine/kaffeine.SlackBuild
+++ b/multimedia/kaffeine/kaffeine.SlackBuild
@@ -25,14 +25,14 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=kaffeine
-VERSION=${VERSION:-1.3.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.0.18}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -52,8 +52,8 @@ OUTPUT=${OUTPUT:-/tmp}
 
 SRC_VERSION=$(echo $VERSION | tr _ -)
 
-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"
@@ -72,7 +72,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$SRC_VERSION
-tar xvf $CWD/$PRGNAM-$SRC_VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$SRC_VERSION.tar.xz
 cd $PRGNAM-$SRC_VERSION
 chown -R root:root .
 find -L . \
@@ -81,7 +81,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -p1 < $CWD/CMakeLists.patch
 mkdir -p build
 cd build
   cmake \
@@ -99,8 +98,11 @@ cd -
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING* Changelog NOTES README  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING* Changelog NOTES README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/multimedia/kaffeine/kaffeine.info b/multimedia/kaffeine/kaffeine.info
index 19dc2ca843..183134592f 100644
--- a/multimedia/kaffeine/kaffeine.info
+++ b/multimedia/kaffeine/kaffeine.info
@@ -1,8 +1,8 @@
 PRGNAM="kaffeine"
-VERSION="1.3.1"
-HOMEPAGE="http://kaffeine.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/kaffeine/kaffeine-1.3.1.tar.gz"
-MD5SUM="f2308cf7abf5ec7ad5c724593594c198"
+VERSION="2.0.18"
+HOMEPAGE="https://apps.kde.org/kaffeine/"
+DOWNLOAD="https://download.kde.org/stable/kaffeine/kaffeine-2.0.18.tar.xz"
+MD5SUM="185cd114e1ebcf15b98674e872a53556"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="vlc"
diff --git a/multimedia/kaffeine/slack-desc b/multimedia/kaffeine/slack-desc
index e4bfa3435d..d47926bcf8 100644
--- a/multimedia/kaffeine/slack-desc
+++ b/multimedia/kaffeine/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
         |-----handy-ruler------------------------------------------------------|
-kaffeine: kaffeine (multimedia player for kde)
+kaffeine: kaffeine (Multimedia player for KDE)
 kaffeine:
-kaffeine: Kaffeine is a full featured Multimedia-Player for KDE.
+kaffeine: Kaffeine is a media player. What makes it different from the others is
+kaffeine: its excellent support of digital TV (DVB). Kaffeine has user-friendly
+kaffeine: interface, so that even first time users can start immediately playing
+kaffeine: their movies: from DVD (including DVD menus, titles, chapters, etc.),
+kaffeine: VCD, or a file.
 kaffeine: Kaffeine is free software distributed under the terms of the
 kaffeine: GNU General Public Licence.
 kaffeine:
-kaffeine: Homepage: http://kaffeine.sourceforge.net
-kaffeine:
-kaffeine:
-kaffeine:
-kaffeine:
+kaffeine: homepage: https://apps.kde.org/kaffeine/