diff options
Diffstat (limited to 'libraries/qwt')
| -rw-r--r-- | libraries/qwt/qwt-6.0.2-qwtconfig.pri.patch | 37 | ||||
| -rw-r--r-- | libraries/qwt/qwt.SlackBuild | 10 | ||||
| -rw-r--r-- | libraries/qwt/qwt.info | 6 |
3 files changed, 8 insertions, 45 deletions
diff --git a/libraries/qwt/qwt-6.0.2-qwtconfig.pri.patch b/libraries/qwt/qwt-6.0.2-qwtconfig.pri.patch deleted file mode 100644 index 0218af0fc6cd..000000000000 --- a/libraries/qwt/qwt-6.0.2-qwtconfig.pri.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Naur qwt-6.0.2.orig/qwtconfig.pri qwt-6.0.2/qwtconfig.pri ---- qwt-6.0.2.orig/qwtconfig.pri 2012-11-30 14:22:47.397127932 +0100 -+++ qwt-6.0.2/qwtconfig.pri 2013-01-07 13:16:08.747317951 +0100 -@@ -19,7 +19,7 @@ - QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX] - - unix { -- QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION -+ QWT_INSTALL_PREFIX = /usr - } - - win32 { -@@ -28,13 +28,13 @@ - - QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc - QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include --QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib -+QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib@LIBDIRSUFFIX@ - - ###################################################################### - # Designer plugin - ###################################################################### - --QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer -+QWT_INSTALL_PLUGINS = @QT4DIR@/plugins/designer - # QWT_INSTALL_PLUGINS = $${QT_INSTALL_PREFIX}/plugins/designer - - ###################################################################### -@@ -49,7 +49,7 @@ - # with every Qt upgrade. - ###################################################################### - --QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features -+QWT_INSTALL_FEATURES = @QT4DIR@/features - # QWT_INSTALL_FEATURES = $${QT_INSTALL_PREFIX}/features - - ###################################################################### diff --git a/libraries/qwt/qwt.SlackBuild b/libraries/qwt/qwt.SlackBuild index 0741c09b9932..167493e6732c 100644 --- a/libraries/qwt/qwt.SlackBuild +++ b/libraries/qwt/qwt.SlackBuild @@ -6,16 +6,16 @@ # 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> +# Maintained 2015-2016 by Christoph Willing <chris.willing@linux.com> PRGNAM=qwt -VERSION=${VERSION:-6.1.2} +VERSION=${VERSION:-6.1.3} 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 @@ -26,8 +26,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" diff --git a/libraries/qwt/qwt.info b/libraries/qwt/qwt.info index 3a5661af2dad..10514c96d1b2 100644 --- a/libraries/qwt/qwt.info +++ b/libraries/qwt/qwt.info @@ -1,8 +1,8 @@ PRGNAM="qwt" -VERSION="6.1.2" +VERSION="6.1.3" HOMEPAGE="http://qwt.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/qwt/qwt-6.1.2.tar.bz2" -MD5SUM="9c88db1774fa7e3045af063bbde44d7d" +DOWNLOAD="http://downloads.sourceforge.net/qwt/qwt-6.1.3.tar.bz2" +MD5SUM="19d1f5fa5e22054d22ee3accc37c54ba" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |