From d2ddeb3a2322cbeaeaee4fba54efe3f8773e8c78 Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Wed, 20 Jun 2018 14:47:50 +0300
Subject: [PATCH] qwt-qt5: Update to 6.1.3

---
 mingw-w64-qwt-qt5/PKGBUILD            | 32 ++++++++---------
 mingw-w64-qwt-qt5/qwtconfig-msys2.pri | 51 ++++++++++++++++++++++++---
 2 files changed, 61 insertions(+), 22 deletions(-)

diff --git a/mingw-w64-qwt-qt5/PKGBUILD b/mingw-w64-qwt-qt5/PKGBUILD
index aac174b7da..673cf9dd97 100644
--- a/mingw-w64-qwt-qt5/PKGBUILD
+++ b/mingw-w64-qwt-qt5/PKGBUILD
@@ -5,8 +5,8 @@
 _realname=qwt
 pkgbase=mingw-w64-${_realname}-qt5
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-qt5"
-pkgver=6.1.2
-pkgrel=2
+pkgver=6.1.3
+pkgrel=1
 pkgdesc="Qt Widgets for Technical Applications (mingw-w64)"
 arch=('any')
 license=("custom:$pkgname")
@@ -16,28 +16,24 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
 options=(!strip staticlibs !buildflags)
 source=("https://downloads.sourceforge.net/${_realname}/${_realname}-${pkgver}.tar.bz2"
         "qwtconfig-msys2.pri")
-sha256sums=('2b08f18d1d3970e7c3c6096d850f17aea6b54459389731d3ce715d193e243d0c'
-            'a2ed9222424c41930dc8c4c1329bea46d2b23e0f05f894a891e07fd753f99f3b')
+sha256sums=('f3ecd34e72a9a2b08422fb6c8e909ca76f4ce5fa77acad7a2883b701f4309733'
+            'bae2c49a88f4a212a46524745665629328ae2311872e87d21598016efe036853')
 
 prepare() {
-  local PREFIX_WIN=$(cygpath -am ${pkgdir}${MINGW_PREFIX})
-
-  cd ${srcdir}/${_realname}-${pkgver}
   # copy our config file to the right place
-  cp ${srcdir}/qwtconfig-msys2.pri qwtconfig.pri
-  sed -s "s|%VALUE_QWT_INSTALL_PREFIX%|${PREFIX_WIN}|g" \
-    -i qwtconfig.pri
-}
-
-build() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  ${MINGW_PREFIX}/bin/qmake qwt.pro
-
-  make ${MAKEFLAGS} # VERBOSE=1
+  cp ${srcdir}/qwtconfig-msys2.pri ${srcdir}/${_realname}-${pkgver}/qwtconfig.pri
 }
 
 package() {
-  cd ${srcdir}/${_realname}-${pkgver}
+  local PREFIX_WIN=$(cygpath -am ${pkgdir}${MINGW_PREFIX})
+
+  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
+  cp -rf ${srcdir}/${_realname}-${pkgver} ${srcdir}/build-${MINGW_CHOST}
+  cd ${srcdir}/build-${MINGW_CHOST}
+  sed -s "s|%VALUE_QWT_INSTALL_PREFIX%|${PREFIX_WIN}|g" -i qwtconfig.pri
+  ${MINGW_PREFIX}/bin/qmake CONFIG+=build_all qwt.pro
+
+  make # VERBOSE=1
   make -j1 install
 
   mkdir -p ${pkgdir}${MINGW_PREFIX}/bin/
diff --git a/mingw-w64-qwt-qt5/qwtconfig-msys2.pri b/mingw-w64-qwt-qt5/qwtconfig-msys2.pri
index a5e595d30f..d43f713a44 100644
--- a/mingw-w64-qwt-qt5/qwtconfig-msys2.pri
+++ b/mingw-w64-qwt-qt5/qwtconfig-msys2.pri
@@ -9,7 +9,7 @@
 
 QWT_VER_MAJ      = 6
 QWT_VER_MIN      = 1
-QWT_VER_PAT      = 1
+QWT_VER_PAT      = 3
 QWT_VERSION      = $${QWT_VER_MAJ}.$${QWT_VER_MIN}.$${QWT_VER_PAT}
 
 ######################################################################
@@ -72,6 +72,12 @@ QWT_CONFIG     += QwtWidgets
 
 QWT_CONFIG     += QwtSvg
 
+######################################################################
+# If you want to use a OpenGL plot canvas
+######################################################################
+
+QWT_CONFIG     += QwtOpenGL
+
 ######################################################################
 # You can use the MathML renderer of the Qt solutions package to 
 # enable MathML support in Qwt. Because of license implications
@@ -91,6 +97,22 @@ QWT_CONFIG     += QwtSvg
 
 QWT_CONFIG     += QwtDesigner
 
+######################################################################
+# Compile all Qwt classes into the designer plugin instead
+# of linking it against the shared Qwt library. Has no effect
+# when QwtDesigner or QwtDll are not both enabled.
+#
+# On systems where rpath is supported ( all Unixoids ) the 
+# location of the installed Qwt library is compiled into the plugin,
+# but on Windows it might be easier to have a self contained
+# plugin to avoid any hassle with configuring the runtime
+# environment of the designer/creator.
+######################################################################
+
+win32 {
+    QWT_CONFIG     += QwtDesignerSelfContained
+}
+
 ######################################################################
 # If you want to auto build the examples, enable the line below
 # Otherwise you have to build them from the examples directory.
@@ -99,11 +121,32 @@ QWT_CONFIG     += QwtDesigner
 #QWT_CONFIG     += QwtExamples
 
 ######################################################################
-# When Qt has been built as framework qmake ( qtAddLibrary ) wants 
+# The playground is primarily intended for the Qwt development 
+# to explore and test new features. Nevertheless you might find
+# ideas or code snippets that help for application development
+# If you want to auto build the applications in playground, enable 
+# the line below.
+# Otherwise you have to build them from the playground directory.
+######################################################################
+
+#QWT_CONFIG     += QwtPlayground
+
+######################################################################
+# When Qt has been built as framework qmake wants 
 # to link frameworks instead of regular libs
 ######################################################################
 
-macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
+macx:!static:CONFIG(qt_framework, qt_framework|qt_no_framework) {
 
     QWT_CONFIG += QwtFramework
-}
\ No newline at end of file
+}  
+
+######################################################################
+# Create and install pc files for pkg-config
+# See http://www.freedesktop.org/wiki/Software/pkg-config/
+######################################################################
+
+unix {
+
+    #QWT_CONFIG     += QwtPkgConfig
+}