From 8df93347cac5500259e8851f955a5638f3930ba3 Mon Sep 17 00:00:00 2001
From: Marie Loise Nolden <loise@kde.org>
Date: Mon, 13 Jul 2020 06:38:55 +0000
Subject: [PATCH] Update patch for 6.1.5

[loise@w530 SOURCES]$ cat qwt-6.1.5-qt_install_paths.patch
diff -u qwt-6.1.5.orig/qwtbuild.pri qwt-6.1.5/qwtbuild.pri
--- qwt-6.1.5.orig/qwtbuild.pri 2020-06-01 18:48:07.321112118 +0200
+++ qwt-6.1.5/qwtbuild.pri      2020-07-13 08:32:49.193310754 +0200
@@ -14,7 +14,7 @@
 CONFIG           += qt
 CONFIG           += warn_on
 CONFIG           += no_keywords
-CONFIG           += silent
+#CONFIG           += silent

 DEFINES += QT_NO_DEPRECATED_WARNINGS # not fixing those before Qwt 6.2

diff -u qwt-6.1.5.orig/qwtconfig.pri qwt-6.1.5/qwtconfig.pri
--- qwt-6.1.5.orig/qwtconfig.pri        2020-06-01 18:48:07.325112226 +0200
+++ qwt-6.1.5/qwtconfig.pri     2020-07-13 08:32:16.364626829 +0200
@@ -19,7 +19,7 @@
 QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]

 unix {
-    QWT_INSTALL_PREFIX    = /usr/local/qwt-$$QWT_VERSION
+    # QWT_INSTALL_PREFIX    = /usr/local/qwt-$$QWT_VERSION
     # QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-qt-$$QT_VERSION
 }

@@ -28,9 +28,9 @@
     # QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-qt-$$QT_VERSION
 }

-QWT_INSTALL_DOCS      = $${QWT_INSTALL_PREFIX}/doc
-QWT_INSTALL_HEADERS   = $${QWT_INSTALL_PREFIX}/include
-QWT_INSTALL_LIBS      = $${QWT_INSTALL_PREFIX}/lib
+QWT_INSTALL_DOCS      = $$[QT_INSTALL_DOCS]/html
+QWT_INSTALL_HEADERS   = $$[QT_INSTALL_HEADERS]/qwt
+QWT_INSTALL_LIBS      = $$[QT_INSTALL_LIBS]

 ######################################################################
 # Designer plugin
@@ -42,7 +42,8 @@
 # runtime environment of designer/creator.
 ######################################################################

-QWT_INSTALL_PLUGINS   = $${QWT_INSTALL_PREFIX}/plugins/designer
+#QWT_INSTALL_PLUGINS   = $${QWT_INSTALL_PREFIX}/plugins/designer
+QWT_INSTALL_PLUGINS   = $$[QT_INSTALL_PLUGINS]/designer

 # linux distributors often organize the Qt installation
 # their way and QT_INSTALL_PREFIX doesn't offer a good
@@ -63,8 +64,8 @@
 # with every Qt upgrade.
 ######################################################################

-QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/features
-# QWT_INSTALL_FEATURES  = $$[QT_INSTALL_PREFIX]/features
+#QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/features
+QWT_INSTALL_FEATURES  = $$[QMAKE_MKSPECS]/features

 ######################################################################
 # Build the static/shared libraries.
@@ -110,7 +111,7 @@
 # to your qmake project file.
 ######################################################################

-#QWT_CONFIG     += QwtMathML
+QWT_CONFIG     += QwtMathML

 ######################################################################
 # If you want to build the Qwt designer plugin,
---
 qwt.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qwt.spec b/qwt.spec
index c6bc152..d329553 100644
--- a/qwt.spec
+++ b/qwt.spec
@@ -23,7 +23,7 @@ Source:  http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 # fix pkgconfig support
 Patch50: qwt-6.1.1-pkgconfig.patch
 # use QT_INSTALL_ paths instead of custom prefix
-Patch51: qwt-6.1.2-qt_install_paths.patch
+Patch51: qwt-6.1.5-qt_install_paths.patch
 # parallel-installable qt5 version
 Patch52: qwt-qt5.patch
 #