From f72886bf44093af01fa54094cea88491c5740548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 17 Sep 2020 01:50:44 -0400 Subject: [PATCH 01/23] Add kf5newstuff port --- ports/kf5newstuff/CONTROL | 5 ++++ ports/kf5newstuff/portfile.cmake | 40 ++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 ports/kf5newstuff/CONTROL create mode 100644 ports/kf5newstuff/portfile.cmake diff --git a/ports/kf5newstuff/CONTROL b/ports/kf5newstuff/CONTROL new file mode 100644 index 00000000000000..7694bb268ba339 --- /dev/null +++ b/ports/kf5newstuff/CONTROL @@ -0,0 +1,5 @@ +Source: kf5newstuff +Version: 5.73.0 +Homepage: https://api.kde.org/frameworks/knewstuff/html/index.html +Description: Framework for downloading and sharing additional application data +Build-Depends: ecm, qt5-base, qt5-tools, kf5archive, kf5completion, kf5config, kf5coreaddons, kf5i18n, kf5iconthemes, kf5kio, kf5itemviews, kf5package, kf5service, kf5textwidgets, kf5widgetsaddons, kf5xmlgui, kf5attica \ No newline at end of file diff --git a/ports/kf5newstuff/portfile.cmake b/ports/kf5newstuff/portfile.cmake new file mode 100644 index 00000000000000..bf01be985da621 --- /dev/null +++ b/ports/kf5newstuff/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/knewstuff + REF v5.73.0 + SHA512 b5e86e7589143dc68f02d8e8e62780940d9b1a54eb4d82bcb970912169e28cb9fddfa27c23497966388552964a4cf1a678d7bc9d6ed3fa5d0d5173d8ccfaa3b1 + 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 + 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/KF5NewStuff DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5NewStuffCore TARGET_PATH share/KF5NewStuffCore) +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(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/qml ${CURRENT_PACKAGES_DIR}/debug/qml ) +file(RENAME ${CURRENT_PACKAGES_DIR}/lib/qml ${CURRENT_PACKAGES_DIR}/qml ) + +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/knewstuff-dialog${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/bin/knewstuff-dialog${VCPKG_HOST_EXECUTABLE_SUFFIX}") +endif() + + +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From db59c69fc6ed9a99ac84ce52f9a89d3d42744eb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 17 Sep 2020 01:54:05 -0400 Subject: [PATCH 02/23] [kf5newstuff] match the lower case --- ports/kf5newstuff/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5newstuff/portfile.cmake b/ports/kf5newstuff/portfile.cmake index bf01be985da621..b112b7282e8849 100644 --- a/ports/kf5newstuff/portfile.cmake +++ b/ports/kf5newstuff/portfile.cmake @@ -21,7 +21,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5NewStuff DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5NewStuffCore TARGET_PATH share/KF5NewStuffCore) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5NewStuffCore TARGET_PATH share/kf5newstuffcore) vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) From 3efbfc96c23942cef6cc22e5d958e23df83721ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 9 Nov 2020 20:21:22 -0500 Subject: [PATCH 03/23] [kf5*] update to 5.75.0 --- ports/kf5newstuff/CONTROL | 2 +- ports/kf5newstuff/portfile.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/kf5newstuff/CONTROL b/ports/kf5newstuff/CONTROL index 7694bb268ba339..9065f0aaaf2ac1 100644 --- a/ports/kf5newstuff/CONTROL +++ b/ports/kf5newstuff/CONTROL @@ -1,5 +1,5 @@ Source: kf5newstuff -Version: 5.73.0 +Version: 5.75.0 Homepage: https://api.kde.org/frameworks/knewstuff/html/index.html Description: Framework for downloading and sharing additional application data Build-Depends: ecm, qt5-base, qt5-tools, kf5archive, kf5completion, kf5config, kf5coreaddons, kf5i18n, kf5iconthemes, kf5kio, kf5itemviews, kf5package, kf5service, kf5textwidgets, kf5widgetsaddons, kf5xmlgui, kf5attica \ No newline at end of file diff --git a/ports/kf5newstuff/portfile.cmake b/ports/kf5newstuff/portfile.cmake index b112b7282e8849..5fa9449d24fa99 100644 --- a/ports/kf5newstuff/portfile.cmake +++ b/ports/kf5newstuff/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/knewstuff - REF v5.73.0 - SHA512 b5e86e7589143dc68f02d8e8e62780940d9b1a54eb4d82bcb970912169e28cb9fddfa27c23497966388552964a4cf1a678d7bc9d6ed3fa5d0d5173d8ccfaa3b1 + REF v5.75.0 + SHA512 ee7df278038b0f5033ad22febf6fcdc2cca32aff16cfdb5f31b26655fef4d7d30375b4ae0ff74013f5e28493bb678c351507e5af76295230a7af876fdd7a4b9a HEAD_REF master ) @@ -37,4 +37,4 @@ elseif(VCPKG_TARGET_IS_WINDOWS) 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 From 3bbdca5fa999f4c556dac8b8ed5c559f8c59b114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 16 Sep 2021 11:48:20 +0200 Subject: [PATCH 04/23] [kf5newstuff] convert manifest to JSON --- ports/kf5newstuff/CONTROL | 5 ----- ports/kf5newstuff/vcpkg.json | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 5 deletions(-) delete mode 100644 ports/kf5newstuff/CONTROL create mode 100644 ports/kf5newstuff/vcpkg.json diff --git a/ports/kf5newstuff/CONTROL b/ports/kf5newstuff/CONTROL deleted file mode 100644 index 9065f0aaaf2ac1..00000000000000 --- a/ports/kf5newstuff/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: kf5newstuff -Version: 5.75.0 -Homepage: https://api.kde.org/frameworks/knewstuff/html/index.html -Description: Framework for downloading and sharing additional application data -Build-Depends: ecm, qt5-base, qt5-tools, kf5archive, kf5completion, kf5config, kf5coreaddons, kf5i18n, kf5iconthemes, kf5kio, kf5itemviews, kf5package, kf5service, kf5textwidgets, kf5widgetsaddons, kf5xmlgui, kf5attica \ No newline at end of file diff --git a/ports/kf5newstuff/vcpkg.json b/ports/kf5newstuff/vcpkg.json new file mode 100644 index 00000000000000..36dfdf80379809 --- /dev/null +++ b/ports/kf5newstuff/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "kf5newstuff", + "version-string": "5.75.0", + "description": "Framework for downloading and sharing additional application data", + "homepage": "https://api.kde.org/frameworks/knewstuff/html/index.html", + "dependencies": [ + "ecm", + "kf5archive", + "kf5attica", + "kf5completion", + "kf5config", + "kf5coreaddons", + "kf5i18n", + "kf5iconthemes", + "kf5itemviews", + "kf5kio", + "kf5package", + "kf5service", + "kf5textwidgets", + "kf5widgetsaddons", + "kf5xmlgui", + "qt5-base", + "qt5-tools" + ] +} From 1ab1ddcac98383bcf8998dc1cf7d3ae92e0e68b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 16 Sep 2021 12:04:55 +0200 Subject: [PATCH 05/23] [kf5newstuff] use gettext port --- ports/kf5newstuff/portfile.cmake | 4 ---- ports/kf5newstuff/vcpkg.json | 7 +++++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ports/kf5newstuff/portfile.cmake b/ports/kf5newstuff/portfile.cmake index 5fa9449d24fa99..4f684721204e26 100644 --- a/ports/kf5newstuff/portfile.cmake +++ b/ports/kf5newstuff/portfile.cmake @@ -6,10 +6,6 @@ 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 diff --git a/ports/kf5newstuff/vcpkg.json b/ports/kf5newstuff/vcpkg.json index 36dfdf80379809..01000e71f7d133 100644 --- a/ports/kf5newstuff/vcpkg.json +++ b/ports/kf5newstuff/vcpkg.json @@ -5,6 +5,13 @@ "homepage": "https://api.kde.org/frameworks/knewstuff/html/index.html", "dependencies": [ "ecm", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, "kf5archive", "kf5attica", "kf5completion", From 1907c10a52334250c419cb7610655123d2dd0b4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 16 Sep 2021 12:06:15 +0200 Subject: [PATCH 06/23] [kf5newstuff] only remove what's needed --- ports/kf5newstuff/portfile.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/kf5newstuff/portfile.cmake b/ports/kf5newstuff/portfile.cmake index 4f684721204e26..d58623c04e0f32 100644 --- a/ports/kf5newstuff/portfile.cmake +++ b/ports/kf5newstuff/portfile.cmake @@ -20,9 +20,8 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5NewStuff DO_NOT_DELETE_PARENT vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5NewStuffCore TARGET_PATH share/kf5newstuffcore) 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 ) From a5149887bd53739b8ef2b9e4524264f0a5684bf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 16 Sep 2021 12:07:20 +0200 Subject: [PATCH 07/23] [kf5newstuff] wrap paths in quotes --- ports/kf5newstuff/portfile.cmake | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ports/kf5newstuff/portfile.cmake b/ports/kf5newstuff/portfile.cmake index d58623c04e0f32..ffceee4bdfd46c 100644 --- a/ports/kf5newstuff/portfile.cmake +++ b/ports/kf5newstuff/portfile.cmake @@ -7,7 +7,7 @@ vcpkg_from_github( ) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS -DBUILD_HTML_DOCS=OFF -DBUILD_MAN_DOCS=OFF @@ -20,16 +20,16 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5NewStuff DO_NOT_DELETE_PARENT vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5NewStuffCore TARGET_PATH share/kf5newstuffcore) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -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(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +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") -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +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/knewstuff-dialog${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/bin/knewstuff-dialog${VCPKG_HOST_EXECUTABLE_SUFFIX}") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/knewstuff-dialog${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/bin/knewstuff-dialog${VCPKG_HOST_EXECUTABLE_SUFFIX}") 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 From ff6751e3a93379d541f6e19175adebd3732bd42b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 16 Sep 2021 12:33:46 +0200 Subject: [PATCH 08/23] [kf5newstuff] remove unused options --- ports/kf5newstuff/portfile.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ports/kf5newstuff/portfile.cmake b/ports/kf5newstuff/portfile.cmake index ffceee4bdfd46c..ba3f41667a4d00 100644 --- a/ports/kf5newstuff/portfile.cmake +++ b/ports/kf5newstuff/portfile.cmake @@ -9,10 +9,8 @@ vcpkg_from_github( 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 ) vcpkg_install_cmake() From 56cf408a931a6d19baac463af9986c29535a8342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 16 Sep 2021 12:40:34 +0200 Subject: [PATCH 09/23] [kf5newstuff] use current spec --- ports/kf5newstuff/portfile.cmake | 20 ++++++++++++-------- ports/kf5newstuff/vcpkg.json | 10 +++++++++- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/ports/kf5newstuff/portfile.cmake b/ports/kf5newstuff/portfile.cmake index ba3f41667a4d00..4647fe4ec942ac 100644 --- a/ports/kf5newstuff/portfile.cmake +++ b/ports/kf5newstuff/portfile.cmake @@ -6,18 +6,25 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( + DISABLE_PARALLEL_CONFIGURE SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5NewStuff DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5NewStuffCore TARGET_PATH share/kf5newstuffcore) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5NewStuff CONFIG_PATH lib/cmake/KF5NewStuff DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5NewStuffCore CONFIG_PATH lib/cmake/KF5NewStuffCore) vcpkg_copy_pdbs() +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_copy_tools( + TOOL_NAMES knewstuff-dialog + AUTO_CLEAN + ) +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/qml" "${CURRENT_PACKAGES_DIR}/debug/qml") @@ -25,9 +32,6 @@ file(RENAME "${CURRENT_PACKAGES_DIR}/lib/qml" "${CURRENT_PACKAGES_DIR}/qml") 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/knewstuff-dialog${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/bin/knewstuff-dialog${VCPKG_HOST_EXECUTABLE_SUFFIX}") endif() - file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file diff --git a/ports/kf5newstuff/vcpkg.json b/ports/kf5newstuff/vcpkg.json index 01000e71f7d133..7e25b9d838485c 100644 --- a/ports/kf5newstuff/vcpkg.json +++ b/ports/kf5newstuff/vcpkg.json @@ -27,6 +27,14 @@ "kf5widgetsaddons", "kf5xmlgui", "qt5-base", - "qt5-tools" + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } From daece0442025e4e9e8e0284ea2aece933456ba83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 16 Sep 2021 12:59:46 +0200 Subject: [PATCH 10/23] [kf5newstuff] use KDE_INSTALL_QMLDIR instead of manual renaming --- ports/kf5newstuff/portfile.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/kf5newstuff/portfile.cmake b/ports/kf5newstuff/portfile.cmake index 4647fe4ec942ac..1eefc93f8d6a9a 100644 --- a/ports/kf5newstuff/portfile.cmake +++ b/ports/kf5newstuff/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF + -DKDE_INSTALL_QMLDIR=qml ) vcpkg_cmake_install() @@ -27,8 +28,6 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") 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") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") From f0477c82b86cffb47bc9b2989b0a0bd8ee91659e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 16 Sep 2021 13:01:56 +0200 Subject: [PATCH 11/23] [kf5newstuff] update to 5.84 --- ports/kf5newstuff/portfile.cmake | 4 ++-- ports/kf5newstuff/vcpkg.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/kf5newstuff/portfile.cmake b/ports/kf5newstuff/portfile.cmake index 1eefc93f8d6a9a..d39c6bd0fec156 100644 --- a/ports/kf5newstuff/portfile.cmake +++ b/ports/kf5newstuff/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/knewstuff - REF v5.75.0 - SHA512 ee7df278038b0f5033ad22febf6fcdc2cca32aff16cfdb5f31b26655fef4d7d30375b4ae0ff74013f5e28493bb678c351507e5af76295230a7af876fdd7a4b9a + REF v5.84.0 + SHA512 107f8c7915f5a7656ed729d03b59e5f53f8751d771487b96e517358f1149801981e27d5cafdf86f759be539305fc8f847c51a28a35947766200cc912072f5c8d HEAD_REF master ) diff --git a/ports/kf5newstuff/vcpkg.json b/ports/kf5newstuff/vcpkg.json index 7e25b9d838485c..4251d8d6f7b069 100644 --- a/ports/kf5newstuff/vcpkg.json +++ b/ports/kf5newstuff/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5newstuff", - "version-string": "5.75.0", + "version-string": "5.84.0", "description": "Framework for downloading and sharing additional application data", "homepage": "https://api.kde.org/frameworks/knewstuff/html/index.html", "dependencies": [ From 0ab50d3d5e36e77b87fc5bf2474faa925bca86a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 16 Sep 2021 13:02:14 +0200 Subject: [PATCH 12/23] [kf5newstuff] fix versioning --- ports/kf5newstuff/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5newstuff/vcpkg.json b/ports/kf5newstuff/vcpkg.json index 4251d8d6f7b069..09551fd9e2c750 100644 --- a/ports/kf5newstuff/vcpkg.json +++ b/ports/kf5newstuff/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5newstuff", - "version-string": "5.84.0", + "version": "5.84.0", "description": "Framework for downloading and sharing additional application data", "homepage": "https://api.kde.org/frameworks/knewstuff/html/index.html", "dependencies": [ From 835f043372a8ed373827042b827a74ae065c1e3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 16 Sep 2021 13:03:28 +0200 Subject: [PATCH 13/23] [kf5newstuff] update versions --- versions/baseline.json | 4 ++++ versions/k-/kf5newstuff.json | 9 +++++++++ 2 files changed, 13 insertions(+) create mode 100644 versions/k-/kf5newstuff.json diff --git a/versions/baseline.json b/versions/baseline.json index 1aaaea54a7df22..0676019e5a0a55 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3064,6 +3064,10 @@ "baseline": "5.84.0", "port-version": 0 }, + "kf5newstuff": { + "baseline": "5.84.0", + "port-version": 0 + }, "kf5notifications": { "baseline": "5.84.0", "port-version": 0 diff --git a/versions/k-/kf5newstuff.json b/versions/k-/kf5newstuff.json new file mode 100644 index 00000000000000..d4dcbd96bb0c64 --- /dev/null +++ b/versions/k-/kf5newstuff.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9d647a2cbbeaf84962fa863a43637cad5bc8d5fd", + "version": "5.84.0", + "port-version": 0 + } + ] +} From 8f0aa88bd165d0638c5612ba795099054828aabc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 16 Sep 2021 17:12:56 +0200 Subject: [PATCH 14/23] [kf5newstuff] fix static builds --- ports/kf5newstuff/fix_static_builds.patch | 68 +++++++++++++++++++++++ ports/kf5newstuff/portfile.cmake | 2 + 2 files changed, 70 insertions(+) create mode 100644 ports/kf5newstuff/fix_static_builds.patch diff --git a/ports/kf5newstuff/fix_static_builds.patch b/ports/kf5newstuff/fix_static_builds.patch new file mode 100644 index 00000000000000..ae7daa66163103 --- /dev/null +++ b/ports/kf5newstuff/fix_static_builds.patch @@ -0,0 +1,68 @@ +From 3eabc253dab40581aa4716f466bf101f0f1d5199 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= +Date: Thu, 16 Sep 2021 17:07:38 +0200 +Subject: [PATCH 1/2] Add support for static builds + +--- + KF5NewStuffConfig.cmake.in | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/KF5NewStuffConfig.cmake.in b/KF5NewStuffConfig.cmake.in +index e4ef2944..063b83ca 100644 +--- a/KF5NewStuffConfig.cmake.in ++++ b/KF5NewStuffConfig.cmake.in +@@ -10,5 +10,25 @@ find_dependency(KF5Service "@KF_DEP_VERSION@") + find_dependency(KF5NewStuffCore "@KF_VERSION@") + find_dependency(KF5NewStuffQuick "@KF_VERSION@") + ++if (NOT @BUILD_SHARED_LIBS@) ++ find_dependency(Qt5Qml @REQUIRED_QT_VERSION@) ++ find_dependency(Qt5Quick @REQUIRED_QT_VERSION@) ++ find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) ++ ++ find_dependency(KF5KIO "@KF_DEP_VERSION@") ++ find_dependency(KF5Completion "@KF_DEP_VERSION@") ++ find_dependency(KF5I18n "@KF_DEP_VERSION@") ++ find_dependency(KF5ItemViews "@KF_DEP_VERSION@") ++ find_dependency(KF5IconThemes "@KF_DEP_VERSION@") ++ find_dependency(KF5TextWidgets "@KF_DEP_VERSION@") ++ find_dependency(KF5Archive "@KF_DEP_VERSION@") ++ find_dependency(KF5Package "@KF_DEP_VERSION@") ++ find_dependency(KF5Config "@KF_DEP_VERSION@") ++ ++ if(@KF5Syndication_FOUND@) ++ find_dependency(KF5Syndication "@KF_VERSION@") ++ endif() ++endif() ++ + include("${CMAKE_CURRENT_LIST_DIR}/KF5NewStuffTargets.cmake") + @PACKAGE_INCLUDE_QCHTARGETS@ +-- +GitLab + + +From e31b2b07a10b23d82e1e84316716aaf832e4ad99 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= +Date: Thu, 16 Sep 2021 17:09:49 +0200 +Subject: [PATCH 2/2] Add missing find_package(Qt5Gui) + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c7022663..d2ead74a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,7 +18,7 @@ include(KDECMakeSettings) + include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) + + set(REQUIRED_QT_VERSION 5.15.0) +-find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED COMPONENTS Widgets Xml) ++find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED COMPONENTS Gui Widgets Xml) + find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE COMPONENTS Qml Quick) + + find_package(KF5Archive ${KF_DEP_VERSION} REQUIRED) +-- +GitLab + diff --git a/ports/kf5newstuff/portfile.cmake b/ports/kf5newstuff/portfile.cmake index d39c6bd0fec156..b81d62f4251cf9 100644 --- a/ports/kf5newstuff/portfile.cmake +++ b/ports/kf5newstuff/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF v5.84.0 SHA512 107f8c7915f5a7656ed729d03b59e5f53f8751d771487b96e517358f1149801981e27d5cafdf86f759be539305fc8f847c51a28a35947766200cc912072f5c8d HEAD_REF master + PATCHES + fix_static_builds.patch ) vcpkg_cmake_configure( From e0788a4f868f021847d10030d3082ea329866a65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 16 Sep 2021 17:21:03 +0200 Subject: [PATCH 15/23] [kf5newstuff] update versions --- versions/k-/kf5newstuff.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5newstuff.json b/versions/k-/kf5newstuff.json index d4dcbd96bb0c64..2a480ddf942be7 100644 --- a/versions/k-/kf5newstuff.json +++ b/versions/k-/kf5newstuff.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "9d647a2cbbeaf84962fa863a43637cad5bc8d5fd", + "git-tree": "1fb6638d23c245c35d6dde5867433f063a37f709", "version": "5.84.0", "port-version": 0 } From 25551790dbcac7574b38117d2e11dbadd8c99c7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 16 Sep 2021 20:00:58 +0200 Subject: [PATCH 16/23] [kf5newstuff] fix tool handling on macOS --- ports/kf5newstuff/portfile.cmake | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ports/kf5newstuff/portfile.cmake b/ports/kf5newstuff/portfile.cmake index b81d62f4251cf9..41da18557a5cf0 100644 --- a/ports/kf5newstuff/portfile.cmake +++ b/ports/kf5newstuff/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_cmake_configure( OPTIONS -DBUILD_TESTING=OFF -DKDE_INSTALL_QMLDIR=qml + -DBUNDLE_INSTALL_DIR=bin ) vcpkg_cmake_install() @@ -21,12 +22,10 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME KF5NewStuff CONFIG_PATH lib/cmake/KF5NewSt vcpkg_cmake_config_fixup(PACKAGE_NAME KF5NewStuffCore CONFIG_PATH lib/cmake/KF5NewStuffCore) vcpkg_copy_pdbs() -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_copy_tools( - TOOL_NAMES knewstuff-dialog - AUTO_CLEAN - ) -endif() +vcpkg_copy_tools( + TOOL_NAMES knewstuff-dialog + AUTO_CLEAN +) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") From 6fff8c79e47be7930453d754a81286a42ca9aa52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 16 Sep 2021 20:01:10 +0200 Subject: [PATCH 17/23] [kf5newstuff] update versions --- versions/k-/kf5newstuff.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5newstuff.json b/versions/k-/kf5newstuff.json index 2a480ddf942be7..2ce7bb2918abf6 100644 --- a/versions/k-/kf5newstuff.json +++ b/versions/k-/kf5newstuff.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1fb6638d23c245c35d6dde5867433f063a37f709", + "git-tree": "a7ebb87070b6db94227016342f17bea9344d1d69", "version": "5.84.0", "port-version": 0 } From 3e5d5a36a4e0505033e73978f7f899f68e1a892e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 17 Sep 2021 23:16:48 +0200 Subject: [PATCH 18/23] [kf5newstuff] fix static builds - continued --- ports/kf5newstuff/fix_static_builds2.patch | 65 ++++++++++++++++++++++ ports/kf5newstuff/portfile.cmake | 6 +- 2 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 ports/kf5newstuff/fix_static_builds2.patch diff --git a/ports/kf5newstuff/fix_static_builds2.patch b/ports/kf5newstuff/fix_static_builds2.patch new file mode 100644 index 00000000000000..a2ffb5ec251137 --- /dev/null +++ b/ports/kf5newstuff/fix_static_builds2.patch @@ -0,0 +1,65 @@ +From 606522b9586c8c583f4c1e9de36e5343412ed88c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= +Date: Fri, 17 Sep 2021 23:12:32 +0200 +Subject: [PATCH] Add support for static builds - fixes + +KF5NewStuffCore has a separate config template, so find its own +dependencies accordingly. +--- + KF5NewStuffConfig.cmake.in | 8 -------- + KF5NewStuffCoreConfig.cmake.in | 13 +++++++++++++ + 2 files changed, 13 insertions(+), 8 deletions(-) + +diff --git a/KF5NewStuffConfig.cmake.in b/KF5NewStuffConfig.cmake.in +index 063b83ca..1be53741 100644 +--- a/KF5NewStuffConfig.cmake.in ++++ b/KF5NewStuffConfig.cmake.in +@@ -13,7 +13,6 @@ find_dependency(KF5NewStuffQuick "@KF_VERSION@") + if (NOT @BUILD_SHARED_LIBS@) + find_dependency(Qt5Qml @REQUIRED_QT_VERSION@) + find_dependency(Qt5Quick @REQUIRED_QT_VERSION@) +- find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) + + find_dependency(KF5KIO "@KF_DEP_VERSION@") + find_dependency(KF5Completion "@KF_DEP_VERSION@") +@@ -21,13 +20,6 @@ if (NOT @BUILD_SHARED_LIBS@) + find_dependency(KF5ItemViews "@KF_DEP_VERSION@") + find_dependency(KF5IconThemes "@KF_DEP_VERSION@") + find_dependency(KF5TextWidgets "@KF_DEP_VERSION@") +- find_dependency(KF5Archive "@KF_DEP_VERSION@") +- find_dependency(KF5Package "@KF_DEP_VERSION@") +- find_dependency(KF5Config "@KF_DEP_VERSION@") +- +- if(@KF5Syndication_FOUND@) +- find_dependency(KF5Syndication "@KF_VERSION@") +- endif() + endif() + + include("${CMAKE_CURRENT_LIST_DIR}/KF5NewStuffTargets.cmake") +diff --git a/KF5NewStuffCoreConfig.cmake.in b/KF5NewStuffCoreConfig.cmake.in +index c65c7c42..b395f8cd 100644 +--- a/KF5NewStuffCoreConfig.cmake.in ++++ b/KF5NewStuffCoreConfig.cmake.in +@@ -3,6 +3,19 @@ + include(CMakeFindDependencyMacro) + find_dependency(KF5Attica "@KF_DEP_VERSION@") + ++if (NOT @BUILD_SHARED_LIBS@) ++ find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) ++ ++ find_dependency(KF5I18n "@KF_DEP_VERSION@") ++ find_dependency(KF5Archive "@KF_DEP_VERSION@") ++ find_dependency(KF5Package "@KF_DEP_VERSION@") ++ find_dependency(KF5Config "@KF_DEP_VERSION@") ++ ++ if(@KF5Syndication_FOUND@) ++ find_dependency(KF5Syndication "@KF_VERSION@") ++ endif() ++endif() ++ + set(KDE_INSTALL_KNSRCDIR "@KDE_INSTALL_DATADIR@/knsrcfiles") + + include("${CMAKE_CURRENT_LIST_DIR}/KF5NewStuffCoreTargets.cmake") +-- +GitLab + diff --git a/ports/kf5newstuff/portfile.cmake b/ports/kf5newstuff/portfile.cmake index 41da18557a5cf0..94ccfb5f1b1c38 100644 --- a/ports/kf5newstuff/portfile.cmake +++ b/ports/kf5newstuff/portfile.cmake @@ -5,7 +5,8 @@ vcpkg_from_github( SHA512 107f8c7915f5a7656ed729d03b59e5f53f8751d771487b96e517358f1149801981e27d5cafdf86f759be539305fc8f847c51a28a35947766200cc912072f5c8d HEAD_REF master PATCHES - fix_static_builds.patch + fix_static_builds.patch # https://invent.kde.org/frameworks/knewstuff/-/merge_requests/139 + fix_static_builds2.patch # https://invent.kde.org/frameworks/knewstuff/-/merge_requests/140 ) vcpkg_cmake_configure( @@ -19,7 +20,8 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME KF5NewStuff CONFIG_PATH lib/cmake/KF5NewStuff DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(PACKAGE_NAME KF5NewStuffCore CONFIG_PATH lib/cmake/KF5NewStuffCore) +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5NewStuffCore CONFIG_PATH lib/cmake/KF5NewStuffCore DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5NewStuffQuick CONFIG_PATH lib/cmake/KF5NewStuffQuick) vcpkg_copy_pdbs() vcpkg_copy_tools( From 060b9cd06a434a4b993f3c124ca8cf93f2a7d41b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 17 Sep 2021 23:20:34 +0200 Subject: [PATCH 19/23] [kf5newstuff] update versions --- versions/k-/kf5newstuff.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5newstuff.json b/versions/k-/kf5newstuff.json index 2ce7bb2918abf6..ebd62344995574 100644 --- a/versions/k-/kf5newstuff.json +++ b/versions/k-/kf5newstuff.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a7ebb87070b6db94227016342f17bea9344d1d69", + "git-tree": "f14367471ecd4c8d592ff8f413b556e5647cd86f", "version": "5.84.0", "port-version": 0 } From fa0a00bc8c3cd1ef380df4fe8d16847454493c6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Thu, 14 Oct 2021 12:49:31 +0200 Subject: [PATCH 20/23] [kf5newstuff] reduce patch size 1/3 Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/kf5newstuff/fix_static_builds.patch | 9 --------- 1 file changed, 9 deletions(-) diff --git a/ports/kf5newstuff/fix_static_builds.patch b/ports/kf5newstuff/fix_static_builds.patch index ae7daa66163103..3cfdab574a51c9 100644 --- a/ports/kf5newstuff/fix_static_builds.patch +++ b/ports/kf5newstuff/fix_static_builds.patch @@ -1,12 +1,3 @@ -From 3eabc253dab40581aa4716f466bf101f0f1d5199 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= -Date: Thu, 16 Sep 2021 17:07:38 +0200 -Subject: [PATCH 1/2] Add support for static builds - ---- - KF5NewStuffConfig.cmake.in | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - diff --git a/KF5NewStuffConfig.cmake.in b/KF5NewStuffConfig.cmake.in index e4ef2944..063b83ca 100644 --- a/KF5NewStuffConfig.cmake.in From c18a7ad26f6674ffeea6423fab8eff62043cbd07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Thu, 14 Oct 2021 12:49:41 +0200 Subject: [PATCH 21/23] [kf5newstuff] reduce patch size 2/3 Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/kf5newstuff/fix_static_builds.patch | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ports/kf5newstuff/fix_static_builds.patch b/ports/kf5newstuff/fix_static_builds.patch index 3cfdab574a51c9..a8c8e9727b5994 100644 --- a/ports/kf5newstuff/fix_static_builds.patch +++ b/ports/kf5newstuff/fix_static_builds.patch @@ -31,16 +31,6 @@ index e4ef2944..063b83ca 100644 -- GitLab - -From e31b2b07a10b23d82e1e84316716aaf832e4ad99 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= -Date: Thu, 16 Sep 2021 17:09:49 +0200 -Subject: [PATCH 2/2] Add missing find_package(Qt5Gui) - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - diff --git a/CMakeLists.txt b/CMakeLists.txt index c7022663..d2ead74a 100644 --- a/CMakeLists.txt From 0ea111de4e9df66bdac0d65fc7a17163623a5fce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Thu, 14 Oct 2021 12:49:51 +0200 Subject: [PATCH 22/23] [kf5newstuff] reduce patch size 3/3 Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/kf5newstuff/fix_static_builds2.patch | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/ports/kf5newstuff/fix_static_builds2.patch b/ports/kf5newstuff/fix_static_builds2.patch index a2ffb5ec251137..7d29ff7b556c36 100644 --- a/ports/kf5newstuff/fix_static_builds2.patch +++ b/ports/kf5newstuff/fix_static_builds2.patch @@ -1,15 +1,3 @@ -From 606522b9586c8c583f4c1e9de36e5343412ed88c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= -Date: Fri, 17 Sep 2021 23:12:32 +0200 -Subject: [PATCH] Add support for static builds - fixes - -KF5NewStuffCore has a separate config template, so find its own -dependencies accordingly. ---- - KF5NewStuffConfig.cmake.in | 8 -------- - KF5NewStuffCoreConfig.cmake.in | 13 +++++++++++++ - 2 files changed, 13 insertions(+), 8 deletions(-) - diff --git a/KF5NewStuffConfig.cmake.in b/KF5NewStuffConfig.cmake.in index 063b83ca..1be53741 100644 --- a/KF5NewStuffConfig.cmake.in From 426a6678df690c993d488b2d5c5aa23334580edc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 14 Oct 2021 12:50:20 +0200 Subject: [PATCH 23/23] [kf5newstuff] update versions --- versions/k-/kf5newstuff.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5newstuff.json b/versions/k-/kf5newstuff.json index ebd62344995574..52226138dffa1a 100644 --- a/versions/k-/kf5newstuff.json +++ b/versions/k-/kf5newstuff.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f14367471ecd4c8d592ff8f413b556e5647cd86f", + "git-tree": "39c986b0766ffb962beb7022b74e1e1037bdc203", "version": "5.84.0", "port-version": 0 }