4 files changed, 98 insertions, 12 deletions
diff --git a/libraries/qwt/patch-6.1.2-pkgconfig.diff b/libraries/qwt/patch-6.1.2-pkgconfig.diff
new file mode 100644
index 0000000000000..b7572b19e913d
--- /dev/null
+++ b/libraries/qwt/patch-6.1.2-pkgconfig.diff
@@ -0,0 +1,22 @@
+--- src/src.pro.orig	2014-12-12 00:13:13.461186493 +1000
++++ src/src.pro	2015-10-05 08:55:43.504194164 +1000
+@@ -21,6 +21,19 @@
+ 
+ DESTDIR           = $${QWT_OUT_ROOT}/lib
+ 
++# Add pkgconfig support
++unix {
++	CONFIG  += create_pc create_prl no_install_prl
++	QMAKE_PKGCONFIG_NAME            = qwt
++	QMAKE_PKGCONFIG_DESCRIPTION     = GUI components
++	QMAKE_PKGCONFIG_PREFIX          = $${QWT_INSTALL_PREFIX}
++	QMAKE_PKGCONFIG_LIBDIR          = $${QWT_INSTALL_LIBS}
++	QMAKE_PKGCONFIG_INCDIR          = $${QWT_INSTALL_HEADERS}
++	QMAKE_PKGCONFIG_REQUIRES        = QtCore
++	QMAKE_PKGCONFIG_DESTDIR         = pkgconfig
++}
++
++
+ contains(QWT_CONFIG, QwtDll) {
+ 
+     CONFIG += dll
diff --git a/libraries/qwt/patch-6.1.2-qwtconfig.diff b/libraries/qwt/patch-6.1.2-qwtconfig.diff
new file mode 100644
index 0000000000000..ca1638156a3bc
--- /dev/null
+++ b/libraries/qwt/patch-6.1.2-qwtconfig.diff
@@ -0,0 +1,63 @@
+--- qwtconfig.pri.orig	2014-12-11 14:13:13.513186492 +0000
++++ qwtconfig.pri	2015-09-27 08:33:01.948490369 +0000
+@@ -16,11 +16,8 @@
+ # Install paths
+ ######################################################################
+ 
+-QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
+-
+ unix {
+-    QWT_INSTALL_PREFIX    = /usr/local/qwt-$$QWT_VERSION
+-    # QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-qt-$$QT_VERSION
++    QWT_INSTALL_PREFIX    = /usr
+ }
+ 
+ win32 {
+@@ -29,8 +26,10 @@
+ }
+ 
+ QWT_INSTALL_DOCS      = $${QWT_INSTALL_PREFIX}/doc
+-QWT_INSTALL_HEADERS   = $${QWT_INSTALL_PREFIX}/include
+-QWT_INSTALL_LIBS      = $${QWT_INSTALL_PREFIX}/lib
++QWT_INSTALL_HEADERS   = $${QWT_INSTALL_PREFIX}/include/qwt
++QWT_INSTALL_LIBS      = $${QWT_INSTALL_PREFIX}/lib$${LIBDIRSUFFIX}
++
++
+ 
+ ######################################################################
+ # Designer plugin
+@@ -42,14 +41,12 @@
+ # runtime environment of designer/creator.
+ ######################################################################
+ 
+-QWT_INSTALL_PLUGINS   = $${QWT_INSTALL_PREFIX}/plugins/designer
+-
+ # linux distributors often organize the Qt installation
+ # their way and QT_INSTALL_PREFIX doesn't offer a good
+ # path. Also QT_INSTALL_PREFIX is only one of the default
+ # search paths of the designer - not the Qt creator
+ 
+-#QWT_INSTALL_PLUGINS   = $$[QT_INSTALL_PREFIX]/plugins/designer
++QWT_INSTALL_PLUGINS   = $$[QT_INSTALL_PLUGINS]/designer
+ 
+ ######################################################################
+ # Features
+@@ -63,8 +60,7 @@
+ # with every Qt upgrade. 
+ ######################################################################
+ 
+-QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/features
+-# QWT_INSTALL_FEATURES  = $$[QT_INSTALL_PREFIX]/features
++QWT_INSTALL_FEATURES  = $$[QMAKE_MKSPECS]/features
+ 
+ ######################################################################
+ # Build the static/shared libraries.
+@@ -141,7 +137,7 @@
+ # Otherwise you have to build them from the examples directory.
+ ######################################################################
+ 
+-#QWT_CONFIG     += QwtExamples
++QWT_CONFIG     += QwtExamples
+ 
+ ######################################################################
+ # The playground is primarily intended for the Qwt development 
diff --git a/libraries/qwt/qwt.SlackBuild b/libraries/qwt/qwt.SlackBuild
index 2d837299f5fa1..0741c09b99323 100644
--- a/libraries/qwt/qwt.SlackBuild
+++ b/libraries/qwt/qwt.SlackBuild
@@ -4,12 +4,12 @@
 
 # Written by Zordrak
 # Nobbled from Slacky and sanitised for sanity :)
-
 # Modified by dunkyp <dunkyp@gmail.com>
 # Modified by the Slackbuilds.org project
+# Maintained from 2015 by Christoph Willing <chris.willing@linux.com>
 
 PRGNAM=qwt
-VERSION=${VERSION:-6.0.2}
+VERSION=${VERSION:-6.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -48,6 +48,8 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
+patch -p0 < $CWD/patch-6.1.2-qwtconfig.diff
+patch -p0 < $CWD/patch-6.1.2-pkgconfig.diff
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -55,10 +57,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-patch -p1 < $CWD/qwt-6.0.2-qwtconfig.pri.patch
-sed -i -e "s%@LIBDIRSUFFIX@%$LIBDIRSUFFIX%" -e "s%@QT4DIR@%$QT4DIR%" qwtconfig.pri
-
-qmake INSTALLBASE=/usr CONFIG+=QwtExamples
+qmake LIBDIRSUFFIX=$LIBDIRSUFFIX
 make \
   CFLAGS+="$SLKCFLAGS" \
   CXXFLAGS+="$SLKCFLAGS"
@@ -75,9 +74,11 @@ rm -f $PKG/usr/man/man3/_tmp*
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples
-cp -a CHANGES COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+find ./examples/ -name moc -type d |xargs rm -rf
+find ./examples/ -name obj -type d |xargs rm -rf
 cp -a ./examples/* $PKG/usr/doc/$PRGNAM-$VERSION/examples
 mv $PKG/usr/doc/html $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES* COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/qwt/qwt.info b/libraries/qwt/qwt.info
index 2e1c463f1d955..3a5661af2dad7 100644
--- a/libraries/qwt/qwt.info
+++ b/libraries/qwt/qwt.info
@@ -1,10 +1,10 @@
 PRGNAM="qwt"
-VERSION="6.0.2"
+VERSION="6.1.2"
 HOMEPAGE="http://qwt.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/qwt/qwt-6.0.2.tar.bz2"
-MD5SUM="845837320328e3c92d049cc45c7bdbc2"
+DOWNLOAD="http://downloads.sourceforge.net/qwt/qwt-6.1.2.tar.bz2"
+MD5SUM="9c88db1774fa7e3045af063bbde44d7d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="dunkyp"
-EMAIL="dunkyp@gmail.com"
+MAINTAINER="Christoph Willing"
+EMAIL="chris.willing@linux.com"