[qwt] update to 6.1.5 (#12459)

* [qwt] update to 6.1.5

* delete patch file

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

4 files changed, 8 insertions, 157 deletions

diff --git a/ports/qwt/CONTROL b/ports/qwt/CONTROL
index 8353f4670..22e6ed9c2 100644
--- a/ports/qwt/CONTROL
+++ b/ports/qwt/CONTROL
@@ -1,6 +1,5 @@
 Source: qwt
-Version: 6.1.4
-Port-Version: 1
+Version: 6.1.5
 Homepage: https://sourceforge.net/projects/qwt
 Description: Qt widgets library for technical applications
 Build-Depends: qt5-base[core], qt5-svg, qt5-tools
diff --git a/ports/qwt/build.patch b/ports/qwt/build.patch
deleted file mode 100644
index 8b36bb833..000000000
--- a/ports/qwt/build.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-diff --git a/src/qwt_compass_rose.cpp b/src/qwt_compass_rose.cpp
-index 8acb045c2..b7b676712 100644
---- a/src/qwt_compass_rose.cpp	
-+++ b/src/qwt_compass_rose.cpp
-@@ -11,6 +11,7 @@
- #include "qwt_point_polar.h"

- #include "qwt_painter.h"

- #include <qpainter.h>

-+#include <QPainterPath>

- 

- static QPointF qwtIntersection(

-     QPointF p11, QPointF p12, QPointF p21, QPointF p22 )

-diff --git a/src/qwt_dial_needle.cpp b/src/qwt_dial_needle.cpp
-index 3589b011d..4f20aada1 100644
---- a/src/qwt_dial_needle.cpp	
-+++ b/src/qwt_dial_needle.cpp
-@@ -13,6 +13,7 @@
- #include "qwt_painter.h"

- #include <qapplication.h>

- #include <qpainter.h>

-+#include <QPainterPath>

- 

- #if QT_VERSION < 0x040601

- #define qFastSin(x) qSin(x)

-diff --git a/src/qwt_null_paintdevice.cpp b/src/qwt_null_paintdevice.cpp
-index 21b97b0ad..545804b06 100644
---- a/src/qwt_null_paintdevice.cpp	
-+++ b/src/qwt_null_paintdevice.cpp
-@@ -10,6 +10,7 @@
- #include "qwt_null_paintdevice.h"

- #include <qpaintengine.h>

- #include <qpixmap.h>

-+#include <QPainterPath>

- 

- class QwtNullPaintDevice::PrivateData

- {

-diff --git a/src/qwt_painter.cpp b/src/qwt_painter.cpp
-index 069e2ae42..824ddfc20 100644
---- a/src/qwt_painter.cpp	
-+++ b/src/qwt_painter.cpp
-@@ -27,6 +27,7 @@
- #include <qpaintengine.h>

- #include <qapplication.h>

- #include <qdesktopwidget.h>

-+#include <QPainterPath>

- 

- #if QT_VERSION >= 0x050000

- #include <qwindow.h>

-diff --git a/src/qwt_painter_command.h b/src/qwt_painter_command.h
-index 032d0348b..13db43559 100644
---- a/src/qwt_painter_command.h	
-+++ b/src/qwt_painter_command.h
-@@ -15,8 +15,7 @@
- #include <qpixmap.h>

- #include <qimage.h>

- #include <qpolygon.h>

--

--class QPainterPath;

-+#include <QPainterPath>

- 

- /*!

-   QwtPainterCommand represents the attributes of a paint operation

-diff --git a/src/qwt_plot_glcanvas.cpp b/src/qwt_plot_glcanvas.cpp
-index 64b39b90e..414cb22c5 100644
---- a/src/qwt_plot_glcanvas.cpp	
-+++ b/src/qwt_plot_glcanvas.cpp
-@@ -15,6 +15,7 @@
- #include <qdrawutil.h>

- #include <qstyle.h>

- #include <qstyleoption.h>

-+#include <QPainterPath>

- 

- #define FIX_GL_TRANSLATION 0

- 

-diff --git a/src/qwt_plot_glcanvas.h b/src/qwt_plot_glcanvas.h
-index 82770747f..be93232c4 100644
---- a/src/qwt_plot_glcanvas.h	
-+++ b/src/qwt_plot_glcanvas.h
-@@ -13,6 +13,7 @@
- #include "qwt_global.h"

- #include <qframe.h>

- #include <qgl.h>

-+#include <QPainterPath>

- 

- class QwtPlot;

- 

-diff --git a/src/qwt_plot_panner.cpp b/src/qwt_plot_panner.cpp
-index bed4566dd..852998f01 100644
---- a/src/qwt_plot_panner.cpp	
-+++ b/src/qwt_plot_panner.cpp
-@@ -14,6 +14,7 @@
- #include <qbitmap.h>

- #include <qstyle.h>

- #include <qstyleoption.h>

-+#include <QPainterPath>

- 

- #if QT_VERSION >= 0x050000

- #if QT_VERSION < 0x050100

-diff --git a/src/qwt_plot_renderer.cpp b/src/qwt_plot_renderer.cpp
-index b6c83447e..a309fe290 100644
---- a/src/qwt_plot_renderer.cpp	
-+++ b/src/qwt_plot_renderer.cpp
-@@ -26,6 +26,7 @@
- #include <qfileinfo.h>

- #include <qimagewriter.h>

- #include <qvariant.h>

-+#include <QPainterPath>

- 

- #ifndef QWT_NO_SVG

- #ifdef QT_SVG_LIB

-diff --git a/src/qwt_widget_overlay.cpp b/src/qwt_widget_overlay.cpp
-index 79c46ce10..f64042ac8 100644
---- a/src/qwt_widget_overlay.cpp	
-+++ b/src/qwt_widget_overlay.cpp
-@@ -13,6 +13,7 @@
- #include <qpaintengine.h>

- #include <qimage.h>

- #include <qevent.h>

-+#include <QPainterPath>

- 

- static QImage::Format qwtMaskImageFormat()

- {

-diff --git a/src/src.pri b/src/src.pri
-index 571870361..412636d5b 100644
---- a/src/src.pri	
-+++ b/src/src.pri
-@@ -7,7 +7,7 @@
- # modify it under the terms of the Qwt License, Version 1.0

- ################################################################

- 

--

-+QT += gui

- HEADERS += \

-     qwt.h \

-     qwt_abstract_scale_draw.h \

diff --git a/ports/qwt/fix-dynamic-static.patch b/ports/qwt/fix-dynamic-static.patch
deleted file mode 100644
index 918934670..000000000
--- a/ports/qwt/fix-dynamic-static.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/qwtconfig.pri b/qwtconfig.pri
-index 1fe6055..441c69b 100644
---- a/qwtconfig.pri
-+++ b/qwtconfig.pri
-@@ -72,7 +72,10 @@ QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/features
- # it will be a static library.
- ######################################################################
- 
-+CONFIG(dynamic, dynamic|static) {
-+
- QWT_CONFIG           += QwtDll
-+}
- 
- ######################################################################
- # QwtPlot enables all classes, that are needed to use the QwtPlot
diff --git a/ports/qwt/portfile.cmake b/ports/qwt/portfile.cmake
index 795fe53b0..1752a2526 100644
--- a/ports/qwt/portfile.cmake
+++ b/ports/qwt/portfile.cmake
@@ -1,11 +1,9 @@
 vcpkg_from_sourceforge(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO qwt/qwt
-    REF 6.1.4
-    FILENAME "qwt-6.1.4.zip"
-    SHA512 711256ec4d1d54d201650e9c63b584b17a61dbedde5a581e0b6227fdbee149cdbe2a889aa58f67777125b6471fc1fe248992ec845eb6481a2dfc2c4276701d7f
-    PATCHES fix-dynamic-static.patch
-            build.patch
+    REF 6.1.5
+    FILENAME "qwt-6.1.5.zip"
+    SHA512 249634d2032ccc8083e26f1d151b301d6ccfcc3140a2c2c469d77d3d8973bc296872a1cff96e002944c40fa558a9896ca2a0f1a0531169c3c8d0fe2240610266
 )
 
 vcpkg_configure_qmake(
@@ -26,6 +24,10 @@ else ()
     )
 endif()
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
 #Install the header files
 file(GLOB HEADER_FILES ${SOURCE_PATH}/src/*.h)
 file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT})