Update KF5 framework to 5.73

kf5crash - make x11 patch exclusive to linux - enable win/macOS builds kf5syntaxhighlighting - fix building on non-Win by removing the cli tool from all platforms
wrobelda · Sep 11, 2020 · e10a483 · e10a483
1 parent 18ab4b7
commit e10a483
Show file tree

Hide file tree

Showing 32 changed files with 61 additions and 68 deletions.
diff --git a/ports/ecm/CONTROL b/ports/ecm/CONTROL
@@ -1,4 +1,4 @@
 Source: ecm
-Version: 5.66.0
+Version: 5.73.0
 Homepage: https://github.com/KDE/extra-cmake-modules
 Description: Extra CMake Modules (ECM), extra modules and scripts for CMake
diff --git a/ports/ecm/portfile.cmake b/ports/ecm/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/extra-cmake-modules
-    REF c427b4e94ebb5f6557823315cf518d77c634a08e # v5.66.0
-    SHA512 b7eb19d28fe242ed6e5bf507525806796ea312d80f31c97028ef08b2593a285767ed2269ff990b6ddc5e22424bdccd963ab8be880f84c6c7395e7f29ad289110
+    REF 6a278dff8b70f6ed3453c39a82ba41c97248aadd # v5.73.0
+    SHA512 405ecb758df124fe3f98316945f0e9b2f531da9e2ca526246963718acd962bfe3481d59134f5a9b96eaa96fe727536ca3108949fb8768f682b75a0a66cc6f018
     HEAD_REF master
 )
 

diff --git a/ports/kf5archive/CONTROL b/ports/kf5archive/CONTROL
@@ -1,5 +1,5 @@
 Source: kf5archive
-Version: 5.64.0-1
+Version: 5.73.0
 Homepage: https://api.kde.org/frameworks/karchive/html/index.html
 Description: File compression
 Build-Depends: ecm, qt5-base[core], zlib, bzip2
diff --git a/ports/kf5archive/portfile.cmake b/ports/kf5archive/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/karchive
-    REF v5.64.0
-    SHA512 006cd9117eec02e1471b3b0082ee5f21161dc9c52855b6e4be7f3f3614bde9e22a3392f4a90be23654b648a003761bfa70a5497974577da43807eaf56fa126ba
+    REF v5.73.0
+    SHA512 8d5b4ee17b0777b7a37b0d505e50d0058308251cbd9ed831fdb339c5c0ed4e1633d21089ad55fcd8c2838d293927fa05cc217baef7e3bd342bda9d2d44ef8ce3
     HEAD_REF master
 )
 

diff --git a/ports/kf5completion/CONTROL b/ports/kf5completion/CONTROL
@@ -1,5 +1,5 @@
 Source: kf5completion
-Version: 5.64.0
+Version: 5.73.0
 Homepage: https://api.kde.org/frameworks/kcompletion/html/index.html
 Description: Text completion helpers and widgets
 Build-Depends: ecm, qt5-tools, kf5config, kf5widgetsaddons
diff --git a/ports/kf5completion/add-qdbus-to-required-libraries.patch b/ports/kf5completion/add-qdbus-to-required-libraries.patch
@@ -1,10 +1,9 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a86a05e..688bae2 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -32,7 +32,7 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KCOMPLETION
  # Dependencies
- set(REQUIRED_QT_VERSION 5.11.0)
+ set(REQUIRED_QT_VERSION 5.12.0)
 
 -find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Widgets)
 +find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Widgets DBus)

diff --git a/ports/kf5completion/portfile.cmake b/ports/kf5completion/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kcompletion
-    REF v5.64.0
-    SHA512 1d597bc0e82d1570b1ff7b254425ab18d4d505a0b7f475a43b51d70566b91e763b86675837421c3f09073544efa77e673e9d2cfef586c12684fc9fe7b0c6a0cc
+    REF v5.73.0
+    SHA512 db5f5c50ede00b1357154792fda164d56004f2f0413db7be69be19312e179c41eaf73ec062cdfdfefaeb3b10a316203329dab4aaba4af14f632ee2c8fbe64b12
     HEAD_REF master
     # reported issue, just a manual workaround until the issue is fixed upstream
     PATCHES 

diff --git a/ports/kf5config/CONTROL b/ports/kf5config/CONTROL
@@ -1,5 +1,5 @@
 Source: kf5config
-Version: 5.64.0
+Version: 5.73.0
 Homepage: https://api.kde.org/frameworks/kconfig/html/index.html
 Description: Configuration system
 Build-Depends: ecm, qt5-base, qt5-tools
diff --git a/ports/kf5config/portfile.cmake b/ports/kf5config/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kconfig
-    REF v5.64.0
-    SHA512 b8919e552a35ed3f4882d2d15205c5576be985e9f6e4e834d26587c9288e85a2ab27504a1531d1af70e8db4dc7ed71a6b0caf91c7310dace81177b68aa6a97e5
+    REF v5.73.0
+    SHA512 cf80d7c1db8d8b4372f011b9aefbed196a83721eeb8d3935a6903fea4cdfb57f07c01a8f70103ca5fb9f57b9865383dc77dd5214ec2bc53a0029090f2d005a6c
     HEAD_REF master
 )
 

diff --git a/ports/kf5coreaddons/CONTROL b/ports/kf5coreaddons/CONTROL
@@ -1,5 +1,5 @@
 Source: kf5coreaddons
-Version: 5.64.0
+Version: 5.73.0
 Homepage: https://api.kde.org/frameworks/kcoreaddons/html/index.html
 Description: Addons to QtCore
 Build-Depends: ecm, qt5-base, qt5-tools
diff --git a/ports/kf5coreaddons/portfile.cmake b/ports/kf5coreaddons/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kcoreaddons
-    REF v5.64.0
-    SHA512 b6849c072aa33cd2d93477e7a08ffc8ec7034f7d8530b6492faa9a53e4e15af0da778fc54e5d865e68b36c32aa6559f3d178a03046f5120d11dcb61d35ed7a60
+    REF v5.73.0
+    SHA512 4d0b50225c7bcb01f5aa092f430b4bab7373bfe0d7016784c06f6a8b4ba8eb3291cbd0ce57bf4b4c1c0f2ea3b063a1cf9b4492d607fa7b23c5a2f263e7e95679
 )
 
 vcpkg_configure_cmake(

diff --git a/ports/kf5crash/CONTROL b/ports/kf5crash/CONTROL
@@ -1,6 +1,6 @@
 Source: kf5crash
-Version: 5.64.0
+Version: 5.73.0
 Homepage: https://api.kde.org/frameworks/kcrash/html/index.html
 Description: KCrash provides support for intercepting and handling application crashes.
 Supports: linux
-Build-Depends: ecm, kf5coreaddons, kf5widgetsaddons
+Build-Depends: ecm, kf5coreaddons, kf5windowsystem, qt5-x11extras (linux)
diff --git a/ports/kf5crash/add_x11extras.patch b/ports/kf5crash/add_x11extras.patch
@@ -1,13 +1,12 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8a9d1c6..0d5fb3f 100644
+index 8c66d85..b9d9499 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -12,7 +12,7 @@ feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKA
- set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+@@ -19,6 +19,7 @@ include(KDECMakeSettings)
 
- set(REQUIRED_QT_VERSION 5.11.0)
--find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core)
-+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core X11Extras)
- include(KDEInstallDirs)
- include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
- include(KDECMakeSettings)
+ if (NOT APPLE)
+     find_package(X11)
++    find_package(X11Extras)
+ endif()
+
+ set(HAVE_X11 ${X11_FOUND})
diff --git a/ports/kf5crash/portfile.cmake b/ports/kf5crash/portfile.cmake
@@ -1,10 +1,8 @@
-vcpkg_fail_port_install(ON_TARGET "osx" "uwp" "windows")
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kcrash
-    REF v5.64.0
-    SHA512 28749b220002fef756dbd8436cf684b7e3eb1d72ae00ae8b1bfded5c4a446683dc925a3be9beb55ad0872e71d3c23411d32b4fab935909816efa339cedaeda3d
+    REF v5.73.0
+    SHA512 50df67c405a26f52825aa35d859495c7d424c513b08278f484d942d39c5ca6efe02cc51ebbfa89f29695aa973198fa7e4064f0fe28b684634d892c41d79df965
     HEAD_REF master
     PATCHES
         add_x11extras.patch

diff --git a/ports/kf5guiaddons/CONTROL b/ports/kf5guiaddons/CONTROL
@@ -1,5 +1,5 @@
 Source: kf5guiaddons
-Version: 5.64.0
+Version: 5.73.0
 Homepage: https://api.kde.org/frameworks/kguiaddons/html/index.html
 Description: Addons to QtGui
 Build-Depends: ecm, qt5-winextras (windows), qt5-x11extras (linux), qt5-tools
diff --git a/ports/kf5guiaddons/portfile.cmake b/ports/kf5guiaddons/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kguiaddons
-    REF v5.64.0
-    SHA512 98d07360f02b473997cdbf9e9b832ea8c4a459a73669eff1db5276dfbd63e9a9088e3c1ed99d70cc1433468e1efcbce43d22fefdf75a399f4812e0fc4a4f13b1
+    REF v5.73.0
+    SHA512 e351f217eebeaac9d01a0de698efbf8584e6fa0557f7f83c6069618769d78bea5b133473c9a9ff37ec21f294472b6db035d30ba9dcdc1982680258d9ed94b3b8
     HEAD_REF master
 )
 

diff --git a/ports/kf5holidays/CONTROL b/ports/kf5holidays/CONTROL
@@ -1,4 +1,4 @@
 Source: kf5holidays
-Version: 5.64.0-1
+Version: 5.73.0
 Description: Holiday calculation library
 Build-Depends: ecm, qt5-base[core], qt5-tools
diff --git a/ports/kf5holidays/portfile.cmake b/ports/kf5holidays/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kholidays
-    REF v5.64.0
-    SHA512 a4d9a88bb12b89c636ac63d848505c7895c672ef0e540e7fa45de22fb085048fa5f76729be60fceafbe63ab4b325251fdc65f36b58ab6d9bae7f50678578d4c8
+    REF v5.73.0
+    SHA512 ba0ea9c199c2fd033b76edf8438189d4ae40994645bdca790f8ad92aa3dfdca5116a13ee801a601c8fc518440e0b5b264af5b17474ae3b2447c3e03c16fa983e
     HEAD_REF master
 )
 
@@ -19,10 +19,10 @@ vcpkg_install_cmake()
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Holidays)
 vcpkg_copy_pdbs()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 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 )
 

diff --git a/ports/kf5i18n/CONTROL b/ports/kf5i18n/CONTROL
@@ -1,6 +1,5 @@
 Source: kf5i18n
-Version: 5.64.0
-Port-Version: 1
+Version: 5.73.0
 Homepage: https://api.kde.org/frameworks/ki18n/html/index.html
 Description: Advanced internationalization framework
 Build-Depends: ecm, qt5-declarative, qt5-tools, gettext
diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/ki18n
-    REF v5.64.0
-    SHA512 13b5d701003edea704ffc86a886d86b27ff2198d4cde4ee732b9241cf04dba0fba403f1f78b45facd7c2d3b543f8f0a098369035270a61b347331eb495fae1d3
+    REF v5.73.0
+    SHA512 2d3e1bd468f267ba2b666848a047e9ba8da3e25c54388fb921b1e9179bec991fd52811960c57fb4efdf1493f33bb448d90210cb7a30ddd0fc74460ab51726f75
 )
 
 if(CMAKE_HOST_WIN32)

diff --git a/ports/kf5itemmodels/CONTROL b/ports/kf5itemmodels/CONTROL
@@ -1,5 +1,5 @@
 Source: kf5itemmodels
-Version: 5.64.0
+Version: 5.73.0
 Homepage: https://api.kde.org/frameworks/kitemmodels/html/index.html
 Description: Models for Qt Model/View system
 Build-Depends: ecm, qt5-tools, qt5-base
diff --git a/ports/kf5itemmodels/portfile.cmake b/ports/kf5itemmodels/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kitemmodels
-    REF v5.64.0
-    SHA512 c29911b5ff521a8d1dae9b72250be59267da7bf059aeb1efec6a7361204957c12a1ae95fd34a00067b277ce3a61d88930326501c361341a316d6c0afb109b7ed
+    REF v5.73.0
+    SHA512 4fc8bf6cfdd33e7225b47b1bab46918c7dabdc2abd193e9e071b71298a4b015e7b4a831ca244597867ad7571322b6a157e37e9fbd7448ad1fe1761505e0aa3ed
 )
 
 vcpkg_configure_cmake(

diff --git a/ports/kf5itemviews/CONTROL b/ports/kf5itemviews/CONTROL
@@ -1,5 +1,5 @@
 Source: kf5itemviews
-Version: 5.64.0
+Version: 5.73.0
 Homepage: https://api.kde.org/frameworks/kitemviews/html/index.html
 Description: Widget addons for Qt Model/View
 Build-Depends: ecm, qt5-tools, qt5-base
diff --git a/ports/kf5itemviews/portfile.cmake b/ports/kf5itemviews/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kitemviews
-    REF v5.64.0
-    SHA512 c40d1dee94badac2e58098138522d72be00082ac9ce70e8f5690b5bd5ae0705fa79a7edc3af391230a86d08a4a8b7dac1c28f148758f7ee8c09195a178e35bcb
+    REF v5.73.0
+    SHA512 4cb29b243cf28ae96c8cc22675b0f0f8c00503a75ef531a7611af6d249fe338767d5cbd380af3b9c127e38003720df3b9affee9dcf86041ea5a86b7765252969
 )
 
 vcpkg_configure_cmake(

diff --git a/ports/kf5plotting/CONTROL b/ports/kf5plotting/CONTROL
@@ -1,5 +1,5 @@
 Source: kf5plotting
-Version: 5.64.0-1
+Version: 5.73.0
 Homepage: https://api.kde.org/frameworks/kplotting/html/index.html
 Description: Lightweight plotting framework
 Build-Depends: ecm, qt5-base[core], qt5-tools
diff --git a/ports/kf5plotting/portfile.cmake b/ports/kf5plotting/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kplotting
-    REF v5.64.0
-    SHA512 831b26a5e85a8baa1d49405e1358c7cda62b0a643e85b9677e2ceee413938fd03b96ff2c060dc2e0fa012da0a45452f32b734633ec4c99eecbf9d6228ff722b4
+    REF v5.73.0
+    SHA512 1d705aa7f6918cb4a52e20726271243e34c5899fb6f9bc0de46d614f2833ea3ecf8e864cd5544702c1fe8c32f70728debd16490751c528806ebbcf2e74c424a6
     HEAD_REF master
 )
 

diff --git a/ports/kf5syntaxhighlighting/CONTROL b/ports/kf5syntaxhighlighting/CONTROL
@@ -1,5 +1,5 @@
 Source: kf5syntaxhighlighting
-Version: 5.64.0-1
+Version: 5.73.0
 Homepage: https://github.com/KDE/syntax-highlighting
 Description: Syntax highlighting engine for Kate syntax definitions
 Build-Depends: ecm, qt5-base[core], qt5-tools, qt5-xmlpatterns
diff --git a/ports/kf5syntaxhighlighting/portfile.cmake b/ports/kf5syntaxhighlighting/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/syntax-highlighting
-    REF v5.64.0
-    SHA512 b33a136fad0e55054660c34328a208a19834c1adc9cdb9e8f334e9224492f2894bbcb355e61c8f6da6301363a11f832fa7e38cff293be249876048dd34c39476
+    REF v5.73.0
+    SHA512 184aac6f29be8b2c0c5a309a00bb00197c9f3f5971e7f7bbc9e128274d3659bb58825e4d43229712f3616e4cfd43289a38960b2e64d7e6edaad05489c80d7c65
     HEAD_REF master
 )
 
@@ -23,12 +23,10 @@ vcpkg_install_cmake(ADD_BIN_TO_PATH)
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5SyntaxHighlighting)
 vcpkg_copy_pdbs()
 
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/kf5syntaxhighlighting RENAME copyright)
 
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kate-syntax-highlighter.exe)
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/kf5syntaxhighlighting)
-file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kate-syntax-highlighter.exe
-            ${CURRENT_PACKAGES_DIR}/tools/kf5syntaxhighlighting/kate-syntax-highlighter.exe)
-
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/kf5syntaxhighlighting)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
diff --git a/ports/kf5widgetsaddons/CONTROL b/ports/kf5widgetsaddons/CONTROL
@@ -1,5 +1,5 @@
 Source: kf5widgetsaddons
-Version: 5.64.0
+Version: 5.73.0
 Homepage: https://api.kde.org/frameworks/kwidgetsaddons/html/index.html
 Description: Addons to QtWidgets
 Build-Depends: ecm, qt5-base, qt5-tools
diff --git a/ports/kf5widgetsaddons/portfile.cmake b/ports/kf5widgetsaddons/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kwidgetsaddons
-    REF v5.64.0
-    SHA512 f49bade85b97468ad4c2faa34b71c6d04ff95c720c27e5b7adfb9a7b5acf8ff30b91d2beca7472dec6b8241f918b4fb15bddc1429be86a62bcefefe918311307
+    REF v5.73.0
+    SHA512 b1fb9baaafba2aa62e3d34178e61ad393402fc6f38671dcb883db393b8d7aba44635d217336be37a92e2970ad66c73f1f2f5df688700ada80ec1263ccb4c9cb6
     HEAD_REF master
 )
 

diff --git a/ports/kf5windowsystem/CONTROL b/ports/kf5windowsystem/CONTROL
@@ -1,5 +1,5 @@
 Source: kf5windowsystem
-Version: 5.64.0
+Version: 5.73.0
 Homepage: https://api.kde.org/frameworks/kwindowsystem/html/
 Description: Access to the windowing system
 Build-Depends: ecm, qt5-winextras (windows), qt5-tools
diff --git a/ports/kf5windowsystem/portfile.cmake b/ports/kf5windowsystem/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kwindowsystem
-    REF v5.64.0
-    SHA512 7e1033ac383042b76254f35676c8aa011f02192e80ac2eb0554014a483749b13002062e7e928884f95dc7cb2a1c390bd2a93a7871d3f107b7042f7219dadecf5
+    REF v5.73.0
+    SHA512 ae71a1eeb621df042ebb6b1325617cd8524b7a4f6c16a4e17771cfe5046a1bfdc4c37fc8f01e6a78389b9adb4e943d1660c65bdfee22d920ad0d7a9c091b86b5
 )
 
 vcpkg_configure_cmake(