Fix plugin targets not populated in mingw-w64-qt5-base

See https://github.com/Martchus/PKGBUILDs/issues/168
2023-08-12 14:05:35 +02:00 · 2023-08-12 14:05:35 +02:00 · 11290f62f0
parent edce7b262f
commit 11290f62f0
14 changed files with 41 additions and 39 deletions
--- a/qt5-base/mingw-w64-static/PKGBUILD
+++ b/qt5-base/mingw-w64-static/PKGBUILD
@ -91,18 +91,18 @@ sha256sums=('SKIP'
            '42f2895f03bcf196c7f4e3e41d68d5e0196645291ec9f27705c1ccbd386fe5b2'
            '151b0094b7e50392e8c9b5226ce2a6db3a76a4daae3a1decfd35b9a0738f14d1'
            'fd2af0030ce93ca93d14778461f8e738b91fcc8a37414902f0bdbdd4a3a4232e'
-            'd5a89d52fac9118f3e6107015863bfcf3592bed858a5159c2010bdca363b06fc'
-            '9c362e5508f717feb0577d2fc7882a088e8c981dd1b0a3f19bf06663819e89e8'
-            'fcde7e40a7709abc17fbf37db3a649b326f6c6dde96c8f4e48f887f59c7485c3'
-            '43c808091ce13470596bc3f8d1719a215ef51fe8ec1417c8086525415b74c3e6'
-            '80eafdb90c2602b0984fa603a78ef398a142b85e3c1eda4bacf626be23f7799e'
-            '136c4b294eeeaf71ae3fd26715f0af9966705dd861ed7f1c48194ad1dca73803'
-            'a7116e2b07a5f7eb25aed6aefcc3a5a72a6da4a9d532b8cdf72ce6aac1935393'
-            'e4b56d99f0815dc67d05926c0127e65ecd1c9c1f3ff6077d4588a8f331575d79'
-            'aa803f2083fb77ba86a41b8cfd51cbc33880e7cba44584ddbd725a349dcef68b'
-            'a44077d097e39690220ab5eda173382b6b66c13c2f93854dbcf299c5caadd15e'
-            'd17ad5ba095239c35f9320327c85b772ef955eaf9de8e8b2cee864f67ceb2c96'
-            '0077e058b78d75e83ee33a1659a297c48b060838d226945156769f17473fae95')
+            'f38224590d06922078a06626cbc0776c7099f55123924866499b59578c7d4130'
+            '7b900ea3483c45eaaffb9e4adb0b7e014f8f80dfaa85daab72f0debe1aa85fd5'
+            'a1593e51838702c69226921c36d79de635640a1c94724db9d1ce484747943c15'
+            'ee59daf156030098bbda8596eca52d0ff8edd7c4a1b01ea5bfea0bbf227d67ed'
+            '5ab6a475aa5b933f986005c9b8ae41da3727ec75ea363521d1412b582e98eb7e'
+            'b9ddb2d30e99aeccd81e06fb3949ac6d70ea79cd45dc5701edfc8f931eac70f0'
+            '89f358595842d182a3b4da26c6890f899d4321795a3d8b5dda1d461847974c35'
+            'cfcb1ea9ed6d8a13e2edca13fda915a87fac5877d6b1a81749052e20f736cb4b'
+            '1afb33eb230f998303593e2405c0660f220eea60698f3aa3be0cc4813db3e1c9'
+            '3b4f56685d879db9ca71f683397fbb7d444a6d7a3dd45c3cbe89b51b13953600'
+            'e3e888aedc08d92fc544a145138e287065e76529264bafb025d97c6d96851797'
+            'ed43703fb278417fdd036724b49c45d6bff2e34f790c3e44656da3b74bc22c56')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

--- a/qt5-base/mingw-w64/0021-Allow-usage-of-static-version-with-CMake.patch
+++ b/qt5-base/mingw-w64/0021-Allow-usage-of-static-version-with-CMake.patch
@ -1,4 +1,4 @@
-From 967093fb90793e18fb0121f5370474329c3f90b8 Mon Sep 17 00:00:00 2001
+From 4114849ba798df4fc871cfa1d6be4da457508281 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 5 Aug 2017 21:14:26 +0200
 Subject: [PATCH 21/32] Allow usage of static version with CMake
@ -887,7 +887,7 @@ index 5a5bc4d61d..97150fb244 100644
     )
 endif()
 diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-index eaf9011c3d..65869c5122 100644
+index eaf9011c3d..de09c85b90 100644
 --- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
@@ -1,13 +1,13 @@
@ -908,8 +908,11 @@ index eaf9011c3d..65869c5122 100644
             $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT}
             ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET}
             ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED}
-@@ -17,17 +17,25 @@ foreach(_module_dep ${_Qt5$${CMAKE_PLUGIN_NAME}_MODULE_DEPENDENCIES})
+@@ -15,19 +15,27 @@ foreach(_module_dep ${_Qt5$${CMAKE_PLUGIN_NAME}_MODULE_DEPENDENCIES})
+         )
+     endif()
 endforeach()
+!!ENDIF
 
 !!IF !isEmpty(CMAKE_RELEASE_TYPE)
 -    _populate_$${CMAKE_MODULE_NAME}_plugin_properties(Qt5::$$CMAKE_MODULE_NAME Qt5::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
@ -917,7 +920,6 @@ index eaf9011c3d..65869c5122 100644
 +    _populate_$${CMAKE_MODULE_NAME}_plugin_properties_static(${QT_VARIANT_PREFIX}Qt5::$$CMAKE_MODULE_NAME ${QT_VARIANT_PREFIX}Qt5::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE_STATIC}\")
 +!!ELSE
 +    _populate_$${CMAKE_MODULE_NAME}_plugin_properties(${QT_VARIANT_PREFIX}Qt5::$$CMAKE_MODULE_NAME ${QT_VARIANT_PREFIX}Qt5::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
-+!!ENDIF
 !!ENDIF
 !!ENDIF
 
--- a/qt5-base/mingw-w64/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ b/qt5-base/mingw-w64/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
@ -1,4 +1,4 @@
-From a076aa5b3c0f76ffd6cdb2676af59aae87ebb8c3 Mon Sep 17 00:00:00 2001
+From 421f3b3d9279df6d01e7b424496c5f2550276ffb Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 16:42:07 +0200
 Subject: [PATCH 22/32] Adjust linker flags for static build with
--- a/qt5-base/mingw-w64/0023-Use-correct-pkg-config-static-flag.patch
+++ b/qt5-base/mingw-w64/0023-Use-correct-pkg-config-static-flag.patch
@ -1,4 +1,4 @@
-From 802418548469aef0786dcc7a0f5ea558be1fb531 Mon Sep 17 00:00:00 2001
+From 2c29c5bb2b41ea6efaa3d8f2dc7963050b0e96bf Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:50:21 +0200
 Subject: [PATCH 23/32] Use correct pkg-config --static flag
--- a/qt5-base/mingw-w64/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/qt5-base/mingw-w64/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
@ -1,4 +1,4 @@
-From 01ba1834d878308636460452d21fd19fb97acf75 Mon Sep 17 00:00:00 2001
+From 1df0d8c71c1ebf6e1abaf13f736f6fc7dc529c46 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 4 Dec 2016 20:35:47 +0100
 Subject: [PATCH 24/32] Fix macro invoking moc, rcc and uic
--- a/qt5-base/mingw-w64/0025-Ignore-errors-about-missing-feature-static.patch
+++ b/qt5-base/mingw-w64/0025-Ignore-errors-about-missing-feature-static.patch
@ -1,4 +1,4 @@
-From 03dcb78a55013e1d5cf3544b7b626bdd99570cb0 Mon Sep 17 00:00:00 2001
+From 779d5e666b100467bdfeaf3bbad5a23d7728a7ba Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 20:59:54 +0100
 Subject: [PATCH 25/32] Ignore errors about missing feature static
--- a/qt5-base/mingw-w64/0026-Enable-and-fix-use-of-iconv.patch
+++ b/qt5-base/mingw-w64/0026-Enable-and-fix-use-of-iconv.patch
@ -1,4 +1,4 @@
-From 3ae78f69a30b56d29c5807339153cac8f1873dbc Mon Sep 17 00:00:00 2001
+From b683af46976d588b03785dcb2a4a0d9e9a8b2d52 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:20 +0100
 Subject: [PATCH 26/32] Enable and fix use of iconv
--- a/qt5-base/mingw-w64/0027-Ignore-failing-pkg-config-test.patch
+++ b/qt5-base/mingw-w64/0027-Ignore-failing-pkg-config-test.patch
@ -1,4 +1,4 @@
-From d7cb1055db6a80a089915190c12434f6d96ecff0 Mon Sep 17 00:00:00 2001
+From db1ae063e6c0e79a3e139ecc25c25c5d51daed75 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:48 +0100
 Subject: [PATCH 27/32] Ignore failing pkg-config test
--- a/qt5-base/mingw-w64/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/qt5-base/mingw-w64/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
@ -1,4 +1,4 @@
-From aa48569879407584b038a9356ea39ba39c3d8ef5 Mon Sep 17 00:00:00 2001
+From d2f3d1b7e9b728f866aa90fbc1b2959fef42e1ac Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 7 Feb 2017 18:25:28 +0100
 Subject: [PATCH 28/32] Prevent qmake from messing static lib dependencies
--- a/qt5-base/mingw-w64/0029-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/qt5-base/mingw-w64/0029-Hardcode-linker-flags-for-platform-plugins.patch
@ -1,4 +1,4 @@
-From 55191d32380daeaea66eb8c8f0b7775b5d0d33d5 Mon Sep 17 00:00:00 2001
+From 4cdb9a1971f6c3484234563a5cc79579dfb75218 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 23:42:30 +0100
 Subject: [PATCH 29/32] Hardcode linker flags for platform plugins
--- a/qt5-base/mingw-w64/0030-Fix-linking-against-static-plugins-with-qmake.patch
+++ b/qt5-base/mingw-w64/0030-Fix-linking-against-static-plugins-with-qmake.patch
@ -1,4 +1,4 @@
-From 00b7b85a199cec674b6163f2c53abf35d8bbf26c Mon Sep 17 00:00:00 2001
+From 0aa8542902c84bdda22c92384e9c83ef2c2727ec Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 25 Aug 2017 17:07:17 +0200
 Subject: [PATCH 30/32] Fix linking against static plugins with qmake
--- a/qt5-base/mingw-w64/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
+++ b/qt5-base/mingw-w64/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
@ -1,4 +1,4 @@
-From 20b36b2a46eb7ceb350c15277731359ce6dce7ab Mon Sep 17 00:00:00 2001
+From adbf3e91fb779b75ab45e247a23bae4ae1442c77 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Mon, 24 Jun 2019 13:51:02 +0200
 Subject: [PATCH 31/32] Prevent 'Cannot find feature windows_vulkan_sdk'
--- a/qt5-base/mingw-w64/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch
+++ b/qt5-base/mingw-w64/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch
@ -1,4 +1,4 @@
-From c1f0e9b693f65942319e8b93be6b2089d4019b17 Mon Sep 17 00:00:00 2001
+From 5d8069b4404b7d4be5f513682c17b52cf83f7483 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 26 Jun 2021 22:24:12 +0200
 Subject: [PATCH 32/32] Fix crashes in rasterization code using setjmp
--- a/qt5-base/mingw-w64/PKGBUILD
+++ b/qt5-base/mingw-w64/PKGBUILD
@ -90,18 +90,18 @@ sha256sums=('SKIP'
            '42f2895f03bcf196c7f4e3e41d68d5e0196645291ec9f27705c1ccbd386fe5b2'
            '151b0094b7e50392e8c9b5226ce2a6db3a76a4daae3a1decfd35b9a0738f14d1'
            'fd2af0030ce93ca93d14778461f8e738b91fcc8a37414902f0bdbdd4a3a4232e'
-            'd5a89d52fac9118f3e6107015863bfcf3592bed858a5159c2010bdca363b06fc'
-            '9c362e5508f717feb0577d2fc7882a088e8c981dd1b0a3f19bf06663819e89e8'
-            'fcde7e40a7709abc17fbf37db3a649b326f6c6dde96c8f4e48f887f59c7485c3'
-            '43c808091ce13470596bc3f8d1719a215ef51fe8ec1417c8086525415b74c3e6'
-            '80eafdb90c2602b0984fa603a78ef398a142b85e3c1eda4bacf626be23f7799e'
-            '136c4b294eeeaf71ae3fd26715f0af9966705dd861ed7f1c48194ad1dca73803'
-            'a7116e2b07a5f7eb25aed6aefcc3a5a72a6da4a9d532b8cdf72ce6aac1935393'
-            'e4b56d99f0815dc67d05926c0127e65ecd1c9c1f3ff6077d4588a8f331575d79'
-            'aa803f2083fb77ba86a41b8cfd51cbc33880e7cba44584ddbd725a349dcef68b'
-            'a44077d097e39690220ab5eda173382b6b66c13c2f93854dbcf299c5caadd15e'
-            'd17ad5ba095239c35f9320327c85b772ef955eaf9de8e8b2cee864f67ceb2c96'
-            '0077e058b78d75e83ee33a1659a297c48b060838d226945156769f17473fae95')
+            'f38224590d06922078a06626cbc0776c7099f55123924866499b59578c7d4130'
+            '7b900ea3483c45eaaffb9e4adb0b7e014f8f80dfaa85daab72f0debe1aa85fd5'
+            'a1593e51838702c69226921c36d79de635640a1c94724db9d1ce484747943c15'
+            'ee59daf156030098bbda8596eca52d0ff8edd7c4a1b01ea5bfea0bbf227d67ed'
+            '5ab6a475aa5b933f986005c9b8ae41da3727ec75ea363521d1412b582e98eb7e'
+            'b9ddb2d30e99aeccd81e06fb3949ac6d70ea79cd45dc5701edfc8f931eac70f0'
+            '89f358595842d182a3b4da26c6890f899d4321795a3d8b5dda1d461847974c35'
+            'cfcb1ea9ed6d8a13e2edca13fda915a87fac5877d6b1a81749052e20f736cb4b'
+            '1afb33eb230f998303593e2405c0660f220eea60698f3aa3be0cc4813db3e1c9'
+            '3b4f56685d879db9ca71f683397fbb7d444a6d7a3dd45c3cbe89b51b13953600'
+            'e3e888aedc08d92fc544a145138e287065e76529264bafb025d97c6d96851797'
+            'ed43703fb278417fdd036724b49c45d6bff2e34f790c3e44656da3b74bc22c56')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'