From e10a4832872e0925d6a1dac0f8e37bd5dce2a184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 10 Sep 2020 20:27:36 -0400 Subject: [PATCH 01/65] 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 --- ports/ecm/CONTROL | 2 +- ports/ecm/portfile.cmake | 4 ++-- ports/kf5archive/CONTROL | 2 +- ports/kf5archive/portfile.cmake | 4 ++-- ports/kf5completion/CONTROL | 2 +- .../add-qdbus-to-required-libraries.patch | 3 +-- ports/kf5completion/portfile.cmake | 4 ++-- ports/kf5config/CONTROL | 2 +- ports/kf5config/portfile.cmake | 4 ++-- ports/kf5coreaddons/CONTROL | 2 +- ports/kf5coreaddons/portfile.cmake | 4 ++-- ports/kf5crash/CONTROL | 4 ++-- ports/kf5crash/add_x11extras.patch | 17 ++++++++--------- ports/kf5crash/portfile.cmake | 6 ++---- ports/kf5guiaddons/CONTROL | 2 +- ports/kf5guiaddons/portfile.cmake | 4 ++-- ports/kf5holidays/CONTROL | 2 +- ports/kf5holidays/portfile.cmake | 8 ++++---- ports/kf5i18n/CONTROL | 3 +-- ports/kf5i18n/portfile.cmake | 4 ++-- ports/kf5itemmodels/CONTROL | 2 +- ports/kf5itemmodels/portfile.cmake | 4 ++-- ports/kf5itemviews/CONTROL | 2 +- ports/kf5itemviews/portfile.cmake | 4 ++-- ports/kf5plotting/CONTROL | 2 +- ports/kf5plotting/portfile.cmake | 4 ++-- ports/kf5syntaxhighlighting/CONTROL | 2 +- ports/kf5syntaxhighlighting/portfile.cmake | 14 ++++++-------- ports/kf5widgetsaddons/CONTROL | 2 +- ports/kf5widgetsaddons/portfile.cmake | 4 ++-- ports/kf5windowsystem/CONTROL | 2 +- ports/kf5windowsystem/portfile.cmake | 4 ++-- 32 files changed, 61 insertions(+), 68 deletions(-) diff --git a/ports/ecm/CONTROL b/ports/ecm/CONTROL index ee261ada58e813..e2a8158fcec7ea 100644 --- 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 index bdd57584b78e1c..8405e15e2b80e1 100644 --- 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 index 16592e34e80d1d..5183109965ed59 100644 --- 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 index c7b99e8526c8de..7525ccd95f22c8 100644 --- 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 index fb1f4309acea58..89e105c8a4dc53 100644 --- 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 \ No newline at end of file diff --git a/ports/kf5completion/add-qdbus-to-required-libraries.patch b/ports/kf5completion/add-qdbus-to-required-libraries.patch index b5c285a652b693..89add3816518b9 100644 --- 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 index d9e697dcf3cd34..5dfcd3ce8e773b 100644 --- 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 index 8c0c49e3114d5d..d5e43c68a51277 100644 --- 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 index 444b1aed5abe24..bcbabe7c6a1643 100644 --- 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 index 03d14a3545db45..1e8c9ea78b3204 100644 --- 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 index 14862e07f1188c..617c8f4ed400a6 100644 --- 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 index 927eca46cd0919..2b88160e70992c 100644 --- 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 index a6ff6fc66ce412..b840abf9c37d45 100644 --- 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 index dc608d37153250..6b2a38e5aac422 100644 --- 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 index a364eecc1d79d3..1b9a8e300d6cfa 100644 --- 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 index 8234e4cd8787ea..25b5b2b7e9e7c9 100644 --- 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 index c1545e97909190..d46ac5946b01b8 100644 --- 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 index 900834d3ac6b98..9e80b51e55d048 100644 --- 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 index d963ed00809e38..c2576f44676e54 100644 --- 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 index 779fd60e8399ea..591f4adb7554d9 100644 --- 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 index f94f20fa9d9fa4..1b10a0cd57e736 100644 --- 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 index 9facbb120bea25..a08b4727b2194c 100644 --- 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 index 8d83844ebeae86..c7a004de03d3f0 100644 --- 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 index f134b477ceb43a..b63ef6f6655d02 100644 --- 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 index 2eb191a7190076..2478d2338df783 100644 --- 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 index 8ea9b3d3f3c3a2..f5332e621b6db0 100644 --- 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 index 52cca4b36fdbe6..367e7f9801583b 100644 --- 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 index b3dd829e2cda8c..261ad804791b79 100644 --- 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() \ No newline at end of file diff --git a/ports/kf5widgetsaddons/CONTROL b/ports/kf5widgetsaddons/CONTROL index 2e5f2eb515d499..8fa2c30d5c20f2 100644 --- 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 index fe7106e224bd09..5be15292b49e26 100644 --- 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 index d5cb904870e089..d8a5b1bd82bb52 100644 --- 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 index 0284c7408e5205..bc630e0e7b7c76 100644 --- 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( From 8703c2423667f62075c34496ef273394a5b8d538 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 10 Sep 2020 21:26:37 -0400 Subject: [PATCH 02/65] Add kf5auth port --- ports/kf5auth/CONTROL | 5 +++++ ports/kf5auth/portfile.cmake | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 ports/kf5auth/CONTROL create mode 100644 ports/kf5auth/portfile.cmake diff --git a/ports/kf5auth/CONTROL b/ports/kf5auth/CONTROL new file mode 100644 index 00000000000000..e2b1755194d1ba --- /dev/null +++ b/ports/kf5auth/CONTROL @@ -0,0 +1,5 @@ +Source: kf5auth +Version: 5.73.0 +Homepage: https://api.kde.org/frameworks/kauth/html/index.html +Description: Execute actions as privileged user +Build-Depends: ecm, qt5-base, qt5-tools, kf5coreaddons diff --git a/ports/kf5auth/portfile.cmake b/ports/kf5auth/portfile.cmake new file mode 100644 index 00000000000000..43d89d3905466f --- /dev/null +++ b/ports/kf5auth/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kauth + REF v5.73.0 + SHA512 123818bfeebabc780fffea0b4177d42f8cdbf625b83baa67fd1d1bc44cd1b28c2f7589ed1b3951045491c680e97e581547eec91657a3d47f3b77f7a72a306e24 + 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/KF5Auth) + +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 760bd50abf392f83eb69989e4a4005128adb6fcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 10 Sep 2020 22:25:01 -0400 Subject: [PATCH 03/65] Revert "Add kf5auth port" This reverts commit 8703c2423667f62075c34496ef273394a5b8d538. --- ports/kf5auth/CONTROL | 5 ----- ports/kf5auth/portfile.cmake | 34 ---------------------------------- 2 files changed, 39 deletions(-) delete mode 100644 ports/kf5auth/CONTROL delete mode 100644 ports/kf5auth/portfile.cmake diff --git a/ports/kf5auth/CONTROL b/ports/kf5auth/CONTROL deleted file mode 100644 index e2b1755194d1ba..00000000000000 --- a/ports/kf5auth/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: kf5auth -Version: 5.73.0 -Homepage: https://api.kde.org/frameworks/kauth/html/index.html -Description: Execute actions as privileged user -Build-Depends: ecm, qt5-base, qt5-tools, kf5coreaddons diff --git a/ports/kf5auth/portfile.cmake b/ports/kf5auth/portfile.cmake deleted file mode 100644 index 43d89d3905466f..00000000000000 --- a/ports/kf5auth/portfile.cmake +++ /dev/null @@ -1,34 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/kauth - REF v5.73.0 - SHA512 123818bfeebabc780fffea0b4177d42f8cdbf625b83baa67fd1d1bc44cd1b28c2f7589ed1b3951045491c680e97e581547eec91657a3d47f3b77f7a72a306e24 - 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/KF5Auth) - -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 f1ac3db8e2019f474a09d6964aea8e21bc9da166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 10 Sep 2020 22:32:40 -0400 Subject: [PATCH 04/65] Add kf5globalaccel port --- ports/kf5globalaccel/CONTROL | 5 +++++ ports/kf5globalaccel/portfile.cmake | 34 +++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 ports/kf5globalaccel/CONTROL create mode 100644 ports/kf5globalaccel/portfile.cmake diff --git a/ports/kf5globalaccel/CONTROL b/ports/kf5globalaccel/CONTROL new file mode 100644 index 00000000000000..5f99e07cc6e21d --- /dev/null +++ b/ports/kf5globalaccel/CONTROL @@ -0,0 +1,5 @@ +Source: kf5globalaccel +Version: 5.73.0 +Homepage: https://api.kde.org/frameworks/kglobalaccel/html/index.html +Description: lobal desktop keyboard shortcuts +Build-Depends: ecm, qt5-base, qt5-tools, kf5config, kf5coreaddons, kf5crash, kf5dbusaddons, kf5windowsystem, kf5dbusaddons diff --git a/ports/kf5globalaccel/portfile.cmake b/ports/kf5globalaccel/portfile.cmake new file mode 100644 index 00000000000000..1761b1d558e7c6 --- /dev/null +++ b/ports/kf5globalaccel/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kglobalaccel + REF v5.73.0 + SHA512 3e510bb1a383e44f2c4217b86ea51638dee9dbb9e0210fa253f18a9572cdcc109d84d25ed62cf5611ecefc5c4b9d96017cc743cf846cc0f823c0e627b74950c5 + 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/KF5GlobalAccel) + +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 0d9ca95ac23bf24200ab9ca49bae8da01d1e6bd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 10 Sep 2020 22:51:16 -0400 Subject: [PATCH 05/65] Revert "Add kf5globalaccel port" This reverts commit f1ac3db8e2019f474a09d6964aea8e21bc9da166. --- ports/kf5globalaccel/CONTROL | 5 ----- ports/kf5globalaccel/portfile.cmake | 34 ----------------------------- 2 files changed, 39 deletions(-) delete mode 100644 ports/kf5globalaccel/CONTROL delete mode 100644 ports/kf5globalaccel/portfile.cmake diff --git a/ports/kf5globalaccel/CONTROL b/ports/kf5globalaccel/CONTROL deleted file mode 100644 index 5f99e07cc6e21d..00000000000000 --- a/ports/kf5globalaccel/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: kf5globalaccel -Version: 5.73.0 -Homepage: https://api.kde.org/frameworks/kglobalaccel/html/index.html -Description: lobal desktop keyboard shortcuts -Build-Depends: ecm, qt5-base, qt5-tools, kf5config, kf5coreaddons, kf5crash, kf5dbusaddons, kf5windowsystem, kf5dbusaddons diff --git a/ports/kf5globalaccel/portfile.cmake b/ports/kf5globalaccel/portfile.cmake deleted file mode 100644 index 1761b1d558e7c6..00000000000000 --- a/ports/kf5globalaccel/portfile.cmake +++ /dev/null @@ -1,34 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/kglobalaccel - REF v5.73.0 - SHA512 3e510bb1a383e44f2c4217b86ea51638dee9dbb9e0210fa253f18a9572cdcc109d84d25ed62cf5611ecefc5c4b9d96017cc743cf846cc0f823c0e627b74950c5 - 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/KF5GlobalAccel) - -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 26d8897f624191860eb486e93bc6b49d3339ba2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 10 Sep 2020 22:53:16 -0400 Subject: [PATCH 06/65] [ecm] use where possible --- ports/ecm/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/ecm/portfile.cmake b/ports/ecm/portfile.cmake index 8405e15e2b80e1..ffc39174439525 100644 --- a/ports/ecm/portfile.cmake +++ b/ports/ecm/portfile.cmake @@ -21,7 +21,7 @@ vcpkg_install_cmake() # Remove debug files file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -file(COPY ${CURRENT_PORT_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/ecm) +file(COPY ${CURRENT_PORT_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) # Handle copyright file(INSTALL ${SOURCE_PATH}/COPYING-CMAKE-SCRIPTS DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 508b8c5277ce654af9bc8c7d4bd56f8df5137efc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 10 Sep 2020 22:56:43 -0400 Subject: [PATCH 07/65] [kf5holidays] use PORT placeholder where possible --- ports/kf5holidays/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5holidays/portfile.cmake b/ports/kf5holidays/portfile.cmake index 9e80b51e55d048..07fb83022bb641 100644 --- a/ports/kf5holidays/portfile.cmake +++ b/ports/kf5holidays/portfile.cmake @@ -26,4 +26,4 @@ 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(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/kf5holidays RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 836bf71197ade57669b5b0a2b29d037b8703c8a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Thu, 10 Sep 2020 23:00:58 -0400 Subject: [PATCH 08/65] [kf5syntaxhighlighting] use PORT placeholder where possible Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/kf5syntaxhighlighting/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/kf5syntaxhighlighting/portfile.cmake b/ports/kf5syntaxhighlighting/portfile.cmake index 261ad804791b79..0655bef38b5a98 100644 --- a/ports/kf5syntaxhighlighting/portfile.cmake +++ b/ports/kf5syntaxhighlighting/portfile.cmake @@ -25,8 +25,8 @@ 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(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() \ No newline at end of file +endif() From f2a9740533aa89f0270202a5878d60d8a352d42e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 10 Sep 2020 23:03:23 -0400 Subject: [PATCH 09/65] [kf5plotting] use PORT placeholder where possible --- ports/kf5plotting/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5plotting/portfile.cmake b/ports/kf5plotting/portfile.cmake index f5332e621b6db0..875da8974a1e69 100644 --- a/ports/kf5plotting/portfile.cmake +++ b/ports/kf5plotting/portfile.cmake @@ -22,4 +22,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/plugins ${CURRENT_PACKAGES_DIR}/debug/plugins) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/plugins ${CURRENT_PACKAGES_DIR}/plugins) -file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/kf5plotting RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 6ad1abd8b4866f745647a687677c721e970a0cd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Sun, 13 Sep 2020 01:21:26 -0400 Subject: [PATCH 10/65] [kf5crash] fix logical condition in the patch --- ports/kf5crash/add_x11extras.patch | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ports/kf5crash/add_x11extras.patch b/ports/kf5crash/add_x11extras.patch index b840abf9c37d45..a146bfd94a80a8 100644 --- a/ports/kf5crash/add_x11extras.patch +++ b/ports/kf5crash/add_x11extras.patch @@ -1,10 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8c66d85..b9d9499 100644 +index 8c66d85..f2d89cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -19,6 +19,7 @@ include(KDECMakeSettings) +@@ -17,8 +17,9 @@ include(KDEInstallDirs) + include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) + include(KDECMakeSettings) - if (NOT APPLE) +-if (NOT APPLE) ++if (LINUX) find_package(X11) + find_package(X11Extras) endif() From c3f6c7228a9b49850341969b55664a2d66251686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Sun, 13 Sep 2020 01:29:08 -0400 Subject: [PATCH 11/65] [kf5crash] logical condition again, include other BSDs --- ports/kf5crash/add_x11extras.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5crash/add_x11extras.patch b/ports/kf5crash/add_x11extras.patch index a146bfd94a80a8..390e4490b97ef2 100644 --- a/ports/kf5crash/add_x11extras.patch +++ b/ports/kf5crash/add_x11extras.patch @@ -7,7 +7,7 @@ index 8c66d85..f2d89cb 100644 include(KDECMakeSettings) -if (NOT APPLE) -+if (LINUX) ++if (UNIX AND NOT APPLE) find_package(X11) + find_package(X11Extras) endif() From 92adab80333ac6c048dc5bcd70914aaa663fa8ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 14 Sep 2020 10:32:23 -0400 Subject: [PATCH 12/65] [kf5i18n] acquire python3 --- ports/kf5i18n/portfile.cmake | 4 ++++ ports/kf5i18n/vcpkg-cmake-wrapper.cmake | 11 +++++++++++ 2 files changed, 15 insertions(+) create mode 100644 ports/kf5i18n/vcpkg-cmake-wrapper.cmake diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake index 591f4adb7554d9..bad7735b065947 100644 --- a/ports/kf5i18n/portfile.cmake +++ b/ports/kf5i18n/portfile.cmake @@ -26,6 +26,8 @@ if(CMAKE_HOST_WIN32) vcpkg_add_to_path(${GETTEXT_PATH}) endif() +vcpkg_find_acquire_program(PYTHON3) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -35,10 +37,12 @@ vcpkg_configure_cmake( -DBUILD_QTHELP_DOCS=OFF -DBUILD_TESTING=OFF -DKDE_INSTALL_PLUGINDIR=plugins + -DPYTHON_EXECUTABLE=${PYTHON3} ) vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5I18n) + vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data) diff --git a/ports/kf5i18n/vcpkg-cmake-wrapper.cmake b/ports/kf5i18n/vcpkg-cmake-wrapper.cmake new file mode 100644 index 00000000000000..b788d95ab1128c --- /dev/null +++ b/ports/kf5i18n/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,11 @@ +_find_package(${ARGS}) + +if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + find_package(unofficial-iconv CONFIG REQUIRED) + find_package(unofficial-gettext CONFIG REQUIRED) + if(TARGET KF5Ii8N) + set_property(TARGET KF5I18N APPEND PROPERTY INTERFACE_LINK_LIBRARIES + unofficial::iconv::libiconv + unofficial::gettext::libintl) + endif() +endif() From 96a82ce7dac2430f655dba46d694607f24475a50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 14 Sep 2020 11:11:47 -0400 Subject: [PATCH 13/65] [kf5i18n] remove vcpk cmake wrapper added mistakenly --- ports/kf5i18n/vcpkg-cmake-wrapper.cmake | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 ports/kf5i18n/vcpkg-cmake-wrapper.cmake diff --git a/ports/kf5i18n/vcpkg-cmake-wrapper.cmake b/ports/kf5i18n/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index b788d95ab1128c..00000000000000 --- a/ports/kf5i18n/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,11 +0,0 @@ -_find_package(${ARGS}) - -if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") - find_package(unofficial-iconv CONFIG REQUIRED) - find_package(unofficial-gettext CONFIG REQUIRED) - if(TARGET KF5Ii8N) - set_property(TARGET KF5I18N APPEND PROPERTY INTERFACE_LINK_LIBRARIES - unofficial::iconv::libiconv - unofficial::gettext::libintl) - endif() -endif() From 5d457b2de579c0ab184838bad65e11112965013e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 10 Sep 2020 20:27:36 -0400 Subject: [PATCH 14/65] 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 --- ports/ecm/CONTROL | 2 +- ports/ecm/portfile.cmake | 4 ++-- ports/kf5archive/CONTROL | 2 +- ports/kf5archive/portfile.cmake | 4 ++-- ports/kf5completion/CONTROL | 2 +- .../add-qdbus-to-required-libraries.patch | 3 +-- ports/kf5completion/portfile.cmake | 4 ++-- ports/kf5config/CONTROL | 2 +- ports/kf5config/portfile.cmake | 4 ++-- ports/kf5coreaddons/CONTROL | 2 +- ports/kf5coreaddons/portfile.cmake | 4 ++-- ports/kf5crash/CONTROL | 4 ++-- ports/kf5crash/add_x11extras.patch | 17 ++++++++--------- ports/kf5crash/portfile.cmake | 6 ++---- ports/kf5guiaddons/CONTROL | 2 +- ports/kf5guiaddons/portfile.cmake | 4 ++-- ports/kf5holidays/CONTROL | 2 +- ports/kf5holidays/portfile.cmake | 8 ++++---- ports/kf5i18n/CONTROL | 3 +-- ports/kf5i18n/portfile.cmake | 4 ++-- ports/kf5itemmodels/CONTROL | 2 +- ports/kf5itemmodels/portfile.cmake | 4 ++-- ports/kf5itemviews/CONTROL | 2 +- ports/kf5itemviews/portfile.cmake | 4 ++-- ports/kf5plotting/CONTROL | 2 +- ports/kf5plotting/portfile.cmake | 4 ++-- ports/kf5syntaxhighlighting/CONTROL | 2 +- ports/kf5syntaxhighlighting/portfile.cmake | 14 ++++++-------- ports/kf5widgetsaddons/CONTROL | 2 +- ports/kf5widgetsaddons/portfile.cmake | 4 ++-- ports/kf5windowsystem/CONTROL | 2 +- ports/kf5windowsystem/portfile.cmake | 4 ++-- 32 files changed, 61 insertions(+), 68 deletions(-) diff --git a/ports/ecm/CONTROL b/ports/ecm/CONTROL index ee261ada58e813..e2a8158fcec7ea 100644 --- 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 index bdd57584b78e1c..8405e15e2b80e1 100644 --- 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 index 16592e34e80d1d..5183109965ed59 100644 --- 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 index c7b99e8526c8de..7525ccd95f22c8 100644 --- 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 index fb1f4309acea58..89e105c8a4dc53 100644 --- 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 \ No newline at end of file diff --git a/ports/kf5completion/add-qdbus-to-required-libraries.patch b/ports/kf5completion/add-qdbus-to-required-libraries.patch index b5c285a652b693..89add3816518b9 100644 --- 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 index d9e697dcf3cd34..5dfcd3ce8e773b 100644 --- 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 index 8c0c49e3114d5d..d5e43c68a51277 100644 --- 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 index 444b1aed5abe24..bcbabe7c6a1643 100644 --- 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 index 03d14a3545db45..1e8c9ea78b3204 100644 --- 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 index 14862e07f1188c..617c8f4ed400a6 100644 --- 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 index 927eca46cd0919..2b88160e70992c 100644 --- 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 index a6ff6fc66ce412..b840abf9c37d45 100644 --- 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 index dc608d37153250..6b2a38e5aac422 100644 --- 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 index a364eecc1d79d3..1b9a8e300d6cfa 100644 --- 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 index 8234e4cd8787ea..25b5b2b7e9e7c9 100644 --- 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 index c1545e97909190..d46ac5946b01b8 100644 --- 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 index 900834d3ac6b98..9e80b51e55d048 100644 --- 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 index d963ed00809e38..c2576f44676e54 100644 --- 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 index 779fd60e8399ea..591f4adb7554d9 100644 --- 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 index f94f20fa9d9fa4..1b10a0cd57e736 100644 --- 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 index 9facbb120bea25..a08b4727b2194c 100644 --- 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 index 8d83844ebeae86..c7a004de03d3f0 100644 --- 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 index f134b477ceb43a..b63ef6f6655d02 100644 --- 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 index 2eb191a7190076..2478d2338df783 100644 --- 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 index 8ea9b3d3f3c3a2..f5332e621b6db0 100644 --- 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 index 52cca4b36fdbe6..367e7f9801583b 100644 --- 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 index b3dd829e2cda8c..261ad804791b79 100644 --- 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() \ No newline at end of file diff --git a/ports/kf5widgetsaddons/CONTROL b/ports/kf5widgetsaddons/CONTROL index 2e5f2eb515d499..8fa2c30d5c20f2 100644 --- 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 index fe7106e224bd09..5be15292b49e26 100644 --- 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 index d5cb904870e089..d8a5b1bd82bb52 100644 --- 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 index 0284c7408e5205..bc630e0e7b7c76 100644 --- 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( From 3bb88f97bf1116e91ba81b1bb7f124a48f91b9db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 10 Sep 2020 21:26:37 -0400 Subject: [PATCH 15/65] Add kf5auth port --- ports/kf5auth/CONTROL | 5 +++++ ports/kf5auth/portfile.cmake | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 ports/kf5auth/CONTROL create mode 100644 ports/kf5auth/portfile.cmake diff --git a/ports/kf5auth/CONTROL b/ports/kf5auth/CONTROL new file mode 100644 index 00000000000000..e2b1755194d1ba --- /dev/null +++ b/ports/kf5auth/CONTROL @@ -0,0 +1,5 @@ +Source: kf5auth +Version: 5.73.0 +Homepage: https://api.kde.org/frameworks/kauth/html/index.html +Description: Execute actions as privileged user +Build-Depends: ecm, qt5-base, qt5-tools, kf5coreaddons diff --git a/ports/kf5auth/portfile.cmake b/ports/kf5auth/portfile.cmake new file mode 100644 index 00000000000000..43d89d3905466f --- /dev/null +++ b/ports/kf5auth/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kauth + REF v5.73.0 + SHA512 123818bfeebabc780fffea0b4177d42f8cdbf625b83baa67fd1d1bc44cd1b28c2f7589ed1b3951045491c680e97e581547eec91657a3d47f3b77f7a72a306e24 + 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/KF5Auth) + +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 22e20ffeb3b7cbfea6085ed2d1f19ce20655b53c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 10 Sep 2020 22:25:01 -0400 Subject: [PATCH 16/65] Revert "Add kf5auth port" This reverts commit 8703c2423667f62075c34496ef273394a5b8d538. --- ports/kf5auth/CONTROL | 5 ----- ports/kf5auth/portfile.cmake | 34 ---------------------------------- 2 files changed, 39 deletions(-) delete mode 100644 ports/kf5auth/CONTROL delete mode 100644 ports/kf5auth/portfile.cmake diff --git a/ports/kf5auth/CONTROL b/ports/kf5auth/CONTROL deleted file mode 100644 index e2b1755194d1ba..00000000000000 --- a/ports/kf5auth/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: kf5auth -Version: 5.73.0 -Homepage: https://api.kde.org/frameworks/kauth/html/index.html -Description: Execute actions as privileged user -Build-Depends: ecm, qt5-base, qt5-tools, kf5coreaddons diff --git a/ports/kf5auth/portfile.cmake b/ports/kf5auth/portfile.cmake deleted file mode 100644 index 43d89d3905466f..00000000000000 --- a/ports/kf5auth/portfile.cmake +++ /dev/null @@ -1,34 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/kauth - REF v5.73.0 - SHA512 123818bfeebabc780fffea0b4177d42f8cdbf625b83baa67fd1d1bc44cd1b28c2f7589ed1b3951045491c680e97e581547eec91657a3d47f3b77f7a72a306e24 - 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/KF5Auth) - -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 48070a36d17df4221778695f9985a8a1e3624eec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 10 Sep 2020 22:32:40 -0400 Subject: [PATCH 17/65] Add kf5globalaccel port --- ports/kf5globalaccel/CONTROL | 5 +++++ ports/kf5globalaccel/portfile.cmake | 34 +++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 ports/kf5globalaccel/CONTROL create mode 100644 ports/kf5globalaccel/portfile.cmake diff --git a/ports/kf5globalaccel/CONTROL b/ports/kf5globalaccel/CONTROL new file mode 100644 index 00000000000000..5f99e07cc6e21d --- /dev/null +++ b/ports/kf5globalaccel/CONTROL @@ -0,0 +1,5 @@ +Source: kf5globalaccel +Version: 5.73.0 +Homepage: https://api.kde.org/frameworks/kglobalaccel/html/index.html +Description: lobal desktop keyboard shortcuts +Build-Depends: ecm, qt5-base, qt5-tools, kf5config, kf5coreaddons, kf5crash, kf5dbusaddons, kf5windowsystem, kf5dbusaddons diff --git a/ports/kf5globalaccel/portfile.cmake b/ports/kf5globalaccel/portfile.cmake new file mode 100644 index 00000000000000..1761b1d558e7c6 --- /dev/null +++ b/ports/kf5globalaccel/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kglobalaccel + REF v5.73.0 + SHA512 3e510bb1a383e44f2c4217b86ea51638dee9dbb9e0210fa253f18a9572cdcc109d84d25ed62cf5611ecefc5c4b9d96017cc743cf846cc0f823c0e627b74950c5 + 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/KF5GlobalAccel) + +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 00f8aff1ecd49ddedb57568e866eb458b035967d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 10 Sep 2020 22:51:16 -0400 Subject: [PATCH 18/65] Revert "Add kf5globalaccel port" This reverts commit f1ac3db8e2019f474a09d6964aea8e21bc9da166. --- ports/kf5globalaccel/CONTROL | 5 ----- ports/kf5globalaccel/portfile.cmake | 34 ----------------------------- 2 files changed, 39 deletions(-) delete mode 100644 ports/kf5globalaccel/CONTROL delete mode 100644 ports/kf5globalaccel/portfile.cmake diff --git a/ports/kf5globalaccel/CONTROL b/ports/kf5globalaccel/CONTROL deleted file mode 100644 index 5f99e07cc6e21d..00000000000000 --- a/ports/kf5globalaccel/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: kf5globalaccel -Version: 5.73.0 -Homepage: https://api.kde.org/frameworks/kglobalaccel/html/index.html -Description: lobal desktop keyboard shortcuts -Build-Depends: ecm, qt5-base, qt5-tools, kf5config, kf5coreaddons, kf5crash, kf5dbusaddons, kf5windowsystem, kf5dbusaddons diff --git a/ports/kf5globalaccel/portfile.cmake b/ports/kf5globalaccel/portfile.cmake deleted file mode 100644 index 1761b1d558e7c6..00000000000000 --- a/ports/kf5globalaccel/portfile.cmake +++ /dev/null @@ -1,34 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/kglobalaccel - REF v5.73.0 - SHA512 3e510bb1a383e44f2c4217b86ea51638dee9dbb9e0210fa253f18a9572cdcc109d84d25ed62cf5611ecefc5c4b9d96017cc743cf846cc0f823c0e627b74950c5 - 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/KF5GlobalAccel) - -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 b2824826b4612cd38523dec89bcb408d656c492f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 10 Sep 2020 22:53:16 -0400 Subject: [PATCH 19/65] [ecm] use where possible --- ports/ecm/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/ecm/portfile.cmake b/ports/ecm/portfile.cmake index 8405e15e2b80e1..ffc39174439525 100644 --- a/ports/ecm/portfile.cmake +++ b/ports/ecm/portfile.cmake @@ -21,7 +21,7 @@ vcpkg_install_cmake() # Remove debug files file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -file(COPY ${CURRENT_PORT_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/ecm) +file(COPY ${CURRENT_PORT_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) # Handle copyright file(INSTALL ${SOURCE_PATH}/COPYING-CMAKE-SCRIPTS DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 010fe68250f9e641dac6421c971d5f2f7c6db784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 10 Sep 2020 22:56:43 -0400 Subject: [PATCH 20/65] [kf5holidays] use PORT placeholder where possible --- ports/kf5holidays/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5holidays/portfile.cmake b/ports/kf5holidays/portfile.cmake index 9e80b51e55d048..07fb83022bb641 100644 --- a/ports/kf5holidays/portfile.cmake +++ b/ports/kf5holidays/portfile.cmake @@ -26,4 +26,4 @@ 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(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/kf5holidays RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From f436e60476fca57c0cc70f40b123c5cb2c09f5d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Thu, 10 Sep 2020 23:00:58 -0400 Subject: [PATCH 21/65] [kf5syntaxhighlighting] use PORT placeholder where possible Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/kf5syntaxhighlighting/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/kf5syntaxhighlighting/portfile.cmake b/ports/kf5syntaxhighlighting/portfile.cmake index 261ad804791b79..0655bef38b5a98 100644 --- a/ports/kf5syntaxhighlighting/portfile.cmake +++ b/ports/kf5syntaxhighlighting/portfile.cmake @@ -25,8 +25,8 @@ 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(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() \ No newline at end of file +endif() From 8f7fe1e50ff105b0d21fa1823d8143b3520248f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 10 Sep 2020 23:03:23 -0400 Subject: [PATCH 22/65] [kf5plotting] use PORT placeholder where possible --- ports/kf5plotting/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5plotting/portfile.cmake b/ports/kf5plotting/portfile.cmake index f5332e621b6db0..875da8974a1e69 100644 --- a/ports/kf5plotting/portfile.cmake +++ b/ports/kf5plotting/portfile.cmake @@ -22,4 +22,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/plugins ${CURRENT_PACKAGES_DIR}/debug/plugins) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/plugins ${CURRENT_PACKAGES_DIR}/plugins) -file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/kf5plotting RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From f2817b4242b00c909b1c628a0d3524b23ab9e918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Sun, 13 Sep 2020 01:21:26 -0400 Subject: [PATCH 23/65] [kf5crash] fix logical condition in the patch --- ports/kf5crash/add_x11extras.patch | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ports/kf5crash/add_x11extras.patch b/ports/kf5crash/add_x11extras.patch index b840abf9c37d45..a146bfd94a80a8 100644 --- a/ports/kf5crash/add_x11extras.patch +++ b/ports/kf5crash/add_x11extras.patch @@ -1,10 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8c66d85..b9d9499 100644 +index 8c66d85..f2d89cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -19,6 +19,7 @@ include(KDECMakeSettings) +@@ -17,8 +17,9 @@ include(KDEInstallDirs) + include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) + include(KDECMakeSettings) - if (NOT APPLE) +-if (NOT APPLE) ++if (LINUX) find_package(X11) + find_package(X11Extras) endif() From 978599a9253fa733adef1ae077b3901aa85d9e56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Sun, 13 Sep 2020 01:29:08 -0400 Subject: [PATCH 24/65] [kf5crash] logical condition again, include other BSDs --- ports/kf5crash/add_x11extras.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5crash/add_x11extras.patch b/ports/kf5crash/add_x11extras.patch index a146bfd94a80a8..390e4490b97ef2 100644 --- a/ports/kf5crash/add_x11extras.patch +++ b/ports/kf5crash/add_x11extras.patch @@ -7,7 +7,7 @@ index 8c66d85..f2d89cb 100644 include(KDECMakeSettings) -if (NOT APPLE) -+if (LINUX) ++if (UNIX AND NOT APPLE) find_package(X11) + find_package(X11Extras) endif() From 105ee6f82f0b48f5f91dff3d9bb87f9c8dc6ebf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 14 Sep 2020 10:32:23 -0400 Subject: [PATCH 25/65] [kf5i18n] acquire python3 --- ports/kf5i18n/portfile.cmake | 4 ++++ ports/kf5i18n/vcpkg-cmake-wrapper.cmake | 11 +++++++++++ 2 files changed, 15 insertions(+) create mode 100644 ports/kf5i18n/vcpkg-cmake-wrapper.cmake diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake index 591f4adb7554d9..bad7735b065947 100644 --- a/ports/kf5i18n/portfile.cmake +++ b/ports/kf5i18n/portfile.cmake @@ -26,6 +26,8 @@ if(CMAKE_HOST_WIN32) vcpkg_add_to_path(${GETTEXT_PATH}) endif() +vcpkg_find_acquire_program(PYTHON3) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -35,10 +37,12 @@ vcpkg_configure_cmake( -DBUILD_QTHELP_DOCS=OFF -DBUILD_TESTING=OFF -DKDE_INSTALL_PLUGINDIR=plugins + -DPYTHON_EXECUTABLE=${PYTHON3} ) vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5I18n) + vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data) diff --git a/ports/kf5i18n/vcpkg-cmake-wrapper.cmake b/ports/kf5i18n/vcpkg-cmake-wrapper.cmake new file mode 100644 index 00000000000000..b788d95ab1128c --- /dev/null +++ b/ports/kf5i18n/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,11 @@ +_find_package(${ARGS}) + +if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + find_package(unofficial-iconv CONFIG REQUIRED) + find_package(unofficial-gettext CONFIG REQUIRED) + if(TARGET KF5Ii8N) + set_property(TARGET KF5I18N APPEND PROPERTY INTERFACE_LINK_LIBRARIES + unofficial::iconv::libiconv + unofficial::gettext::libintl) + endif() +endif() From a864f8cd3b06f62fba08efcdc4f7e09b37540fd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 14 Sep 2020 11:11:47 -0400 Subject: [PATCH 26/65] [kf5i18n] remove vcpk cmake wrapper added mistakenly --- ports/kf5i18n/vcpkg-cmake-wrapper.cmake | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 ports/kf5i18n/vcpkg-cmake-wrapper.cmake diff --git a/ports/kf5i18n/vcpkg-cmake-wrapper.cmake b/ports/kf5i18n/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index b788d95ab1128c..00000000000000 --- a/ports/kf5i18n/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,11 +0,0 @@ -_find_package(${ARGS}) - -if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") - find_package(unofficial-iconv CONFIG REQUIRED) - find_package(unofficial-gettext CONFIG REQUIRED) - if(TARGET KF5Ii8N) - set_property(TARGET KF5I18N APPEND PROPERTY INTERFACE_LINK_LIBRARIES - unofficial::iconv::libiconv - unofficial::gettext::libintl) - endif() -endif() From 824696161d11063aaae643384d2348b59fc4dfd5 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 14 Sep 2020 16:36:50 -0700 Subject: [PATCH 27/65] [ecm] Remove 'skip' from windows baseline --- scripts/ci.baseline.txt | 8 -------- 1 file changed, 8 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d9a84f18e568c0..097a23669d98f4 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -358,14 +358,6 @@ eathread:x64-uwp=fail eathread:x86-windows=fail ebml:arm-uwp=fail ebml:x64-uwp=fail -ecm:arm64-windows = skip -ecm:arm-uwp = skip -ecm:x64-linux = skip -ecm:x64-osx = skip -ecm:x64-uwp = skip -ecm:x64-windows = skip -ecm:x64-windows-static = skip -ecm:x86-windows = skip ecsutil:arm64-windows=fail ecsutil:arm-uwp=fail ecsutil:x64-linux=fail From 3748d85058f41bdba4e2308876fcaa2fdc7d5bc2 Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Tue, 15 Sep 2020 01:01:44 +0530 Subject: [PATCH 28/65] Fixed KF5ItemModel for windows --- ports/kf5itemmodels/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/kf5itemmodels/portfile.cmake b/ports/kf5itemmodels/portfile.cmake index a08b4727b2194c..eaae3a5ffd9b26 100644 --- a/ports/kf5itemmodels/portfile.cmake +++ b/ports/kf5itemmodels/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_configure_cmake( -DBUILD_MAN_DOCS=OFF -DBUILD_QTHELP_DOCS=OFF -DBUILD_TESTING=OFF + -DKDE_INSTALL_QMLDIR=qml ) vcpkg_install_cmake() From d0b2579981722757dbcd1a33d8927bcc6fd976ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 14 Sep 2020 23:07:33 -0400 Subject: [PATCH 29/65] [kf5syntaxhighlighting] fix Windows build --- ports/kf5syntaxhighlighting/portfile.cmake | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ports/kf5syntaxhighlighting/portfile.cmake b/ports/kf5syntaxhighlighting/portfile.cmake index 0655bef38b5a98..3d4041e0a2eb6e 100644 --- a/ports/kf5syntaxhighlighting/portfile.cmake +++ b/ports/kf5syntaxhighlighting/portfile.cmake @@ -26,7 +26,4 @@ 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/${PORT} RENAME copyright) - -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" "${CURRENT_PACKAGES_DIR}/debug/bin") \ No newline at end of file From 17d0f7f563b996f2bfd08fc93cbab2f2d484bb40 Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Wed, 16 Sep 2020 16:11:07 +0530 Subject: [PATCH 30/65] Fixed k5syntaxhighlighting for windows --- ports/kf5syntaxhighlighting/portfile.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ports/kf5syntaxhighlighting/portfile.cmake b/ports/kf5syntaxhighlighting/portfile.cmake index 3d4041e0a2eb6e..c1d02d211124b1 100644 --- a/ports/kf5syntaxhighlighting/portfile.cmake +++ b/ports/kf5syntaxhighlighting/portfile.cmake @@ -23,7 +23,12 @@ vcpkg_install_cmake(ADD_BIN_TO_PATH) vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5SyntaxHighlighting) vcpkg_copy_pdbs() +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/kate-syntax-highlighter.exe" "${CURRENT_PACKAGES_DIR}/debug/bin/kate-syntax-highlighter.exe") +endif() + 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/${PORT} RENAME copyright) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file From 7eadd5d041891e456959fbb03db3a8e53a67ef2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 29 Oct 2020 17:39:49 -0400 Subject: [PATCH 31/65] [kf5plotting] fix license files --- ports/kf5plotting/portfile.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/kf5plotting/portfile.cmake b/ports/kf5plotting/portfile.cmake index 7742f2fb5aeb67..81e673f1e38125 100644 --- a/ports/kf5plotting/portfile.cmake +++ b/ports/kf5plotting/portfile.cmake @@ -22,4 +22,6 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/plugins ${CURRENT_PACKAGES_DIR}/debug/plugins) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/plugins ${CURRENT_PACKAGES_DIR}/plugins) -file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSES/GPL-2.0-or-later.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright-GPL-2.0-or-later) +file(INSTALL ${SOURCE_PATH}/LICENSES/LGPL-2.0-or-later.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright-LGPL-2.0-or-later) + From c8dac7819cec24278ec09ec62463f931be33b466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 29 Oct 2020 21:15:31 -0400 Subject: [PATCH 32/65] [kf5archive] fix license files --- ports/kf5archive/portfile.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ports/kf5archive/portfile.cmake b/ports/kf5archive/portfile.cmake index 05088d7bb051e7..115ed30e2de7a7 100644 --- a/ports/kf5archive/portfile.cmake +++ b/ports/kf5archive/portfile.cmake @@ -24,4 +24,8 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSES/LicenseRef-KDE-Accepted-LGPL.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(INSTALL ${SOURCE_PATH}/LICENSES/BSD-2-Clause.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright-BSD-2-Clause) +file(INSTALL ${SOURCE_PATH}/LICENSES/LGPL-2.0-only.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright-LGPL-2.0-only) +file(INSTALL ${SOURCE_PATH}/LICENSES/LGPL-2.0-or-later.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright-LGPL-2.0-or-later) +file(INSTALL ${SOURCE_PATH}/LICENSES/LGPL-3.0-only.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright-LGPL-3.0-only) From 96f6102220a72a84d17c108e6eae7cd8a687b741 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 30 Oct 2020 13:42:20 -0400 Subject: [PATCH 33/65] [kf5*] update to 5.75.0 --- ports/ecm/CONTROL | 2 +- ports/ecm/portfile.cmake | 4 ++-- ports/kf5archive/CONTROL | 2 +- ports/kf5archive/portfile.cmake | 11 ++++------- ports/kf5completion/CONTROL | 2 +- ports/kf5completion/portfile.cmake | 7 ++++--- ports/kf5config/CONTROL | 2 +- ports/kf5config/portfile.cmake | 6 +++--- ports/kf5coreaddons/CONTROL | 2 +- ports/kf5coreaddons/portfile.cmake | 6 +++--- ports/kf5crash/CONTROL | 2 +- ports/kf5crash/portfile.cmake | 6 +++--- ports/kf5guiaddons/CONTROL | 2 +- ports/kf5guiaddons/portfile.cmake | 7 ++++--- ports/kf5holidays/CONTROL | 2 +- ports/kf5holidays/portfile.cmake | 6 +++--- ports/kf5i18n/CONTROL | 2 +- ports/kf5i18n/portfile.cmake | 7 ++++--- ports/kf5itemmodels/CONTROL | 2 +- ports/kf5itemmodels/portfile.cmake | 7 ++++--- ports/kf5itemviews/CONTROL | 2 +- ports/kf5itemviews/portfile.cmake | 7 ++++--- ports/kf5plotting/CONTROL | 2 +- ports/kf5plotting/portfile.cmake | 7 +++---- ports/kf5syntaxhighlighting/CONTROL | 2 +- ports/kf5syntaxhighlighting/portfile.cmake | 5 +++-- ports/kf5widgetsaddons/CONTROL | 2 +- ports/kf5widgetsaddons/portfile.cmake | 7 ++++--- ports/kf5windowsystem/CONTROL | 2 +- ports/kf5windowsystem/portfile.cmake | 7 ++++--- 30 files changed, 67 insertions(+), 63 deletions(-) diff --git a/ports/ecm/CONTROL b/ports/ecm/CONTROL index ecdc76ea17900f..96bcd2f6e81404 100644 --- a/ports/ecm/CONTROL +++ b/ports/ecm/CONTROL @@ -1,4 +1,4 @@ Source: ecm -Version: 5.74.0 +Version: 5.75.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 index b5a9ba5f1e03ee..990488d0c062d1 100644 --- 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 5c191fa1d2383c69ddc075395e04f84b7679613a # v5.74.0 - SHA512 9a520e2cb45f2891cb5b463409063549904574e2ad0c4f77987555fc9aac68589695344a3acaddcb95d2739458031ece489ff9635c7d713c6309e4f9027f6ef7 + REF v5.75.0 + SHA512 486845a91967c89dec42f9120757c7b883006713d0957e9bd21dfacb2911225fe45680590ef3dc5e0d45a9dbc81cf99e1514fb4922b1a027bcba3864da883076 HEAD_REF master ) diff --git a/ports/kf5archive/CONTROL b/ports/kf5archive/CONTROL index 19ac13327ef635..72e28f8efe1003 100644 --- a/ports/kf5archive/CONTROL +++ b/ports/kf5archive/CONTROL @@ -1,5 +1,5 @@ Source: kf5archive -Version: 5.74.0 +Version: 5.75.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 index 115ed30e2de7a7..c5ddcfc5159bf0 100644 --- 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 6e1f95972f25f1d3a94dd181f44ee0846e042ef9 # v5.74.0 - SHA512 333a5e310c1b482379a3092bb3ac0e31963917090edd3afba6f26e40f63abe327dfdff70800e635667fe3333538e5fc911ab06d7287c17d2062a4618c191f308 + REF v5.75.0 + SHA512 4a909626f776cc9ebf9acd0e16bcda9e2e0e5dd29bd52b27140baa9905758a028f542ccd40e98c5432a4d9eac2908e36e1f9329e40cc4cf835e15557c96175f1 HEAD_REF master ) @@ -24,8 +24,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/LICENSES/LicenseRef-KDE-Accepted-LGPL.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) -file(INSTALL ${SOURCE_PATH}/LICENSES/BSD-2-Clause.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright-BSD-2-Clause) -file(INSTALL ${SOURCE_PATH}/LICENSES/LGPL-2.0-only.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright-LGPL-2.0-only) -file(INSTALL ${SOURCE_PATH}/LICENSES/LGPL-2.0-or-later.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright-LGPL-2.0-or-later) -file(INSTALL ${SOURCE_PATH}/LICENSES/LGPL-3.0-only.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright-LGPL-3.0-only) + +file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file diff --git a/ports/kf5completion/CONTROL b/ports/kf5completion/CONTROL index 89e105c8a4dc53..51afb4bafc601b 100644 --- a/ports/kf5completion/CONTROL +++ b/ports/kf5completion/CONTROL @@ -1,5 +1,5 @@ Source: kf5completion -Version: 5.73.0 +Version: 5.75.0 Homepage: https://api.kde.org/frameworks/kcompletion/html/index.html Description: Text completion helpers and widgets Build-Depends: ecm, qt5-tools, kf5config, kf5widgetsaddons \ No newline at end of file diff --git a/ports/kf5completion/portfile.cmake b/ports/kf5completion/portfile.cmake index 5dfcd3ce8e773b..ec429134c5855f 100644 --- 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.73.0 - SHA512 db5f5c50ede00b1357154792fda164d56004f2f0413db7be69be19312e179c41eaf73ec062cdfdfefaeb3b10a316203329dab4aaba4af14f632ee2c8fbe64b12 + REF v5.75.0 + SHA512 f4ff54b518f51b399392ee8f4be27bcc15a45be993b6a76305a16c84d6a85629017b8c4c27f19ff2c37699eeb3a455b9b6e5c7551716a55f0f7ecce2f2a2240b HEAD_REF master # reported issue, just a manual workaround until the issue is fixed upstream PATCHES @@ -30,4 +30,5 @@ 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 diff --git a/ports/kf5config/CONTROL b/ports/kf5config/CONTROL index d5e43c68a51277..3382cef818cd08 100644 --- a/ports/kf5config/CONTROL +++ b/ports/kf5config/CONTROL @@ -1,5 +1,5 @@ Source: kf5config -Version: 5.73.0 +Version: 5.75.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 index bcbabe7c6a1643..d7bfb4469e9571 100644 --- 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.73.0 - SHA512 cf80d7c1db8d8b4372f011b9aefbed196a83721eeb8d3935a6903fea4cdfb57f07c01a8f70103ca5fb9f57b9865383dc77dd5214ec2bc53a0029090f2d005a6c + REF v5.75.0 + SHA512 66789adf41114354cd2602b4bc6215f99026c1735547ab9c1449fff18dca7cf1e5786dcc8030499b8449498d14ece33aad9d9955109331f5c8c3914d1eccfd50 HEAD_REF master ) @@ -50,4 +50,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) diff --git a/ports/kf5coreaddons/CONTROL b/ports/kf5coreaddons/CONTROL index 1e8c9ea78b3204..0e315b23996fb3 100644 --- a/ports/kf5coreaddons/CONTROL +++ b/ports/kf5coreaddons/CONTROL @@ -1,5 +1,5 @@ Source: kf5coreaddons -Version: 5.73.0 +Version: 5.75.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 index 617c8f4ed400a6..be69ef74ddb778 100644 --- 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.73.0 - SHA512 4d0b50225c7bcb01f5aa092f430b4bab7373bfe0d7016784c06f6a8b4ba8eb3291cbd0ce57bf4b4c1c0f2ea3b063a1cf9b4492d607fa7b23c5a2f263e7e95679 + REF v5.75.0 + SHA512 bf17c323dbf2164a1d8e265ff97f01dd683b0f285c59755dd2f49a842666af0eaba3f6f73496d2f9690088b1cc7fe37e671218f039e8b3be0ce1ac5e2bbe13c3 ) vcpkg_configure_cmake( @@ -39,4 +39,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") 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 diff --git a/ports/kf5crash/CONTROL b/ports/kf5crash/CONTROL index 2b88160e70992c..d6784c6070594d 100644 --- a/ports/kf5crash/CONTROL +++ b/ports/kf5crash/CONTROL @@ -1,5 +1,5 @@ Source: kf5crash -Version: 5.73.0 +Version: 5.75.0 Homepage: https://api.kde.org/frameworks/kcrash/html/index.html Description: KCrash provides support for intercepting and handling application crashes. Supports: linux diff --git a/ports/kf5crash/portfile.cmake b/ports/kf5crash/portfile.cmake index 6b2a38e5aac422..5e12a93ea427fe 100644 --- a/ports/kf5crash/portfile.cmake +++ b/ports/kf5crash/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kcrash - REF v5.73.0 - SHA512 50df67c405a26f52825aa35d859495c7d424c513b08278f484d942d39c5ca6efe02cc51ebbfa89f29695aa973198fa7e4064f0fe28b684634d892c41d79df965 + REF v5.75.0 + SHA512 f6784d2db20bd90194a1ae8134e344a899f8c28d934783fbc104d2719e8340955278059ea5a237eeda550b4c4484e45c6d4b7c09425b0d1bb0b0025d8e214596 HEAD_REF master PATCHES add_x11extras.patch @@ -26,4 +26,4 @@ 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) diff --git a/ports/kf5guiaddons/CONTROL b/ports/kf5guiaddons/CONTROL index 1b9a8e300d6cfa..b73ed3d38f7d79 100644 --- a/ports/kf5guiaddons/CONTROL +++ b/ports/kf5guiaddons/CONTROL @@ -1,5 +1,5 @@ Source: kf5guiaddons -Version: 5.73.0 +Version: 5.75.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 index 25b5b2b7e9e7c9..89329387e5d082 100644 --- 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.73.0 - SHA512 e351f217eebeaac9d01a0de698efbf8584e6fa0557f7f83c6069618769d78bea5b133473c9a9ff37ec21f294472b6db035d30ba9dcdc1982680258d9ed94b3b8 + REF v5.75.0 + SHA512 d016e2e8c6fecd037cab025acd129305a3c062e0f98b537f1454dccfb13d9a6765f1974588416fcd8d23ae9c9efdb2276c3cbab15e21df62aea07059142dd12b HEAD_REF master ) @@ -26,4 +26,5 @@ 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) \ 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/kf5holidays/CONTROL b/ports/kf5holidays/CONTROL index 59f1cf63892526..ee061c908ef496 100644 --- a/ports/kf5holidays/CONTROL +++ b/ports/kf5holidays/CONTROL @@ -1,4 +1,4 @@ Source: kf5holidays -Version: 5.74.0 +Version: 5.75.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 index af1d572df8802c..cc79ea2e37f7a1 100644 --- 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 75055256fdd361fa52bafc0ee2f989b14661cd22 # v5.74.0 - SHA512 0405eac77aedf363697c4aa9cc8699c7031db86957dfc6143078bd8dc88955bcdd31e9fd2af78be2543f87e6391ff73257f591b04135c649450b60006012c34a + REF v5.75.0 + SHA512 0405eac77aedf363697c4aa9cc8699c7031db86957dfc6143078bd8dc88955bcdd31e9fd2af78be2543f87e6391ff73257f591b04135c649450b60006012c34a HEAD_REF master ) @@ -26,4 +26,4 @@ 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(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) diff --git a/ports/kf5i18n/CONTROL b/ports/kf5i18n/CONTROL index c2576f44676e54..3c0f89360ce88a 100644 --- a/ports/kf5i18n/CONTROL +++ b/ports/kf5i18n/CONTROL @@ -1,5 +1,5 @@ Source: kf5i18n -Version: 5.73.0 +Version: 5.75.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 index bad7735b065947..2fd41da45480af 100644 --- 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.73.0 - SHA512 2d3e1bd468f267ba2b666848a047e9ba8da3e25c54388fb921b1e9179bec991fd52811960c57fb4efdf1493f33bb448d90210cb7a30ddd0fc74460ab51726f75 + REF v5.75.0 + SHA512 9e059afb8c3bd074ecdfcb1bf4cf3c9340159dc9f7276c9bb81abb1fa73fc893229abade8c4fac344ffec555889232d3a789df72974d6f9c7c6437627872a356 ) if(CMAKE_HOST_WIN32) @@ -51,4 +51,5 @@ 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) diff --git a/ports/kf5itemmodels/CONTROL b/ports/kf5itemmodels/CONTROL index 1b10a0cd57e736..b8100ed3e8aa2e 100644 --- a/ports/kf5itemmodels/CONTROL +++ b/ports/kf5itemmodels/CONTROL @@ -1,5 +1,5 @@ Source: kf5itemmodels -Version: 5.73.0 +Version: 5.75.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 index eaae3a5ffd9b26..77daab856fec81 100644 --- 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.73.0 - SHA512 4fc8bf6cfdd33e7225b47b1bab46918c7dabdc2abd193e9e071b71298a4b015e7b4a831ca244597867ad7571322b6a157e37e9fbd7448ad1fe1761505e0aa3ed + REF v5.75.0 + SHA512 24304df25d4331edccd8ef579489d6d691dcca8fb8820aedd7c89513ae79310846137aa2281b54b42377189f1ecf7bf30d771da8dce4733bc8959572b749445c ) vcpkg_configure_cmake( @@ -26,4 +26,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -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) diff --git a/ports/kf5itemviews/CONTROL b/ports/kf5itemviews/CONTROL index c7a004de03d3f0..bdbb535f89c7a4 100644 --- a/ports/kf5itemviews/CONTROL +++ b/ports/kf5itemviews/CONTROL @@ -1,5 +1,5 @@ Source: kf5itemviews -Version: 5.73.0 +Version: 5.75.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 index b63ef6f6655d02..afe01756546363 100644 --- 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.73.0 - SHA512 4cb29b243cf28ae96c8cc22675b0f0f8c00503a75ef531a7611af6d249fe338767d5cbd380af3b9c127e38003720df3b9affee9dcf86041ea5a86b7765252969 + REF v5.75.0 + SHA512 929e223540d026121fd5b5d36ed2b5e5b53d55c617d9e5f9abc75f56b9441e3495530faeb7aa38a3dcffc67c551eec70a86bcdeaf22d6e9cf4921fd3812c4c89 ) vcpkg_configure_cmake( @@ -26,4 +26,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -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) diff --git a/ports/kf5plotting/CONTROL b/ports/kf5plotting/CONTROL index 8e78fdf48f3d4e..d017f2fa248ff9 100644 --- a/ports/kf5plotting/CONTROL +++ b/ports/kf5plotting/CONTROL @@ -1,5 +1,5 @@ Source: kf5plotting -Version: 5.74.0 +Version: 5.75.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 index 81e673f1e38125..3899efd0a7f126 100644 --- 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 0645b4803f9d260ea80087cc81ebabfd874e4274 # v5.74.0 - SHA512 32fb460ada2063106df3aee29b618b500e1418c4c341326960393308a65f74a0913480c1089278ef5a32a744d3b40b98b873dea14293c997dadce2525b6647d5 + REF v5.75.0 + SHA512 1eb2320006a21b0d8a3b4fb557458954a1d82427f8b91339d606e5405ef2820f408f257d833fb4af0c5f737eacff0f0371db54b5e6f63b68093e30a8249f17bf HEAD_REF master ) @@ -22,6 +22,5 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/plugins ${CURRENT_PACKAGES_DIR}/debug/plugins) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/plugins ${CURRENT_PACKAGES_DIR}/plugins) -file(INSTALL ${SOURCE_PATH}/LICENSES/GPL-2.0-or-later.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright-GPL-2.0-or-later) -file(INSTALL ${SOURCE_PATH}/LICENSES/LGPL-2.0-or-later.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright-LGPL-2.0-or-later) +file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) diff --git a/ports/kf5syntaxhighlighting/CONTROL b/ports/kf5syntaxhighlighting/CONTROL index 367e7f9801583b..715903ebcf15b8 100644 --- a/ports/kf5syntaxhighlighting/CONTROL +++ b/ports/kf5syntaxhighlighting/CONTROL @@ -1,5 +1,5 @@ Source: kf5syntaxhighlighting -Version: 5.73.0 +Version: 5.75.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 index c1d02d211124b1..19805dd977f703 100644 --- 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.73.0 - SHA512 184aac6f29be8b2c0c5a309a00bb00197c9f3f5971e7f7bbc9e128274d3659bb58825e4d43229712f3616e4cfd43289a38960b2e64d7e6edaad05489c80d7c65 + REF v5.75.0 + SHA512 bb3b722861823b8ebe407b859b425c2f600af6686c2b1107436c55931e50e746e0852df8b11c5ad895323236a2ee857bcfe8a17af563c26baa4541535d275f8c HEAD_REF master ) @@ -31,4 +31,5 @@ endif() 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/${PORT} RENAME copyright) \ No newline at end of file diff --git a/ports/kf5widgetsaddons/CONTROL b/ports/kf5widgetsaddons/CONTROL index 8fa2c30d5c20f2..57d621443af323 100644 --- a/ports/kf5widgetsaddons/CONTROL +++ b/ports/kf5widgetsaddons/CONTROL @@ -1,5 +1,5 @@ Source: kf5widgetsaddons -Version: 5.73.0 +Version: 5.75.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 index 5be15292b49e26..0f21b6c7e634be 100644 --- 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.73.0 - SHA512 b1fb9baaafba2aa62e3d34178e61ad393402fc6f38671dcb883db393b8d7aba44635d217336be37a92e2970ad66c73f1f2f5df688700ada80ec1263ccb4c9cb6 + REF v5.75.0 + SHA512 8854ddc56d8a30081d69d952d035ef303b3a30760fdee3ba8889029b373cb793807f984ce3fc06bd1d377fa3d5a768d3dbf99cb44a3b29a7589b2c4f77767360 HEAD_REF master ) @@ -27,4 +27,5 @@ 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) \ No newline at end of file + +file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) diff --git a/ports/kf5windowsystem/CONTROL b/ports/kf5windowsystem/CONTROL index d8a5b1bd82bb52..a1148a0e01355d 100644 --- a/ports/kf5windowsystem/CONTROL +++ b/ports/kf5windowsystem/CONTROL @@ -1,5 +1,5 @@ Source: kf5windowsystem -Version: 5.73.0 +Version: 5.75.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 index bc630e0e7b7c76..d5fa70b56c2992 100644 --- 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.73.0 - SHA512 ae71a1eeb621df042ebb6b1325617cd8524b7a4f6c16a4e17771cfe5046a1bfdc4c37fc8f01e6a78389b9adb4e943d1660c65bdfee22d920ad0d7a9c091b86b5 + REF v5.75.0 + SHA512 5c88ed9749d9cc5bb4cb1a8ec5f2da7359cb8c8f7c04c4fd63a59d88ddfee1533ed1ce686f12182d14fb7a7e1bd92f82cc416fff60bcdef73510f596217301cb ) vcpkg_configure_cmake( @@ -26,4 +26,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -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 1fcdc9511553c5c93335c67f0b06d7c30856a473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 30 Oct 2020 13:54:13 -0400 Subject: [PATCH 34/65] [kf5holidays] fix sha sum --- ports/kf5holidays/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5holidays/portfile.cmake b/ports/kf5holidays/portfile.cmake index cc79ea2e37f7a1..194853583facb2 100644 --- a/ports/kf5holidays/portfile.cmake +++ b/ports/kf5holidays/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kholidays REF v5.75.0 - SHA512 0405eac77aedf363697c4aa9cc8699c7031db86957dfc6143078bd8dc88955bcdd31e9fd2af78be2543f87e6391ff73257f591b04135c649450b60006012c34a + SHA512 16b62a7e8fc664075cf787a7ae811bdb7f27b11f10619001994e1aa0c89e46bdb1c932091f6fcdcc3bad91614eeb9606a9b6aef62cec5e4a557a0c107e32d816 HEAD_REF master ) From 8db6de5797daff1b7898549caec0c10b9fc8c9ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 30 Oct 2020 14:09:43 -0400 Subject: [PATCH 35/65] [kf5syntaxhighlighting] fix licensing --- ports/kf5syntaxhighlighting/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5syntaxhighlighting/portfile.cmake b/ports/kf5syntaxhighlighting/portfile.cmake index 19805dd977f703..3a0d4e04a3d059 100644 --- a/ports/kf5syntaxhighlighting/portfile.cmake +++ b/ports/kf5syntaxhighlighting/portfile.cmake @@ -32,4 +32,4 @@ endif() 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/${PORT} RENAME 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 e09253441a6b01c2a1436c39a397680973342ce6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 30 Oct 2020 14:25:24 -0400 Subject: [PATCH 36/65] [kf5itemviews] fix windows static build --- ports/kf5itemviews/portfile.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/kf5itemviews/portfile.cmake b/ports/kf5itemviews/portfile.cmake index afe01756546363..72bd83ff9eff6d 100644 --- a/ports/kf5itemviews/portfile.cmake +++ b/ports/kf5itemviews/portfile.cmake @@ -20,6 +20,10 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5ItemViews) 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) From 0d737abcc6257243618f1c26efe9a2ee88f420d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 30 Oct 2020 15:10:05 -0400 Subject: [PATCH 37/65] [kf5widgetsaddons] fix windows static build --- ports/kf5widgetsaddons/portfile.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/kf5widgetsaddons/portfile.cmake b/ports/kf5widgetsaddons/portfile.cmake index 0f21b6c7e634be..7c2a888184f2fe 100644 --- a/ports/kf5widgetsaddons/portfile.cmake +++ b/ports/kf5widgetsaddons/portfile.cmake @@ -21,6 +21,10 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5WidgetsAddons) 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) From 61b4b699de4d779e36d3fbb119a8c2301c7715bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 30 Oct 2020 15:43:15 -0400 Subject: [PATCH 38/65] [kf5completion] fix windows static build --- ports/kf5completion/portfile.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/kf5completion/portfile.cmake b/ports/kf5completion/portfile.cmake index ec429134c5855f..fd4f0c2f269b3b 100644 --- a/ports/kf5completion/portfile.cmake +++ b/ports/kf5completion/portfile.cmake @@ -24,6 +24,10 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(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}/bin/data) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/data) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) From be68bb246ba33d109ab2c42e72a951ef4731c47b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 30 Oct 2020 15:54:05 -0400 Subject: [PATCH 39/65] [kf5*] fix windows static build --- ports/kf5archive/portfile.cmake | 4 ++++ ports/kf5guiaddons/portfile.cmake | 4 ++++ ports/kf5holidays/portfile.cmake | 4 ++++ ports/kf5itemmodels/portfile.cmake | 4 ++++ ports/kf5windowsystem/portfile.cmake | 5 +++++ 5 files changed, 21 insertions(+) diff --git a/ports/kf5archive/portfile.cmake b/ports/kf5archive/portfile.cmake index c5ddcfc5159bf0..544324858e2db9 100644 --- a/ports/kf5archive/portfile.cmake +++ b/ports/kf5archive/portfile.cmake @@ -20,6 +20,10 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(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}/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) diff --git a/ports/kf5guiaddons/portfile.cmake b/ports/kf5guiaddons/portfile.cmake index 89329387e5d082..4a933a91508d2b 100644 --- a/ports/kf5guiaddons/portfile.cmake +++ b/ports/kf5guiaddons/portfile.cmake @@ -20,6 +20,10 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5GuiAddons) 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) diff --git a/ports/kf5holidays/portfile.cmake b/ports/kf5holidays/portfile.cmake index 194853583facb2..b83e776b076d92 100644 --- a/ports/kf5holidays/portfile.cmake +++ b/ports/kf5holidays/portfile.cmake @@ -19,6 +19,10 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Holidays) 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}/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) diff --git a/ports/kf5itemmodels/portfile.cmake b/ports/kf5itemmodels/portfile.cmake index 77daab856fec81..475fcd4f54a24e 100644 --- a/ports/kf5itemmodels/portfile.cmake +++ b/ports/kf5itemmodels/portfile.cmake @@ -20,6 +20,10 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5ItemModels) 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) diff --git a/ports/kf5windowsystem/portfile.cmake b/ports/kf5windowsystem/portfile.cmake index d5fa70b56c2992..0c31c4b25508a5 100644 --- a/ports/kf5windowsystem/portfile.cmake +++ b/ports/kf5windowsystem/portfile.cmake @@ -20,6 +20,11 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5WindowSystem) 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) From a4c5bbe39ea041a03f8dfdca3c338fe6facd131c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 30 Oct 2020 16:09:26 -0400 Subject: [PATCH 40/65] [kf5i18n] fix windows static build --- ports/kf5i18n/portfile.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake index 2fd41da45480af..101941a5ca8bec 100644 --- a/ports/kf5i18n/portfile.cmake +++ b/ports/kf5i18n/portfile.cmake @@ -42,9 +42,12 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5I18n) - 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) From ce87917ce2a0da28c146c26fc1de5430923d86c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Wed, 4 Nov 2020 17:38:45 -0500 Subject: [PATCH 41/65] [kf5windowsystem] require libxcb-res0-dev --- ports/kf5windowsystem/portfile.cmake | 4 ++++ scripts/azure-pipelines/linux/provision-image.sh | 3 +++ 2 files changed, 7 insertions(+) diff --git a/ports/kf5windowsystem/portfile.cmake b/ports/kf5windowsystem/portfile.cmake index 0c31c4b25508a5..9cc1a0e456d01e 100644 --- a/ports/kf5windowsystem/portfile.cmake +++ b/ports/kf5windowsystem/portfile.cmake @@ -5,6 +5,10 @@ vcpkg_from_github( SHA512 5c88ed9749d9cc5bb4cb1a8ec5f2da7359cb8c8f7c04c4fd63a59d88ddfee1533ed1ce686f12182d14fb7a7e1bd92f82cc416fff60bcdef73510f596217301cb ) +if (VCPKG_TARGET_IS_LINUX) + message(WARNING "${PORT} currently requires the following libraries from the system package manager:\n libxcb-res0-dev\n\nThese can be installed on Ubuntu systems via apt-get install libxcb-res0-dev") +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index 4936cf719074b5..191a61a5e0c9bc 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -23,6 +23,9 @@ APT_PACKAGES="$APT_PACKAGES libxkbcommon-dev libxcb-keysyms1-dev \ libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev \ libxcb-render-util0-dev libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev" +# Additionally required by kf5windowsystem +APT_PACKAGES="$APT_PACKAGES libxcb-res0-dev" + # Additionally required by libhdfs3 APT_PACKAGES="$APT_PACKAGES libkrb5-dev" From ff5f07cae0005e10e97b23739ca006df05495dad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Wed, 4 Nov 2020 17:46:38 -0500 Subject: [PATCH 42/65] [kf5windowsystem] depend on qt5-x11extras --- ports/kf5windowsystem/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5windowsystem/CONTROL b/ports/kf5windowsystem/CONTROL index a1148a0e01355d..3b4fc9fdc2f4f9 100644 --- a/ports/kf5windowsystem/CONTROL +++ b/ports/kf5windowsystem/CONTROL @@ -2,4 +2,4 @@ Source: kf5windowsystem Version: 5.75.0 Homepage: https://api.kde.org/frameworks/kwindowsystem/html/ Description: Access to the windowing system -Build-Depends: ecm, qt5-winextras (windows), qt5-tools +Build-Depends: ecm, qt5-winextras (windows), qt5-x11extras (linux), qt5-tools From cd172c44ed9a5d259247e822601a0ba9bfb62926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Sun, 15 Nov 2020 20:51:07 -0500 Subject: [PATCH 43/65] [qt5] fix brotli reference --- ports/qt5-base/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 31c059bba8fe7d..0aa0d4d2e1958f 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -179,7 +179,7 @@ find_library(EAY_RELEASE libeay32 crypto libcrypto PATHS "${CURRENT_INSTALLED_DI find_library(EAY_DEBUG libeay32 crypto libcrypto libeay32d cryptod libcryptod PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) set(FREETYPE_RELEASE_ALL "${FREETYPE_RELEASE} ${BZ2_RELEASE} ${LIBPNG_RELEASE} ${ZLIB_RELEASE} ${BROTLI_ENC_RELEASE} ${BROTLI_DEC_RELEASE} ${BROTLI_COMMON_RELEASE}") -set(FREETYPE_DEBUG_ALL "${FREETYPE_DEBUG} ${BZ2_DEBUG} ${LIBPNG_DEBUG} ${ZLIB_DEBUG} ${BROTLI_ENC_DEBUG} ${BROTLI_DEC_DEBUG} ${BROTLI_COMMON_RELEASE}") +set(FREETYPE_DEBUG_ALL "${FREETYPE_DEBUG} ${BZ2_DEBUG} ${LIBPNG_DEBUG} ${ZLIB_DEBUG} ${BROTLI_ENC_DEBUG} ${BROTLI_DEC_DEBUG} ${BROTLI_COMMON_DEBUG}") # If HarfBuzz is built with GLib enabled, it must be statically link set(GLIB_LIB_VERSION 2.0) From df399a86f4bc7165727bb1013e628e202d7429bb Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 22 Dec 2020 15:41:12 -0800 Subject: [PATCH 44/65] Delete duplicate apt entries. --- scripts/azure-pipelines/linux/provision-image.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index 121308e0e4f658..c04f4b3caac191 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -24,9 +24,6 @@ APT_PACKAGES="$APT_PACKAGES libxkbcommon-dev libxcb-keysyms1-dev \ libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev \ libxcb-render-util0-dev libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev" -# Additionally required by kf5windowsystem -APT_PACKAGES="$APT_PACKAGES libxcb-res0-dev" - # Additionally required by libhdfs3 APT_PACKAGES="$APT_PACKAGES libkrb5-dev" From e0be66db8cdbf2f8b30d6d72095ccd4882aac9cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Sun, 28 Feb 2021 13:03:40 -0400 Subject: [PATCH 45/65] kf5crash: fix linux build --- ports/kf5crash/add_x11extras.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5crash/add_x11extras.patch b/ports/kf5crash/add_x11extras.patch index 390e4490b97ef2..9a260ab52dbd73 100644 --- a/ports/kf5crash/add_x11extras.patch +++ b/ports/kf5crash/add_x11extras.patch @@ -9,7 +9,7 @@ index 8c66d85..f2d89cb 100644 -if (NOT APPLE) +if (UNIX AND NOT APPLE) find_package(X11) -+ find_package(X11Extras) ++ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED COMPONENTS X11Extras) endif() set(HAVE_X11 ${X11_FOUND}) From a986ee2576546c449954c80344cef455f3d93703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 1 Mar 2021 16:52:49 -0400 Subject: [PATCH 46/65] kf5i18n: fix Linux build --- ports/kf5i18n/portfile.cmake | 2 ++ ...cmake-failing-with-variable-notfound.patch | 33 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 ports/kf5i18n/prevent-cmake-failing-with-variable-notfound.patch diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake index 101941a5ca8bec..a2565477878a28 100644 --- a/ports/kf5i18n/portfile.cmake +++ b/ports/kf5i18n/portfile.cmake @@ -3,6 +3,8 @@ vcpkg_from_github( REPO KDE/ki18n REF v5.75.0 SHA512 9e059afb8c3bd074ecdfcb1bf4cf3c9340159dc9f7276c9bb81abb1fa73fc893229abade8c4fac344ffec555889232d3a789df72974d6f9c7c6437627872a356 + PATCHES + "prevent-cmake-failing-with-variable-notfound.patch" ) if(CMAKE_HOST_WIN32) diff --git a/ports/kf5i18n/prevent-cmake-failing-with-variable-notfound.patch b/ports/kf5i18n/prevent-cmake-failing-with-variable-notfound.patch new file mode 100644 index 00000000000000..35741800d715cc --- /dev/null +++ b/ports/kf5i18n/prevent-cmake-failing-with-variable-notfound.patch @@ -0,0 +1,33 @@ +From 6195ac786afd3fb8d74df4db86fdddd966661ec9 Mon Sep 17 00:00:00 2001 +From: Dawid Wrobel +Date: Mon, 1 Mar 2021 20:41:12 +0000 +Subject: [PATCH] Prevent CMake failing with "variable NOTFOUND" + +Since the LibIntl_LIBRARIES has value only on some platforms, CMake can +throw an error complaining about using a NOTFOUND variable. +--- + src/CMakeLists.txt | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 92bfabf..46d2c76 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -41,8 +41,12 @@ target_include_directories(KF5I18n INTERFACE "$ Date: Mon, 1 Mar 2021 17:25:22 -0400 Subject: [PATCH 47/65] ecm: do not override custom clang format files --- ...t-override-custom-clang-format-files.patch | 33 +++++++++++++++++++ ports/ecm/portfile.cmake | 2 ++ ports/kf5syntaxhighlighting/portfile.cmake | 2 +- 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 ports/ecm/do-not-override-custom-clang-format-files.patch diff --git a/ports/ecm/do-not-override-custom-clang-format-files.patch b/ports/ecm/do-not-override-custom-clang-format-files.patch new file mode 100644 index 00000000000000..4e7f4e286de30a --- /dev/null +++ b/ports/ecm/do-not-override-custom-clang-format-files.patch @@ -0,0 +1,33 @@ +From 0d5ed9bb9117f6526691b3572bf85090efbeed4a Mon Sep 17 00:00:00 2001 +From: Alexander Lohnau +Date: Sat, 30 Jan 2021 13:44:07 +0100 +Subject: [PATCH] KDEClangFormat: Do not override custom clang-format files + +--- + kde-modules/KDEClangFormat.cmake | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/kde-modules/KDEClangFormat.cmake b/kde-modules/KDEClangFormat.cmake +index 6cdbd2b5..995f03ad 100644 +--- a/kde-modules/KDEClangFormat.cmake ++++ b/kde-modules/KDEClangFormat.cmake +@@ -35,7 +35,18 @@ find_program(KDE_CLANG_FORMAT_EXECUTABLE clang-format) + + # instantiate our clang-format file, must be in source directory for tooling if we have the tool + if(KDE_CLANG_FORMAT_EXECUTABLE) +- configure_file(${CMAKE_CURRENT_LIST_DIR}/clang-format.cmake ${CMAKE_CURRENT_SOURCE_DIR}/.clang-format @ONLY) ++ set(CLANG_FORMAT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/.clang-format) ++ if (EXISTS ${CLANG_FORMAT_FILE}) ++ file(READ ${CLANG_FORMAT_FILE} CLANG_FORMAT_CONTENTS LIMIT 128) ++ string(FIND "${CLANG_FORMAT_CONTENTS}" "SPDX-FileCopyrightText: 2019 Christoph Cullmann" matchres) ++ if(${matchres} EQUAL -1) ++ message(WARNING "The .clang-format file already exists. Please remove it in order to use the file provided by ECM") ++ else() ++ configure_file(${CMAKE_CURRENT_LIST_DIR}/clang-format.cmake ${CLANG_FORMAT_FILE} @ONLY) ++ endif() ++ else() ++ configure_file(${CMAKE_CURRENT_LIST_DIR}/clang-format.cmake ${CLANG_FORMAT_FILE} @ONLY) ++ endif() + endif() + + # formatting target diff --git a/ports/ecm/portfile.cmake b/ports/ecm/portfile.cmake index 990488d0c062d1..37434bfd38267c 100644 --- a/ports/ecm/portfile.cmake +++ b/ports/ecm/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF v5.75.0 SHA512 486845a91967c89dec42f9120757c7b883006713d0957e9bd21dfacb2911225fe45680590ef3dc5e0d45a9dbc81cf99e1514fb4922b1a027bcba3864da883076 HEAD_REF master + PATCHES + "do-not-override-custom-clang-format-files.patch" ) vcpkg_configure_cmake( diff --git a/ports/kf5syntaxhighlighting/portfile.cmake b/ports/kf5syntaxhighlighting/portfile.cmake index 3a0d4e04a3d059..2a0c4f20531505 100644 --- a/ports/kf5syntaxhighlighting/portfile.cmake +++ b/ports/kf5syntaxhighlighting/portfile.cmake @@ -32,4 +32,4 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -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) From f36e1d693957e095cb7b898ca81402ae78245738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 1 Mar 2021 19:00:12 -0400 Subject: [PATCH 48/65] kf5i18n: fix Windows build --- ports/kf5i18n/portfile.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake index a2565477878a28..668c18fd670ed3 100644 --- a/ports/kf5i18n/portfile.cmake +++ b/ports/kf5i18n/portfile.cmake @@ -1,10 +1,13 @@ +if(!VCPKG_TARGET_IS_WINDOWS) + list(APPEND PATCHES "prevent-cmake-failing-with-variable-notfound.patch") +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/ki18n REF v5.75.0 SHA512 9e059afb8c3bd074ecdfcb1bf4cf3c9340159dc9f7276c9bb81abb1fa73fc893229abade8c4fac344ffec555889232d3a789df72974d6f9c7c6437627872a356 - PATCHES - "prevent-cmake-failing-with-variable-notfound.patch" + PATCHES ${PATCHES} ) if(CMAKE_HOST_WIN32) From dc3629389275448989dc681da2e5ba991e16816a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 1 Mar 2021 20:16:59 -0400 Subject: [PATCH 49/65] [kf5*] update versions --- versions/baseline.json | 34 +++++++++++++------------- versions/e-/ecm.json | 5 ++++ versions/k-/kf5archive.json | 5 ++++ versions/k-/kf5completion.json | 5 ++++ versions/k-/kf5config.json | 5 ++++ versions/k-/kf5coreaddons.json | 5 ++++ versions/k-/kf5crash.json | 5 ++++ versions/k-/kf5guiaddons.json | 5 ++++ versions/k-/kf5holidays.json | 5 ++++ versions/k-/kf5i18n.json | 5 ++++ versions/k-/kf5itemmodels.json | 5 ++++ versions/k-/kf5itemviews.json | 5 ++++ versions/k-/kf5plotting.json | 5 ++++ versions/k-/kf5syntaxhighlighting.json | 5 ++++ versions/k-/kf5widgetsaddons.json | 5 ++++ versions/k-/kf5windowsystem.json | 5 ++++ 16 files changed, 92 insertions(+), 17 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 812beabe2298f8..892fa75c7df645 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1757,7 +1757,7 @@ "port-version": 0 }, "ecm": { - "baseline": "5.74.0", + "baseline": "5.75.0", "port-version": 0 }, "ecos": { @@ -2729,59 +2729,59 @@ "port-version": 0 }, "kf5archive": { - "baseline": "5.74.0", - "port-version": 1 + "baseline": "5.75.0", + "port-version": 0 }, "kf5completion": { - "baseline": "5.64.0", + "baseline": "5.75.0", "port-version": 0 }, "kf5config": { - "baseline": "5.64.0", + "baseline": "5.75.0", "port-version": 0 }, "kf5coreaddons": { - "baseline": "5.64.0", + "baseline": "5.75.0", "port-version": 0 }, "kf5crash": { - "baseline": "5.64.0", + "baseline": "5.75.0", "port-version": 0 }, "kf5guiaddons": { - "baseline": "5.64.0", + "baseline": "5.75.0", "port-version": 0 }, "kf5holidays": { - "baseline": "5.74.0", + "baseline": "5.75.0", "port-version": 0 }, "kf5i18n": { - "baseline": "5.64.0", - "port-version": 1 + "baseline": "5.75.0", + "port-version": 0 }, "kf5itemmodels": { - "baseline": "5.64.0", + "baseline": "5.75.0", "port-version": 0 }, "kf5itemviews": { - "baseline": "5.64.0", + "baseline": "5.75.0", "port-version": 0 }, "kf5plotting": { - "baseline": "5.74.0", + "baseline": "5.75.0", "port-version": 0 }, "kf5syntaxhighlighting": { - "baseline": "5.64.0-1", + "baseline": "5.75.0", "port-version": 0 }, "kf5widgetsaddons": { - "baseline": "5.64.0", + "baseline": "5.75.0", "port-version": 0 }, "kf5windowsystem": { - "baseline": "5.64.0", + "baseline": "5.75.0", "port-version": 0 }, "kfr": { diff --git a/versions/e-/ecm.json b/versions/e-/ecm.json index a327078bac2a6c..577fc27d0dca5c 100644 --- a/versions/e-/ecm.json +++ b/versions/e-/ecm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f7bf1ed9499fd23564964629c8a318979016ccc5", + "version-string": "5.75.0", + "port-version": 0 + }, { "git-tree": "ef6c69c364962a681a9f97d8babc7e10c8d84bfe", "version-string": "5.74.0", diff --git a/versions/k-/kf5archive.json b/versions/k-/kf5archive.json index 4796c25011ff75..b82776280a7f97 100644 --- a/versions/k-/kf5archive.json +++ b/versions/k-/kf5archive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3e70bf60c07d3a7c4d1000c6ee0f0b87078fdf4a", + "version-string": "5.75.0", + "port-version": 0 + }, { "git-tree": "98bfda14e12e6f5468957c379b06fc2cb931ca64", "version-string": "5.74.0", diff --git a/versions/k-/kf5completion.json b/versions/k-/kf5completion.json index e07a670d795f3e..d7aecc215b6bc9 100644 --- a/versions/k-/kf5completion.json +++ b/versions/k-/kf5completion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a3bd7330f3d165e10a19d5d3d78c75316734c967", + "version-string": "5.75.0", + "port-version": 0 + }, { "git-tree": "696b8fc5814324c18e01201d06f72cacb983f858", "version-string": "5.64.0", diff --git a/versions/k-/kf5config.json b/versions/k-/kf5config.json index f9354ba1e0c6ac..d317ff854f5214 100644 --- a/versions/k-/kf5config.json +++ b/versions/k-/kf5config.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2c31bb5492e9710a562c163195deb451af2a779d", + "version-string": "5.75.0", + "port-version": 0 + }, { "git-tree": "b6f37e63a4ee87b5b6de7224072e410f8c93258b", "version-string": "5.64.0", diff --git a/versions/k-/kf5coreaddons.json b/versions/k-/kf5coreaddons.json index d6330016f7cd1d..424387d4f90d74 100644 --- a/versions/k-/kf5coreaddons.json +++ b/versions/k-/kf5coreaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5bb3aade70fd207dcbfc2e0e9a0a25832a46c098", + "version-string": "5.75.0", + "port-version": 0 + }, { "git-tree": "2f1927fb52301082ec65eb107a7605e8edec49d2", "version-string": "5.64.0", diff --git a/versions/k-/kf5crash.json b/versions/k-/kf5crash.json index 631e5cbd050d02..cd1ce581fc12d7 100644 --- a/versions/k-/kf5crash.json +++ b/versions/k-/kf5crash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65717e7be14534038e44ba1167d164962fb292d1", + "version-string": "5.75.0", + "port-version": 0 + }, { "git-tree": "b21008fd070821fe16a997fcc02aa09e85022324", "version-string": "5.64.0", diff --git a/versions/k-/kf5guiaddons.json b/versions/k-/kf5guiaddons.json index 53602c731e7289..427e24d03427d9 100644 --- a/versions/k-/kf5guiaddons.json +++ b/versions/k-/kf5guiaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "18b25525e8619d55eb0b97c8dc13b2fe90922f5c", + "version-string": "5.75.0", + "port-version": 0 + }, { "git-tree": "8bca3434ab81ca66cb57d44ed891ff5a773c92ce", "version-string": "5.64.0", diff --git a/versions/k-/kf5holidays.json b/versions/k-/kf5holidays.json index 395114d23a245b..86a6684c7690a1 100644 --- a/versions/k-/kf5holidays.json +++ b/versions/k-/kf5holidays.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a8f7d01edf20893d3fc339daac4cdc8f9cf59af", + "version-string": "5.75.0", + "port-version": 0 + }, { "git-tree": "c668e8479d432fcb7f1d450ad1c51a6ad9dc67fb", "version-string": "5.74.0", diff --git a/versions/k-/kf5i18n.json b/versions/k-/kf5i18n.json index 8b70233e99ea95..154ad6b93290ed 100644 --- a/versions/k-/kf5i18n.json +++ b/versions/k-/kf5i18n.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "89684ee735dd0f21ed6df397ea98082706f3a3d0", + "version-string": "5.75.0", + "port-version": 0 + }, { "git-tree": "729fd5fa589799c9c12afaa7fa6434c9304301f7", "version-string": "5.64.0", diff --git a/versions/k-/kf5itemmodels.json b/versions/k-/kf5itemmodels.json index 603e0f671a9f1e..7d674f4d867db0 100644 --- a/versions/k-/kf5itemmodels.json +++ b/versions/k-/kf5itemmodels.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "345e49f4c2b632f0ba1cde30d7642c5c552ffb21", + "version-string": "5.75.0", + "port-version": 0 + }, { "git-tree": "2ffea0df33ef54f6741e97f8353e5ee2c2484e6b", "version-string": "5.64.0", diff --git a/versions/k-/kf5itemviews.json b/versions/k-/kf5itemviews.json index 649bf38b20f50b..7d4f346200a2ab 100644 --- a/versions/k-/kf5itemviews.json +++ b/versions/k-/kf5itemviews.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1d11f26233d0ed2fb1f78ef539c9746b3f8b1080", + "version-string": "5.75.0", + "port-version": 0 + }, { "git-tree": "165e6d588675a123a6757b98d821014b71f63613", "version-string": "5.64.0", diff --git a/versions/k-/kf5plotting.json b/versions/k-/kf5plotting.json index 3bb60536324c1e..354bd2460817f6 100644 --- a/versions/k-/kf5plotting.json +++ b/versions/k-/kf5plotting.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "610599be56bccbedbe8b83c73465417622882438", + "version-string": "5.75.0", + "port-version": 0 + }, { "git-tree": "25c33b06994d1c7906afd3ada835facb0a9fc2d7", "version-string": "5.74.0", diff --git a/versions/k-/kf5syntaxhighlighting.json b/versions/k-/kf5syntaxhighlighting.json index d0901ac5a8d618..872e183401de2f 100644 --- a/versions/k-/kf5syntaxhighlighting.json +++ b/versions/k-/kf5syntaxhighlighting.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4dd7ce2361b2723e29cbbe36c889d0e2156ffef9", + "version-string": "5.75.0", + "port-version": 0 + }, { "git-tree": "4fdddfb870b34a5a43de450af11a42822831cf87", "version-string": "5.64.0-1", diff --git a/versions/k-/kf5widgetsaddons.json b/versions/k-/kf5widgetsaddons.json index c53d61ea78a281..87881ed679fe13 100644 --- a/versions/k-/kf5widgetsaddons.json +++ b/versions/k-/kf5widgetsaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6d9067b7085840dcd684dfca8739dbb0432d429", + "version-string": "5.75.0", + "port-version": 0 + }, { "git-tree": "40e1bd1fb0830d760f34b565cb277a9f9a5c31d7", "version-string": "5.64.0", diff --git a/versions/k-/kf5windowsystem.json b/versions/k-/kf5windowsystem.json index 17079c14c58ddd..19e56697d81853 100644 --- a/versions/k-/kf5windowsystem.json +++ b/versions/k-/kf5windowsystem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76c7debf909a8c9d7e64923cd74b7226206a8bd7", + "version-string": "5.75.0", + "port-version": 0 + }, { "git-tree": "35fa4e3ec318a0000fec7537cf7368edb5e5e5fb", "version-string": "5.64.0", From f32f60b5c5d3e340399fd6cde0dce5730e53a363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Wed, 3 Mar 2021 10:47:59 -0400 Subject: [PATCH 50/65] [kf5i18n] fix logical NOT --- ports/kf5i18n/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake index 668c18fd670ed3..ad350dd420726c 100644 --- a/ports/kf5i18n/portfile.cmake +++ b/ports/kf5i18n/portfile.cmake @@ -1,4 +1,4 @@ -if(!VCPKG_TARGET_IS_WINDOWS) +if(NOT VCPKG_TARGET_IS_WINDOWS) list(APPEND PATCHES "prevent-cmake-failing-with-variable-notfound.patch") endif() From d57868d41d2d5db6c1260d3d127185ceaf41a6ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 4 Mar 2021 02:29:39 -0400 Subject: [PATCH 51/65] [kf5syntaxhighlighting] disable parallel configure --- ports/kf5syntaxhighlighting/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/kf5syntaxhighlighting/portfile.cmake b/ports/kf5syntaxhighlighting/portfile.cmake index 2a0c4f20531505..fb3c84b6e54c7d 100644 --- a/ports/kf5syntaxhighlighting/portfile.cmake +++ b/ports/kf5syntaxhighlighting/portfile.cmake @@ -11,6 +11,7 @@ get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) vcpkg_add_to_path("${PERL_EXE_PATH}") vcpkg_configure_cmake( + DISABLE_PARALLEL_CONFIGURE SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -DBUILD_HTML_DOCS=OFF From c2be3133c1f13cfae5bda174c2bb6f9941a3ef00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 4 Mar 2021 02:55:29 -0400 Subject: [PATCH 52/65] [kf5*] update versions --- versions/k-/kf5i18n.json | 2 +- versions/k-/kf5syntaxhighlighting.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/k-/kf5i18n.json b/versions/k-/kf5i18n.json index 154ad6b93290ed..6ef193be158ac2 100644 --- a/versions/k-/kf5i18n.json +++ b/versions/k-/kf5i18n.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "89684ee735dd0f21ed6df397ea98082706f3a3d0", + "git-tree": "2d973f59fbcdd7f7e804f599ce60f39161250ba8", "version-string": "5.75.0", "port-version": 0 }, diff --git a/versions/k-/kf5syntaxhighlighting.json b/versions/k-/kf5syntaxhighlighting.json index 872e183401de2f..e1752ecc3110b2 100644 --- a/versions/k-/kf5syntaxhighlighting.json +++ b/versions/k-/kf5syntaxhighlighting.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4dd7ce2361b2723e29cbbe36c889d0e2156ffef9", + "git-tree": "74b352948eb23079c0ca4a1514fb8048f1aebe68", "version-string": "5.75.0", "port-version": 0 }, From 1f0752da03d009936c35a72a9d650d9b14043d6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 5 Mar 2021 16:23:13 -0400 Subject: [PATCH 53/65] [kf5*] convert CONTROL to manifest --- ports/ecm/CONTROL | 4 ---- ports/ecm/vcpkg.json | 6 ++++++ ports/kf5archive/CONTROL | 5 ----- ports/kf5archive/vcpkg.json | 12 ++++++++++++ ports/kf5completion/CONTROL | 5 ----- ports/kf5completion/vcpkg.json | 12 ++++++++++++ ports/kf5config/CONTROL | 5 ----- ports/kf5config/vcpkg.json | 11 +++++++++++ ports/kf5coreaddons/CONTROL | 5 ----- ports/kf5coreaddons/vcpkg.json | 11 +++++++++++ ports/kf5crash/CONTROL | 6 ------ ports/kf5crash/vcpkg.json | 16 ++++++++++++++++ ports/kf5guiaddons/CONTROL | 5 ----- ports/kf5guiaddons/vcpkg.json | 18 ++++++++++++++++++ ports/kf5holidays/CONTROL | 4 ---- ports/kf5holidays/vcpkg.json | 10 ++++++++++ ports/kf5i18n/CONTROL | 5 ----- ports/kf5i18n/vcpkg.json | 12 ++++++++++++ ports/kf5itemmodels/CONTROL | 5 ----- ports/kf5itemmodels/vcpkg.json | 11 +++++++++++ ports/kf5itemviews/CONTROL | 5 ----- ports/kf5itemviews/vcpkg.json | 11 +++++++++++ ports/kf5plotting/CONTROL | 5 ----- ports/kf5plotting/vcpkg.json | 11 +++++++++++ ports/kf5syntaxhighlighting/CONTROL | 5 ----- ports/kf5syntaxhighlighting/vcpkg.json | 12 ++++++++++++ ports/kf5widgetsaddons/CONTROL | 5 ----- ports/kf5widgetsaddons/vcpkg.json | 11 +++++++++++ ports/kf5windowsystem/CONTROL | 5 ----- ports/kf5windowsystem/vcpkg.json | 18 ++++++++++++++++++ 30 files changed, 182 insertions(+), 74 deletions(-) delete mode 100644 ports/ecm/CONTROL create mode 100644 ports/ecm/vcpkg.json delete mode 100644 ports/kf5archive/CONTROL create mode 100644 ports/kf5archive/vcpkg.json delete mode 100644 ports/kf5completion/CONTROL create mode 100644 ports/kf5completion/vcpkg.json delete mode 100644 ports/kf5config/CONTROL create mode 100644 ports/kf5config/vcpkg.json delete mode 100644 ports/kf5coreaddons/CONTROL create mode 100644 ports/kf5coreaddons/vcpkg.json delete mode 100644 ports/kf5crash/CONTROL create mode 100644 ports/kf5crash/vcpkg.json delete mode 100644 ports/kf5guiaddons/CONTROL create mode 100644 ports/kf5guiaddons/vcpkg.json delete mode 100644 ports/kf5holidays/CONTROL create mode 100644 ports/kf5holidays/vcpkg.json delete mode 100644 ports/kf5i18n/CONTROL create mode 100644 ports/kf5i18n/vcpkg.json delete mode 100644 ports/kf5itemmodels/CONTROL create mode 100644 ports/kf5itemmodels/vcpkg.json delete mode 100644 ports/kf5itemviews/CONTROL create mode 100644 ports/kf5itemviews/vcpkg.json delete mode 100644 ports/kf5plotting/CONTROL create mode 100644 ports/kf5plotting/vcpkg.json delete mode 100644 ports/kf5syntaxhighlighting/CONTROL create mode 100644 ports/kf5syntaxhighlighting/vcpkg.json delete mode 100644 ports/kf5widgetsaddons/CONTROL create mode 100644 ports/kf5widgetsaddons/vcpkg.json delete mode 100644 ports/kf5windowsystem/CONTROL create mode 100644 ports/kf5windowsystem/vcpkg.json diff --git a/ports/ecm/CONTROL b/ports/ecm/CONTROL deleted file mode 100644 index 96bcd2f6e81404..00000000000000 --- a/ports/ecm/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: ecm -Version: 5.75.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/vcpkg.json b/ports/ecm/vcpkg.json new file mode 100644 index 00000000000000..597961d162f12e --- /dev/null +++ b/ports/ecm/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "ecm", + "version-string": "5.75.0", + "description": "Extra CMake Modules (ECM), extra modules and scripts for CMake", + "homepage": "https://github.com/KDE/extra-cmake-modules" +} diff --git a/ports/kf5archive/CONTROL b/ports/kf5archive/CONTROL deleted file mode 100644 index d7e3f2cc831c5e..00000000000000 --- a/ports/kf5archive/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: kf5archive -Version: 5.75.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/vcpkg.json b/ports/kf5archive/vcpkg.json new file mode 100644 index 00000000000000..14455298319240 --- /dev/null +++ b/ports/kf5archive/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "kf5archive", + "version-string": "5.75.0", + "description": "File compression", + "homepage": "https://api.kde.org/frameworks/karchive/html/index.html", + "dependencies": [ + "bzip2", + "ecm", + "qt5-base", + "zlib" + ] +} diff --git a/ports/kf5completion/CONTROL b/ports/kf5completion/CONTROL deleted file mode 100644 index 51afb4bafc601b..00000000000000 --- a/ports/kf5completion/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: kf5completion -Version: 5.75.0 -Homepage: https://api.kde.org/frameworks/kcompletion/html/index.html -Description: Text completion helpers and widgets -Build-Depends: ecm, qt5-tools, kf5config, kf5widgetsaddons \ No newline at end of file diff --git a/ports/kf5completion/vcpkg.json b/ports/kf5completion/vcpkg.json new file mode 100644 index 00000000000000..d414d55cd77df4 --- /dev/null +++ b/ports/kf5completion/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "kf5completion", + "version-string": "5.75.0", + "description": "Text completion helpers and widgets", + "homepage": "https://api.kde.org/frameworks/kcompletion/html/index.html", + "dependencies": [ + "ecm", + "kf5config", + "kf5widgetsaddons", + "qt5-tools" + ] +} diff --git a/ports/kf5config/CONTROL b/ports/kf5config/CONTROL deleted file mode 100644 index 3382cef818cd08..00000000000000 --- a/ports/kf5config/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: kf5config -Version: 5.75.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/vcpkg.json b/ports/kf5config/vcpkg.json new file mode 100644 index 00000000000000..4dfc6c147239e7 --- /dev/null +++ b/ports/kf5config/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "kf5config", + "version-string": "5.75.0", + "description": "Configuration system", + "homepage": "https://api.kde.org/frameworks/kconfig/html/index.html", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-tools" + ] +} diff --git a/ports/kf5coreaddons/CONTROL b/ports/kf5coreaddons/CONTROL deleted file mode 100644 index 0e315b23996fb3..00000000000000 --- a/ports/kf5coreaddons/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: kf5coreaddons -Version: 5.75.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/vcpkg.json b/ports/kf5coreaddons/vcpkg.json new file mode 100644 index 00000000000000..8cd9fd25665593 --- /dev/null +++ b/ports/kf5coreaddons/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "kf5coreaddons", + "version-string": "5.75.0", + "description": "Addons to QtCore", + "homepage": "https://api.kde.org/frameworks/kcoreaddons/html/index.html", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-tools" + ] +} diff --git a/ports/kf5crash/CONTROL b/ports/kf5crash/CONTROL deleted file mode 100644 index d6784c6070594d..00000000000000 --- a/ports/kf5crash/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: kf5crash -Version: 5.75.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, kf5windowsystem, qt5-x11extras (linux) diff --git a/ports/kf5crash/vcpkg.json b/ports/kf5crash/vcpkg.json new file mode 100644 index 00000000000000..73960c394de981 --- /dev/null +++ b/ports/kf5crash/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "kf5crash", + "version-string": "5.75.0", + "description": "KCrash provides support for intercepting and handling application crashes.", + "homepage": "https://api.kde.org/frameworks/kcrash/html/index.html", + "supports": "linux", + "dependencies": [ + "ecm", + "kf5coreaddons", + "kf5windowsystem", + { + "name": "qt5-x11extras", + "platform": "linux" + } + ] +} diff --git a/ports/kf5guiaddons/CONTROL b/ports/kf5guiaddons/CONTROL deleted file mode 100644 index b73ed3d38f7d79..00000000000000 --- a/ports/kf5guiaddons/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: kf5guiaddons -Version: 5.75.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/vcpkg.json b/ports/kf5guiaddons/vcpkg.json new file mode 100644 index 00000000000000..1d4f9275937619 --- /dev/null +++ b/ports/kf5guiaddons/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "kf5guiaddons", + "version-string": "5.75.0", + "description": "Addons to QtGui", + "homepage": "https://api.kde.org/frameworks/kguiaddons/html/index.html", + "dependencies": [ + "ecm", + "qt5-tools", + { + "name": "qt5-winextras", + "platform": "windows" + }, + { + "name": "qt5-x11extras", + "platform": "linux" + } + ] +} diff --git a/ports/kf5holidays/CONTROL b/ports/kf5holidays/CONTROL deleted file mode 100644 index ee061c908ef496..00000000000000 --- a/ports/kf5holidays/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: kf5holidays -Version: 5.75.0 -Description: Holiday calculation library -Build-Depends: ecm, qt5-base[core], qt5-tools diff --git a/ports/kf5holidays/vcpkg.json b/ports/kf5holidays/vcpkg.json new file mode 100644 index 00000000000000..60ea71a4b4e860 --- /dev/null +++ b/ports/kf5holidays/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "kf5holidays", + "version-string": "5.75.0", + "description": "Holiday calculation library", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-tools" + ] +} diff --git a/ports/kf5i18n/CONTROL b/ports/kf5i18n/CONTROL deleted file mode 100644 index 3c0f89360ce88a..00000000000000 --- a/ports/kf5i18n/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: kf5i18n -Version: 5.75.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/vcpkg.json b/ports/kf5i18n/vcpkg.json new file mode 100644 index 00000000000000..bfe215f8cb637b --- /dev/null +++ b/ports/kf5i18n/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "kf5i18n", + "version-string": "5.75.0", + "description": "Advanced internationalization framework", + "homepage": "https://api.kde.org/frameworks/ki18n/html/index.html", + "dependencies": [ + "ecm", + "gettext", + "qt5-declarative", + "qt5-tools" + ] +} diff --git a/ports/kf5itemmodels/CONTROL b/ports/kf5itemmodels/CONTROL deleted file mode 100644 index b8100ed3e8aa2e..00000000000000 --- a/ports/kf5itemmodels/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: kf5itemmodels -Version: 5.75.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/vcpkg.json b/ports/kf5itemmodels/vcpkg.json new file mode 100644 index 00000000000000..fa2acc525b501b --- /dev/null +++ b/ports/kf5itemmodels/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "kf5itemmodels", + "version-string": "5.75.0", + "description": "Models for Qt Model/View system", + "homepage": "https://api.kde.org/frameworks/kitemmodels/html/index.html", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-tools" + ] +} diff --git a/ports/kf5itemviews/CONTROL b/ports/kf5itemviews/CONTROL deleted file mode 100644 index bdbb535f89c7a4..00000000000000 --- a/ports/kf5itemviews/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: kf5itemviews -Version: 5.75.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/vcpkg.json b/ports/kf5itemviews/vcpkg.json new file mode 100644 index 00000000000000..f754ccd0cc7c66 --- /dev/null +++ b/ports/kf5itemviews/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "kf5itemviews", + "version-string": "5.75.0", + "description": "Widget addons for Qt Model/View", + "homepage": "https://api.kde.org/frameworks/kitemviews/html/index.html", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-tools" + ] +} diff --git a/ports/kf5plotting/CONTROL b/ports/kf5plotting/CONTROL deleted file mode 100644 index d017f2fa248ff9..00000000000000 --- a/ports/kf5plotting/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: kf5plotting -Version: 5.75.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/vcpkg.json b/ports/kf5plotting/vcpkg.json new file mode 100644 index 00000000000000..499ac04cbc1774 --- /dev/null +++ b/ports/kf5plotting/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "kf5plotting", + "version-string": "5.75.0", + "description": "Lightweight plotting framework", + "homepage": "https://api.kde.org/frameworks/kplotting/html/index.html", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-tools" + ] +} diff --git a/ports/kf5syntaxhighlighting/CONTROL b/ports/kf5syntaxhighlighting/CONTROL deleted file mode 100644 index 715903ebcf15b8..00000000000000 --- a/ports/kf5syntaxhighlighting/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: kf5syntaxhighlighting -Version: 5.75.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/vcpkg.json b/ports/kf5syntaxhighlighting/vcpkg.json new file mode 100644 index 00000000000000..97139cdd7dc6a0 --- /dev/null +++ b/ports/kf5syntaxhighlighting/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "kf5syntaxhighlighting", + "version-string": "5.75.0", + "description": "Syntax highlighting engine for Kate syntax definitions", + "homepage": "https://github.com/KDE/syntax-highlighting", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-tools", + "qt5-xmlpatterns" + ] +} diff --git a/ports/kf5widgetsaddons/CONTROL b/ports/kf5widgetsaddons/CONTROL deleted file mode 100644 index 57d621443af323..00000000000000 --- a/ports/kf5widgetsaddons/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: kf5widgetsaddons -Version: 5.75.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/vcpkg.json b/ports/kf5widgetsaddons/vcpkg.json new file mode 100644 index 00000000000000..cabd14aa1aa9dd --- /dev/null +++ b/ports/kf5widgetsaddons/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "kf5widgetsaddons", + "version-string": "5.75.0", + "description": "Addons to QtWidgets", + "homepage": "https://api.kde.org/frameworks/kwidgetsaddons/html/index.html", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-tools" + ] +} diff --git a/ports/kf5windowsystem/CONTROL b/ports/kf5windowsystem/CONTROL deleted file mode 100644 index 3b4fc9fdc2f4f9..00000000000000 --- a/ports/kf5windowsystem/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: kf5windowsystem -Version: 5.75.0 -Homepage: https://api.kde.org/frameworks/kwindowsystem/html/ -Description: Access to the windowing system -Build-Depends: ecm, qt5-winextras (windows), qt5-x11extras (linux), qt5-tools diff --git a/ports/kf5windowsystem/vcpkg.json b/ports/kf5windowsystem/vcpkg.json new file mode 100644 index 00000000000000..e3e8e350beec10 --- /dev/null +++ b/ports/kf5windowsystem/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "kf5windowsystem", + "version-string": "5.75.0", + "description": "Access to the windowing system", + "homepage": "https://api.kde.org/frameworks/kwindowsystem/html/", + "dependencies": [ + "ecm", + "qt5-tools", + { + "name": "qt5-winextras", + "platform": "windows" + }, + { + "name": "qt5-x11extras", + "platform": "linux" + } + ] +} From 9407276671767082bcc9a5a826ad0b8377c8bcf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 5 Mar 2021 17:08:10 -0400 Subject: [PATCH 54/65] [kf5*] update versions --- versions/e-/ecm.json | 2 +- versions/k-/kf5archive.json | 2 +- versions/k-/kf5completion.json | 2 +- versions/k-/kf5config.json | 2 +- versions/k-/kf5coreaddons.json | 2 +- versions/k-/kf5crash.json | 2 +- versions/k-/kf5guiaddons.json | 2 +- versions/k-/kf5holidays.json | 2 +- versions/k-/kf5i18n.json | 2 +- versions/k-/kf5itemmodels.json | 2 +- versions/k-/kf5itemviews.json | 2 +- versions/k-/kf5plotting.json | 2 +- versions/k-/kf5syntaxhighlighting.json | 2 +- versions/k-/kf5widgetsaddons.json | 2 +- versions/k-/kf5windowsystem.json | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/versions/e-/ecm.json b/versions/e-/ecm.json index 577fc27d0dca5c..06dbf4732fbfc4 100644 --- a/versions/e-/ecm.json +++ b/versions/e-/ecm.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f7bf1ed9499fd23564964629c8a318979016ccc5", + "git-tree": "41f4fa9293becf3d6c059ce88cc4a83a5f468226", "version-string": "5.75.0", "port-version": 0 }, diff --git a/versions/k-/kf5archive.json b/versions/k-/kf5archive.json index b82776280a7f97..c2d23da264c8ed 100644 --- a/versions/k-/kf5archive.json +++ b/versions/k-/kf5archive.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "3e70bf60c07d3a7c4d1000c6ee0f0b87078fdf4a", + "git-tree": "7f95036026bb9bd9a9913a19118baf84e03ca368", "version-string": "5.75.0", "port-version": 0 }, diff --git a/versions/k-/kf5completion.json b/versions/k-/kf5completion.json index d7aecc215b6bc9..80b071c70d8c6f 100644 --- a/versions/k-/kf5completion.json +++ b/versions/k-/kf5completion.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a3bd7330f3d165e10a19d5d3d78c75316734c967", + "git-tree": "3706a75d664738eb76c3f2de88cd2c292fe5f190", "version-string": "5.75.0", "port-version": 0 }, diff --git a/versions/k-/kf5config.json b/versions/k-/kf5config.json index d317ff854f5214..d0fca3b349ec5a 100644 --- a/versions/k-/kf5config.json +++ b/versions/k-/kf5config.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2c31bb5492e9710a562c163195deb451af2a779d", + "git-tree": "60a84df24b7a2f511b76baeb1ab2dd488422ad9d", "version-string": "5.75.0", "port-version": 0 }, diff --git a/versions/k-/kf5coreaddons.json b/versions/k-/kf5coreaddons.json index 424387d4f90d74..a9e7bdb9db96fa 100644 --- a/versions/k-/kf5coreaddons.json +++ b/versions/k-/kf5coreaddons.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5bb3aade70fd207dcbfc2e0e9a0a25832a46c098", + "git-tree": "3b318f9a683d63c1035ebc4a0b4850ebc11ceb20", "version-string": "5.75.0", "port-version": 0 }, diff --git a/versions/k-/kf5crash.json b/versions/k-/kf5crash.json index cd1ce581fc12d7..f3afd903e18d31 100644 --- a/versions/k-/kf5crash.json +++ b/versions/k-/kf5crash.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "65717e7be14534038e44ba1167d164962fb292d1", + "git-tree": "4f58633f07f27b99f54c01c521d4083106c8828b", "version-string": "5.75.0", "port-version": 0 }, diff --git a/versions/k-/kf5guiaddons.json b/versions/k-/kf5guiaddons.json index 427e24d03427d9..2787c4edd36f36 100644 --- a/versions/k-/kf5guiaddons.json +++ b/versions/k-/kf5guiaddons.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "18b25525e8619d55eb0b97c8dc13b2fe90922f5c", + "git-tree": "f55f30a3d86877affca6cb4b1bcbe7b6bc5c2eab", "version-string": "5.75.0", "port-version": 0 }, diff --git a/versions/k-/kf5holidays.json b/versions/k-/kf5holidays.json index 86a6684c7690a1..4697d0a57c2bf5 100644 --- a/versions/k-/kf5holidays.json +++ b/versions/k-/kf5holidays.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "6a8f7d01edf20893d3fc339daac4cdc8f9cf59af", + "git-tree": "25fa6eac94fdd7ade2bc484b2254fc1055ec00e0", "version-string": "5.75.0", "port-version": 0 }, diff --git a/versions/k-/kf5i18n.json b/versions/k-/kf5i18n.json index 6ef193be158ac2..f2c04a20e23302 100644 --- a/versions/k-/kf5i18n.json +++ b/versions/k-/kf5i18n.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2d973f59fbcdd7f7e804f599ce60f39161250ba8", + "git-tree": "e6ce117fea1532e630a157586fa205bbd5999c80", "version-string": "5.75.0", "port-version": 0 }, diff --git a/versions/k-/kf5itemmodels.json b/versions/k-/kf5itemmodels.json index 7d674f4d867db0..b0e442ffb53f53 100644 --- a/versions/k-/kf5itemmodels.json +++ b/versions/k-/kf5itemmodels.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "345e49f4c2b632f0ba1cde30d7642c5c552ffb21", + "git-tree": "c7720ac86780ef01defb8343fc5d4c6a660e16c3", "version-string": "5.75.0", "port-version": 0 }, diff --git a/versions/k-/kf5itemviews.json b/versions/k-/kf5itemviews.json index 7d4f346200a2ab..03482adf14df38 100644 --- a/versions/k-/kf5itemviews.json +++ b/versions/k-/kf5itemviews.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1d11f26233d0ed2fb1f78ef539c9746b3f8b1080", + "git-tree": "73b164cedf1fa986dd2b5f288ed13cc058bc1f7e", "version-string": "5.75.0", "port-version": 0 }, diff --git a/versions/k-/kf5plotting.json b/versions/k-/kf5plotting.json index 354bd2460817f6..5bdded7116bc48 100644 --- a/versions/k-/kf5plotting.json +++ b/versions/k-/kf5plotting.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "610599be56bccbedbe8b83c73465417622882438", + "git-tree": "87eb4c85c729af757784b1c6e50487cc76962ded", "version-string": "5.75.0", "port-version": 0 }, diff --git a/versions/k-/kf5syntaxhighlighting.json b/versions/k-/kf5syntaxhighlighting.json index e1752ecc3110b2..d640eef9b30197 100644 --- a/versions/k-/kf5syntaxhighlighting.json +++ b/versions/k-/kf5syntaxhighlighting.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "74b352948eb23079c0ca4a1514fb8048f1aebe68", + "git-tree": "99724f5b7d9d670d44cedabf0e5e9d7a74435468", "version-string": "5.75.0", "port-version": 0 }, diff --git a/versions/k-/kf5widgetsaddons.json b/versions/k-/kf5widgetsaddons.json index 87881ed679fe13..fc41118f2ced05 100644 --- a/versions/k-/kf5widgetsaddons.json +++ b/versions/k-/kf5widgetsaddons.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b6d9067b7085840dcd684dfca8739dbb0432d429", + "git-tree": "6578775fffb7606088fb72d648a7e47e37571383", "version-string": "5.75.0", "port-version": 0 }, diff --git a/versions/k-/kf5windowsystem.json b/versions/k-/kf5windowsystem.json index 19e56697d81853..4d934a4777b96e 100644 --- a/versions/k-/kf5windowsystem.json +++ b/versions/k-/kf5windowsystem.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "76c7debf909a8c9d7e64923cd74b7226206a8bd7", + "git-tree": "6dbf66446b557a6381da818beae0ad0a1b4025f9", "version-string": "5.75.0", "port-version": 0 }, From 968eaf5f59bf68734f4517ce219b709d2cfe724d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 8 Mar 2021 14:52:43 -0400 Subject: [PATCH 55/65] [kf5*] update versioning scheme --- ports/ecm/vcpkg.json | 2 +- ports/kf5archive/vcpkg.json | 2 +- ports/kf5completion/vcpkg.json | 2 +- ports/kf5config/vcpkg.json | 2 +- ports/kf5coreaddons/vcpkg.json | 2 +- ports/kf5crash/vcpkg.json | 2 +- ports/kf5guiaddons/vcpkg.json | 2 +- ports/kf5holidays/vcpkg.json | 2 +- ports/kf5i18n/vcpkg.json | 2 +- ports/kf5itemmodels/vcpkg.json | 2 +- ports/kf5itemviews/vcpkg.json | 2 +- ports/kf5plotting/vcpkg.json | 2 +- ports/kf5syntaxhighlighting/vcpkg.json | 2 +- ports/kf5widgetsaddons/vcpkg.json | 2 +- ports/kf5windowsystem/vcpkg.json | 2 +- versions/e-/ecm.json | 4 ++-- versions/k-/kf5archive.json | 4 ++-- versions/k-/kf5completion.json | 4 ++-- versions/k-/kf5config.json | 4 ++-- versions/k-/kf5coreaddons.json | 4 ++-- versions/k-/kf5crash.json | 4 ++-- versions/k-/kf5guiaddons.json | 4 ++-- versions/k-/kf5holidays.json | 4 ++-- versions/k-/kf5i18n.json | 4 ++-- versions/k-/kf5itemmodels.json | 4 ++-- versions/k-/kf5itemviews.json | 4 ++-- versions/k-/kf5plotting.json | 4 ++-- versions/k-/kf5syntaxhighlighting.json | 4 ++-- versions/k-/kf5widgetsaddons.json | 4 ++-- versions/k-/kf5windowsystem.json | 4 ++-- 30 files changed, 45 insertions(+), 45 deletions(-) diff --git a/ports/ecm/vcpkg.json b/ports/ecm/vcpkg.json index 597961d162f12e..0d343e0fd6b27a 100644 --- a/ports/ecm/vcpkg.json +++ b/ports/ecm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ecm", - "version-string": "5.75.0", + "version": "5.75.0", "description": "Extra CMake Modules (ECM), extra modules and scripts for CMake", "homepage": "https://github.com/KDE/extra-cmake-modules" } diff --git a/ports/kf5archive/vcpkg.json b/ports/kf5archive/vcpkg.json index 14455298319240..744e7ecf9fc603 100644 --- a/ports/kf5archive/vcpkg.json +++ b/ports/kf5archive/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5archive", - "version-string": "5.75.0", + "version": "5.75.0", "description": "File compression", "homepage": "https://api.kde.org/frameworks/karchive/html/index.html", "dependencies": [ diff --git a/ports/kf5completion/vcpkg.json b/ports/kf5completion/vcpkg.json index d414d55cd77df4..8a799ccf8215d3 100644 --- a/ports/kf5completion/vcpkg.json +++ b/ports/kf5completion/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5completion", - "version-string": "5.75.0", + "version": "5.75.0", "description": "Text completion helpers and widgets", "homepage": "https://api.kde.org/frameworks/kcompletion/html/index.html", "dependencies": [ diff --git a/ports/kf5config/vcpkg.json b/ports/kf5config/vcpkg.json index 4dfc6c147239e7..858fda317b1e80 100644 --- a/ports/kf5config/vcpkg.json +++ b/ports/kf5config/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5config", - "version-string": "5.75.0", + "version": "5.75.0", "description": "Configuration system", "homepage": "https://api.kde.org/frameworks/kconfig/html/index.html", "dependencies": [ diff --git a/ports/kf5coreaddons/vcpkg.json b/ports/kf5coreaddons/vcpkg.json index 8cd9fd25665593..294d42158ae440 100644 --- a/ports/kf5coreaddons/vcpkg.json +++ b/ports/kf5coreaddons/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5coreaddons", - "version-string": "5.75.0", + "version": "5.75.0", "description": "Addons to QtCore", "homepage": "https://api.kde.org/frameworks/kcoreaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5crash/vcpkg.json b/ports/kf5crash/vcpkg.json index 73960c394de981..b7c09c9b79fa11 100644 --- a/ports/kf5crash/vcpkg.json +++ b/ports/kf5crash/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5crash", - "version-string": "5.75.0", + "version": "5.75.0", "description": "KCrash provides support for intercepting and handling application crashes.", "homepage": "https://api.kde.org/frameworks/kcrash/html/index.html", "supports": "linux", diff --git a/ports/kf5guiaddons/vcpkg.json b/ports/kf5guiaddons/vcpkg.json index 1d4f9275937619..55fd0fdb18d4c0 100644 --- a/ports/kf5guiaddons/vcpkg.json +++ b/ports/kf5guiaddons/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5guiaddons", - "version-string": "5.75.0", + "version": "5.75.0", "description": "Addons to QtGui", "homepage": "https://api.kde.org/frameworks/kguiaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5holidays/vcpkg.json b/ports/kf5holidays/vcpkg.json index 60ea71a4b4e860..ee7a3fcd6c381f 100644 --- a/ports/kf5holidays/vcpkg.json +++ b/ports/kf5holidays/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5holidays", - "version-string": "5.75.0", + "version": "5.75.0", "description": "Holiday calculation library", "dependencies": [ "ecm", diff --git a/ports/kf5i18n/vcpkg.json b/ports/kf5i18n/vcpkg.json index bfe215f8cb637b..d49491e1eb8f95 100644 --- a/ports/kf5i18n/vcpkg.json +++ b/ports/kf5i18n/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5i18n", - "version-string": "5.75.0", + "version": "5.75.0", "description": "Advanced internationalization framework", "homepage": "https://api.kde.org/frameworks/ki18n/html/index.html", "dependencies": [ diff --git a/ports/kf5itemmodels/vcpkg.json b/ports/kf5itemmodels/vcpkg.json index fa2acc525b501b..e511c05e42413f 100644 --- a/ports/kf5itemmodels/vcpkg.json +++ b/ports/kf5itemmodels/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5itemmodels", - "version-string": "5.75.0", + "version": "5.75.0", "description": "Models for Qt Model/View system", "homepage": "https://api.kde.org/frameworks/kitemmodels/html/index.html", "dependencies": [ diff --git a/ports/kf5itemviews/vcpkg.json b/ports/kf5itemviews/vcpkg.json index f754ccd0cc7c66..16f1ecbe0dbe2a 100644 --- a/ports/kf5itemviews/vcpkg.json +++ b/ports/kf5itemviews/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5itemviews", - "version-string": "5.75.0", + "version": "5.75.0", "description": "Widget addons for Qt Model/View", "homepage": "https://api.kde.org/frameworks/kitemviews/html/index.html", "dependencies": [ diff --git a/ports/kf5plotting/vcpkg.json b/ports/kf5plotting/vcpkg.json index 499ac04cbc1774..a3996ec5c4cf55 100644 --- a/ports/kf5plotting/vcpkg.json +++ b/ports/kf5plotting/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5plotting", - "version-string": "5.75.0", + "version": "5.75.0", "description": "Lightweight plotting framework", "homepage": "https://api.kde.org/frameworks/kplotting/html/index.html", "dependencies": [ diff --git a/ports/kf5syntaxhighlighting/vcpkg.json b/ports/kf5syntaxhighlighting/vcpkg.json index 97139cdd7dc6a0..39d9126f14b370 100644 --- a/ports/kf5syntaxhighlighting/vcpkg.json +++ b/ports/kf5syntaxhighlighting/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5syntaxhighlighting", - "version-string": "5.75.0", + "version": "5.75.0", "description": "Syntax highlighting engine for Kate syntax definitions", "homepage": "https://github.com/KDE/syntax-highlighting", "dependencies": [ diff --git a/ports/kf5widgetsaddons/vcpkg.json b/ports/kf5widgetsaddons/vcpkg.json index cabd14aa1aa9dd..00be5c8c427ff8 100644 --- a/ports/kf5widgetsaddons/vcpkg.json +++ b/ports/kf5widgetsaddons/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5widgetsaddons", - "version-string": "5.75.0", + "version": "5.75.0", "description": "Addons to QtWidgets", "homepage": "https://api.kde.org/frameworks/kwidgetsaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5windowsystem/vcpkg.json b/ports/kf5windowsystem/vcpkg.json index e3e8e350beec10..b549798777fc2e 100644 --- a/ports/kf5windowsystem/vcpkg.json +++ b/ports/kf5windowsystem/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5windowsystem", - "version-string": "5.75.0", + "version": "5.75.0", "description": "Access to the windowing system", "homepage": "https://api.kde.org/frameworks/kwindowsystem/html/", "dependencies": [ diff --git a/versions/e-/ecm.json b/versions/e-/ecm.json index 06dbf4732fbfc4..ce1a01b1e158a0 100644 --- a/versions/e-/ecm.json +++ b/versions/e-/ecm.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "41f4fa9293becf3d6c059ce88cc4a83a5f468226", - "version-string": "5.75.0", + "git-tree": "65bc28c3908b39a4996ca0a7bca10b2c93e3a5cb", + "version": "5.75.0", "port-version": 0 }, { diff --git a/versions/k-/kf5archive.json b/versions/k-/kf5archive.json index c2d23da264c8ed..ef5185f0433518 100644 --- a/versions/k-/kf5archive.json +++ b/versions/k-/kf5archive.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "7f95036026bb9bd9a9913a19118baf84e03ca368", - "version-string": "5.75.0", + "git-tree": "d3c3ffce0c459dd73d6a36599fc24a8f28c22b32", + "version": "5.75.0", "port-version": 0 }, { diff --git a/versions/k-/kf5completion.json b/versions/k-/kf5completion.json index 80b071c70d8c6f..fb7d8660cf7d02 100644 --- a/versions/k-/kf5completion.json +++ b/versions/k-/kf5completion.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "3706a75d664738eb76c3f2de88cd2c292fe5f190", - "version-string": "5.75.0", + "git-tree": "2fcd1bf45f43cfac3f85834beea42a82d9f5d5a0", + "version": "5.75.0", "port-version": 0 }, { diff --git a/versions/k-/kf5config.json b/versions/k-/kf5config.json index d0fca3b349ec5a..53942f0d03dd71 100644 --- a/versions/k-/kf5config.json +++ b/versions/k-/kf5config.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "60a84df24b7a2f511b76baeb1ab2dd488422ad9d", - "version-string": "5.75.0", + "git-tree": "1b18ac2e564ec1c1f918ff77cad0b15bead4699f", + "version": "5.75.0", "port-version": 0 }, { diff --git a/versions/k-/kf5coreaddons.json b/versions/k-/kf5coreaddons.json index a9e7bdb9db96fa..1c8baec2ba92fe 100644 --- a/versions/k-/kf5coreaddons.json +++ b/versions/k-/kf5coreaddons.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "3b318f9a683d63c1035ebc4a0b4850ebc11ceb20", - "version-string": "5.75.0", + "git-tree": "a36efec82fc03b9f181a9ebf3bf0724ad44b112f", + "version": "5.75.0", "port-version": 0 }, { diff --git a/versions/k-/kf5crash.json b/versions/k-/kf5crash.json index f3afd903e18d31..43bc4c1667719b 100644 --- a/versions/k-/kf5crash.json +++ b/versions/k-/kf5crash.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "4f58633f07f27b99f54c01c521d4083106c8828b", - "version-string": "5.75.0", + "git-tree": "d8c9a56257206c1946c7ba30f87bbc450598a1ba", + "version": "5.75.0", "port-version": 0 }, { diff --git a/versions/k-/kf5guiaddons.json b/versions/k-/kf5guiaddons.json index 2787c4edd36f36..66a4f17e5fabc5 100644 --- a/versions/k-/kf5guiaddons.json +++ b/versions/k-/kf5guiaddons.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "f55f30a3d86877affca6cb4b1bcbe7b6bc5c2eab", - "version-string": "5.75.0", + "git-tree": "7b32de9f028a53b45e25e0d6ac6517c6e93ec8ea", + "version": "5.75.0", "port-version": 0 }, { diff --git a/versions/k-/kf5holidays.json b/versions/k-/kf5holidays.json index 4697d0a57c2bf5..02b81b2a70a97b 100644 --- a/versions/k-/kf5holidays.json +++ b/versions/k-/kf5holidays.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "25fa6eac94fdd7ade2bc484b2254fc1055ec00e0", - "version-string": "5.75.0", + "git-tree": "b97da73c3466daf4ca6561def1847db8f9f9f0bc", + "version": "5.75.0", "port-version": 0 }, { diff --git a/versions/k-/kf5i18n.json b/versions/k-/kf5i18n.json index f2c04a20e23302..8bdeb06f5a47a8 100644 --- a/versions/k-/kf5i18n.json +++ b/versions/k-/kf5i18n.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "e6ce117fea1532e630a157586fa205bbd5999c80", - "version-string": "5.75.0", + "git-tree": "de9aea1ae1eb983815781d4ab7a8684db7e04b6b", + "version": "5.75.0", "port-version": 0 }, { diff --git a/versions/k-/kf5itemmodels.json b/versions/k-/kf5itemmodels.json index b0e442ffb53f53..87d93f6630384e 100644 --- a/versions/k-/kf5itemmodels.json +++ b/versions/k-/kf5itemmodels.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "c7720ac86780ef01defb8343fc5d4c6a660e16c3", - "version-string": "5.75.0", + "git-tree": "86e47be26b32b4e22157e2e12c78b490d13d9f86", + "version": "5.75.0", "port-version": 0 }, { diff --git a/versions/k-/kf5itemviews.json b/versions/k-/kf5itemviews.json index 03482adf14df38..271c16b748c17f 100644 --- a/versions/k-/kf5itemviews.json +++ b/versions/k-/kf5itemviews.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "73b164cedf1fa986dd2b5f288ed13cc058bc1f7e", - "version-string": "5.75.0", + "git-tree": "efce2fde551eaca8c41d6b55713a2c14e1d8ba1b", + "version": "5.75.0", "port-version": 0 }, { diff --git a/versions/k-/kf5plotting.json b/versions/k-/kf5plotting.json index 5bdded7116bc48..b9f1885915f8da 100644 --- a/versions/k-/kf5plotting.json +++ b/versions/k-/kf5plotting.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "87eb4c85c729af757784b1c6e50487cc76962ded", - "version-string": "5.75.0", + "git-tree": "d0c6197f035b8ce06cd634593430c342d2baa5a3", + "version": "5.75.0", "port-version": 0 }, { diff --git a/versions/k-/kf5syntaxhighlighting.json b/versions/k-/kf5syntaxhighlighting.json index d640eef9b30197..cb264535e3a508 100644 --- a/versions/k-/kf5syntaxhighlighting.json +++ b/versions/k-/kf5syntaxhighlighting.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "99724f5b7d9d670d44cedabf0e5e9d7a74435468", - "version-string": "5.75.0", + "git-tree": "b1124e941814f1508924b762ef923a92f98767e4", + "version": "5.75.0", "port-version": 0 }, { diff --git a/versions/k-/kf5widgetsaddons.json b/versions/k-/kf5widgetsaddons.json index fc41118f2ced05..6088ed0c4e173c 100644 --- a/versions/k-/kf5widgetsaddons.json +++ b/versions/k-/kf5widgetsaddons.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "6578775fffb7606088fb72d648a7e47e37571383", - "version-string": "5.75.0", + "git-tree": "00f70a9674ddeb01e86abf6a902b3d545e95f508", + "version": "5.75.0", "port-version": 0 }, { diff --git a/versions/k-/kf5windowsystem.json b/versions/k-/kf5windowsystem.json index 4d934a4777b96e..e23eb631c18e60 100644 --- a/versions/k-/kf5windowsystem.json +++ b/versions/k-/kf5windowsystem.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "6dbf66446b557a6381da818beae0ad0a1b4025f9", - "version-string": "5.75.0", + "git-tree": "dcebc7ba5d9140cd073ba9fb4c448c404827b824", + "version": "5.75.0", "port-version": 0 }, { From 5e3c5aa5a814a348a8f17d07f53ac4f6c2e3d815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Mon, 8 Mar 2021 23:12:39 -0400 Subject: [PATCH 56/65] [ecm] syntax formatting Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/ecm/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/ecm/portfile.cmake b/ports/ecm/portfile.cmake index 37434bfd38267c..279c7c32848f7e 100644 --- a/ports/ecm/portfile.cmake +++ b/ports/ecm/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( SHA512 486845a91967c89dec42f9120757c7b883006713d0957e9bd21dfacb2911225fe45680590ef3dc5e0d45a9dbc81cf99e1514fb4922b1a027bcba3864da883076 HEAD_REF master PATCHES - "do-not-override-custom-clang-format-files.patch" + "do-not-override-custom-clang-format-files.patch" ) vcpkg_configure_cmake( From f4a19f2caab81ddab5c73850c2f4fe8daeb821ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Mon, 8 Mar 2021 23:14:07 -0400 Subject: [PATCH 57/65] [kf5syntaxhighlighting] syntax formatting Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/kf5syntaxhighlighting/portfile.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/kf5syntaxhighlighting/portfile.cmake b/ports/kf5syntaxhighlighting/portfile.cmake index fb3c84b6e54c7d..62f01059b02319 100644 --- a/ports/kf5syntaxhighlighting/portfile.cmake +++ b/ports/kf5syntaxhighlighting/portfile.cmake @@ -14,7 +14,8 @@ vcpkg_configure_cmake( DISABLE_PARALLEL_CONFIGURE SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -DBUILD_HTML_DOCS=OFF + OPTIONS + -DBUILD_HTML_DOCS=OFF -DBUILD_MAN_DOCS=OFF -DBUILD_QTHELP_DOCS=OFF -DBUILD_TESTING=OFF From a0e0a4cc0263b830a676dd666a4077a639ef4cec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Mon, 8 Mar 2021 23:14:32 -0400 Subject: [PATCH 58/65] [kf5holidays] syntax formatting Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/kf5holidays/portfile.cmake | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ports/kf5holidays/portfile.cmake b/ports/kf5holidays/portfile.cmake index b83e776b076d92..1614e4c01e8ea7 100644 --- a/ports/kf5holidays/portfile.cmake +++ b/ports/kf5holidays/portfile.cmake @@ -9,10 +9,11 @@ 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_HTML_DOCS=OFF + -DBUILD_MAN_DOCS=OFF + -DBUILD_QTHELP_DOCS=OFF + -DBUILD_TESTING=OFF ) vcpkg_install_cmake() From 3bac05c3b6dcd61fb1d6b4c0c68eec08e43adb42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 8 Mar 2021 23:19:08 -0400 Subject: [PATCH 59/65] [kf5archive] restore original line order --- ports/kf5holidays/portfile.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/kf5holidays/portfile.cmake b/ports/kf5holidays/portfile.cmake index 1614e4c01e8ea7..aeb174dd3262a6 100644 --- a/ports/kf5holidays/portfile.cmake +++ b/ports/kf5holidays/portfile.cmake @@ -24,10 +24,11 @@ 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}/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) 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 cf054e084dddfbc9c7ea505439b960a48601d909 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 9 Mar 2021 00:20:37 -0400 Subject: [PATCH 60/65] [kf5holidays] restore CRLF --- ports/kf5holidays/portfile.cmake | 70 ++++++++++++++++---------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/ports/kf5holidays/portfile.cmake b/ports/kf5holidays/portfile.cmake index aeb174dd3262a6..22899a21b09a0c 100644 --- a/ports/kf5holidays/portfile.cmake +++ b/ports/kf5holidays/portfile.cmake @@ -1,35 +1,35 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/kholidays - REF v5.75.0 - SHA512 16b62a7e8fc664075cf787a7ae811bdb7f27b11f10619001994e1aa0c89e46bdb1c932091f6fcdcc3bad91614eeb9606a9b6aef62cec5e4a557a0c107e32d816 - 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/KF5Holidays) -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}/etc) -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 ) - -file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kholidays + REF v5.75.0 + SHA512 16b62a7e8fc664075cf787a7ae811bdb7f27b11f10619001994e1aa0c89e46bdb1c932091f6fcdcc3bad91614eeb9606a9b6aef62cec5e4a557a0c107e32d816 + 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/KF5Holidays) +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}/etc) +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 ) + +file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) From d10df4eaef5afb755f44e11bcc4cfa7dcc712d6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 9 Mar 2021 00:21:33 -0400 Subject: [PATCH 61/65] [kf5archive] restore CRLF --- ports/kf5archive/portfile.cmake | 62 ++++++++++++++++----------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/ports/kf5archive/portfile.cmake b/ports/kf5archive/portfile.cmake index 544324858e2db9..1b97f8ddecfbfc 100644 --- a/ports/kf5archive/portfile.cmake +++ b/ports/kf5archive/portfile.cmake @@ -1,32 +1,32 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/karchive - REF v5.75.0 - SHA512 4a909626f776cc9ebf9acd0e16bcda9e2e0e5dd29bd52b27140baa9905758a028f542ccd40e98c5432a4d9eac2908e36e1f9329e40cc4cf835e15557c96175f1 - 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/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}/etc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) - +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/karchive + REF v5.75.0 + SHA512 4a909626f776cc9ebf9acd0e16bcda9e2e0e5dd29bd52b27140baa9905758a028f542ccd40e98c5432a4d9eac2908e36e1f9329e40cc4cf835e15557c96175f1 + 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/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}/etc) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file From b144c5d11caef6168bda2e39f914c26d7b53d79d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 9 Mar 2021 00:43:39 -0400 Subject: [PATCH 62/65] [kf5syntaxhighlighting] syntax formatting --- ports/kf5syntaxhighlighting/portfile.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/kf5syntaxhighlighting/portfile.cmake b/ports/kf5syntaxhighlighting/portfile.cmake index 62f01059b02319..14e6fc87379429 100644 --- a/ports/kf5syntaxhighlighting/portfile.cmake +++ b/ports/kf5syntaxhighlighting/portfile.cmake @@ -16,9 +16,9 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF - -DBUILD_TESTING=OFF + -DBUILD_MAN_DOCS=OFF + -DBUILD_QTHELP_DOCS=OFF + -DBUILD_TESTING=OFF ) vcpkg_install_cmake(ADD_BIN_TO_PATH) From 5b7e011f8268122aea15d77bee4c3cffbdee32c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 9 Mar 2021 00:44:30 -0400 Subject: [PATCH 63/65] [kf5syntaxhighlighting] quotations --- ports/kf5syntaxhighlighting/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5syntaxhighlighting/portfile.cmake b/ports/kf5syntaxhighlighting/portfile.cmake index 14e6fc87379429..662309c308aacb 100644 --- a/ports/kf5syntaxhighlighting/portfile.cmake +++ b/ports/kf5syntaxhighlighting/portfile.cmake @@ -32,6 +32,6 @@ elseif(VCPKG_TARGET_IS_WINDOWS) endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) From 514fe8652860e473960a19c607b57e2b9b030f33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 9 Mar 2021 01:02:22 -0400 Subject: [PATCH 64/65] [kf5syntaxhighlighting] fix \bin removal redundancy --- ports/kf5syntaxhighlighting/portfile.cmake | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ports/kf5syntaxhighlighting/portfile.cmake b/ports/kf5syntaxhighlighting/portfile.cmake index 662309c308aacb..4b4fbc9910200b 100644 --- a/ports/kf5syntaxhighlighting/portfile.cmake +++ b/ports/kf5syntaxhighlighting/portfile.cmake @@ -25,12 +25,7 @@ vcpkg_install_cmake(ADD_BIN_TO_PATH) vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5SyntaxHighlighting) vcpkg_copy_pdbs() -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/kate-syntax-highlighter.exe" "${CURRENT_PACKAGES_DIR}/debug/bin/kate-syntax-highlighter.exe") -endif() - +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") From bd31fe6abe89fa150eeef1f9bf095ea5443eb077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 9 Mar 2021 01:04:38 -0400 Subject: [PATCH 65/65] [kf5*] update versions --- versions/e-/ecm.json | 2 +- versions/k-/kf5archive.json | 2 +- versions/k-/kf5holidays.json | 2 +- versions/k-/kf5syntaxhighlighting.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/versions/e-/ecm.json b/versions/e-/ecm.json index ce1a01b1e158a0..c8e3dfa110ef90 100644 --- a/versions/e-/ecm.json +++ b/versions/e-/ecm.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "65bc28c3908b39a4996ca0a7bca10b2c93e3a5cb", + "git-tree": "ae79be3c1aec28736e6df3b1c9e6973ac6d3c33b", "version": "5.75.0", "port-version": 0 }, diff --git a/versions/k-/kf5archive.json b/versions/k-/kf5archive.json index ef5185f0433518..2ddeca6167ae93 100644 --- a/versions/k-/kf5archive.json +++ b/versions/k-/kf5archive.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d3c3ffce0c459dd73d6a36599fc24a8f28c22b32", + "git-tree": "4c427a520895326ea450337eb531cb8ed5c7be30", "version": "5.75.0", "port-version": 0 }, diff --git a/versions/k-/kf5holidays.json b/versions/k-/kf5holidays.json index 02b81b2a70a97b..ed4f322e1058aa 100644 --- a/versions/k-/kf5holidays.json +++ b/versions/k-/kf5holidays.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b97da73c3466daf4ca6561def1847db8f9f9f0bc", + "git-tree": "18dd0b493b905446080c4060b086e2e8ad653613", "version": "5.75.0", "port-version": 0 }, diff --git a/versions/k-/kf5syntaxhighlighting.json b/versions/k-/kf5syntaxhighlighting.json index cb264535e3a508..0e91a08d8031ec 100644 --- a/versions/k-/kf5syntaxhighlighting.json +++ b/versions/k-/kf5syntaxhighlighting.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b1124e941814f1508924b762ef923a92f98767e4", + "git-tree": "b58bac6d264e3a74e6347874a5c550b4e3edbbce", "version": "5.75.0", "port-version": 0 },