From dfefce2c4ebdcf58c7f574df222fc42f324f5908 Mon Sep 17 00:00:00 2001
From: AlexWMF <alexxwmf@gmail.com>
Date: Sat, 6 Dec 2014 19:04:01 +0300
Subject: [PATCH] qwt-qt5: Complatibility with Qt 5.4.0rc fix.

---
 mingw-w64-qwt-qt5/PKGBUILD                        | 10 ++++++++--
 .../transform_cpp_static_const.patch              | 15 +++++++++++++++
 mingw-w64-qwt-qt5/transform_h_static_const.patch  | 13 +++++++++++++
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 mingw-w64-qwt-qt5/transform_cpp_static_const.patch
 create mode 100644 mingw-w64-qwt-qt5/transform_h_static_const.patch

diff --git a/mingw-w64-qwt-qt5/PKGBUILD b/mingw-w64-qwt-qt5/PKGBUILD
index 5af1b8b90d..660ebf8cd2 100644
--- a/mingw-w64-qwt-qt5/PKGBUILD
+++ b/mingw-w64-qwt-qt5/PKGBUILD
@@ -14,9 +14,13 @@ depends=("${MINGW_PACKAGE_PREFIX}-qt5")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
 options=(!strip staticlibs !buildflags)
 source=("http://downloads.sourceforge.net/${_realname}/${_realname}-$pkgver.tar.bz2" \
-        "qwtconfig-msys2.pri")
+        "qwtconfig-msys2.pri"
+        "transform_cpp_static_const.patch"
+        "transform_h_static_const.patch")
 md5sums=('fe4bdd561ef5584924e72e15bcf46b9e'
-         'cb2fcbe950fd61056ef13069c824d700')
+         'cb2fcbe950fd61056ef13069c824d700'
+         'c650213b9223bd75d6e192a280c16030'
+         '2ef486784fa0232ce845a3ef295a47ae')
 
 prepare() {
   mkdir -p ${pkgdir}${MINGW_PREFIX}
@@ -29,6 +33,8 @@ prepare() {
   cp ${srcdir}/qwtconfig-msys2.pri qwtconfig.pri
   sed -s "s|%VALUE_QWT_INSTALL_PREFIX%|${PREFIX_WIN}|g" \
     -i qwtconfig.pri
+  patch -p1 -i ${srcdir}/transform_cpp_static_const.patch
+  patch -p1 -i ${srcdir}/transform_h_static_const.patch
 }
 
 build() {
diff --git a/mingw-w64-qwt-qt5/transform_cpp_static_const.patch b/mingw-w64-qwt-qt5/transform_cpp_static_const.patch
new file mode 100644
index 0000000000..44228f912d
--- /dev/null
+++ b/mingw-w64-qwt-qt5/transform_cpp_static_const.patch
@@ -0,0 +1,15 @@
+--- qwt-6.1.1/src/qwt_transform.cpp.orig	2014-09-18 17:59:46.405028700 +0300
++++ qwt-6.1.1/src/qwt_transform.cpp	2014-12-06 18:55:54.227604600 +0300
+@@ -15,10 +15,10 @@
+ #endif
+ 
+ //! Smallest allowed value for logarithmic scales: 1.0e-150
+-QT_STATIC_CONST_IMPL double QwtLogTransform::LogMin = 1.0e-150;
++const double QwtLogTransform::LogMin = 1.0e-150;
+ 
+ //! Largest allowed value for logarithmic scales: 1.0e150
+-QT_STATIC_CONST_IMPL double QwtLogTransform::LogMax = 1.0e150;
++const double QwtLogTransform::LogMax = 1.0e150;
+ 
+ //! Constructor
+ QwtTransform::QwtTransform()
diff --git a/mingw-w64-qwt-qt5/transform_h_static_const.patch b/mingw-w64-qwt-qt5/transform_h_static_const.patch
new file mode 100644
index 0000000000..258ebd306d
--- /dev/null
+++ b/mingw-w64-qwt-qt5/transform_h_static_const.patch
@@ -0,0 +1,13 @@
+--- qwt-6.1.1/src/qwt_transform.h.orig	2014-09-18 17:59:45.342028700 +0300
++++ qwt-6.1.1/src/qwt_transform.h	2014-12-06 18:56:12.894672200 +0300
+@@ -107,8 +107,8 @@
+ 
+     virtual QwtTransform *copy() const;
+ 
+-    QT_STATIC_CONST double LogMin;
+-    QT_STATIC_CONST double LogMax;
++    static const double LogMin;
++    static const double LogMax;
+ };
+ 
+ /*!