desktop/kde-gtk-config: Updated for version 2.2_git, new maintainer.

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

4 files changed, 50 insertions, 19 deletions

diff --git a/desktop/kde-gtk-config/gtk3proxies.diff b/desktop/kde-gtk-config/gtk3proxies.diff
new file mode 100644
index 0000000000000..8d0ef483fc8ff
--- /dev/null
+++ b/desktop/kde-gtk-config/gtk3proxies.diff
@@ -0,0 +1,11 @@
+--- a/gtk3proxies/CMakeLists.txt	2017-03-16 20:19:44.291236607 -0400
++++ b/gtk3proxies/CMakeLists.txt	2017-03-16 20:19:37.305236276 -0400
+@@ -2,7 +2,7 @@
+ 
+ include_directories(${GTK3_INCLUDE_DIRS})
+ 
+-add_definitions(-DDATA_DIR="\\\"${DATA_INSTALL_DIR}/kcm-gtk-module/\\\"")
++add_definitions(-DDATA_DIR=\"${DATA_INSTALL_DIR}/kcm-gtk-module\")
+ 
+ add_executable(gtk3_preview preview3.c)
+ target_link_libraries(gtk3_preview ${GTK3_LIBRARY} ${GOBJECT2_LIBRARY} ${GLIB2_LIBRARY})
diff --git a/desktop/kde-gtk-config/gtkproxies.diff b/desktop/kde-gtk-config/gtkproxies.diff
new file mode 100644
index 0000000000000..45eac7ced7cf8
--- /dev/null
+++ b/desktop/kde-gtk-config/gtkproxies.diff
@@ -0,0 +1,11 @@
+--- a/gtkproxies/CMakeLists.txt	2017-03-15 19:19:53.000000000 -0400
++++ b/gtkproxies/CMakeLists.txt 2017-03-16 20:21:14.239240865 -0400
+@@ -6,7 +6,7 @@
+ target_link_libraries(reload_gtk_apps ${GTK2_LIBRARIES})
+ install(TARGETS reload_gtk_apps RUNTIME DESTINATION "${KDE4_LIBEXEC_INSTALL_DIR}")
+ 
+-add_definitions(-DDATA_DIR="\\\"${DATA_INSTALL_DIR}/kcm-gtk-module/\\\"")
++add_definitions(-DDATA_DIR=\"${DATA_INSTALL_DIR}/kcm-gtk-module\")
+ 
+ add_executable(gtk_preview preview.c)
+ target_link_libraries(gtk_preview ${GTK2_LIBRARIES} ${GTK2_GIOMM_LIBRARY})
diff --git a/desktop/kde-gtk-config/kde-gtk-config.SlackBuild b/desktop/kde-gtk-config/kde-gtk-config.SlackBuild
index 53071aa7c6b22..46747081c736f 100644
--- a/desktop/kde-gtk-config/kde-gtk-config.SlackBuild
+++ b/desktop/kde-gtk-config/kde-gtk-config.SlackBuild
@@ -2,8 +2,11 @@
 
 # Slackware build script for kde-gtk-config
 
+# Copyright 2017 Daniel Prosser | Lexington Park, MD
+# All rights reserved.
+#
 # Originally by Luis Henrique <lmello.009@gmail.com>
-# Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
+# and Ryan P.C. McQuen <ryanpcmcquen@member.fsf.org>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,13 +27,13 @@
 # <http://www.gnu.org/licenses/>.
 
 PRGNAM=kde-gtk-config
-VERSION=${VERSION:-2.2.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.2_git}
+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
@@ -41,8 +44,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-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"
@@ -60,9 +63,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -fr $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -70,20 +73,26 @@ 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 {} \;
 
-sed -i "s|DATA_DIR \"/preview.ui\"|\"\/usr\/share\/apps\/kcm-gtk-module\/preview.ui\"|"g gtk3proxies/preview3.c
-sed -i "s|DATA_DIR \"/preview.ui\"|\"\/usr\/share\/apps\/kcm-gtk-module\/preview.ui\"|"g gtkproxies/preview.c
+# Patch some errors in cmake files to fix gtk_preview and gtk3_preview
+patch -p1 < $CWD/gtkproxies.diff
+patch -p1 < $CWD/gtk3proxies.diff
 
 mkdir -p build
 cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DLIB_SUFFIX=$LIBDIRSUFFIX ..
-  make VERBOSE=1
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
   make install DESTDIR=$PKG
 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
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ChangeLog COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/desktop/kde-gtk-config/kde-gtk-config.info b/desktop/kde-gtk-config/kde-gtk-config.info
index fb5d7d0fef220..6e59a1bbc03ec 100644
--- a/desktop/kde-gtk-config/kde-gtk-config.info
+++ b/desktop/kde-gtk-config/kde-gtk-config.info
@@ -1,10 +1,10 @@
 PRGNAM="kde-gtk-config"
-VERSION="2.2.1"
+VERSION="2.2_git"
 HOMEPAGE="https://projects.kde.org/kde-gtk-config"
-DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/kde-gtk-config/kde-gtk-config-2.2.1.tar.xz"
-MD5SUM="d155ed431d509e54a60383a70b700e1c"
+DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/kde-gtk-config/kde-gtk-config-2.2_git.tar.gz"
+MD5SUM="cabcba1af684f092c5e1cebb86be7c58"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Ryan P.C. McQuen"
-EMAIL="ryanpcmcquen@member.fsf.org"
+MAINTAINER="Daniel Prosser"
+EMAIL="dpross1100@msn.com"