From 54a303747408b367e0a939f1f5c4fe90598183e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Sun, 13 Sep 2020 02:18:52 -0400 Subject: [PATCH 01/28] Add kf5package port --- ports/kf5package/CONTROL | 5 +++++ ports/kf5package/portfile.cmake | 36 +++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 ports/kf5package/CONTROL create mode 100644 ports/kf5package/portfile.cmake diff --git a/ports/kf5package/CONTROL b/ports/kf5package/CONTROL new file mode 100644 index 00000000000000..0d113a0fe11712 --- /dev/null +++ b/ports/kf5package/CONTROL @@ -0,0 +1,5 @@ +Source: kf5package +Version: 5.73.0 +Homepage: https://api.kde.org/frameworks/kpackage/html/index.html +Description: Installation and loading of additional content (ex: scripts, images...) as packages +Build-Depends: ecm, qt5-base[core], qt5-tools, kf5coreaddons, kf5i18n, kf5archive diff --git a/ports/kf5package/portfile.cmake b/ports/kf5package/portfile.cmake new file mode 100644 index 00000000000000..d6f57031862448 --- /dev/null +++ b/ports/kf5package/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kpackage + REF v5.73.0 + SHA512 b9fe2179ea0c6b52f1e451631dc3384836c6f241c46102bebc0d218c13fe6505d2ffc7c53c0f0b3805f71fc1fac5ca8e6b98bed26a6463e3b46b0645420bd823 + 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 +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KPackage) + +configure_file( + ${CMAKE_CURRENT_LIST_DIR}/vcp kg-cmake-wrapper.cmake + ${CURRENT_PACKAGES_DIR}/share/${PORT} + @ONLY +) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +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/${PORT} RENAME copyright) From 353c40f2e57f30c9d4dd53246551d9156afbc428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Sun, 13 Sep 2020 02:22:15 -0400 Subject: [PATCH 02/28] [kf5package] remove vcpkg-cmake-wrapper block --- ports/kf5package/portfile.cmake | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ports/kf5package/portfile.cmake b/ports/kf5package/portfile.cmake index d6f57031862448..1de94ce817b56d 100644 --- a/ports/kf5package/portfile.cmake +++ b/ports/kf5package/portfile.cmake @@ -17,13 +17,6 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KPackage) - -configure_file( - ${CMAKE_CURRENT_LIST_DIR}/vcp kg-cmake-wrapper.cmake - ${CURRENT_PACKAGES_DIR}/share/${PORT} - @ONLY -) - vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) From 206a3344c6e47f2625f6c50354b6c2efa299da83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Sun, 13 Sep 2020 02:44:21 -0400 Subject: [PATCH 03/28] [kf5package] more fixes --- ports/kf5package/portfile.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ports/kf5package/portfile.cmake b/ports/kf5package/portfile.cmake index 1de94ce817b56d..6a9838b85dc79b 100644 --- a/ports/kf5package/portfile.cmake +++ b/ports/kf5package/portfile.cmake @@ -16,14 +16,16 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KPackage) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Package) 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}/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) 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/${PORT} RENAME copyright) From 68756163860ffef9b0ff5dc28bcacb81505e1e32 Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Tue, 15 Sep 2020 21:11:36 +0530 Subject: [PATCH 04/28] Fixed kf5package for windows --- ports/kf5package/portfile.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ports/kf5package/portfile.cmake b/ports/kf5package/portfile.cmake index 6a9838b85dc79b..53952ee0b2371f 100644 --- a/ports/kf5package/portfile.cmake +++ b/ports/kf5package/portfile.cmake @@ -6,6 +6,10 @@ vcpkg_from_github( HEAD_REF master ) +vcpkg_find_acquire_program(GETTEXT_MSGMERGE) +get_filename_component(GETTEXT_MSGMERGE_EXE_PATH ${GETTEXT_MSGMERGE} DIRECTORY) +vcpkg_add_to_path(${GETTEXT_MSGMERGE_EXE_PATH}) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -21,6 +25,8 @@ vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +elseif(VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/kpackagetool5.exe" "${CURRENT_PACKAGES_DIR}/debug/bin/kpackagetool5.exe") endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) From c00e9c68d569479e31c87a0fe68deb5ea58f7f68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Wed, 28 Jul 2021 03:55:20 +0200 Subject: [PATCH 05/28] Fixed kf5package for windows (by Kuntal Majumder) --- ports/kf5package/portfile.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ports/kf5package/portfile.cmake b/ports/kf5package/portfile.cmake index 53952ee0b2371f..54e08252022df2 100644 --- a/ports/kf5package/portfile.cmake +++ b/ports/kf5package/portfile.cmake @@ -23,10 +23,12 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Package) vcpkg_copy_pdbs() +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/kf5package) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/kpackagetool5${VCPKG_HOST_EXECUTABLE_SUFFIX}) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kpackagetool5${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/kf5package/kpackagetool5${VCPKG_HOST_EXECUTABLE_SUFFIX}) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -elseif(VCPKG_TARGET_IS_WINDOWS) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/kpackagetool5.exe" "${CURRENT_PACKAGES_DIR}/debug/bin/kpackagetool5.exe") endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) From 27eef430ef75f9caa579a22e4cf5f543c3fbde52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Wed, 28 Jul 2021 03:56:36 +0200 Subject: [PATCH 06/28] [kf5package] use PORT variable where applicable --- ports/kf5package/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/kf5package/portfile.cmake b/ports/kf5package/portfile.cmake index 54e08252022df2..ab41926fbb6d3e 100644 --- a/ports/kf5package/portfile.cmake +++ b/ports/kf5package/portfile.cmake @@ -23,9 +23,9 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Package) vcpkg_copy_pdbs() -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/kf5package) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/kpackagetool5${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kpackagetool5${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/kf5package/kpackagetool5${VCPKG_HOST_EXECUTABLE_SUFFIX}) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kpackagetool5${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/${PORT}/kpackagetool5${VCPKG_HOST_EXECUTABLE_SUFFIX}) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") From 6cc85c3fb03690edf80e21a896b379f0dae8a99f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Wed, 28 Jul 2021 03:57:35 +0200 Subject: [PATCH 07/28] [kf5package] update to 5.75.0 --- ports/kf5package/CONTROL | 2 +- ports/kf5package/portfile.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/kf5package/CONTROL b/ports/kf5package/CONTROL index 0d113a0fe11712..a79ed42f149420 100644 --- a/ports/kf5package/CONTROL +++ b/ports/kf5package/CONTROL @@ -1,5 +1,5 @@ Source: kf5package -Version: 5.73.0 +Version: 5.75.0 Homepage: https://api.kde.org/frameworks/kpackage/html/index.html Description: Installation and loading of additional content (ex: scripts, images...) as packages Build-Depends: ecm, qt5-base[core], qt5-tools, kf5coreaddons, kf5i18n, kf5archive diff --git a/ports/kf5package/portfile.cmake b/ports/kf5package/portfile.cmake index ab41926fbb6d3e..170c0108bbcfaf 100644 --- a/ports/kf5package/portfile.cmake +++ b/ports/kf5package/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kpackage - REF v5.73.0 - SHA512 b9fe2179ea0c6b52f1e451631dc3384836c6f241c46102bebc0d218c13fe6505d2ffc7c53c0f0b3805f71fc1fac5ca8e6b98bed26a6463e3b46b0645420bd823 + REF v5.75.0 + SHA512 8498fbd6bb2ed2fc37feab2e248f9d56800dafda27d993e6eefc66e383e74f58aa237c8813f92f03f5aec0afe03c4e0ca76d1dc71e9f0c9d69e0a08627b5ecd2 HEAD_REF master ) @@ -36,4 +36,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -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 From cbf72e1f6a606724f39beacb384dfd13658e9607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Wed, 11 Nov 2020 12:04:44 -0500 Subject: [PATCH 08/28] [kf5package] fix macOS libiconv --- ports/kf5package/CONTROL | 2 +- ports/kf5package/fix_libiconv.patch | 24 ++++++++++++++++++++++++ ports/kf5package/portfile.cmake | 2 ++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 ports/kf5package/fix_libiconv.patch diff --git a/ports/kf5package/CONTROL b/ports/kf5package/CONTROL index a79ed42f149420..bcd4d5bbce5dbf 100644 --- a/ports/kf5package/CONTROL +++ b/ports/kf5package/CONTROL @@ -2,4 +2,4 @@ Source: kf5package Version: 5.75.0 Homepage: https://api.kde.org/frameworks/kpackage/html/index.html Description: Installation and loading of additional content (ex: scripts, images...) as packages -Build-Depends: ecm, qt5-base[core], qt5-tools, kf5coreaddons, kf5i18n, kf5archive +Build-Depends: ecm, qt5-base[core], qt5-tools, kf5coreaddons, kf5i18n, kf5archive, gettext, libiconv diff --git a/ports/kf5package/fix_libiconv.patch b/ports/kf5package/fix_libiconv.patch new file mode 100644 index 00000000000000..972eba2d2f6584 --- /dev/null +++ b/ports/kf5package/fix_libiconv.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4fa85aa..7dccdb4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.5) ++cmake_minimum_required(VERSION 3.11) + + set(KF5_VERSION "5.75.0") # handled by release scripts + set(KF5_DEP_VERSION "5.75.0") # handled by release scripts +@@ -10,6 +10,13 @@ find_package(ECM 5.75.0 NO_MODULE) + set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules") + feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) + ++if(APPLE) ++ find_library(LIBINTL_LIBRARY NAMES intl) ++endif() ++ ++find_package(unofficial-iconv REQUIRED) ++link_libraries(${LIBINTL_LIBRARY} unofficial::iconv::libiconv) ++ + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) + + include(KDEInstallDirs) diff --git a/ports/kf5package/portfile.cmake b/ports/kf5package/portfile.cmake index 170c0108bbcfaf..99f5e11ffc089c 100644 --- a/ports/kf5package/portfile.cmake +++ b/ports/kf5package/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF v5.75.0 SHA512 8498fbd6bb2ed2fc37feab2e248f9d56800dafda27d993e6eefc66e383e74f58aa237c8813f92f03f5aec0afe03c4e0ca76d1dc71e9f0c9d69e0a08627b5ecd2 HEAD_REF master + PATCHES + "fix_libiconv.patch" ) vcpkg_find_acquire_program(GETTEXT_MSGMERGE) From bcfc5b0025d2ea4a7ec8b1432a8eb309b79c59d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Wed, 28 Jul 2021 12:04:13 +0200 Subject: [PATCH 09/28] [kf5package] update to 5.84.0 --- ports/kf5package/CONTROL | 5 ---- ports/kf5package/fix_libiconv.patch | 38 ++++++++++++----------------- ports/kf5package/portfile.cmake | 21 +++++++--------- ports/kf5package/vcpkg.json | 22 +++++++++++++++++ 4 files changed, 47 insertions(+), 39 deletions(-) delete mode 100644 ports/kf5package/CONTROL create mode 100644 ports/kf5package/vcpkg.json diff --git a/ports/kf5package/CONTROL b/ports/kf5package/CONTROL deleted file mode 100644 index bcd4d5bbce5dbf..00000000000000 --- a/ports/kf5package/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: kf5package -Version: 5.75.0 -Homepage: https://api.kde.org/frameworks/kpackage/html/index.html -Description: Installation and loading of additional content (ex: scripts, images...) as packages -Build-Depends: ecm, qt5-base[core], qt5-tools, kf5coreaddons, kf5i18n, kf5archive, gettext, libiconv diff --git a/ports/kf5package/fix_libiconv.patch b/ports/kf5package/fix_libiconv.patch index 972eba2d2f6584..742d0a11ad8235 100644 --- a/ports/kf5package/fix_libiconv.patch +++ b/ports/kf5package/fix_libiconv.patch @@ -1,24 +1,18 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4fa85aa..7dccdb4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.5) -+cmake_minimum_required(VERSION 3.11) +diff --git a/src/kpackage/CMakeLists.txt b/src/kpackage/CMakeLists.txt +index c5aca02..5f87cc9 100644 +--- a/src/kpackage/CMakeLists.txt ++++ b/src/kpackage/CMakeLists.txt +@@ -49,9 +49,13 @@ ecm_generate_export_header(KF5Package + EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} + ) - set(KF5_VERSION "5.75.0") # handled by release scripts - set(KF5_DEP_VERSION "5.75.0") # handled by release scripts -@@ -10,6 +10,13 @@ find_package(ECM 5.75.0 NO_MODULE) - set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules") - feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) - -+if(APPLE) -+ find_library(LIBINTL_LIBRARY NAMES intl) -+endif() -+ -+find_package(unofficial-iconv REQUIRED) -+link_libraries(${LIBINTL_LIBRARY} unofficial::iconv::libiconv) ++find_package(Iconv REQUIRED) ++include_directories(${Iconv_INCLUDE_DIRS}) + - set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) - - include(KDEInstallDirs) + target_link_libraries(KF5Package + PUBLIC + KF5::CoreAddons ++ ${Iconv_LIBRARIES} + PRIVATE + Qt5::DBus + KF5::Archive diff --git a/ports/kf5package/portfile.cmake b/ports/kf5package/portfile.cmake index 99f5e11ffc089c..c35b4e02a9ca76 100644 --- a/ports/kf5package/portfile.cmake +++ b/ports/kf5package/portfile.cmake @@ -1,24 +1,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kpackage - REF v5.75.0 - SHA512 8498fbd6bb2ed2fc37feab2e248f9d56800dafda27d993e6eefc66e383e74f58aa237c8813f92f03f5aec0afe03c4e0ca76d1dc71e9f0c9d69e0a08627b5ecd2 + REF v5.84.0 + SHA512 ad6a7083d461b2e782c612a544a8f6c0493c68c98a915e3f8fd4fd7de4ce636002383869476f877ace407fdc5013ad58e297ed3fd46dcac055ce79251704bf95 HEAD_REF master PATCHES - "fix_libiconv.patch" + fix_libiconv.patch ) -vcpkg_find_acquire_program(GETTEXT_MSGMERGE) -get_filename_component(GETTEXT_MSGMERGE_EXE_PATH ${GETTEXT_MSGMERGE} DIRECTORY) -vcpkg_add_to_path(${GETTEXT_MSGMERGE_EXE_PATH}) - 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_TESTING=OFF + MAYBE_UNUSED_VARIABLES + -DBUILD_HTML_DOCS=OFF + -DBUILD_MAN_DOCS=OFF + -DBUILD_QTHELP_DOCS=OFF ) vcpkg_install_cmake() @@ -33,7 +31,6 @@ 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}/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/kf5package/vcpkg.json b/ports/kf5package/vcpkg.json new file mode 100644 index 00000000000000..516a9eee50fb28 --- /dev/null +++ b/ports/kf5package/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "kf5package", + "version-string": "5.84.0", + "description": "Installation and loading of additional content (ex: scripts, images...) as packages", + "homepage": "https://api.kde.org/frameworks/kpackage/html/index.html", + "dependencies": [ + "ecm", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "kf5archive", + "kf5coreaddons", + "kf5i18n", + "libiconv", + "qt5-base", + "qt5-tools" + ] +} From afc032178dac63bba03eaa6f3bf8fd2e55140aed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Wed, 28 Jul 2021 11:52:33 +0200 Subject: [PATCH 10/28] [kf5package] update versions --- versions/baseline.json | 4 ++++ versions/k-/kf5package.json | 9 +++++++++ 2 files changed, 13 insertions(+) create mode 100644 versions/k-/kf5package.json diff --git a/versions/baseline.json b/versions/baseline.json index 6e7defe6b406cb..1c32800ff19b13 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2956,6 +2956,10 @@ "baseline": "5.84.0", "port-version": 0 }, + "kf5package": { + "baseline": "5.84.0", + "port-version": 0 + }, "kf5plotting": { "baseline": "5.84.0", "port-version": 1 diff --git a/versions/k-/kf5package.json b/versions/k-/kf5package.json new file mode 100644 index 00000000000000..06714ba5b9185c --- /dev/null +++ b/versions/k-/kf5package.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "79d4b00bc64e07275f10732bf8d93ce5fd1ac5f2", + "version-string": "5.84.0", + "port-version": 0 + } + ] +} From ab89426749084a6f4975c0d55d702f27a76b7b32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Wed, 28 Jul 2021 19:03:11 +0200 Subject: [PATCH 11/28] [kf5package] use vcpkg_copy_tools() to copy kpackagetool5 --- ports/kf5package/portfile.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ports/kf5package/portfile.cmake b/ports/kf5package/portfile.cmake index c35b4e02a9ca76..dfaf7503b26202 100644 --- a/ports/kf5package/portfile.cmake +++ b/ports/kf5package/portfile.cmake @@ -23,9 +23,7 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Package) vcpkg_copy_pdbs() -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/kpackagetool5${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kpackagetool5${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/${PORT}/kpackagetool5${VCPKG_HOST_EXECUTABLE_SUFFIX}) +vcpkg_copy_tools(TOOL_NAMES kpackagetool5 AUTO_CLEAN) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") From 49cae3d8c4cfea486e65a24d88279f88d4f026c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Wed, 28 Jul 2021 19:03:23 +0200 Subject: [PATCH 12/28] [kf5package] update versions --- versions/k-/kf5package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5package.json b/versions/k-/kf5package.json index 06714ba5b9185c..05c266107f965c 100644 --- a/versions/k-/kf5package.json +++ b/versions/k-/kf5package.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "79d4b00bc64e07275f10732bf8d93ce5fd1ac5f2", + "git-tree": "4e5856483bffbc4256d147de39bc4cb889c944ba", "version-string": "5.84.0", "port-version": 0 } From d38b980c192f02b2106341086806f383c9f4768e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 26 Aug 2021 18:31:32 +0200 Subject: [PATCH 13/28] [kf5package] use semVer --- ports/kf5package/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5package/vcpkg.json b/ports/kf5package/vcpkg.json index 516a9eee50fb28..b1b0aab664893d 100644 --- a/ports/kf5package/vcpkg.json +++ b/ports/kf5package/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5package", - "version-string": "5.84.0", + "version-semver": "5.84.0", "description": "Installation and loading of additional content (ex: scripts, images...) as packages", "homepage": "https://api.kde.org/frameworks/kpackage/html/index.html", "dependencies": [ From ce211d37c2e6e5feb2cab7fee9af0d4053c3e384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 26 Aug 2021 18:31:50 +0200 Subject: [PATCH 14/28] [kf5package] remove redundant options, wrap paths in quotes --- ports/kf5package/portfile.cmake | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/ports/kf5package/portfile.cmake b/ports/kf5package/portfile.cmake index dfaf7503b26202..659d4667b96ec9 100644 --- a/ports/kf5package/portfile.cmake +++ b/ports/kf5package/portfile.cmake @@ -9,14 +9,10 @@ vcpkg_from_github( ) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) vcpkg_install_cmake() @@ -29,8 +25,7 @@ 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}/debug/etc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/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 From 240d44f5d97e5ea6299e5429eb7372895acf2dac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 26 Aug 2021 18:35:21 +0200 Subject: [PATCH 15/28] [kf5package] update to current spec --- ports/kf5package/portfile.cmake | 8 ++++---- ports/kf5package/vcpkg.json | 10 +++++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ports/kf5package/portfile.cmake b/ports/kf5package/portfile.cmake index 659d4667b96ec9..d283d7523957c1 100644 --- a/ports/kf5package/portfile.cmake +++ b/ports/kf5package/portfile.cmake @@ -8,15 +8,15 @@ vcpkg_from_github( fix_libiconv.patch ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA - OPTIONS + OPTIONS -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Package) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5Package) vcpkg_copy_pdbs() vcpkg_copy_tools(TOOL_NAMES kpackagetool5 AUTO_CLEAN) diff --git a/ports/kf5package/vcpkg.json b/ports/kf5package/vcpkg.json index b1b0aab664893d..ea25cc3fd4a97a 100644 --- a/ports/kf5package/vcpkg.json +++ b/ports/kf5package/vcpkg.json @@ -17,6 +17,14 @@ "kf5i18n", "libiconv", "qt5-base", - "qt5-tools" + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } From 4eb6cbfc2d73d3f25efb85b5d6e2d892adbbf119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 26 Aug 2021 18:35:47 +0200 Subject: [PATCH 16/28] [kf5package] update versions --- versions/k-/kf5package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/k-/kf5package.json b/versions/k-/kf5package.json index 05c266107f965c..58d2a685d3d15c 100644 --- a/versions/k-/kf5package.json +++ b/versions/k-/kf5package.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "4e5856483bffbc4256d147de39bc4cb889c944ba", - "version-string": "5.84.0", + "git-tree": "b3c7cdfc051bb9a07c94beac42d0fd0520cea327", + "version-semver": "5.84.0", "port-version": 0 } ] From e3bd9dd7faabcd5622bdbf48da5038253b8c1d24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 26 Aug 2021 18:45:01 +0200 Subject: [PATCH 17/28] [kf5package] fix configure options --- ports/kf5package/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5package/portfile.cmake b/ports/kf5package/portfile.cmake index d283d7523957c1..c70fd9e65c63e7 100644 --- a/ports/kf5package/portfile.cmake +++ b/ports/kf5package/portfile.cmake @@ -9,8 +9,8 @@ vcpkg_from_github( ) vcpkg_cmake_configure( + DISABLE_PARALLEL_CONFIGURE SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF ) From 351898ef3bf572da32ed31ea4817a0b4342217ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 26 Aug 2021 18:45:06 +0200 Subject: [PATCH 18/28] [kf5package] update versions --- versions/k-/kf5package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5package.json b/versions/k-/kf5package.json index 58d2a685d3d15c..2cda100eb6cf5e 100644 --- a/versions/k-/kf5package.json +++ b/versions/k-/kf5package.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b3c7cdfc051bb9a07c94beac42d0fd0520cea327", + "git-tree": "c643241137d6c0afa1aeede297efec91705ae6b4", "version-semver": "5.84.0", "port-version": 0 } From dbea3d826af12ff21d1bea335f8c1315a1e487db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Fri, 27 Aug 2021 13:08:04 +0200 Subject: [PATCH 19/28] [kf5package] fix vcpkg_cmake_config_fixup() usage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/kf5package/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5package/portfile.cmake b/ports/kf5package/portfile.cmake index c70fd9e65c63e7..e1d18561434d27 100644 --- a/ports/kf5package/portfile.cmake +++ b/ports/kf5package/portfile.cmake @@ -16,7 +16,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5Package) +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Package CONFIG_PATH lib/cmake/KF5Package) vcpkg_copy_pdbs() vcpkg_copy_tools(TOOL_NAMES kpackagetool5 AUTO_CLEAN) From 2d1366a2b89a1ecbc5d70a1df72fc1610f38dcfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 27 Aug 2021 13:08:53 +0200 Subject: [PATCH 20/28] [kf5package] update versions --- versions/k-/kf5package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5package.json b/versions/k-/kf5package.json index 2cda100eb6cf5e..41b4f5a5cdc9ad 100644 --- a/versions/k-/kf5package.json +++ b/versions/k-/kf5package.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c643241137d6c0afa1aeede297efec91705ae6b4", + "git-tree": "1ae4cc0a53a51d63f09ef06f44b865fb9e7db1d3", "version-semver": "5.84.0", "port-version": 0 } From 1bb3568b383a671d77f17736bc1102415a3fc520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 31 Aug 2021 01:07:31 +0200 Subject: [PATCH 21/28] [kf5package] libiconv patches only for windows static builds --- ports/kf5package/portfile.cmake | 9 +++++++-- ports/kf5package/vcpkg.json | 5 ++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ports/kf5package/portfile.cmake b/ports/kf5package/portfile.cmake index e1d18561434d27..50ad0fc052a8a4 100644 --- a/ports/kf5package/portfile.cmake +++ b/ports/kf5package/portfile.cmake @@ -1,11 +1,16 @@ +set(PATCHES) + +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL static) + list(APPEND PATCHES fix_libiconv.patch) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kpackage REF v5.84.0 SHA512 ad6a7083d461b2e782c612a544a8f6c0493c68c98a915e3f8fd4fd7de4ce636002383869476f877ace407fdc5013ad58e297ed3fd46dcac055ce79251704bf95 HEAD_REF master - PATCHES - fix_libiconv.patch + PATCHES ${PATCHES} ) vcpkg_cmake_configure( diff --git a/ports/kf5package/vcpkg.json b/ports/kf5package/vcpkg.json index ea25cc3fd4a97a..72b7e4de29f3b2 100644 --- a/ports/kf5package/vcpkg.json +++ b/ports/kf5package/vcpkg.json @@ -15,7 +15,10 @@ "kf5archive", "kf5coreaddons", "kf5i18n", - "libiconv", + { + "name": "libiconv", + "platform": "windows & static" + }, "qt5-base", "qt5-tools", { From 30940e32972a032edcaec88cf8b41406acd9bc63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 31 Aug 2021 01:07:39 +0200 Subject: [PATCH 22/28] [kf5package] update versions --- versions/k-/kf5package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5package.json b/versions/k-/kf5package.json index 41b4f5a5cdc9ad..0dc3b4e3853698 100644 --- a/versions/k-/kf5package.json +++ b/versions/k-/kf5package.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1ae4cc0a53a51d63f09ef06f44b865fb9e7db1d3", + "git-tree": "b9e47300b5b4b47e7f494854254ccc225725610f", "version-semver": "5.84.0", "port-version": 0 } From 42d5abf8c62683c8518c4a33a931df65f092ab07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 31 Aug 2021 01:37:15 +0200 Subject: [PATCH 23/28] [kf5package] libiconv patches also on osx --- ports/kf5package/portfile.cmake | 2 +- ports/kf5package/vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/kf5package/portfile.cmake b/ports/kf5package/portfile.cmake index 50ad0fc052a8a4..35f8abf777f1d4 100644 --- a/ports/kf5package/portfile.cmake +++ b/ports/kf5package/portfile.cmake @@ -1,6 +1,6 @@ set(PATCHES) -if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL static) +if((VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX) AND VCPKG_LIBRARY_LINKAGE STREQUAL static) list(APPEND PATCHES fix_libiconv.patch) endif() diff --git a/ports/kf5package/vcpkg.json b/ports/kf5package/vcpkg.json index 72b7e4de29f3b2..911cf7a55c9ac4 100644 --- a/ports/kf5package/vcpkg.json +++ b/ports/kf5package/vcpkg.json @@ -17,7 +17,7 @@ "kf5i18n", { "name": "libiconv", - "platform": "windows & static" + "platform": "osx | (windows & static)" }, "qt5-base", "qt5-tools", From 6785c6240022e7b57f27edb6e3e65dc72b48bec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 31 Aug 2021 01:37:29 +0200 Subject: [PATCH 24/28] [kf5package] update versions --- versions/k-/kf5package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5package.json b/versions/k-/kf5package.json index 0dc3b4e3853698..83ce3d9bda068c 100644 --- a/versions/k-/kf5package.json +++ b/versions/k-/kf5package.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b9e47300b5b4b47e7f494854254ccc225725610f", + "git-tree": "044f688049c9d6de8163055dee3676dd0c2517ea", "version-semver": "5.84.0", "port-version": 0 } From 27ee6ebec2441103dada8c05dba2d6a6e2e18551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 7 Sep 2021 02:21:09 +0200 Subject: [PATCH 25/28] [kf5package] cleanup, iconv was fixed in kf5i18n --- ports/kf5package/fix_libiconv.patch | 18 ------------------ ports/kf5package/portfile.cmake | 7 ------- ports/kf5package/vcpkg.json | 4 ---- 3 files changed, 29 deletions(-) delete mode 100644 ports/kf5package/fix_libiconv.patch diff --git a/ports/kf5package/fix_libiconv.patch b/ports/kf5package/fix_libiconv.patch deleted file mode 100644 index 742d0a11ad8235..00000000000000 --- a/ports/kf5package/fix_libiconv.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/kpackage/CMakeLists.txt b/src/kpackage/CMakeLists.txt -index c5aca02..5f87cc9 100644 ---- a/src/kpackage/CMakeLists.txt -+++ b/src/kpackage/CMakeLists.txt -@@ -49,9 +49,13 @@ ecm_generate_export_header(KF5Package - EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} - ) - -+find_package(Iconv REQUIRED) -+include_directories(${Iconv_INCLUDE_DIRS}) -+ - target_link_libraries(KF5Package - PUBLIC - KF5::CoreAddons -+ ${Iconv_LIBRARIES} - PRIVATE - Qt5::DBus - KF5::Archive diff --git a/ports/kf5package/portfile.cmake b/ports/kf5package/portfile.cmake index 35f8abf777f1d4..f67cfb8525f489 100644 --- a/ports/kf5package/portfile.cmake +++ b/ports/kf5package/portfile.cmake @@ -1,16 +1,9 @@ -set(PATCHES) - -if((VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX) AND VCPKG_LIBRARY_LINKAGE STREQUAL static) - list(APPEND PATCHES fix_libiconv.patch) -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kpackage REF v5.84.0 SHA512 ad6a7083d461b2e782c612a544a8f6c0493c68c98a915e3f8fd4fd7de4ce636002383869476f877ace407fdc5013ad58e297ed3fd46dcac055ce79251704bf95 HEAD_REF master - PATCHES ${PATCHES} ) vcpkg_cmake_configure( diff --git a/ports/kf5package/vcpkg.json b/ports/kf5package/vcpkg.json index 911cf7a55c9ac4..9461a067c09e77 100644 --- a/ports/kf5package/vcpkg.json +++ b/ports/kf5package/vcpkg.json @@ -15,10 +15,6 @@ "kf5archive", "kf5coreaddons", "kf5i18n", - { - "name": "libiconv", - "platform": "osx | (windows & static)" - }, "qt5-base", "qt5-tools", { From f2008ec7de1bc79e3d8d2899c22e6d6681c967c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 7 Sep 2021 02:21:20 +0200 Subject: [PATCH 26/28] [kf5package] update versions --- versions/k-/kf5package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5package.json b/versions/k-/kf5package.json index 83ce3d9bda068c..5e7f54d5c0df7e 100644 --- a/versions/k-/kf5package.json +++ b/versions/k-/kf5package.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "044f688049c9d6de8163055dee3676dd0c2517ea", + "git-tree": "8d9a27160c572bb0e7c8d600414165340dac2953", "version-semver": "5.84.0", "port-version": 0 } From 2246d57b5ad66e56e41e61f4d822d6078f8badd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 13 Sep 2021 07:37:33 +0100 Subject: [PATCH 27/28] [kf5package] use generic, non-semver versioning --- ports/kf5package/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5package/vcpkg.json b/ports/kf5package/vcpkg.json index 9461a067c09e77..086ffbdfb711c8 100644 --- a/ports/kf5package/vcpkg.json +++ b/ports/kf5package/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5package", - "version-semver": "5.84.0", + "version": "5.84.0", "description": "Installation and loading of additional content (ex: scripts, images...) as packages", "homepage": "https://api.kde.org/frameworks/kpackage/html/index.html", "dependencies": [ From d91f1f42a535b3e8b4ef56e89c03b95032b8d50a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 13 Sep 2021 07:37:53 +0100 Subject: [PATCH 28/28] [kf5package] update versions --- versions/k-/kf5package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/k-/kf5package.json b/versions/k-/kf5package.json index 5e7f54d5c0df7e..8f7ea21f785703 100644 --- a/versions/k-/kf5package.json +++ b/versions/k-/kf5package.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "8d9a27160c572bb0e7c8d600414165340dac2953", - "version-semver": "5.84.0", + "git-tree": "aeff67d2d07a017d69a853037a12371683c5aa97", + "version": "5.84.0", "port-version": 0 } ]