Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[kf5] upgrade to 5.89 #21890

Merged
merged 8 commits into from
Dec 17, 2021
Merged

[kf5] upgrade to 5.89 #21890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2f01fa4
[kf5*] Update to 5.89
wrobelda Dec 7, 2021
9f75652
[kf5*] Update versions
wrobelda Dec 7, 2021
0b3fe2c
[kf5kio] update tag to rc2
wrobelda Dec 12, 2021
5a607c0
[kf5kio] update versions
wrobelda Dec 12, 2021
a06d41a
[kf5*] final 5.89 released
wrobelda Dec 12, 2021
6e776fa
[kf5*] update versions
wrobelda Dec 14, 2021
8d06860
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Dec 17, 2021
4f0ad52
Clean up trailing whitespace and add quotes when naming .clang-format.
BillyONeal Dec 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ports/ecm/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/extra-cmake-modules
REF v5.88.0
SHA512 976c83b155c92bdab639752ad44046722dbc363b0341533a51b2123a36cdfb82b0ddefa4886e1def9b7f236b8569dc9f9c2b26c0ea83debb631e574d531c30df
REF v5.89.0
SHA512 1c3f6ad5dbe1485d1602e297989d6cd53e7646aa99dc28ac1159d0aa22134c97efd74b2c01923e74732f59c861ce05486adb7cff7de050237a35b0980e92cbcf
HEAD_REF master
PATCHES
fix_canberra.patch # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/187
Expand Down
2 changes: 1 addition & 1 deletion ports/ecm/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ecm",
"version": "5.88.0",
"version": "5.89.0",
"description": "Extra CMake Modules (ECM), extra modules and scripts for CMake",
"homepage": "https://github.com/KDE/extra-cmake-modules",
"dependencies": [
Expand Down
78 changes: 38 additions & 40 deletions ports/kf5archive/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,38 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/karchive
REF v5.88.0
SHA512 233ea884aafc70a186698fece376727cac5ae79daa6396752a375c8b66c6bbf9ea952ee14cd48b54fcf58af2f931d9c96a83f3d01c8e2c29ab618ee961285762
HEAD_REF master
PATCHES
use_cmake_to_find_zstd.patch # https://invent.kde.org/frameworks/karchive/-/merge_requests/24
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
INVERTED_FEATURES
"lzma" CMAKE_DISABLE_FIND_PACKAGE_LibLZMA
"zstd" CMAKE_DISABLE_FIND_PACKAGE_ZSTD
)

# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_TESTING=OFF
${FEATURE_OPTIONS}
)

vcpkg_cmake_install()
vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Archive CONFIG_PATH lib/cmake/KF5Archive)
vcpkg_copy_pdbs()

if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")


vcpkg_from_github(
JonLiu1993 marked this conversation as resolved.
Show resolved Hide resolved
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/karchive
REF v5.89.0
SHA512 e77d5233b6549332f180be3dcf0459688d6565c24e1af409814aab92d415ebb2b8a04ad720dfa9ed6f017f3ab86fab766b909e30a860bb83c5ddd51def7c3e5f
HEAD_REF master
PATCHES
use_cmake_to_find_zstd.patch # https://invent.kde.org/frameworks/karchive/-/merge_requests/24
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
INVERTED_FEATURES
"lzma" CMAKE_DISABLE_FIND_PACKAGE_LibLZMA
"zstd" CMAKE_DISABLE_FIND_PACKAGE_ZSTD
)

# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_TESTING=OFF
${FEATURE_OPTIONS}
)

vcpkg_cmake_install()
vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Archive CONFIG_PATH lib/cmake/KF5Archive)
vcpkg_copy_pdbs()

if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
2 changes: 1 addition & 1 deletion ports/kf5archive/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kf5archive",
"version": "5.88.0",
"version": "5.89.0",
"description": "File compression",
"homepage": "https://api.kde.org/frameworks/karchive/html/index.html",
"dependencies": [
Expand Down
60 changes: 29 additions & 31 deletions ports/kf5attica/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,29 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/attica
REF v5.88.0
SHA512 09c04ae1572a165c8208c09db9bc3591584b7f327b56f78fcd7f9beb088a13ae69e41c593d4903b539ae52739a1c649359b668cfe8775bb2c61210152cb7be3f
HEAD_REF master
)

# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_TESTING=OFF
)

vcpkg_cmake_install()
vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Attica CONFIG_PATH lib/cmake/KF5Attica)
vcpkg_copy_pdbs()

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")


vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/attica
REF v5.89.0
SHA512 46f4cb550a13032da2e48861916356f3dfa47de0e1c0672ffeea19bad813dfb5cdf1b45b1a25ff35adc07e622486b37d7a65ddf3d39c2b214114d916f09577bb
HEAD_REF master
)

# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_TESTING=OFF
)

vcpkg_cmake_install()
vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Attica CONFIG_PATH lib/cmake/KF5Attica)
vcpkg_copy_pdbs()

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")
2 changes: 1 addition & 1 deletion ports/kf5attica/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kf5attica",
"version": "5.88.0",
"version": "5.89.0",
"description": "A Qt library that implements the Open Collaboration Services API",
"homepage": "https://api.kde.org/frameworks/attica/html/index.html",
"dependencies": [
Expand Down
8 changes: 3 additions & 5 deletions ports/kf5auth/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/kauth
REF v5.88.0
SHA512 f4db5c5ff1f1f72c27fd80ed4f2206fc9f17ac1eaff2486530884be989eaeaae77eff6f536909d961060ee4bed33498ef49ca22b5b22f90cc0bf6c5b8cb5bed0
REF v5.89.0
SHA512 815672fc572b22c51761476da9c82bc128a6a66ede39b5b9e09592c415908064d2b2f0c39674b702f503eeb48f33d0d4443d200bc2830b63b5f4468db66b0d8f
HEAD_REF master
)

# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
Expand All @@ -28,5 +28,3 @@ endif()
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")


2 changes: 1 addition & 1 deletion ports/kf5auth/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kf5auth",
"version": "5.88.0",
"version": "5.89.0",
"description": "Execute actions as privileged user",
"homepage": "https://api.kde.org/frameworks/kauth/html/index.html",
"dependencies": [
Expand Down
9 changes: 4 additions & 5 deletions ports/kf5bookmarks/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/kbookmarks
REF v5.88.0
SHA512 cb5ed71cf802b0bb9ccc94e65450cc7541fc90e14fe3b07780ffcfc72706fecfa887a41d90d7d56cf9bac7ef4d39cfd803a0d1f6b3bf139f5f09b6c54b88d89b
REF v5.89.0
SHA512 590b95c049600745995c76c2c7b8033eb591f8b7c1a2b832068a0e0d668858e04b1ed4a1fc8d2ef3c7fe43c5f3b7b311a7d0626a1053706fd46cbc5506c222b8
HEAD_REF master
)

# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
OPTIONS
-DBUILD_TESTING=OFF
)

Expand All @@ -27,4 +27,3 @@ 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")

2 changes: 1 addition & 1 deletion ports/kf5bookmarks/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kf5bookmarks",
"version": "5.88.0",
"version": "5.89.0",
"description": "Bookmarks management library",
"homepage": "https://api.kde.org/frameworks/kbookmarks/html/index.html",
"dependencies": [
Expand Down
9 changes: 4 additions & 5 deletions ports/kf5codecs/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/kcodecs
REF v5.88.0
SHA512 b7554fa98f98eed76d3b41e15a51e632c90eafb9547969d0394b09315cbed13c43a3e2c50e766d874f28a28df54526de921f70189c054dbb91500ae423931fdf
REF v5.89.0
SHA512 77104ab234d0b0baf00c2d3a37d366dc36c6f831c0fa011cb5ad965310e5317bbca3b569d9202123ed23b70137fe61ffec1689f51cccf8d60cc750913d36856f
HEAD_REF master
)

# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")

find_program(GPERF_EXE NAMES gperf PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools" NO_DEFAULT_PATH)

Expand All @@ -23,12 +23,11 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Codecs CONFIG_PATH lib/cmake/KF5Codecs)

vcpkg_copy_pdbs()

if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
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/share")

file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")

2 changes: 1 addition & 1 deletion ports/kf5codecs/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kf5codecs",
"version": "5.88.0",
"version": "5.89.0",
"description": "String encoding library",
"homepage": "https://api.kde.org/frameworks/kcodecs/html/index.html",
"dependencies": [
Expand Down
61 changes: 30 additions & 31 deletions ports/kf5completion/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,30 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/kcompletion
REF v5.88.0
SHA512 fc9dc7dde3d515523417308b8c73717c1ae628b3cb6276ac7e229a300ff61231d06bf02caba1d5ac77f2a1a85d21705e2a0830963390870baa58417d124aaa1b
HEAD_REF master
)

# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_TESTING=OFF
-DBUILD_DESIGNERPLUGIN=OFF
)

vcpkg_cmake_install()
vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Completion CONFIG_PATH lib/cmake/KF5Completion)
vcpkg_copy_pdbs()

if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/kcompletion
REF v5.89.0
SHA512 26211e45497bfc324503213fdc31acc062fca9c203a192b92e06cd41385df6d207c592fb84bbed1e55627418685ff99347129704f09f98302d03e9ef57c4ed78
HEAD_REF master
)

# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_TESTING=OFF
-DBUILD_DESIGNERPLUGIN=OFF
)

vcpkg_cmake_install()
vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Completion CONFIG_PATH lib/cmake/KF5Completion)
vcpkg_copy_pdbs()

if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
2 changes: 1 addition & 1 deletion ports/kf5completion/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kf5completion",
"version": "5.88.0",
"version": "5.89.0",
"description": "Text completion helpers and widgets",
"homepage": "https://api.kde.org/frameworks/kcompletion/html/index.html",
"dependencies": [
Expand Down
Loading