From bc96cd54bf3afe85e4c1f201d6475f5ce0a4763c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Mon, 12 Apr 2021 13:15:11 -0400 Subject: [PATCH] [many ports] Update existing KF5 frameworks to 5.75 (#13467) * Update KF5 framework to 5.73 kf5crash - make x11 patch exclusive to linux - enable win/macOS builds kf5syntaxhighlighting - fix building on non-Win by removing the cli tool from all platforms * Add kf5auth port * Revert "Add kf5auth port" This reverts commit 8703c2423667f62075c34496ef273394a5b8d538. * Add kf5globalaccel port * Revert "Add kf5globalaccel port" This reverts commit f1ac3db8e2019f474a09d6964aea8e21bc9da166. * [ecm] use where possible * [kf5holidays] use PORT placeholder where possible * [kf5syntaxhighlighting] use PORT placeholder where possible Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [kf5plotting] use PORT placeholder where possible * [kf5crash] fix logical condition in the patch * [kf5crash] logical condition again, include other BSDs * [kf5i18n] acquire python3 * [kf5i18n] remove vcpk cmake wrapper added mistakenly * Update KF5 framework to 5.73 kf5crash - make x11 patch exclusive to linux - enable win/macOS builds kf5syntaxhighlighting - fix building on non-Win by removing the cli tool from all platforms * Add kf5auth port * Revert "Add kf5auth port" This reverts commit 8703c2423667f62075c34496ef273394a5b8d538. * Add kf5globalaccel port * Revert "Add kf5globalaccel port" This reverts commit f1ac3db8e2019f474a09d6964aea8e21bc9da166. * [ecm] use where possible * [kf5holidays] use PORT placeholder where possible * [kf5syntaxhighlighting] use PORT placeholder where possible Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [kf5plotting] use PORT placeholder where possible * [kf5crash] fix logical condition in the patch * [kf5crash] logical condition again, include other BSDs * [kf5i18n] acquire python3 * [kf5i18n] remove vcpk cmake wrapper added mistakenly * [ecm] Remove 'skip' from windows baseline * Fixed KF5ItemModel for windows * [kf5syntaxhighlighting] fix Windows build * Fixed k5syntaxhighlighting for windows * [kf5plotting] fix license files * [kf5archive] fix license files * [kf5*] update to 5.75.0 * [kf5holidays] fix sha sum * [kf5syntaxhighlighting] fix licensing * [kf5itemviews] fix windows static build * [kf5widgetsaddons] fix windows static build * [kf5completion] fix windows static build * [kf5*] fix windows static build * [kf5i18n] fix windows static build * [kf5windowsystem] require libxcb-res0-dev * [kf5windowsystem] depend on qt5-x11extras * [qt5] fix brotli reference * Delete duplicate apt entries. * kf5crash: fix linux build * kf5i18n: fix Linux build * ecm: do not override custom clang format files * kf5i18n: fix Windows build * [kf5*] update versions * [kf5i18n] fix logical NOT * [kf5syntaxhighlighting] disable parallel configure * [kf5*] update versions * [kf5*] convert CONTROL to manifest * [kf5*] update versions * [kf5*] update versioning scheme * [ecm] syntax formatting Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [kf5syntaxhighlighting] syntax formatting Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [kf5holidays] syntax formatting Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [kf5archive] restore original line order * [kf5holidays] restore CRLF * [kf5archive] restore CRLF * [kf5syntaxhighlighting] syntax formatting * [kf5syntaxhighlighting] quotations * [kf5syntaxhighlighting] fix \bin removal redundancy * [kf5*] update versions Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Robert Schumacher Co-authored-by: Kuntal Majumder Co-authored-by: Billy Robert O'Neal III --- ports/ecm/CONTROL | 4 --- ...t-override-custom-clang-format-files.patch | 33 ++++++++++++++++++ ports/ecm/portfile.cmake | 8 +++-- ports/ecm/vcpkg.json | 6 ++++ ports/kf5archive/CONTROL | 6 ---- ports/kf5archive/portfile.cmake | 11 ++++-- ports/kf5archive/vcpkg.json | 12 +++++++ ports/kf5completion/CONTROL | 5 --- .../add-qdbus-to-required-libraries.patch | 3 +- ports/kf5completion/portfile.cmake | 11 ++++-- ports/kf5completion/vcpkg.json | 12 +++++++ ports/kf5config/CONTROL | 5 --- ports/kf5config/portfile.cmake | 6 ++-- ports/kf5config/vcpkg.json | 11 ++++++ ports/kf5coreaddons/CONTROL | 5 --- ports/kf5coreaddons/portfile.cmake | 6 ++-- ports/kf5coreaddons/vcpkg.json | 11 ++++++ ports/kf5crash/CONTROL | 6 ---- ports/kf5crash/add_x11extras.patch | 18 +++++----- ports/kf5crash/portfile.cmake | 8 ++--- ports/kf5crash/vcpkg.json | 16 +++++++++ ports/kf5guiaddons/CONTROL | 5 --- ports/kf5guiaddons/portfile.cmake | 11 ++++-- ports/kf5guiaddons/vcpkg.json | 18 ++++++++++ ports/kf5holidays/CONTROL | 4 --- ports/kf5holidays/portfile.cmake | 20 +++++++---- ports/kf5holidays/vcpkg.json | 10 ++++++ ports/kf5i18n/CONTROL | 6 ---- ports/kf5i18n/portfile.cmake | 19 +++++++++-- ...cmake-failing-with-variable-notfound.patch | 33 ++++++++++++++++++ ports/kf5i18n/vcpkg.json | 12 +++++++ ports/kf5itemmodels/CONTROL | 5 --- ports/kf5itemmodels/portfile.cmake | 12 +++++-- ports/kf5itemmodels/vcpkg.json | 11 ++++++ ports/kf5itemviews/CONTROL | 5 --- ports/kf5itemviews/portfile.cmake | 11 ++++-- ports/kf5itemviews/vcpkg.json | 11 ++++++ ports/kf5plotting/CONTROL | 5 --- ports/kf5plotting/portfile.cmake | 7 ++-- ports/kf5plotting/vcpkg.json | 11 ++++++ ports/kf5syntaxhighlighting/CONTROL | 5 --- ports/kf5syntaxhighlighting/portfile.cmake | 26 +++++++------- ports/kf5syntaxhighlighting/vcpkg.json | 12 +++++++ ports/kf5widgetsaddons/CONTROL | 5 --- ports/kf5widgetsaddons/portfile.cmake | 11 ++++-- ports/kf5widgetsaddons/vcpkg.json | 11 ++++++ ports/kf5windowsystem/CONTROL | 5 --- ports/kf5windowsystem/portfile.cmake | 16 +++++++-- ports/kf5windowsystem/vcpkg.json | 18 ++++++++++ scripts/ci.baseline.txt | 9 ----- versions/baseline.json | 34 +++++++++---------- versions/e-/ecm.json | 5 +++ versions/k-/kf5archive.json | 5 +++ versions/k-/kf5completion.json | 5 +++ versions/k-/kf5config.json | 5 +++ versions/k-/kf5coreaddons.json | 5 +++ versions/k-/kf5crash.json | 5 +++ versions/k-/kf5guiaddons.json | 5 +++ versions/k-/kf5holidays.json | 5 +++ versions/k-/kf5i18n.json | 5 +++ versions/k-/kf5itemmodels.json | 5 +++ versions/k-/kf5itemviews.json | 5 +++ versions/k-/kf5plotting.json | 5 +++ versions/k-/kf5syntaxhighlighting.json | 5 +++ versions/k-/kf5widgetsaddons.json | 5 +++ versions/k-/kf5windowsystem.json | 5 +++ 66 files changed, 472 insertions(+), 174 deletions(-) delete mode 100644 ports/ecm/CONTROL create mode 100644 ports/ecm/do-not-override-custom-clang-format-files.patch create mode 100644 ports/ecm/vcpkg.json delete mode 100644 ports/kf5archive/CONTROL create mode 100644 ports/kf5archive/vcpkg.json delete mode 100644 ports/kf5completion/CONTROL create mode 100644 ports/kf5completion/vcpkg.json delete mode 100644 ports/kf5config/CONTROL create mode 100644 ports/kf5config/vcpkg.json delete mode 100644 ports/kf5coreaddons/CONTROL create mode 100644 ports/kf5coreaddons/vcpkg.json delete mode 100644 ports/kf5crash/CONTROL create mode 100644 ports/kf5crash/vcpkg.json delete mode 100644 ports/kf5guiaddons/CONTROL create mode 100644 ports/kf5guiaddons/vcpkg.json delete mode 100644 ports/kf5holidays/CONTROL create mode 100644 ports/kf5holidays/vcpkg.json delete mode 100644 ports/kf5i18n/CONTROL create mode 100644 ports/kf5i18n/prevent-cmake-failing-with-variable-notfound.patch create mode 100644 ports/kf5i18n/vcpkg.json delete mode 100644 ports/kf5itemmodels/CONTROL create mode 100644 ports/kf5itemmodels/vcpkg.json delete mode 100644 ports/kf5itemviews/CONTROL create mode 100644 ports/kf5itemviews/vcpkg.json delete mode 100644 ports/kf5plotting/CONTROL create mode 100644 ports/kf5plotting/vcpkg.json delete mode 100644 ports/kf5syntaxhighlighting/CONTROL create mode 100644 ports/kf5syntaxhighlighting/vcpkg.json delete mode 100644 ports/kf5widgetsaddons/CONTROL create mode 100644 ports/kf5widgetsaddons/vcpkg.json delete mode 100644 ports/kf5windowsystem/CONTROL create mode 100644 ports/kf5windowsystem/vcpkg.json diff --git a/ports/ecm/CONTROL b/ports/ecm/CONTROL deleted file mode 100644 index ecdc76ea179..00000000000 --- a/ports/ecm/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: ecm -Version: 5.74.0 -Homepage: https://github.com/KDE/extra-cmake-modules -Description: Extra CMake Modules (ECM), extra modules and scripts for CMake diff --git a/ports/ecm/do-not-override-custom-clang-format-files.patch b/ports/ecm/do-not-override-custom-clang-format-files.patch new file mode 100644 index 00000000000..4e7f4e286de --- /dev/null +++ b/ports/ecm/do-not-override-custom-clang-format-files.patch @@ -0,0 +1,33 @@ +From 0d5ed9bb9117f6526691b3572bf85090efbeed4a Mon Sep 17 00:00:00 2001 +From: Alexander Lohnau +Date: Sat, 30 Jan 2021 13:44:07 +0100 +Subject: [PATCH] KDEClangFormat: Do not override custom clang-format files + +--- + kde-modules/KDEClangFormat.cmake | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/kde-modules/KDEClangFormat.cmake b/kde-modules/KDEClangFormat.cmake +index 6cdbd2b5..995f03ad 100644 +--- a/kde-modules/KDEClangFormat.cmake ++++ b/kde-modules/KDEClangFormat.cmake +@@ -35,7 +35,18 @@ find_program(KDE_CLANG_FORMAT_EXECUTABLE clang-format) + + # instantiate our clang-format file, must be in source directory for tooling if we have the tool + if(KDE_CLANG_FORMAT_EXECUTABLE) +- configure_file(${CMAKE_CURRENT_LIST_DIR}/clang-format.cmake ${CMAKE_CURRENT_SOURCE_DIR}/.clang-format @ONLY) ++ set(CLANG_FORMAT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/.clang-format) ++ if (EXISTS ${CLANG_FORMAT_FILE}) ++ file(READ ${CLANG_FORMAT_FILE} CLANG_FORMAT_CONTENTS LIMIT 128) ++ string(FIND "${CLANG_FORMAT_CONTENTS}" "SPDX-FileCopyrightText: 2019 Christoph Cullmann" matchres) ++ if(${matchres} EQUAL -1) ++ message(WARNING "The .clang-format file already exists. Please remove it in order to use the file provided by ECM") ++ else() ++ configure_file(${CMAKE_CURRENT_LIST_DIR}/clang-format.cmake ${CLANG_FORMAT_FILE} @ONLY) ++ endif() ++ else() ++ configure_file(${CMAKE_CURRENT_LIST_DIR}/clang-format.cmake ${CLANG_FORMAT_FILE} @ONLY) ++ endif() + endif() + + # formatting target diff --git a/ports/ecm/portfile.cmake b/ports/ecm/portfile.cmake index c3ef7cdb160..279c7c32848 100644 --- a/ports/ecm/portfile.cmake +++ b/ports/ecm/portfile.cmake @@ -1,9 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/extra-cmake-modules - REF 5c191fa1d2383c69ddc075395e04f84b7679613a # v5.74.0 - SHA512 9a520e2cb45f2891cb5b463409063549904574e2ad0c4f77987555fc9aac68589695344a3acaddcb95d2739458031ece489ff9635c7d713c6309e4f9027f6ef7 + REF v5.75.0 + SHA512 486845a91967c89dec42f9120757c7b883006713d0957e9bd21dfacb2911225fe45680590ef3dc5e0d45a9dbc81cf99e1514fb4922b1a027bcba3864da883076 HEAD_REF master + PATCHES + "do-not-override-custom-clang-format-files.patch" ) vcpkg_configure_cmake( @@ -21,7 +23,7 @@ vcpkg_install_cmake() # Remove debug files file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -file(COPY ${CURRENT_PORT_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/ecm) +file(COPY ${CURRENT_PORT_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) # Handle copyright file(INSTALL ${SOURCE_PATH}/COPYING-CMAKE-SCRIPTS DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/ecm/vcpkg.json b/ports/ecm/vcpkg.json new file mode 100644 index 00000000000..0d343e0fd6b --- /dev/null +++ b/ports/ecm/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "ecm", + "version": "5.75.0", + "description": "Extra CMake Modules (ECM), extra modules and scripts for CMake", + "homepage": "https://github.com/KDE/extra-cmake-modules" +} diff --git a/ports/kf5archive/CONTROL b/ports/kf5archive/CONTROL deleted file mode 100644 index d94ba138351..00000000000 --- a/ports/kf5archive/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: kf5archive -Version: 5.74.0 -Port-Version: 1 -Homepage: https://api.kde.org/frameworks/karchive/html/index.html -Description: File compression -Build-Depends: ecm, qt5-base[core], zlib, bzip2 diff --git a/ports/kf5archive/portfile.cmake b/ports/kf5archive/portfile.cmake index 537f1bb4fb2..1b97f8ddecf 100644 --- a/ports/kf5archive/portfile.cmake +++ b/ports/kf5archive/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/karchive - REF 6e1f95972f25f1d3a94dd181f44ee0846e042ef9 # v5.74.0 - SHA512 333a5e310c1b482379a3092bb3ac0e31963917090edd3afba6f26e40f63abe327dfdff70800e635667fe3333538e5fc911ab06d7287c17d2062a4618c191f308 + REF v5.75.0 + SHA512 4a909626f776cc9ebf9acd0e16bcda9e2e0e5dd29bd52b27140baa9905758a028f542ccd40e98c5432a4d9eac2908e36e1f9329e40cc4cf835e15557c96175f1 HEAD_REF master ) @@ -20,8 +20,13 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Archive) vcpkg_copy_pdbs() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/LICENSES/LGPL-3.0-only.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file diff --git a/ports/kf5archive/vcpkg.json b/ports/kf5archive/vcpkg.json new file mode 100644 index 00000000000..744e7ecf9fc --- /dev/null +++ b/ports/kf5archive/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "kf5archive", + "version": "5.75.0", + "description": "File compression", + "homepage": "https://api.kde.org/frameworks/karchive/html/index.html", + "dependencies": [ + "bzip2", + "ecm", + "qt5-base", + "zlib" + ] +} diff --git a/ports/kf5completion/CONTROL b/ports/kf5completion/CONTROL deleted file mode 100644 index fb1f4309ace..00000000000 --- a/ports/kf5completion/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: kf5completion -Version: 5.64.0 -Homepage: https://api.kde.org/frameworks/kcompletion/html/index.html -Description: Text completion helpers and widgets -Build-Depends: ecm, qt5-tools, kf5config, kf5widgetsaddons \ No newline at end of file diff --git a/ports/kf5completion/add-qdbus-to-required-libraries.patch b/ports/kf5completion/add-qdbus-to-required-libraries.patch index b5c285a652b..89add381651 100644 --- a/ports/kf5completion/add-qdbus-to-required-libraries.patch +++ b/ports/kf5completion/add-qdbus-to-required-libraries.patch @@ -1,10 +1,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a86a05e..688bae2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KCOMPLETION # Dependencies - set(REQUIRED_QT_VERSION 5.11.0) + set(REQUIRED_QT_VERSION 5.12.0) -find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Widgets) +find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Widgets DBus) diff --git a/ports/kf5completion/portfile.cmake b/ports/kf5completion/portfile.cmake index d9e697dcf3c..fd4f0c2f269 100644 --- a/ports/kf5completion/portfile.cmake +++ b/ports/kf5completion/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kcompletion - REF v5.64.0 - SHA512 1d597bc0e82d1570b1ff7b254425ab18d4d505a0b7f475a43b51d70566b91e763b86675837421c3f09073544efa77e673e9d2cfef586c12684fc9fe7b0c6a0cc + REF v5.75.0 + SHA512 f4ff54b518f51b399392ee8f4be27bcc15a45be993b6a76305a16c84d6a85629017b8c4c27f19ff2c37699eeb3a455b9b6e5c7551716a55f0f7ecce2f2a2240b HEAD_REF master # reported issue, just a manual workaround until the issue is fixed upstream PATCHES @@ -24,10 +24,15 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Completion) vcpkg_copy_pdbs() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/data) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) -file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file diff --git a/ports/kf5completion/vcpkg.json b/ports/kf5completion/vcpkg.json new file mode 100644 index 00000000000..8a799ccf821 --- /dev/null +++ b/ports/kf5completion/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "kf5completion", + "version": "5.75.0", + "description": "Text completion helpers and widgets", + "homepage": "https://api.kde.org/frameworks/kcompletion/html/index.html", + "dependencies": [ + "ecm", + "kf5config", + "kf5widgetsaddons", + "qt5-tools" + ] +} diff --git a/ports/kf5config/CONTROL b/ports/kf5config/CONTROL deleted file mode 100644 index 8c0c49e3114..00000000000 --- a/ports/kf5config/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: kf5config -Version: 5.64.0 -Homepage: https://api.kde.org/frameworks/kconfig/html/index.html -Description: Configuration system -Build-Depends: ecm, qt5-base, qt5-tools diff --git a/ports/kf5config/portfile.cmake b/ports/kf5config/portfile.cmake index 444b1aed5ab..d7bfb4469e9 100644 --- a/ports/kf5config/portfile.cmake +++ b/ports/kf5config/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kconfig - REF v5.64.0 - SHA512 b8919e552a35ed3f4882d2d15205c5576be985e9f6e4e834d26587c9288e85a2ab27504a1531d1af70e8db4dc7ed71a6b0caf91c7310dace81177b68aa6a97e5 + REF v5.75.0 + SHA512 66789adf41114354cd2602b4bc6215f99026c1735547ab9c1449fff18dca7cf1e5786dcc8030499b8449498d14ece33aad9d9955109331f5c8c3914d1eccfd50 HEAD_REF master ) @@ -50,4 +50,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) -file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) diff --git a/ports/kf5config/vcpkg.json b/ports/kf5config/vcpkg.json new file mode 100644 index 00000000000..858fda317b1 --- /dev/null +++ b/ports/kf5config/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "kf5config", + "version": "5.75.0", + "description": "Configuration system", + "homepage": "https://api.kde.org/frameworks/kconfig/html/index.html", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-tools" + ] +} diff --git a/ports/kf5coreaddons/CONTROL b/ports/kf5coreaddons/CONTROL deleted file mode 100644 index 03d14a3545d..00000000000 --- a/ports/kf5coreaddons/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: kf5coreaddons -Version: 5.64.0 -Homepage: https://api.kde.org/frameworks/kcoreaddons/html/index.html -Description: Addons to QtCore -Build-Depends: ecm, qt5-base, qt5-tools diff --git a/ports/kf5coreaddons/portfile.cmake b/ports/kf5coreaddons/portfile.cmake index 14862e07f11..be69ef74ddb 100644 --- a/ports/kf5coreaddons/portfile.cmake +++ b/ports/kf5coreaddons/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kcoreaddons - REF v5.64.0 - SHA512 b6849c072aa33cd2d93477e7a08ffc8ec7034f7d8530b6492faa9a53e4e15af0da778fc54e5d865e68b36c32aa6559f3d178a03046f5120d11dcb61d35ed7a60 + REF v5.75.0 + SHA512 bf17c323dbf2164a1d8e265ff97f01dd683b0f285c59755dd2f49a842666af0eaba3f6f73496d2f9690088b1cc7fe37e671218f039e8b3be0ce1ac5e2bbe13c3 ) vcpkg_configure_cmake( @@ -39,4 +39,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file diff --git a/ports/kf5coreaddons/vcpkg.json b/ports/kf5coreaddons/vcpkg.json new file mode 100644 index 00000000000..294d42158ae --- /dev/null +++ b/ports/kf5coreaddons/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "kf5coreaddons", + "version": "5.75.0", + "description": "Addons to QtCore", + "homepage": "https://api.kde.org/frameworks/kcoreaddons/html/index.html", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-tools" + ] +} diff --git a/ports/kf5crash/CONTROL b/ports/kf5crash/CONTROL deleted file mode 100644 index 927eca46cd0..00000000000 --- a/ports/kf5crash/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: kf5crash -Version: 5.64.0 -Homepage: https://api.kde.org/frameworks/kcrash/html/index.html -Description: KCrash provides support for intercepting and handling application crashes. -Supports: linux -Build-Depends: ecm, kf5coreaddons, kf5widgetsaddons diff --git a/ports/kf5crash/add_x11extras.patch b/ports/kf5crash/add_x11extras.patch index a6ff6fc66ce..9a260ab52db 100644 --- a/ports/kf5crash/add_x11extras.patch +++ b/ports/kf5crash/add_x11extras.patch @@ -1,13 +1,15 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8a9d1c6..0d5fb3f 100644 +index 8c66d85..f2d89cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -12,7 +12,7 @@ feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKA - set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) - - set(REQUIRED_QT_VERSION 5.11.0) --find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core) -+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core X11Extras) - include(KDEInstallDirs) +@@ -17,8 +17,9 @@ include(KDEInstallDirs) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) + +-if (NOT APPLE) ++if (UNIX AND NOT APPLE) + find_package(X11) ++ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED COMPONENTS X11Extras) + endif() + + set(HAVE_X11 ${X11_FOUND}) diff --git a/ports/kf5crash/portfile.cmake b/ports/kf5crash/portfile.cmake index dc608d37153..5e12a93ea42 100644 --- a/ports/kf5crash/portfile.cmake +++ b/ports/kf5crash/portfile.cmake @@ -1,10 +1,8 @@ -vcpkg_fail_port_install(ON_TARGET "osx" "uwp" "windows") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kcrash - REF v5.64.0 - SHA512 28749b220002fef756dbd8436cf684b7e3eb1d72ae00ae8b1bfded5c4a446683dc925a3be9beb55ad0872e71d3c23411d32b4fab935909816efa339cedaeda3d + REF v5.75.0 + SHA512 f6784d2db20bd90194a1ae8134e344a899f8c28d934783fbc104d2719e8340955278059ea5a237eeda550b4c4484e45c6d4b7c09425b0d1bb0b0025d8e214596 HEAD_REF master PATCHES add_x11extras.patch @@ -28,4 +26,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) -file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) diff --git a/ports/kf5crash/vcpkg.json b/ports/kf5crash/vcpkg.json new file mode 100644 index 00000000000..b7c09c9b79f --- /dev/null +++ b/ports/kf5crash/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "kf5crash", + "version": "5.75.0", + "description": "KCrash provides support for intercepting and handling application crashes.", + "homepage": "https://api.kde.org/frameworks/kcrash/html/index.html", + "supports": "linux", + "dependencies": [ + "ecm", + "kf5coreaddons", + "kf5windowsystem", + { + "name": "qt5-x11extras", + "platform": "linux" + } + ] +} diff --git a/ports/kf5guiaddons/CONTROL b/ports/kf5guiaddons/CONTROL deleted file mode 100644 index a364eecc1d7..00000000000 --- a/ports/kf5guiaddons/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: kf5guiaddons -Version: 5.64.0 -Homepage: https://api.kde.org/frameworks/kguiaddons/html/index.html -Description: Addons to QtGui -Build-Depends: ecm, qt5-winextras (windows), qt5-x11extras (linux), qt5-tools diff --git a/ports/kf5guiaddons/portfile.cmake b/ports/kf5guiaddons/portfile.cmake index 8234e4cd878..4a933a91508 100644 --- a/ports/kf5guiaddons/portfile.cmake +++ b/ports/kf5guiaddons/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kguiaddons - REF v5.64.0 - SHA512 98d07360f02b473997cdbf9e9b832ea8c4a459a73669eff1db5276dfbd63e9a9088e3c1ed99d70cc1433468e1efcbce43d22fefdf75a399f4812e0fc4a4f13b1 + REF v5.75.0 + SHA512 d016e2e8c6fecd037cab025acd129305a3c062e0f98b537f1454dccfb13d9a6765f1974588416fcd8d23ae9c9efdb2276c3cbab15e21df62aea07059142dd12b HEAD_REF master ) @@ -20,10 +20,15 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5GuiAddons) vcpkg_copy_pdbs() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/data) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) -file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file + +file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file diff --git a/ports/kf5guiaddons/vcpkg.json b/ports/kf5guiaddons/vcpkg.json new file mode 100644 index 00000000000..55fd0fdb18d --- /dev/null +++ b/ports/kf5guiaddons/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "kf5guiaddons", + "version": "5.75.0", + "description": "Addons to QtGui", + "homepage": "https://api.kde.org/frameworks/kguiaddons/html/index.html", + "dependencies": [ + "ecm", + "qt5-tools", + { + "name": "qt5-winextras", + "platform": "windows" + }, + { + "name": "qt5-x11extras", + "platform": "linux" + } + ] +} diff --git a/ports/kf5holidays/CONTROL b/ports/kf5holidays/CONTROL deleted file mode 100644 index 514b893a5b7..00000000000 --- a/ports/kf5holidays/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: kf5holidays -Version: 5.74.0 -Description: Holiday calculation library -Build-Depends: ecm, qt5-base[core], qt5-tools diff --git a/ports/kf5holidays/portfile.cmake b/ports/kf5holidays/portfile.cmake index 81fb56389c7..22899a21b09 100644 --- a/ports/kf5holidays/portfile.cmake +++ b/ports/kf5holidays/portfile.cmake @@ -1,29 +1,35 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kholidays - REF 75055256fdd361fa52bafc0ee2f989b14661cd22 # v5.74.0 - SHA512 0405eac77aedf363697c4aa9cc8699c7031db86957dfc6143078bd8dc88955bcdd31e9fd2af78be2543f87e6391ff73257f591b04135c649450b60006012c34a + REF v5.75.0 + SHA512 16b62a7e8fc664075cf787a7ae811bdb7f27b11f10619001994e1aa0c89e46bdb1c932091f6fcdcc3bad91614eeb9606a9b6aef62cec5e4a557a0c107e32d816 HEAD_REF master ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF - -DBUILD_TESTING=OFF + OPTIONS + -DBUILD_HTML_DOCS=OFF + -DBUILD_MAN_DOCS=OFF + -DBUILD_QTHELP_DOCS=OFF + -DBUILD_TESTING=OFF ) vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Holidays) vcpkg_copy_pdbs() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/qml ${CURRENT_PACKAGES_DIR}/debug/qml ) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/qml ${CURRENT_PACKAGES_DIR}/qml ) -file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/kf5holidays RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) diff --git a/ports/kf5holidays/vcpkg.json b/ports/kf5holidays/vcpkg.json new file mode 100644 index 00000000000..ee7a3fcd6c3 --- /dev/null +++ b/ports/kf5holidays/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "kf5holidays", + "version": "5.75.0", + "description": "Holiday calculation library", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-tools" + ] +} diff --git a/ports/kf5i18n/CONTROL b/ports/kf5i18n/CONTROL deleted file mode 100644 index d963ed00809..00000000000 --- a/ports/kf5i18n/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: kf5i18n -Version: 5.64.0 -Port-Version: 1 -Homepage: https://api.kde.org/frameworks/ki18n/html/index.html -Description: Advanced internationalization framework -Build-Depends: ecm, qt5-declarative, qt5-tools, gettext diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake index 779fd60e839..ad350dd4207 100644 --- a/ports/kf5i18n/portfile.cmake +++ b/ports/kf5i18n/portfile.cmake @@ -1,8 +1,13 @@ +if(NOT VCPKG_TARGET_IS_WINDOWS) + list(APPEND PATCHES "prevent-cmake-failing-with-variable-notfound.patch") +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/ki18n - REF v5.64.0 - SHA512 13b5d701003edea704ffc86a886d86b27ff2198d4cde4ee732b9241cf04dba0fba403f1f78b45facd7c2d3b543f8f0a098369035270a61b347331eb495fae1d3 + REF v5.75.0 + SHA512 9e059afb8c3bd074ecdfcb1bf4cf3c9340159dc9f7276c9bb81abb1fa73fc893229abade8c4fac344ffec555889232d3a789df72974d6f9c7c6437627872a356 + PATCHES ${PATCHES} ) if(CMAKE_HOST_WIN32) @@ -26,6 +31,8 @@ if(CMAKE_HOST_WIN32) vcpkg_add_to_path(${GETTEXT_PATH}) endif() +vcpkg_find_acquire_program(PYTHON3) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -35,16 +42,22 @@ vcpkg_configure_cmake( -DBUILD_QTHELP_DOCS=OFF -DBUILD_TESTING=OFF -DKDE_INSTALL_PLUGINDIR=plugins + -DPYTHON_EXECUTABLE=${PYTHON3} ) vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5I18n) vcpkg_copy_pdbs() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/data) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) -file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) diff --git a/ports/kf5i18n/prevent-cmake-failing-with-variable-notfound.patch b/ports/kf5i18n/prevent-cmake-failing-with-variable-notfound.patch new file mode 100644 index 00000000000..35741800d71 --- /dev/null +++ b/ports/kf5i18n/prevent-cmake-failing-with-variable-notfound.patch @@ -0,0 +1,33 @@ +From 6195ac786afd3fb8d74df4db86fdddd966661ec9 Mon Sep 17 00:00:00 2001 +From: Dawid Wrobel +Date: Mon, 1 Mar 2021 20:41:12 +0000 +Subject: [PATCH] Prevent CMake failing with "variable NOTFOUND" + +Since the LibIntl_LIBRARIES has value only on some platforms, CMake can +throw an error complaining about using a NOTFOUND variable. +--- + src/CMakeLists.txt | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 92bfabf..46d2c76 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -41,8 +41,12 @@ target_include_directories(KF5I18n INTERFACE "$