[manyports]Regenerate patches and modify how the patches are used. (#7484)

* [ccfits]Regenerate patches and modify how the patches are used.

* [itpp]Regenerate patches and modify how the patches are used.

* [mpg123]Regenerate patches and modify how the patches are used.

* [qwt]Regenerate patches and modify how the patches are used.

* [sdl1]Remove a patche and modify how the patches are used.

4 files changed, 18 insertions, 34 deletions

diff --git a/ports/qwt/CONTROL b/ports/qwt/CONTROL
index 230203b34..c1271a72f 100644
--- a/ports/qwt/CONTROL
+++ b/ports/qwt/CONTROL
@@ -1,5 +1,5 @@
 Source: qwt
-Version: 6.1.3-6
+Version: 6.1.3-7
 Homepage: https://sourceforge.net/projects/qwt
 Description: Qt widgets library for technical applications
 Build-Depends: qt5-base, qt5-svg, qt5-tools
diff --git a/ports/qwt/build-static-lib.patch b/ports/qwt/build-static-lib.patch
deleted file mode 100644
index 3e1b462ac..000000000
--- a/ports/qwt/build-static-lib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/qwtconfig.pri b/qwtconfig.pri
-index 2dc3715..756231a 100644
---- a/qwtconfig.pri
-+++ b/qwtconfig.pri
-@@ -72,7 +72,7 @@ QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/features
- # it will be a static library.
- ######################################################################
- 
--QWT_CONFIG           += QwtDll
-+# QWT_CONFIG           += QwtDll
- 
- ######################################################################
- # QwtPlot enables all classes, that are needed to use the QwtPlot 
diff --git a/ports/qwt/build-shared-lib.patch b/ports/qwt/fix-dynamic-static.patch
index 2a8447d52..b608681f2 100644
--- a/ports/qwt/build-shared-lib.patch
+++ b/ports/qwt/fix-dynamic-static.patch
@@ -1,13 +1,15 @@
 diff --git a/qwtconfig.pri b/qwtconfig.pri
-index 756231a..2dc3715 100644
+index 1fe6055..441c69b 100644
 --- a/qwtconfig.pri
 +++ b/qwtconfig.pri
-@@ -72,7 +72,7 @@ QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/features
+@@ -72,7 +72,10 @@ QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/features
  # it will be a static library.
  ######################################################################
  
--# QWT_CONFIG           += QwtDll
-+QWT_CONFIG           += QwtDll
++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 918914a01..002272e24 100644
--- a/ports/qwt/portfile.cmake
+++ b/ports/qwt/portfile.cmake
@@ -1,30 +1,25 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/qwt-6.1.3)
+
 vcpkg_download_distfile(ARCHIVE
     URLS "https://sourceforge.net/projects/qwt/files/qwt/6.1.3/qwt-6.1.3.zip"
     FILENAME "qwt-6.1.3.zip"
     SHA512 8f249e23d50f71d14fca37776ea40d8d6931db14d9602e03a343bfb7a9bf55502202103135b77f583c3890a7924220e8a142a01c448dbde311860d89a3b10fc8
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    vcpkg_apply_patches(
-        SOURCE_PATH ${SOURCE_PATH}
-        PATCHES "${CMAKE_CURRENT_LIST_DIR}/build-shared-lib.patch"
-        QUIET
-    )
-else()
-    vcpkg_apply_patches(
-        SOURCE_PATH ${SOURCE_PATH}
-        PATCHES "${CMAKE_CURRENT_LIST_DIR}/build-static-lib.patch"
-        QUIET
-    )
-endif()
+vcpkg_extract_source_archive_ex(
+    ARCHIVE ${ARCHIVE}
+    OUT_SOURCE_PATH SOURCE_PATH
+    PATCHES fix-dynamic-static.patch
+)
 
 set(DEBUG_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
 set(RELEASE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
 
-vcpkg_configure_qmake(SOURCE_PATH ${SOURCE_PATH})
+vcpkg_configure_qmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS
+        CONFIG+=${VCPKG_LIBRARY_LINKAGE}
+)
 
 vcpkg_build_qmake(
     RELEASE_TARGETS sub-src-release_ordered