dash/depends/patches/qt/fix_qt_pkgconfig.patch

--- old/qtbase/mkspecs/features/qt_module.prf
+++ new/qtbase/mkspecs/features/qt_module.prf
@@ -269,7 +269,7 @@ load(qt_installs)
 load(qt_targets)
 
 # this builds on top of qt_common
-!internal_module:if(unix|mingw):!if(darwin:debug_and_release:CONFIG(debug, debug|release)) {
+if(unix|mingw):!if(darwin:debug_and_release:CONFIG(debug, debug|release)) {
     CONFIG += create_pc
     QMAKE_PKGCONFIG_DESTDIR = pkgconfig
     host_build: \
Merge #9469: [depends] Qt 5.7.1 bb077fa [depends] Remove OBJCXX define from config.site.in (fanquake) c37ea4d depends: fix qt translations build (Cory Fields) 2b32dea depends: use new variable layout for qt sdk (Cory Fields) 02fcb29 [depends] Qt 5.7.1 (fanquake) 2017-01-15 06:41:39 +01:00			`--- old/qtbase/mkspecs/features/qt_module.prf`
			`+++ new/qtbase/mkspecs/features/qt_module.prf`
merge bitcoin#21376: Qt 5.12.10 2021-11-25 05:02:50 +01:00			`@@ -269,7 +269,7 @@ load(qt_installs)`
Merge #8210: [Qt] Bump to Qt5.6.1 2759597 Only pass -lQt5PlatformSupport if >=Qt5.6 (Jonas Schnelli) 59d063d Use runtime linking of QT libdbus, use custom/temp. SDK URL (Jonas Schnelli) 6194d9a Fix bitcoin_qt.m4 and fix-xcb-include-order.patch (Jonas Schnelli) f6eb4e2 [depends] OpenSSL 1.0.1k - update config_opts (fanquake) f25209a depends: bump OSX toolchain (Cory Fields) 2016-06-20 13:31:17 +02:00			`load(qt_targets)`

			`# this builds on top of qt_common`
merge bitcoin#23489: Qt 5.15.2 2023-08-03 13:45:17 +02:00			`-!internal_module:if(unix\|mingw):!if(darwin:debug_and_release:CONFIG(debug, debug\|release)) {`
Merge #18297: build: Use pkg-config in BITCOIN_QT_CONFIGURE for all hosts including Windows 8a26848c460160e1279f26bc413f693a34e33b9d build: Fix m4 escaping (Hennadii Stepanov) 9123ec15db104397998f5084afc69403d2f9e4b8 build: Remove extra tokens warning (Hennadii Stepanov) fded4f48c33742d7c790335c8de59c15b80d94e6 build: Remove duplicated QT_STATICPLUGIN define (Hennadii Stepanov) 05a93d5d96101b45d87571af5b772c7a1e82fd27 build: Fix indentation in bitcoin_qt.m4 (Hennadii Stepanov) ddbb41931019ed4226af3df37874c7eb7cf570f1 build: Use pkg-config in BITCOIN_QT_CONFIGURE for all hosts (Hennadii Stepanov) 492971de35bab26346545f68365872211f458b00 build: Fix mingw pkgconfig file and dependency naming (Hennadii Stepanov) Pull request description: This PR makes `bitcoin_qt.m4` to use `pkg-config` for all hosts and removes non-pkg-config paths from it. This is a step towards the idea which was clear [stated](https://github.com/bitcoin/bitcoin/pull/8314#issue-76644643) by Cory Fields: > I believe the consensus is to treat Windows like the others and require pkg-config across the board. We can drop all of the non-pkg-config paths, and simply AC_REQUIRE(PKG_PROG_PKG_CONFIG) There are two unsolved problems with this PR. If depends is built with `DEBUG=1` the `configure` script fails to pickup Qt: - for macOS host (similar to, but not the same as #16391) - for Windows host (regression) The fix is ~on its way~ submitted in #18298 (as a followup). Also this PR picks some small improvements from #17820. ACKs for top commit: theuni: Code review ACK 8a26848c460160e1279f26bc413f693a34e33b9d dongcarl: Code Review ACK 8a26848c460160e1279f26bc413f693a34e33b9d laanwj: Code review ACK 8a26848c460160e1279f26bc413f693a34e33b9d Tree-SHA512: 3b25990934b939121983df7707997b31d61063b1207d909f539d69494c7cb85212f353092956d09ecffebb9fef28b869914dd1216a596d102fcb9744bb5487f7 2020-06-13 09:10:37 +02:00			`+if(unix\|mingw):!if(darwin:debug_and_release:CONFIG(debug, debug\|release)) {`
Merge #8210: [Qt] Bump to Qt5.6.1 2759597 Only pass -lQt5PlatformSupport if >=Qt5.6 (Jonas Schnelli) 59d063d Use runtime linking of QT libdbus, use custom/temp. SDK URL (Jonas Schnelli) 6194d9a Fix bitcoin_qt.m4 and fix-xcb-include-order.patch (Jonas Schnelli) f6eb4e2 [depends] OpenSSL 1.0.1k - update config_opts (fanquake) f25209a depends: bump OSX toolchain (Cory Fields) 2016-06-20 13:31:17 +02:00			`CONFIG += create_pc`
			`QMAKE_PKGCONFIG_DESTDIR = pkgconfig`
			`host_build: \`