From 1be182651fde88fa37c50457c5bda99a0ed2424c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Sat, 7 Aug 2021 19:11:27 +0000 Subject: [PATCH 01/15] [kf5coreaddons] fix Windows static builds https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/122 Also: - replace deprecated functions - embrace paths in quotes - actually remove the folders that need to be removed --- ports/kf5coreaddons/122.patch | 51 ++++++++++++++++++++++++++++++ ports/kf5coreaddons/portfile.cmake | 27 +++++++--------- ports/kf5coreaddons/vcpkg.json | 13 ++++++-- 3 files changed, 73 insertions(+), 18 deletions(-) create mode 100644 ports/kf5coreaddons/122.patch diff --git a/ports/kf5coreaddons/122.patch b/ports/kf5coreaddons/122.patch new file mode 100644 index 00000000000000..400af0032ca88f --- /dev/null +++ b/ports/kf5coreaddons/122.patch @@ -0,0 +1,51 @@ +From de4e22fe644d5df9066ba78f778032a42c2f19b9 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella +Date: Sat, 7 Aug 2021 17:24:44 +0200 +Subject: [PATCH] Fix issue when building KCrash static + +KCoreAddons forward declares a function from KCrash. + +It contains a Q_DECL_IMPORT but that breaks when doing a static build. + +Only add the Q_DECL_IMPORT when we are doing a dynamic build. + +BUG: 440416 +--- + src/lib/CMakeLists.txt | 4 ++++ + src/lib/kaboutdata.h | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt +index 8e9006fd..b3ea957f 100644 +--- a/src/lib/CMakeLists.txt ++++ b/src/lib/CMakeLists.txt +@@ -16,6 +16,10 @@ configure_file(util/config-accountsservice.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/c + add_library(KF5CoreAddons) + add_library(KF5::CoreAddons ALIAS KF5CoreAddons) + ++if(NOT BUILD_SHARED_LIBS) ++ target_compile_definitions(KF5CoreAddons PUBLIC -DKCOREADDONS_STATIC) ++endif() ++ + ecm_create_qm_loader(KF5CoreAddons kcoreaddons5_qt) + + if (FAM_FOUND) +diff --git a/src/lib/kaboutdata.h b/src/lib/kaboutdata.h +index 4309b145..a0222861 100644 +--- a/src/lib/kaboutdata.h ++++ b/src/lib/kaboutdata.h +@@ -27,7 +27,11 @@ class KAboutData; + class KPluginMetaData; + namespace KCrash + { ++#ifdef KCOREADDONS_STATIC ++void defaultCrashHandler(int sig); ++#else + Q_DECL_IMPORT void defaultCrashHandler(int sig); ++#endif + } + + /** +-- +GitLab + diff --git a/ports/kf5coreaddons/portfile.cmake b/ports/kf5coreaddons/portfile.cmake index 09c9baf8419b88..37ed60e9e5bf9e 100644 --- a/ports/kf5coreaddons/portfile.cmake +++ b/ports/kf5coreaddons/portfile.cmake @@ -3,22 +3,20 @@ vcpkg_from_github( REPO KDE/kcoreaddons REF v5.84.0 SHA512 58a802d03bea135c192265651540f9f87066b20ee4af620a94a874ec3992c5e734d1ab1e4ccb082de97389fa3479fd3672ec586c3dd36c9b4a5422c7be98d119 + PATCHES + 122.patch # https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/122 ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA OPTIONS - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF -DBUILD_TESTING=OFF -DKDE_INSTALL_DATAROOTDIR=data ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5CoreAddons) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5CoreAddons) vcpkg_copy_pdbs() vcpkg_copy_tools( @@ -26,18 +24,15 @@ vcpkg_copy_tools( AUTO_CLEAN ) -file(APPEND ${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf "Data = ../../data") +file(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "Data = ../../data") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/data) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/desktoptojson${EXECUTABLE_SUFFIX}) -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(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/desktoptojson${EXECUTABLE_SUFFIX}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/data") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -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 diff --git a/ports/kf5coreaddons/vcpkg.json b/ports/kf5coreaddons/vcpkg.json index 7308ce9949d20d..7d81987f0debf7 100644 --- a/ports/kf5coreaddons/vcpkg.json +++ b/ports/kf5coreaddons/vcpkg.json @@ -1,11 +1,20 @@ { "name": "kf5coreaddons", - "version": "5.84.0", + "version-semver": "5.84.0", + "port-version": 1, "description": "Addons to QtCore", "homepage": "https://api.kde.org/frameworks/kcoreaddons/html/index.html", "dependencies": [ "ecm", "qt5-base", - "qt5-tools" + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } From 25a362f8f89a8bf12ef532c379c94bfea7d134aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Sat, 7 Aug 2021 20:27:21 +0000 Subject: [PATCH 02/15] [kf5coreaddons] update versions --- versions/baseline.json | 2 +- versions/k-/kf5coreaddons.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 52e6abb4e428c1..08009b3691bd82 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2902,7 +2902,7 @@ }, "kf5coreaddons": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5crash": { "baseline": "5.84.0", diff --git a/versions/k-/kf5coreaddons.json b/versions/k-/kf5coreaddons.json index 9fd80548b8da00..5562157155cfa2 100644 --- a/versions/k-/kf5coreaddons.json +++ b/versions/k-/kf5coreaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24074fd26832177458d5cc38c1ac2c06664dd087", + "version-semver": "5.84.0", + "port-version": 1 + }, { "git-tree": "0afc60c5f0db7847953d1082a96b5a4844047f02", "version": "5.84.0", From 22a0427b35312173e67836f891ad7952788f08a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 9 Aug 2021 18:47:56 +0000 Subject: [PATCH 03/15] [kf5coreaddons] delete redundant REMOVE --- ports/kf5coreaddons/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/kf5coreaddons/portfile.cmake b/ports/kf5coreaddons/portfile.cmake index 37ed60e9e5bf9e..36670dbaa6c905 100644 --- a/ports/kf5coreaddons/portfile.cmake +++ b/ports/kf5coreaddons/portfile.cmake @@ -26,7 +26,6 @@ vcpkg_copy_tools( file(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "Data = ../../data") -file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/desktoptojson${EXECUTABLE_SUFFIX}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/data") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") From aacbba15010614d24275b82a4f3cbf3d0fd5d2c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 9 Aug 2021 18:48:10 +0000 Subject: [PATCH 04/15] [kf5coreaddons] update versions --- versions/k-/kf5coreaddons.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5coreaddons.json b/versions/k-/kf5coreaddons.json index 5562157155cfa2..3fbd96b3568b1f 100644 --- a/versions/k-/kf5coreaddons.json +++ b/versions/k-/kf5coreaddons.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "24074fd26832177458d5cc38c1ac2c06664dd087", + "git-tree": "21306a7ff47f77e05866338f3555d02aff4ed6f3", "version-semver": "5.84.0", "port-version": 1 }, From 47e7dbdb1d75797a21e9e6619e5cb385e41a4498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 20 Aug 2021 20:45:22 +0200 Subject: [PATCH 05/15] [kf5coreaddons] save data files to default /share location --- ports/kf5coreaddons/portfile.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ports/kf5coreaddons/portfile.cmake b/ports/kf5coreaddons/portfile.cmake index 36670dbaa6c905..19464b148166fb 100644 --- a/ports/kf5coreaddons/portfile.cmake +++ b/ports/kf5coreaddons/portfile.cmake @@ -12,7 +12,6 @@ vcpkg_cmake_configure( DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_TESTING=OFF - -DKDE_INSTALL_DATAROOTDIR=data ) vcpkg_cmake_install() @@ -24,9 +23,8 @@ vcpkg_copy_tools( AUTO_CLEAN ) -file(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "Data = ../../data") +file(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "Data = ../../share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/data") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") From a7603acbf960737952fd222d7c8f87dbbe220657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 20 Aug 2021 20:45:41 +0200 Subject: [PATCH 06/15] [kf5coreaddons] update versions --- versions/k-/kf5coreaddons.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5coreaddons.json b/versions/k-/kf5coreaddons.json index 3fbd96b3568b1f..d979a4f09a2c6e 100644 --- a/versions/k-/kf5coreaddons.json +++ b/versions/k-/kf5coreaddons.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "21306a7ff47f77e05866338f3555d02aff4ed6f3", + "git-tree": "5bbf0797aaf841516d6d1b3dfb338c648336da6b", "version-semver": "5.84.0", "port-version": 1 }, From edc6865988ef82f5a4f9d177bf52678b1ee17171 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 27 Aug 2021 02:05:20 +0200 Subject: [PATCH 07/15] [kf5coreaddons] fix CMake Config for static builds --- ports/kf5coreaddons/129.patch | 38 ++++++++++++++++++++++++++++++ ports/kf5coreaddons/portfile.cmake | 1 + 2 files changed, 39 insertions(+) create mode 100644 ports/kf5coreaddons/129.patch diff --git a/ports/kf5coreaddons/129.patch b/ports/kf5coreaddons/129.patch new file mode 100644 index 00000000000000..2ef2207fb4c758 --- /dev/null +++ b/ports/kf5coreaddons/129.patch @@ -0,0 +1,38 @@ +From 4588b0052c11189aa6872e3c3c13f05dbae0c26e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= +Date: Fri, 27 Aug 2021 02:02:08 +0200 +Subject: [PATCH] Add support for static builds + +--- + KF5CoreAddonsConfig.cmake.in | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/KF5CoreAddonsConfig.cmake.in b/KF5CoreAddonsConfig.cmake.in +index f86b69ff..f9e0d31f 100644 +--- a/KF5CoreAddonsConfig.cmake.in ++++ b/KF5CoreAddonsConfig.cmake.in +@@ -18,6 +18,21 @@ else() + set_target_properties(KF5::desktoptojson PROPERTIES IMPORTED_LOCATION ${DESKTOPTOJSON_EXECUTABLE}) + endif() + endif() ++ ++if(NOT @BUILD_SHARED_LIBS@) ++ if(NOT WIN32) ++ find_dependency(Threads) ++ endif() ++ ++ if(@Inotify_FOUND@) ++ find_dependency(Inotify) ++ endif() ++ ++ if(@Procstat_FOUND@) ++ find_dependency(Procstat) ++ endif() ++endif() ++ + include("${CMAKE_CURRENT_LIST_DIR}/KF5CoreAddonsTargets.cmake") + include("${CMAKE_CURRENT_LIST_DIR}/KF5CoreAddonsMacros.cmake") + @PACKAGE_INCLUDE_QCHTARGETS@ +-- +GitLab + diff --git a/ports/kf5coreaddons/portfile.cmake b/ports/kf5coreaddons/portfile.cmake index 19464b148166fb..9c5281fbd34ede 100644 --- a/ports/kf5coreaddons/portfile.cmake +++ b/ports/kf5coreaddons/portfile.cmake @@ -5,6 +5,7 @@ vcpkg_from_github( SHA512 58a802d03bea135c192265651540f9f87066b20ee4af620a94a874ec3992c5e734d1ab1e4ccb082de97389fa3479fd3672ec586c3dd36c9b4a5422c7be98d119 PATCHES 122.patch # https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/122 + 129.patch # https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/129 ) vcpkg_cmake_configure( From 0e1c0514d0fc1f29124f07c54af56cf81ac74e3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 27 Aug 2021 02:05:35 +0200 Subject: [PATCH 08/15] [kf5coreaddons] update versions --- versions/k-/kf5coreaddons.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5coreaddons.json b/versions/k-/kf5coreaddons.json index d979a4f09a2c6e..2da37e7c3efc2e 100644 --- a/versions/k-/kf5coreaddons.json +++ b/versions/k-/kf5coreaddons.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5bbf0797aaf841516d6d1b3dfb338c648336da6b", + "git-tree": "059e61162bdd7577edde6f9c4f642e6ad8ce7778", "version-semver": "5.84.0", "port-version": 1 }, From e1363cb835c8697d155812ac3fbc64a28ff015c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 27 Aug 2021 02:19:52 +0200 Subject: [PATCH 09/15] [kf5coreaddons] update versions --- versions/k-/kf5coreaddons.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5coreaddons.json b/versions/k-/kf5coreaddons.json index 2da37e7c3efc2e..c4bbac457b0b95 100644 --- a/versions/k-/kf5coreaddons.json +++ b/versions/k-/kf5coreaddons.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "059e61162bdd7577edde6f9c4f642e6ad8ce7778", + "git-tree": "24cfe84be8ece6d236a55717fcff06120d738400", "version-semver": "5.84.0", "port-version": 1 }, From 0b20f0386b0a55b1b0725ecd7f8fe14775561dbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 27 Aug 2021 13:09:52 +0200 Subject: [PATCH 10/15] [kf5coreaddons] fix vcpkg_cmake_config_fixup() usage --- ports/kf5coreaddons/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5coreaddons/portfile.cmake b/ports/kf5coreaddons/portfile.cmake index 9c5281fbd34ede..242054be501a8d 100644 --- a/ports/kf5coreaddons/portfile.cmake +++ b/ports/kf5coreaddons/portfile.cmake @@ -16,7 +16,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5CoreAddons) +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5CoreAddons CONFIG_PATH lib/cmake/KF5CoreAddons) vcpkg_copy_pdbs() vcpkg_copy_tools( From 855331edab9498f4a7393e5cbcbe9b38e5d6af8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 27 Aug 2021 13:10:04 +0200 Subject: [PATCH 11/15] [kf5coreaddons] update versions --- versions/k-/kf5coreaddons.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5coreaddons.json b/versions/k-/kf5coreaddons.json index c4bbac457b0b95..e3b34918a16a74 100644 --- a/versions/k-/kf5coreaddons.json +++ b/versions/k-/kf5coreaddons.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "24cfe84be8ece6d236a55717fcff06120d738400", + "git-tree": "c7ee141e10336185e626fdae151114520754ad3c", "version-semver": "5.84.0", "port-version": 1 }, From c3b201a95bc1cc3aaba01b91cb0f1ae96f7a0482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 27 Aug 2021 15:33:56 +0200 Subject: [PATCH 12/15] [kf5coreaddons] workaround Linux Inotify issue --- ports/kf5coreaddons/129.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5coreaddons/129.patch b/ports/kf5coreaddons/129.patch index 2ef2207fb4c758..059da3c70b5e75 100644 --- a/ports/kf5coreaddons/129.patch +++ b/ports/kf5coreaddons/129.patch @@ -22,7 +22,7 @@ index f86b69ff..f9e0d31f 100644 + endif() + + if(@Inotify_FOUND@) -+ find_dependency(Inotify) ++ find_package(Inotify) # https://bugs.kde.org/show_bug.cgi?id=441604 + endif() + + if(@Procstat_FOUND@) From 0bc2e855c6b339edd4fee298651dab891e116c78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 27 Aug 2021 15:34:06 +0200 Subject: [PATCH 13/15] [kf5coreaddons] update versions --- versions/k-/kf5coreaddons.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5coreaddons.json b/versions/k-/kf5coreaddons.json index e3b34918a16a74..f46d9441d36693 100644 --- a/versions/k-/kf5coreaddons.json +++ b/versions/k-/kf5coreaddons.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c7ee141e10336185e626fdae151114520754ad3c", + "git-tree": "bc0103324e585c123062f208f2d03faf96890ede", "version-semver": "5.84.0", "port-version": 1 }, From fe07e02d18344c4e8d9e60409000339374519ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 30 Aug 2021 16:12:18 +0200 Subject: [PATCH 14/15] [kf5coreaddons] rename patch file --- ports/kf5coreaddons/{129.patch => fix_cmake_config.patch} | 0 ports/kf5coreaddons/{122.patch => fix_static_build.patch} | 0 ports/kf5coreaddons/portfile.cmake | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename ports/kf5coreaddons/{129.patch => fix_cmake_config.patch} (100%) rename ports/kf5coreaddons/{122.patch => fix_static_build.patch} (100%) diff --git a/ports/kf5coreaddons/129.patch b/ports/kf5coreaddons/fix_cmake_config.patch similarity index 100% rename from ports/kf5coreaddons/129.patch rename to ports/kf5coreaddons/fix_cmake_config.patch diff --git a/ports/kf5coreaddons/122.patch b/ports/kf5coreaddons/fix_static_build.patch similarity index 100% rename from ports/kf5coreaddons/122.patch rename to ports/kf5coreaddons/fix_static_build.patch diff --git a/ports/kf5coreaddons/portfile.cmake b/ports/kf5coreaddons/portfile.cmake index 242054be501a8d..24f1d78414b183 100644 --- a/ports/kf5coreaddons/portfile.cmake +++ b/ports/kf5coreaddons/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_from_github( REF v5.84.0 SHA512 58a802d03bea135c192265651540f9f87066b20ee4af620a94a874ec3992c5e734d1ab1e4ccb082de97389fa3479fd3672ec586c3dd36c9b4a5422c7be98d119 PATCHES - 122.patch # https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/122 - 129.patch # https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/129 + fix_static_build.patch # https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/122 + fix_cmake_config.patch # https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/129 ) vcpkg_cmake_configure( From 351d3dcecd5c6bc0159a535c5fa9c0e4447d3755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 30 Aug 2021 16:12:29 +0200 Subject: [PATCH 15/15] [kf5coreaddons] update versions --- versions/k-/kf5coreaddons.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5coreaddons.json b/versions/k-/kf5coreaddons.json index f46d9441d36693..3527c22e7cfb69 100644 --- a/versions/k-/kf5coreaddons.json +++ b/versions/k-/kf5coreaddons.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "bc0103324e585c123062f208f2d03faf96890ede", + "git-tree": "001ac94bfbadcc7b05c30448bff3adc9e2dc08dd", "version-semver": "5.84.0", "port-version": 1 },