From 87a1c35256031f5bf8a8ddf1f370f5d116ac62e0 Mon Sep 17 00:00:00 2001 From: Leander Schulten Date: Sat, 27 Nov 2021 17:08:09 +0100 Subject: [PATCH 1/6] [qt5-base] no _debug lib suffixes on macOS (#14225) --- ports/qt5-base/portfile.cmake | 14 +++++++++++++- ports/qt5-base/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/qt5-base.json | 5 +++++ 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 1dacc980faef83..6f6ef8b962ccca 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -504,7 +504,19 @@ if(QT_BUILD_LATEST) ) endif() -vcpkg_fixup_pkgconfig() +if(NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_fixup_pkgconfig() +endif() +if(VCPKG_TARGET_IS_OSX) + file(GLOB_RECURSE _debug_files "${CURRENT_PACKAGES_DIR}/debug/lib/*_debug.*") + foreach(_file ${_debug_libs}) + string(REPLACE "_debug" "" _new_filename "${_file}") + file(RENAME "${_file}" "${_new_filename}") + if(_new_filename MATCHES "*.(la|prl|pc)") + vcpkg_replace_string("${_new_filename}" "_debug" "") + endif() + endforeach() +endif() # #Code to get generated CMake files from CI # file(RENAME "${CURRENT_PACKAGES_DIR}/share/cmake/Qt5Core/Qt5CoreConfig.cmake" "${CURRENT_BUILDTREES_DIR}/Qt5CoreConfig.cmake.log") diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index a8e22ebd1d7447..7922d6120858e0 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-base", "version-semver": "5.15.2", - "port-version": 16, + "port-version": 17, "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index e7be1c8a662cbd..aef5418f0d4767 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5518,7 +5518,7 @@ }, "qt5-base": { "baseline": "5.15.2", - "port-version": 16 + "port-version": 17 }, "qt5-canvas3d": { "baseline": "0", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index 5a7c19ab85f97c..ba96b55aadcee6 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c3312e6857115542e74a0bdbafc9028ff8c251c", + "version-semver": "5.15.2", + "port-version": 17 + }, { "git-tree": "5f510633de982d6e75e3d1170af23feedf208166", "version-semver": "5.15.2", From cb7d45608b239b22997786250e7eb727683baf0d Mon Sep 17 00:00:00 2001 From: Leander Schulten Date: Tue, 30 Nov 2021 18:44:58 +0100 Subject: [PATCH 2/6] [qt5-base] patch qt5-base to remove _debug postfix on osx --- .../patches/osx-no-_debug-postfix.patch | 116 ++++++++++++++++++ ports/qt5-base/portfile.cmake | 11 +- versions/q-/qt5-base.json | 2 +- 3 files changed, 118 insertions(+), 11 deletions(-) create mode 100644 ports/qt5-base/patches/osx-no-_debug-postfix.patch diff --git a/ports/qt5-base/patches/osx-no-_debug-postfix.patch b/ports/qt5-base/patches/osx-no-_debug-postfix.patch new file mode 100644 index 00000000000000..538421d4fbb113 --- /dev/null +++ b/ports/qt5-base/patches/osx-no-_debug-postfix.patch @@ -0,0 +1,116 @@ +diff --git a/examples/widgets/tools/plugandpaint/app/app.pro b/examples/widgets/tools/plugandpaint/app/app.pro +index 558d359e..3de0822f 100644 +--- a/examples/widgets/tools/plugandpaint/app/app.pro ++++ b/examples/widgets/tools/plugandpaint/app/app.pro +@@ -20,7 +20,7 @@ macx-xcode { + } else { + LIBS += -lpnp_basictools + if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { +- mac:LIBS = $$member(LIBS, 0) $$member(LIBS, 1)_debug ++ mac:LIBS = $$member(LIBS, 0) $$member(LIBS, 1) + win32:LIBS = $$member(LIBS, 0) $$member(LIBS, 1)d + } + } +diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf +index a732c49e..dec0d811 100644 +--- a/mkspecs/features/create_cmake.prf ++++ b/mkspecs/features/create_cmake.prf +@@ -233,9 +233,9 @@ contains(CONFIG, plugin) { + else: CMAKE_PLUGIN_EXT = .a + + CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${CMAKE_PLUGIN_EXT} +- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}_debug$${CMAKE_PLUGIN_EXT} ++ CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${CMAKE_PLUGIN_EXT} + CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.prl +- CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}_debug.prl ++ CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.prl + } else { + isEmpty(CMAKE_STATIC_TYPE): CMAKE_PLUGIN_EXT = .so + else: CMAKE_PLUGIN_EXT = .a +@@ -297,10 +297,10 @@ equals(TEMPLATE, aux): CMAKE_FEATURE_PROPERTY_PREFIX = "INTERFACE_" + mac { + CMAKE_FIND_OTHER_LIBRARY_BUILD = "true" + !isEmpty(CMAKE_STATIC_TYPE) { +- CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.a ++ CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.a + CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a + +- CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.prl ++ CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.prl + CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl + } else { + qt_framework { +@@ -309,7 +309,7 @@ mac { + CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.framework/$${CMAKE_QT_STEM} + CMAKE_BUILD_IS_FRAMEWORK = "true" + } else { +- CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.$$eval(QT.$${MODULE}.VERSION).dylib ++ CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.$$eval(QT.$${MODULE}.VERSION).dylib + CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$$eval(QT.$${MODULE}.VERSION).dylib + } + } +diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf +index 7777e615..59be06f8 100644 +--- a/mkspecs/features/qt_functions.prf ++++ b/mkspecs/features/qt_functions.prf +@@ -16,7 +16,7 @@ defineReplace(qtPlatformTargetSuffix) { + darwin { + CONFIG(debug, debug|release) { + !debug_and_release|build_pass: \ +- return($${suffix}_debug) ++ return($${suffix}) + } + } + return($$suffix) +diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf +index bc20251b..2af6313c 100644 +--- a/mkspecs/features/qt_helper_lib.prf ++++ b/mkspecs/features/qt_helper_lib.prf +@@ -64,7 +64,7 @@ win32|CONFIG(static, static|shared) { + win32: \ + MODULE_DEBUG_LIBS = $$DESTDIR/$$prefix$${TARGET}d.$$suffix + else: darwin: \ +- MODULE_DEBUG_LIBS = $$DESTDIR/$$prefix$${TARGET}_debug.$$suffix ++ MODULE_DEBUG_LIBS = $$DESTDIR/$$prefix$${TARGET}.$$suffix + else: \ + error("'$$QMAKE_PLATFORM' does not do debug_and_release.") + MODULE_RELEASE_LIBS = $$DESTDIR/$$prefix$${TARGET}.$$suffix +diff --git a/mkspecs/features/resolve_config.prf b/mkspecs/features/resolve_config.prf +index 816c3b68..39d55c63 100644 +--- a/mkspecs/features/resolve_config.prf ++++ b/mkspecs/features/resolve_config.prf +@@ -43,10 +43,10 @@ CONFIG(debug, debug|release) { + suffix = + qtConfig(debug_and_release) { + equals(build, debug): \ +- suffix = _debug ++ suffix = + } else { + contains(QT_CONFIG, debug): \ +- suffix = _debug ++ suffix = + } + + library_suffix_$${build}.name = $$QMAKE_XCODE_LIBRARY_SUFFIX_SETTING +diff --git a/qmake/doc/snippets/code/doc_src_qmake-manual.pro b/qmake/doc/snippets/code/doc_src_qmake-manual.pro +index d36d926b..26e48d89 100644 +--- a/qmake/doc/snippets/code/doc_src_qmake-manual.pro ++++ b/qmake/doc/snippets/code/doc_src_qmake-manual.pro +@@ -175,7 +175,7 @@ make all + + #! [25] + build_pass:CONFIG(debug, debug|release) { +- unix: TARGET = $$join(TARGET,,,_debug) ++ unix: TARGET = $$join(TARGET,,,) + else: TARGET = $$join(TARGET,,,d) + } + #! [25] +@@ -781,7 +781,7 @@ make install + + #! [127] + CONFIG(debug, debug|release) { +- mac: TARGET = $$join(TARGET,,,_debug) ++ mac: TARGET = $$join(TARGET,,,) + win32: TARGET = $$join(TARGET,,d) + } + #! [127] diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 6f6ef8b962ccca..7549ce7d166ae1 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -89,6 +89,7 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH ${PATCHES} patches/Qt5GuiConfigExtras.patch # Patches the library search behavior for EGL since angle is not build with Qt patches/limits_include.patch # Add missing includes to build with gcc 11 + patches/osx-no-_debug-postfix.patch ) # Remove vendored dependencies to ensure they are not picked up by the build @@ -507,16 +508,6 @@ endif() if(NOT VCPKG_TARGET_IS_WINDOWS) vcpkg_fixup_pkgconfig() endif() -if(VCPKG_TARGET_IS_OSX) - file(GLOB_RECURSE _debug_files "${CURRENT_PACKAGES_DIR}/debug/lib/*_debug.*") - foreach(_file ${_debug_libs}) - string(REPLACE "_debug" "" _new_filename "${_file}") - file(RENAME "${_file}" "${_new_filename}") - if(_new_filename MATCHES "*.(la|prl|pc)") - vcpkg_replace_string("${_new_filename}" "_debug" "") - endif() - endforeach() -endif() # #Code to get generated CMake files from CI # file(RENAME "${CURRENT_PACKAGES_DIR}/share/cmake/Qt5Core/Qt5CoreConfig.cmake" "${CURRENT_BUILDTREES_DIR}/Qt5CoreConfig.cmake.log") diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index ba96b55aadcee6..5dc499c0349da7 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7c3312e6857115542e74a0bdbafc9028ff8c251c", + "git-tree": "b5dc08e9e97994e7810c4c989e6d399f78375f30", "version-semver": "5.15.2", "port-version": 17 }, From 55a3b9c5a535fb0b9d3f14dd0b9ebbde59d651a8 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 3 Dec 2021 21:14:37 +0100 Subject: [PATCH 3/6] Apply suggestions from code review Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> --- ports/qt5-base/patches/osx-no-_debug-postfix.patch | 8 -------- versions/q-/qt5-base.json | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/ports/qt5-base/patches/osx-no-_debug-postfix.patch b/ports/qt5-base/patches/osx-no-_debug-postfix.patch index 538421d4fbb113..59059d1aac10b7 100644 --- a/ports/qt5-base/patches/osx-no-_debug-postfix.patch +++ b/ports/qt5-base/patches/osx-no-_debug-postfix.patch @@ -31,8 +31,6 @@ index a732c49e..dec0d811 100644 mac { CMAKE_FIND_OTHER_LIBRARY_BUILD = "true" !isEmpty(CMAKE_STATIC_TYPE) { -- CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.a -+ CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.a CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a - CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.prl @@ -44,8 +42,6 @@ index a732c49e..dec0d811 100644 CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.framework/$${CMAKE_QT_STEM} CMAKE_BUILD_IS_FRAMEWORK = "true" } else { -- CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.$$eval(QT.$${MODULE}.VERSION).dylib -+ CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.$$eval(QT.$${MODULE}.VERSION).dylib CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$$eval(QT.$${MODULE}.VERSION).dylib } } @@ -57,8 +53,6 @@ index 7777e615..59be06f8 100644 darwin { CONFIG(debug, debug|release) { !debug_and_release|build_pass: \ -- return($${suffix}_debug) -+ return($${suffix}) } } return($$suffix) @@ -70,8 +64,6 @@ index bc20251b..2af6313c 100644 win32: \ MODULE_DEBUG_LIBS = $$DESTDIR/$$prefix$${TARGET}d.$$suffix else: darwin: \ -- MODULE_DEBUG_LIBS = $$DESTDIR/$$prefix$${TARGET}_debug.$$suffix -+ MODULE_DEBUG_LIBS = $$DESTDIR/$$prefix$${TARGET}.$$suffix else: \ error("'$$QMAKE_PLATFORM' does not do debug_and_release.") MODULE_RELEASE_LIBS = $$DESTDIR/$$prefix$${TARGET}.$$suffix diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index 5dc499c0349da7..baa9a3db2592db 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b5dc08e9e97994e7810c4c989e6d399f78375f30", + "git-tree": "25ea9cef2a31677adad9c428c86b90a1574444f0", "version-semver": "5.15.2", "port-version": 17 }, From c42f14584c5380fd26ff973f549f261fa6a667f7 Mon Sep 17 00:00:00 2001 From: Leander Schulten Date: Sun, 5 Dec 2021 05:39:22 +0100 Subject: [PATCH 4/6] [qt5-base] create link to _debug.pc file from .pc file without _debug --- .../patches/osx-no-_debug-postfix.patch | 108 ------------------ ports/qt5-base/portfile.cmake | 12 +- versions/q-/qt5-base.json | 2 +- 3 files changed, 9 insertions(+), 113 deletions(-) delete mode 100644 ports/qt5-base/patches/osx-no-_debug-postfix.patch diff --git a/ports/qt5-base/patches/osx-no-_debug-postfix.patch b/ports/qt5-base/patches/osx-no-_debug-postfix.patch deleted file mode 100644 index 59059d1aac10b7..00000000000000 --- a/ports/qt5-base/patches/osx-no-_debug-postfix.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff --git a/examples/widgets/tools/plugandpaint/app/app.pro b/examples/widgets/tools/plugandpaint/app/app.pro -index 558d359e..3de0822f 100644 ---- a/examples/widgets/tools/plugandpaint/app/app.pro -+++ b/examples/widgets/tools/plugandpaint/app/app.pro -@@ -20,7 +20,7 @@ macx-xcode { - } else { - LIBS += -lpnp_basictools - if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { -- mac:LIBS = $$member(LIBS, 0) $$member(LIBS, 1)_debug -+ mac:LIBS = $$member(LIBS, 0) $$member(LIBS, 1) - win32:LIBS = $$member(LIBS, 0) $$member(LIBS, 1)d - } - } -diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index a732c49e..dec0d811 100644 ---- a/mkspecs/features/create_cmake.prf -+++ b/mkspecs/features/create_cmake.prf -@@ -233,9 +233,9 @@ contains(CONFIG, plugin) { - else: CMAKE_PLUGIN_EXT = .a - - CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${CMAKE_PLUGIN_EXT} -- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}_debug$${CMAKE_PLUGIN_EXT} -+ CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${CMAKE_PLUGIN_EXT} - CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.prl -- CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}_debug.prl -+ CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.prl - } else { - isEmpty(CMAKE_STATIC_TYPE): CMAKE_PLUGIN_EXT = .so - else: CMAKE_PLUGIN_EXT = .a -@@ -297,10 +297,10 @@ equals(TEMPLATE, aux): CMAKE_FEATURE_PROPERTY_PREFIX = "INTERFACE_" - mac { - CMAKE_FIND_OTHER_LIBRARY_BUILD = "true" - !isEmpty(CMAKE_STATIC_TYPE) { - CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a - -- CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.prl -+ CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.prl - CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl - } else { - qt_framework { -@@ -309,7 +309,7 @@ mac { - CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.framework/$${CMAKE_QT_STEM} - CMAKE_BUILD_IS_FRAMEWORK = "true" - } else { - CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$$eval(QT.$${MODULE}.VERSION).dylib - } - } -diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 7777e615..59be06f8 100644 ---- a/mkspecs/features/qt_functions.prf -+++ b/mkspecs/features/qt_functions.prf -@@ -16,7 +16,7 @@ defineReplace(qtPlatformTargetSuffix) { - darwin { - CONFIG(debug, debug|release) { - !debug_and_release|build_pass: \ - } - } - return($$suffix) -diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf -index bc20251b..2af6313c 100644 ---- a/mkspecs/features/qt_helper_lib.prf -+++ b/mkspecs/features/qt_helper_lib.prf -@@ -64,7 +64,7 @@ win32|CONFIG(static, static|shared) { - win32: \ - MODULE_DEBUG_LIBS = $$DESTDIR/$$prefix$${TARGET}d.$$suffix - else: darwin: \ - else: \ - error("'$$QMAKE_PLATFORM' does not do debug_and_release.") - MODULE_RELEASE_LIBS = $$DESTDIR/$$prefix$${TARGET}.$$suffix -diff --git a/mkspecs/features/resolve_config.prf b/mkspecs/features/resolve_config.prf -index 816c3b68..39d55c63 100644 ---- a/mkspecs/features/resolve_config.prf -+++ b/mkspecs/features/resolve_config.prf -@@ -43,10 +43,10 @@ CONFIG(debug, debug|release) { - suffix = - qtConfig(debug_and_release) { - equals(build, debug): \ -- suffix = _debug -+ suffix = - } else { - contains(QT_CONFIG, debug): \ -- suffix = _debug -+ suffix = - } - - library_suffix_$${build}.name = $$QMAKE_XCODE_LIBRARY_SUFFIX_SETTING -diff --git a/qmake/doc/snippets/code/doc_src_qmake-manual.pro b/qmake/doc/snippets/code/doc_src_qmake-manual.pro -index d36d926b..26e48d89 100644 ---- a/qmake/doc/snippets/code/doc_src_qmake-manual.pro -+++ b/qmake/doc/snippets/code/doc_src_qmake-manual.pro -@@ -175,7 +175,7 @@ make all - - #! [25] - build_pass:CONFIG(debug, debug|release) { -- unix: TARGET = $$join(TARGET,,,_debug) -+ unix: TARGET = $$join(TARGET,,,) - else: TARGET = $$join(TARGET,,,d) - } - #! [25] -@@ -781,7 +781,7 @@ make install - - #! [127] - CONFIG(debug, debug|release) { -- mac: TARGET = $$join(TARGET,,,_debug) -+ mac: TARGET = $$join(TARGET,,,) - win32: TARGET = $$join(TARGET,,d) - } - #! [127] diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 7549ce7d166ae1..4188e38a6139bb 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -89,7 +89,6 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH ${PATCHES} patches/Qt5GuiConfigExtras.patch # Patches the library search behavior for EGL since angle is not build with Qt patches/limits_include.patch # Add missing includes to build with gcc 11 - patches/osx-no-_debug-postfix.patch ) # Remove vendored dependencies to ensure they are not picked up by the build @@ -505,10 +504,15 @@ if(QT_BUILD_LATEST) ) endif() -if(NOT VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_pkgconfig() -endif() +vcpkg_fixup_pkgconfig() +if(VCPKG_TARGET_IS_OSX) + file(GLOB _debug_files "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*_debug.pc") + foreach(_file ${_debug_files}) + string(REGEX REPLACE "_debug\.pc$" ".pc" _new_filename "${_file}") + file(CREATE_LINK "${_file}" "${_new_filename}") + endforeach() +endif() # #Code to get generated CMake files from CI # file(RENAME "${CURRENT_PACKAGES_DIR}/share/cmake/Qt5Core/Qt5CoreConfig.cmake" "${CURRENT_BUILDTREES_DIR}/Qt5CoreConfig.cmake.log") # file(GLOB_RECURSE CMAKE_GUI_FILES "${CURRENT_PACKAGES_DIR}/share/cmake/Qt5Gui/*.cmake" ) diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index baa9a3db2592db..72a6d8ac1b97c8 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "25ea9cef2a31677adad9c428c86b90a1574444f0", + "git-tree": "357a432112f16688e2a0529020d7debaf0421550", "version-semver": "5.15.2", "port-version": 17 }, From d44174dba70bf309aa982d1c4efa35f60fe6d2ae Mon Sep 17 00:00:00 2001 From: Leander Schulten Date: Tue, 7 Dec 2021 15:00:15 +0100 Subject: [PATCH 5/6] update version --- ports/qt5-base/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/qt5-base.json | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index 7922d6120858e0..8a05321bcf8646 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-base", "version-semver": "5.15.2", - "port-version": 17, + "port-version": 18, "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index d801294af7f255..b84bc300a595b7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5526,7 +5526,7 @@ }, "qt5-base": { "baseline": "5.15.2", - "port-version": 17 + "port-version": 18 }, "qt5-canvas3d": { "baseline": "0", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index d192f255ac8b7f..fc837448832e2c 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "61c4e933f6d8c618dc42f06f2cf270c7647e4a46", + "version-semver": "5.15.2", + "port-version": 18 + }, { "git-tree": "f8fbecca6183036771dc794859432a2a84435abb", "version-semver": "5.15.2", From 33211b630dc5b36682ca35a33dfdee994d899275 Mon Sep 17 00:00:00 2001 From: Leander Schulten Date: Sun, 12 Dec 2021 00:02:58 +0100 Subject: [PATCH 6/6] [qt5-base] create forward pkgconfig file --- ports/qt5-base/portfile.cmake | 7 +++++-- versions/q-/qt5-base.json | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 4188e38a6139bb..dac4d876ba9a36 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -509,8 +509,11 @@ vcpkg_fixup_pkgconfig() if(VCPKG_TARGET_IS_OSX) file(GLOB _debug_files "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*_debug.pc") foreach(_file ${_debug_files}) - string(REGEX REPLACE "_debug\.pc$" ".pc" _new_filename "${_file}") - file(CREATE_LINK "${_file}" "${_new_filename}") + string(REGEX REPLACE "_debug\\.pc$" ".pc" _new_filename "${_file}") + string(REGEX MATCH "(Qt5[a-zA-Z]+)_debug\\.pc$" _not_used "${_file}") + set(_name ${CMAKE_MATCH_1}) + file(STRINGS "${_file}" _version REGEX "^(Version):.+$") + file(WRITE "${_new_filename}" "Name: ${_name}\nDescription: Forwarding to the _debug version by vcpkg\n${_version}\nRequires: ${_name}_debug\n") endforeach() endif() # #Code to get generated CMake files from CI diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index 045326a9e24586..829c9e123fead5 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "91ba9e0a3cfc41b0c96942e4968ecc7dcd52c6e5", + "git-tree": "5a9c2b85fd5f62bb1b52f18c4628b0e08d765dd4", "version-semver": "5.15.2", "port-version": 19 },