From cdfdf506cf4a6d3deb636acd9ee89eb1f2529de6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 10 Sep 2020 22:17:15 -0400 Subject: [PATCH 01/29] Add kf5service port --- ports/kf5service/CONTROL | 5 +++++ ports/kf5service/portfile.cmake | 34 +++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 ports/kf5service/CONTROL create mode 100644 ports/kf5service/portfile.cmake diff --git a/ports/kf5service/CONTROL b/ports/kf5service/CONTROL new file mode 100644 index 00000000000000..083291ea039388 --- /dev/null +++ b/ports/kf5service/CONTROL @@ -0,0 +1,5 @@ +Source: kf5service +Version: 5.73.0 +Homepage: https://api.kde.org/frameworks/kservice/html/index.html +Description: Plugin framework for desktop services +Build-Depends: ecm, qt5-base, qt5-tools, kf5config, kf5coreaddons, kf5dbusaddons, kf5i18n diff --git a/ports/kf5service/portfile.cmake b/ports/kf5service/portfile.cmake new file mode 100644 index 00000000000000..a0d77025748305 --- /dev/null +++ b/ports/kf5service/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kservice + REF v5.73.0 + SHA512 02329f8aca3a3fc7ffc8fa4565aecab32e01938ab60bd14d5c3379aacecd0e2f252110c76b4cee37639d2182b1f1af10d4b33a1c815cc8c8b4d8190581d4341f + 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/KF5Service) + +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) From 7f4cb4da0de3333ced56d85e5e6e0d52dd56c6f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 11 Sep 2020 00:33:18 -0400 Subject: [PATCH 02/29] Add kf5service port --- ports/kf5service/CONTROL | 2 +- .../add-missing-kf5windowsystem-dependency.patch | 12 ++++++++++++ ports/kf5service/portfile.cmake | 15 +++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 ports/kf5service/add-missing-kf5windowsystem-dependency.patch diff --git a/ports/kf5service/CONTROL b/ports/kf5service/CONTROL index 083291ea039388..ead16e258a114d 100644 --- a/ports/kf5service/CONTROL +++ b/ports/kf5service/CONTROL @@ -2,4 +2,4 @@ Source: kf5service Version: 5.73.0 Homepage: https://api.kde.org/frameworks/kservice/html/index.html Description: Plugin framework for desktop services -Build-Depends: ecm, qt5-base, qt5-tools, kf5config, kf5coreaddons, kf5dbusaddons, kf5i18n +Build-Depends: ecm, qt5-base, qt5-tools, kf5config, kf5coreaddons, kf5dbusaddons, kf5i18n, kf5windowsystem diff --git a/ports/kf5service/add-missing-kf5windowsystem-dependency.patch b/ports/kf5service/add-missing-kf5windowsystem-dependency.patch new file mode 100644 index 00000000000000..064199da6f9417 --- /dev/null +++ b/ports/kf5service/add-missing-kf5windowsystem-dependency.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bd73f1a..bfb8a7e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -54,6 +54,7 @@ if (NOT ANDROID) + find_package(KF5DBusAddons ${KF5_DEP_VERSION} CONFIG REQUIRED) + endif() + find_package(KF5I18n ${KF5_DEP_VERSION} CONFIG REQUIRED) ++find_package(KF5WindowSystem ${KF5_DEP_VERSION} CONFIG REQUIRED) + find_package(KF5DocTools ${KF5_DEP_VERSION} CONFIG) + + find_package(FLEX REQUIRED) diff --git a/ports/kf5service/portfile.cmake b/ports/kf5service/portfile.cmake index a0d77025748305..58037fdf0b55ac 100644 --- a/ports/kf5service/portfile.cmake +++ b/ports/kf5service/portfile.cmake @@ -4,8 +4,23 @@ vcpkg_from_github( REF v5.73.0 SHA512 02329f8aca3a3fc7ffc8fa4565aecab32e01938ab60bd14d5c3379aacecd0e2f252110c76b4cee37639d2182b1f1af10d4b33a1c815cc8c8b4d8190581d4341f HEAD_REF master + PATCHES + "add-missing-kf5windowsystem-dependency.patch" ) +if (VCPKG_TARGET_IS_OSX) + message(WARNING "${PORT} requires bison version greater than one provided by macOS, please use \`brew install bison\` to install a newer bison.") +endif() + +vcpkg_find_acquire_program(BISON) +vcpkg_find_acquire_program(FLEX) + +get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY ) +get_filename_component(BISON_DIR "${BISON}" DIRECTORY ) + +vcpkg_add_to_path(PREPEND "${FLEX_DIR}") +vcpkg_add_to_path(PREPEND "${BISON_DIR}") + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA From ae6b094ea71382a1f87bb93df5e761d108b01812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Wed, 28 Jul 2021 02:30:08 +0200 Subject: [PATCH 03/29] [kf5service] update to 5.75.0 --- ports/kf5service/CONTROL | 2 +- ports/kf5service/portfile.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/kf5service/CONTROL b/ports/kf5service/CONTROL index ead16e258a114d..d0d3ad9e3428c2 100644 --- a/ports/kf5service/CONTROL +++ b/ports/kf5service/CONTROL @@ -1,5 +1,5 @@ Source: kf5service -Version: 5.73.0 +Version: 5.75.0 Homepage: https://api.kde.org/frameworks/kservice/html/index.html Description: Plugin framework for desktop services Build-Depends: ecm, qt5-base, qt5-tools, kf5config, kf5coreaddons, kf5dbusaddons, kf5i18n, kf5windowsystem diff --git a/ports/kf5service/portfile.cmake b/ports/kf5service/portfile.cmake index 58037fdf0b55ac..81cfcd1bb9df58 100644 --- a/ports/kf5service/portfile.cmake +++ b/ports/kf5service/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kservice - REF v5.73.0 - SHA512 02329f8aca3a3fc7ffc8fa4565aecab32e01938ab60bd14d5c3379aacecd0e2f252110c76b4cee37639d2182b1f1af10d4b33a1c815cc8c8b4d8190581d4341f + REF v5.75.0 + SHA512 bdef2d6d2ac999936498e44cd2d4cc23b3187373da145073797c3d5c6e8fa3ff26c4d61fa3b233338ac104143fff1e0b6498f68e7c0da1cd886c2f2b33d4d353 HEAD_REF master PATCHES "add-missing-kf5windowsystem-dependency.patch" @@ -46,4 +46,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) \ No newline at end of file From 90f3f4353ecbcc5335e1496d73f74ce15c7464f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Wed, 28 Jul 2021 02:35:44 +0200 Subject: [PATCH 04/29] [kf5service] update to 5.84.0 --- ports/kf5service/CONTROL | 5 ---- ...d-missing-kf5windowsystem-dependency.patch | 12 --------- ports/kf5service/portfile.cmake | 26 +++++++++++++------ ports/kf5service/vcpkg.json | 17 ++++++++++++ 4 files changed, 35 insertions(+), 25 deletions(-) delete mode 100644 ports/kf5service/CONTROL delete mode 100644 ports/kf5service/add-missing-kf5windowsystem-dependency.patch create mode 100644 ports/kf5service/vcpkg.json diff --git a/ports/kf5service/CONTROL b/ports/kf5service/CONTROL deleted file mode 100644 index d0d3ad9e3428c2..00000000000000 --- a/ports/kf5service/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: kf5service -Version: 5.75.0 -Homepage: https://api.kde.org/frameworks/kservice/html/index.html -Description: Plugin framework for desktop services -Build-Depends: ecm, qt5-base, qt5-tools, kf5config, kf5coreaddons, kf5dbusaddons, kf5i18n, kf5windowsystem diff --git a/ports/kf5service/add-missing-kf5windowsystem-dependency.patch b/ports/kf5service/add-missing-kf5windowsystem-dependency.patch deleted file mode 100644 index 064199da6f9417..00000000000000 --- a/ports/kf5service/add-missing-kf5windowsystem-dependency.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bd73f1a..bfb8a7e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -54,6 +54,7 @@ if (NOT ANDROID) - find_package(KF5DBusAddons ${KF5_DEP_VERSION} CONFIG REQUIRED) - endif() - find_package(KF5I18n ${KF5_DEP_VERSION} CONFIG REQUIRED) -+find_package(KF5WindowSystem ${KF5_DEP_VERSION} CONFIG REQUIRED) - find_package(KF5DocTools ${KF5_DEP_VERSION} CONFIG) - - find_package(FLEX REQUIRED) diff --git a/ports/kf5service/portfile.cmake b/ports/kf5service/portfile.cmake index 81cfcd1bb9df58..51c831734efd05 100644 --- a/ports/kf5service/portfile.cmake +++ b/ports/kf5service/portfile.cmake @@ -1,17 +1,29 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kservice - REF v5.75.0 - SHA512 bdef2d6d2ac999936498e44cd2d4cc23b3187373da145073797c3d5c6e8fa3ff26c4d61fa3b233338ac104143fff1e0b6498f68e7c0da1cd886c2f2b33d4d353 + REF v5.84.0 + SHA512 3867da989c8f70fccba63d91aeb0038ad6345e66ca7df6003f968628e4a54e076e9686acb501940ef8f540c39d5f1a70a949cbfdd1caa34e6c4d51daebff418d HEAD_REF master - PATCHES - "add-missing-kf5windowsystem-dependency.patch" ) -if (VCPKG_TARGET_IS_OSX) - message(WARNING "${PORT} requires bison version greater than one provided by macOS, please use \`brew install bison\` to install a newer bison.") +if(VCPKG_TARGET_IS_OSX) + # In Darwin platform, there can be an old version of `bison`, + # Which can't be used for `gst-build`. It requires 2.4+ + vcpkg_find_acquire_program(BISON) + execute_process( + COMMAND ${BISON} --version + OUTPUT_VARIABLE BISON_OUTPUT + ) + string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" BISON_VERSION "${BISON_OUTPUT}") + set(BISON_MAJOR ${CMAKE_MATCH_1}) + set(BISON_MINOR ${CMAKE_MATCH_2}) + message(STATUS "Using bison: ${BISON_MAJOR}.${BISON_MINOR}.${CMAKE_MATCH_3}") + if(NOT (BISON_MAJOR GREATER_EQUAL 2 AND BISON_MINOR GREATER_EQUAL 4)) + message(WARNING "${PORT} requires bison version greater than one provided by macOS, please use \`brew install bison\` to install a newer bison.") + endif() endif() + vcpkg_find_acquire_program(BISON) vcpkg_find_acquire_program(FLEX) @@ -40,10 +52,8 @@ 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}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file diff --git a/ports/kf5service/vcpkg.json b/ports/kf5service/vcpkg.json new file mode 100644 index 00000000000000..b740e771456623 --- /dev/null +++ b/ports/kf5service/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "kf5service", + "version-string": "5.84.0", + "description": "Plugin framework for desktop services", + "homepage": "https://api.kde.org/frameworks/kservice/html/index.html", + "dependencies": [ + "ecm", + "kf5config", + "kf5coreaddons", + "kf5crash", + "kf5dbusaddons", + "kf5i18n", + "kf5windowsystem", + "qt5-base", + "qt5-tools" + ] +} From 2f5875f4d4f61b29d051e4dfa7a5273efe20cd67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Wed, 28 Jul 2021 03:24:04 +0200 Subject: [PATCH 05/29] [kf5service] update versions --- versions/baseline.json | 4 ++++ versions/k-/kf5service.json | 9 +++++++++ 2 files changed, 13 insertions(+) create mode 100644 versions/k-/kf5service.json diff --git a/versions/baseline.json b/versions/baseline.json index 6e7defe6b406cb..ac511709317c3a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2960,6 +2960,10 @@ "baseline": "5.84.0", "port-version": 1 }, + "kf5service": { + "baseline": "5.84.0", + "port-version": 0 + }, "kf5solid": { "baseline": "5.84.0", "port-version": 1 diff --git a/versions/k-/kf5service.json b/versions/k-/kf5service.json new file mode 100644 index 00000000000000..6538e7a51fac6b --- /dev/null +++ b/versions/k-/kf5service.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "434ee44e269a33bafcd919f66fb773a5b9357859", + "version-string": "5.84.0", + "port-version": 0 + } + ] +} From ddf3ab7e88afc9da1a1339a4af54a4aa426d70e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Fri, 27 Aug 2021 12:10:46 +0200 Subject: [PATCH 06/29] [kf5service] update to current spec Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/kf5service/portfile.cmake | 9 ++++----- ports/kf5service/vcpkg.json | 10 +++++++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ports/kf5service/portfile.cmake b/ports/kf5service/portfile.cmake index 51c831734efd05..16c09978db97bf 100644 --- a/ports/kf5service/portfile.cmake +++ b/ports/kf5service/portfile.cmake @@ -33,9 +33,8 @@ get_filename_component(BISON_DIR "${BISON}" DIRECTORY ) vcpkg_add_to_path(PREPEND "${FLEX_DIR}") vcpkg_add_to_path(PREPEND "${BISON_DIR}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_HTML_DOCS=OFF -DBUILD_MAN_DOCS=OFF @@ -43,8 +42,8 @@ vcpkg_configure_cmake( -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Service) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5Service) vcpkg_copy_pdbs() diff --git a/ports/kf5service/vcpkg.json b/ports/kf5service/vcpkg.json index b740e771456623..0a9da67e8df9b5 100644 --- a/ports/kf5service/vcpkg.json +++ b/ports/kf5service/vcpkg.json @@ -12,6 +12,14 @@ "kf5i18n", "kf5windowsystem", "qt5-base", - "qt5-tools" + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } From b4a834203a43545e2e3f0d3a0a3acdc9700ec2cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Fri, 27 Aug 2021 12:11:11 +0200 Subject: [PATCH 07/29] [kf5service] use semVer Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/kf5service/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5service/vcpkg.json b/ports/kf5service/vcpkg.json index 0a9da67e8df9b5..d4eaae673471e1 100644 --- a/ports/kf5service/vcpkg.json +++ b/ports/kf5service/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5service", - "version-string": "5.84.0", + "version-semver": "5.84.0", "description": "Plugin framework for desktop services", "homepage": "https://api.kde.org/frameworks/kservice/html/index.html", "dependencies": [ From 382e1f7cd4e84e3063bd9af1686b98454986c0ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Fri, 27 Aug 2021 12:11:44 +0200 Subject: [PATCH 08/29] [kf5service] wrap paths in quotes Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/kf5service/portfile.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/kf5service/portfile.cmake b/ports/kf5service/portfile.cmake index 16c09978db97bf..4b35d0ce11bdd0 100644 --- a/ports/kf5service/portfile.cmake +++ b/ports/kf5service/portfile.cmake @@ -51,8 +51,8 @@ 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/bin/data) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) -file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file +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}/debug/etc") +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file From 7d981358a89919c6ed372ab56317b1b3795beff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 27 Aug 2021 12:25:54 +0200 Subject: [PATCH 09/29] [kf5service] update versions --- versions/k-/kf5service.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/k-/kf5service.json b/versions/k-/kf5service.json index 6538e7a51fac6b..ba1bc3c58ec0ea 100644 --- a/versions/k-/kf5service.json +++ b/versions/k-/kf5service.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "434ee44e269a33bafcd919f66fb773a5b9357859", - "version-string": "5.84.0", + "git-tree": "6259aca85666f1f62598148d84bde6d69db8f3e0", + "version-semver": "5.84.0", "port-version": 0 } ] From 59c7e1c692e270a5347df1b7de8df8285c4ac137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 27 Aug 2021 12:29:37 +0200 Subject: [PATCH 10/29] [kf5package] only remove what's needed --- ports/kf5service/portfile.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/ports/kf5service/portfile.cmake b/ports/kf5service/portfile.cmake index 4b35d0ce11bdd0..fb9c2371e48eb4 100644 --- a/ports/kf5service/portfile.cmake +++ b/ports/kf5service/portfile.cmake @@ -51,8 +51,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}/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}/debug/etc") file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file From 6e7c45b2acf34e5ed982dda0dd5c9fb452076c98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 27 Aug 2021 12:29:56 +0200 Subject: [PATCH 11/29] [kf5package] phrasing, other cleanups --- ports/kf5service/portfile.cmake | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ports/kf5service/portfile.cmake b/ports/kf5service/portfile.cmake index fb9c2371e48eb4..42b8a5f7ffabd2 100644 --- a/ports/kf5service/portfile.cmake +++ b/ports/kf5service/portfile.cmake @@ -7,8 +7,7 @@ vcpkg_from_github( ) if(VCPKG_TARGET_IS_OSX) - # In Darwin platform, there can be an old version of `bison`, - # Which can't be used for `gst-build`. It requires 2.4+ + # On Darwin platform, the bundled version of 'bison' may be too old (< 2.4). vcpkg_find_acquire_program(BISON) execute_process( COMMAND ${BISON} --version @@ -27,8 +26,8 @@ endif() vcpkg_find_acquire_program(BISON) vcpkg_find_acquire_program(FLEX) -get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY ) -get_filename_component(BISON_DIR "${BISON}" DIRECTORY ) +get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY) +get_filename_component(BISON_DIR "${BISON}" DIRECTORY) vcpkg_add_to_path(PREPEND "${FLEX_DIR}") vcpkg_add_to_path(PREPEND "${BISON_DIR}") @@ -44,11 +43,10 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5Service) - vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") From a0c77f5538aaf0ed4e9b8fdff0dfa99807ff0d5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 27 Aug 2021 12:30:02 +0200 Subject: [PATCH 12/29] [kf5service] update versions --- versions/k-/kf5service.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5service.json b/versions/k-/kf5service.json index ba1bc3c58ec0ea..e9840075e3d70f 100644 --- a/versions/k-/kf5service.json +++ b/versions/k-/kf5service.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "6259aca85666f1f62598148d84bde6d69db8f3e0", + "git-tree": "2511f64e5e6259c4f3e198c6fba62e36312275f1", "version-semver": "5.84.0", "port-version": 0 } From 914f804050dcd7bd178568186adbfd5be39523ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 27 Aug 2021 12:52:22 +0200 Subject: [PATCH 13/29] [kf5service] DISABLE_PARALLEL_CONFIGURE --- ports/kf5service/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/kf5service/portfile.cmake b/ports/kf5service/portfile.cmake index 42b8a5f7ffabd2..bc2e7fe9078f47 100644 --- a/ports/kf5service/portfile.cmake +++ b/ports/kf5service/portfile.cmake @@ -33,6 +33,7 @@ vcpkg_add_to_path(PREPEND "${FLEX_DIR}") vcpkg_add_to_path(PREPEND "${BISON_DIR}") vcpkg_cmake_configure( + DISABLE_PARALLEL_CONFIGURE SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_HTML_DOCS=OFF From 028855e5fb62f8a4630b2462a69d29110ea41831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 27 Aug 2021 12:52:29 +0200 Subject: [PATCH 14/29] [kf5service] update versions --- versions/k-/kf5service.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5service.json b/versions/k-/kf5service.json index e9840075e3d70f..d553ec8d592e16 100644 --- a/versions/k-/kf5service.json +++ b/versions/k-/kf5service.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2511f64e5e6259c4f3e198c6fba62e36312275f1", + "git-tree": "dbd86f3d9499a2844559b7d7d3cc4040fc4c53c1", "version-semver": "5.84.0", "port-version": 0 } From 0c40977377ebca995b56c67d28039138d1f4a453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 27 Aug 2021 13:28:57 +0200 Subject: [PATCH 15/29] [kf5service] add gettext tools dependency --- ports/kf5service/vcpkg.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ports/kf5service/vcpkg.json b/ports/kf5service/vcpkg.json index d4eaae673471e1..67a9d0a400e0dd 100644 --- a/ports/kf5service/vcpkg.json +++ b/ports/kf5service/vcpkg.json @@ -5,6 +5,13 @@ "homepage": "https://api.kde.org/frameworks/kservice/html/index.html", "dependencies": [ "ecm", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, "kf5config", "kf5coreaddons", "kf5crash", From 5b829ccb94712fac81eaa30d97e3ecb57c53062b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 27 Aug 2021 13:29:06 +0200 Subject: [PATCH 16/29] [kf5service] update versions --- versions/k-/kf5service.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5service.json b/versions/k-/kf5service.json index d553ec8d592e16..b8a452463b8356 100644 --- a/versions/k-/kf5service.json +++ b/versions/k-/kf5service.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "dbd86f3d9499a2844559b7d7d3cc4040fc4c53c1", + "git-tree": "aa9b0ce028bf432939be504c1935aa4b32018fc8", "version-semver": "5.84.0", "port-version": 0 } From af41e99071151ac8335f4274865de064894b7823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 27 Aug 2021 13:36:20 +0200 Subject: [PATCH 17/29] [kf5service] upstream requires bison >= 3.0 --- ports/kf5service/portfile.cmake | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ports/kf5service/portfile.cmake b/ports/kf5service/portfile.cmake index bc2e7fe9078f47..c97d4df2cb6291 100644 --- a/ports/kf5service/portfile.cmake +++ b/ports/kf5service/portfile.cmake @@ -7,7 +7,7 @@ vcpkg_from_github( ) if(VCPKG_TARGET_IS_OSX) - # On Darwin platform, the bundled version of 'bison' may be too old (< 2.4). + # On Darwin platform, the bundled version of 'bison' may be too old (< 3.0). vcpkg_find_acquire_program(BISON) execute_process( COMMAND ${BISON} --version @@ -17,12 +17,11 @@ if(VCPKG_TARGET_IS_OSX) set(BISON_MAJOR ${CMAKE_MATCH_1}) set(BISON_MINOR ${CMAKE_MATCH_2}) message(STATUS "Using bison: ${BISON_MAJOR}.${BISON_MINOR}.${CMAKE_MATCH_3}") - if(NOT (BISON_MAJOR GREATER_EQUAL 2 AND BISON_MINOR GREATER_EQUAL 4)) + if(NOT (BISON_MAJOR GREATER_EQUAL 3 AND BISON_MINOR GREATER_EQUAL 0)) message(WARNING "${PORT} requires bison version greater than one provided by macOS, please use \`brew install bison\` to install a newer bison.") endif() endif() - vcpkg_find_acquire_program(BISON) vcpkg_find_acquire_program(FLEX) From e5d890eb1424521306bb19cfce0472142ebb8e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 27 Aug 2021 13:46:09 +0200 Subject: [PATCH 18/29] [kf5service] remove unused dependencies --- ports/kf5service/vcpkg.json | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/kf5service/vcpkg.json b/ports/kf5service/vcpkg.json index 67a9d0a400e0dd..87545d2e30ccf2 100644 --- a/ports/kf5service/vcpkg.json +++ b/ports/kf5service/vcpkg.json @@ -14,10 +14,15 @@ }, "kf5config", "kf5coreaddons", - "kf5crash", - "kf5dbusaddons", + { + "name": "kf5crash", + "platform": "!android" + }, + { + "name": "kf5dbusaddons", + "platform": "!android" + }, "kf5i18n", - "kf5windowsystem", "qt5-base", "qt5-tools", { From 42b8d11f9832c94f83c9368962d39e43ec1c7416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 27 Aug 2021 13:46:16 +0200 Subject: [PATCH 19/29] [kf5service] update versions --- versions/k-/kf5service.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5service.json b/versions/k-/kf5service.json index b8a452463b8356..e3351deaa76d84 100644 --- a/versions/k-/kf5service.json +++ b/versions/k-/kf5service.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "aa9b0ce028bf432939be504c1935aa4b32018fc8", + "git-tree": "b763034e13433c5872308e6a78f8c82896e7fb07", "version-semver": "5.84.0", "port-version": 0 } From f67769683c1dd9213f121c19c4c41e7045346952 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 27 Aug 2021 14:01:33 +0200 Subject: [PATCH 20/29] [kf5service] remove redundant options --- ports/kf5service/portfile.cmake | 3 --- 1 file changed, 3 deletions(-) diff --git a/ports/kf5service/portfile.cmake b/ports/kf5service/portfile.cmake index c97d4df2cb6291..a4887a99e23312 100644 --- a/ports/kf5service/portfile.cmake +++ b/ports/kf5service/portfile.cmake @@ -35,9 +35,6 @@ vcpkg_cmake_configure( DISABLE_PARALLEL_CONFIGURE SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF -DBUILD_TESTING=OFF ) From f01f55aec7cf2678788270de4ce7d9db8311d59e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 27 Aug 2021 14:01:41 +0200 Subject: [PATCH 21/29] [kf5service] update versions --- versions/k-/kf5service.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5service.json b/versions/k-/kf5service.json index e3351deaa76d84..83c93ca3372a36 100644 --- a/versions/k-/kf5service.json +++ b/versions/k-/kf5service.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b763034e13433c5872308e6a78f8c82896e7fb07", + "git-tree": "96e11c34b42552b212070220b86c5eb230f2eaf7", "version-semver": "5.84.0", "port-version": 0 } From ac386f0c1f5b34690bce7dcb4feb8bc34e5b63e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 27 Aug 2021 14:12:46 +0200 Subject: [PATCH 22/29] [kf5service] copy kbuildsycoca5 tool --- ports/kf5service/portfile.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ports/kf5service/portfile.cmake b/ports/kf5service/portfile.cmake index a4887a99e23312..71077a8f54c430 100644 --- a/ports/kf5service/portfile.cmake +++ b/ports/kf5service/portfile.cmake @@ -42,6 +42,11 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5Service) vcpkg_copy_pdbs() +vcpkg_copy_tools( + TOOL_NAMES kbuildsycoca5 + AUTO_CLEAN +) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() From 00e6165f211c7a0d6910013091dddddf528cde0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 27 Aug 2021 14:12:51 +0200 Subject: [PATCH 23/29] [kf5service] update versions --- versions/k-/kf5service.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5service.json b/versions/k-/kf5service.json index 83c93ca3372a36..fe9cbb8cd76245 100644 --- a/versions/k-/kf5service.json +++ b/versions/k-/kf5service.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "96e11c34b42552b212070220b86c5eb230f2eaf7", + "git-tree": "b4f918a4443022b0661e41cdc79c77a732b62d4c", "version-semver": "5.84.0", "port-version": 0 } From 9d53554a031ab2fc6f7d67acb1736560f74dd730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 27 Aug 2021 14:53:28 +0200 Subject: [PATCH 24/29] [kf5service] fix Windows static builds --- ports/kf5service/fix_libiconv.patch | 20 ++++++++++++++++++++ ports/kf5service/portfile.cmake | 2 ++ ports/kf5service/vcpkg.json | 1 + 3 files changed, 23 insertions(+) create mode 100644 ports/kf5service/fix_libiconv.patch diff --git a/ports/kf5service/fix_libiconv.patch b/ports/kf5service/fix_libiconv.patch new file mode 100644 index 00000000000000..aac0e0349fa550 --- /dev/null +++ b/ports/kf5service/fix_libiconv.patch @@ -0,0 +1,20 @@ +diff --git a/src/kbuildsycoca/CMakeLists.txt b/src/kbuildsycoca/CMakeLists.txt +index 0d86176..c5396fb 100644 +--- a/src/kbuildsycoca/CMakeLists.txt ++++ b/src/kbuildsycoca/CMakeLists.txt +@@ -10,11 +10,15 @@ target_sources(kbuildsycoca5 PRIVATE + kbuildsycoca_main.cpp + ) + ++find_package(Iconv REQUIRED) ++include_directories(${Iconv_INCLUDE_DIRS}) ++ + target_link_libraries(kbuildsycoca5 + KF5::Service + KF5::CoreAddons # KAboutData + KF5::I18n + Qt5::Xml ++ ${Iconv_LIBRARIES} + ) + if (NOT ANDROID) + target_link_libraries(kbuildsycoca5 diff --git a/ports/kf5service/portfile.cmake b/ports/kf5service/portfile.cmake index 71077a8f54c430..f445c74d8d081e 100644 --- a/ports/kf5service/portfile.cmake +++ b/ports/kf5service/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF v5.84.0 SHA512 3867da989c8f70fccba63d91aeb0038ad6345e66ca7df6003f968628e4a54e076e9686acb501940ef8f540c39d5f1a70a949cbfdd1caa34e6c4d51daebff418d HEAD_REF master + PATCHES + fix_libiconv.patch ) if(VCPKG_TARGET_IS_OSX) diff --git a/ports/kf5service/vcpkg.json b/ports/kf5service/vcpkg.json index 87545d2e30ccf2..d5fbd1ac2d6f71 100644 --- a/ports/kf5service/vcpkg.json +++ b/ports/kf5service/vcpkg.json @@ -23,6 +23,7 @@ "platform": "!android" }, "kf5i18n", + "libiconv", "qt5-base", "qt5-tools", { From a699e86b1c83433572ea6c886579d3245fd4c6ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 27 Aug 2021 14:53:34 +0200 Subject: [PATCH 25/29] [kf5service] update versions --- versions/baseline.json | 2 +- versions/k-/kf5service.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index ac511709317c3a..c73daea114044e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2963,7 +2963,7 @@ "kf5service": { "baseline": "5.84.0", "port-version": 0 - }, + }, "kf5solid": { "baseline": "5.84.0", "port-version": 1 diff --git a/versions/k-/kf5service.json b/versions/k-/kf5service.json index fe9cbb8cd76245..ffdee366223253 100644 --- a/versions/k-/kf5service.json +++ b/versions/k-/kf5service.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b4f918a4443022b0661e41cdc79c77a732b62d4c", + "git-tree": "0d939dce272370cf26cfa02a5c1a5b285085eba8", "version-semver": "5.84.0", "port-version": 0 } From 9d12ea565b12a4c49b6dce4a5cb88f1e89548ec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 7 Sep 2021 02:51:51 +0200 Subject: [PATCH 26/29] [kf5service] cleanup, iconv was fixed in kf5i18n --- ports/kf5service/fix_libiconv.patch | 20 -------------------- ports/kf5service/portfile.cmake | 2 -- ports/kf5service/vcpkg.json | 1 - 3 files changed, 23 deletions(-) delete mode 100644 ports/kf5service/fix_libiconv.patch diff --git a/ports/kf5service/fix_libiconv.patch b/ports/kf5service/fix_libiconv.patch deleted file mode 100644 index aac0e0349fa550..00000000000000 --- a/ports/kf5service/fix_libiconv.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/kbuildsycoca/CMakeLists.txt b/src/kbuildsycoca/CMakeLists.txt -index 0d86176..c5396fb 100644 ---- a/src/kbuildsycoca/CMakeLists.txt -+++ b/src/kbuildsycoca/CMakeLists.txt -@@ -10,11 +10,15 @@ target_sources(kbuildsycoca5 PRIVATE - kbuildsycoca_main.cpp - ) - -+find_package(Iconv REQUIRED) -+include_directories(${Iconv_INCLUDE_DIRS}) -+ - target_link_libraries(kbuildsycoca5 - KF5::Service - KF5::CoreAddons # KAboutData - KF5::I18n - Qt5::Xml -+ ${Iconv_LIBRARIES} - ) - if (NOT ANDROID) - target_link_libraries(kbuildsycoca5 diff --git a/ports/kf5service/portfile.cmake b/ports/kf5service/portfile.cmake index f445c74d8d081e..71077a8f54c430 100644 --- a/ports/kf5service/portfile.cmake +++ b/ports/kf5service/portfile.cmake @@ -4,8 +4,6 @@ vcpkg_from_github( REF v5.84.0 SHA512 3867da989c8f70fccba63d91aeb0038ad6345e66ca7df6003f968628e4a54e076e9686acb501940ef8f540c39d5f1a70a949cbfdd1caa34e6c4d51daebff418d HEAD_REF master - PATCHES - fix_libiconv.patch ) if(VCPKG_TARGET_IS_OSX) diff --git a/ports/kf5service/vcpkg.json b/ports/kf5service/vcpkg.json index d5fbd1ac2d6f71..87545d2e30ccf2 100644 --- a/ports/kf5service/vcpkg.json +++ b/ports/kf5service/vcpkg.json @@ -23,7 +23,6 @@ "platform": "!android" }, "kf5i18n", - "libiconv", "qt5-base", "qt5-tools", { From 0fedd5e8898f0188ef5a27bc6e6ff13eebb41c62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 7 Sep 2021 02:52:04 +0200 Subject: [PATCH 27/29] [kf5service] update versions --- versions/k-/kf5service.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5service.json b/versions/k-/kf5service.json index ffdee366223253..fe9cbb8cd76245 100644 --- a/versions/k-/kf5service.json +++ b/versions/k-/kf5service.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "0d939dce272370cf26cfa02a5c1a5b285085eba8", + "git-tree": "b4f918a4443022b0661e41cdc79c77a732b62d4c", "version-semver": "5.84.0", "port-version": 0 } From da468e6e6e88d4a8aecbc0397f0f75a4d6893dc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 13 Sep 2021 07:39:37 +0100 Subject: [PATCH 28/29] [kf5service] use generic, non-semver versioning --- ports/kf5service/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5service/vcpkg.json b/ports/kf5service/vcpkg.json index 87545d2e30ccf2..69f73cd9c35646 100644 --- a/ports/kf5service/vcpkg.json +++ b/ports/kf5service/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5service", - "version-semver": "5.84.0", + "version": "5.84.0", "description": "Plugin framework for desktop services", "homepage": "https://api.kde.org/frameworks/kservice/html/index.html", "dependencies": [ From 92da0b600ae14b02df65ae2e7338184a1af4518e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 13 Sep 2021 07:39:47 +0100 Subject: [PATCH 29/29] [kf5service] update versions --- versions/k-/kf5service.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/k-/kf5service.json b/versions/k-/kf5service.json index fe9cbb8cd76245..cbc9e49c2913c8 100644 --- a/versions/k-/kf5service.json +++ b/versions/k-/kf5service.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "b4f918a4443022b0661e41cdc79c77a732b62d4c", - "version-semver": "5.84.0", + "git-tree": "13315cd7dbaa61af6c16276f83a15ceaab5a1235", + "version": "5.84.0", "port-version": 0 } ]