From 9dd6ebbc4120158f6e839973e356aebccbcb4e6f Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Fri, 1 Nov 2019 16:47:50 -0700 Subject: [PATCH] Update current KF5 libs to version 5.64.0 --- ports/ecm/CONTROL | 2 +- ports/ecm/portfile.cmake | 4 ++-- ports/kf5archive/CONTROL | 4 ++-- ports/kf5archive/portfile.cmake | 4 ++-- ports/kf5holidays/CONTROL | 4 ++-- ports/kf5holidays/portfile.cmake | 4 ++-- ports/kf5plotting/CONTROL | 4 ++-- ports/kf5plotting/portfile.cmake | 6 ++++-- 8 files changed, 17 insertions(+), 15 deletions(-) diff --git a/ports/ecm/CONTROL b/ports/ecm/CONTROL index 058c8815d5b..2078afd0880 100644 --- a/ports/ecm/CONTROL +++ b/ports/ecm/CONTROL @@ -1,4 +1,4 @@ Source: ecm -Version: 5.60.0-2 +Version: 5.64.0-1 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 26dbd2b22d6..4729a1a47a5 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 v5.60.0 - SHA512 98c7cbb0a84fbd4806cdf84538cb16717cbbb13fa5cce5c4bf9a507a699c579fa6f88af5091b3d311bdd504a119d6147114b2fad5de2dfd5f18448bca60cdc92 + REF v5.64.0 + SHA512 849718414912051b7b25bf0787448c03f94afc61d240cdec2b83ea181899d4784361492cab01927e68452798e98b964215e56689fd9e43f608a31d239cdbd7f2 HEAD_REF master ) diff --git a/ports/kf5archive/CONTROL b/ports/kf5archive/CONTROL index 94216747107..29e641a8f70 100644 --- a/ports/kf5archive/CONTROL +++ b/ports/kf5archive/CONTROL @@ -1,4 +1,4 @@ Source: kf5archive -Version: 5.58.0 +Version: 5.64.0 Description: File compression -Build-Depends: ecm, qt5-base, zlib, bzip2 \ No newline at end of file +Build-Depends: ecm, qt5-base, zlib, bzip2 diff --git a/ports/kf5archive/portfile.cmake b/ports/kf5archive/portfile.cmake index 4e028695f19..6f0f626fd3d 100644 --- a/ports/kf5archive/portfile.cmake +++ b/ports/kf5archive/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/karchive - REF v5.58.0 - SHA512 8ac1ff25db7e27881cbea640744639a087a8fc87251337bca5c557b3ef3ec2b3490d3d1f2caf8fc22e0671dad1945e9263a59d22e4d1c395bd3b422cbb7ad1de + REF v5.64.0 + SHA512 006cd9117eec02e1471b3b0082ee5f21161dc9c52855b6e4be7f3f3614bde9e22a3392f4a90be23654b648a003761bfa70a5497974577da43807eaf56fa126ba HEAD_REF master ) diff --git a/ports/kf5holidays/CONTROL b/ports/kf5holidays/CONTROL index 7110145aa31..0221e7177d1 100644 --- a/ports/kf5holidays/CONTROL +++ b/ports/kf5holidays/CONTROL @@ -1,4 +1,4 @@ Source: kf5holidays -Version: 5.58.0 +Version: 5.64.0 Description: Holiday calculation library -Build-Depends: ecm, qt5-base, qt5-declarative, qt5-tools \ No newline at end of file +Build-Depends: ecm, qt5-base, qt5-tools diff --git a/ports/kf5holidays/portfile.cmake b/ports/kf5holidays/portfile.cmake index 64209c5cb5b..d39ffee5a0a 100644 --- a/ports/kf5holidays/portfile.cmake +++ b/ports/kf5holidays/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kholidays - REF v5.58.0 - SHA512 1451603816617eef7e37c67085d12f34ce2e4b10db97220222450c9a7c5dc3200479718b86ea39b279bab93651790a8c70941ac1280458de7864ca04f9cf6471 + REF v5.64.0 + SHA512 a4d9a88bb12b89c636ac63d848505c7895c672ef0e540e7fa45de22fb085048fa5f76729be60fceafbe63ab4b325251fdc65f36b58ab6d9bae7f50678578d4c8 HEAD_REF master ) diff --git a/ports/kf5plotting/CONTROL b/ports/kf5plotting/CONTROL index 0b75bd8c1c5..ede11f24cee 100644 --- a/ports/kf5plotting/CONTROL +++ b/ports/kf5plotting/CONTROL @@ -1,5 +1,5 @@ Source: kf5plotting -Version: 5.58.0 +Version: 5.64.0 Homepage: https://api.kde.org/frameworks/kplotting/html/index.html Description: Lightweight plotting framework -Build-Depends: ecm, qt5-base +Build-Depends: ecm, qt5-base, qt5-tools diff --git a/ports/kf5plotting/portfile.cmake b/ports/kf5plotting/portfile.cmake index a5a4e1d467c..20732c29ca1 100644 --- a/ports/kf5plotting/portfile.cmake +++ b/ports/kf5plotting/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kplotting - REF v5.58.0 - SHA512 4d2fd69bad6c3117084811453bd32fdd92d1f1df89dba489e6109caad9268107d908e0df6f3e35a460878aa32fe4744173cf96ff292858d657c49582ee1674fc + REF v5.64.0 + SHA512 831b26a5e85a8baa1d49405e1358c7cda62b0a643e85b9677e2ceee413938fd03b96ff2c060dc2e0fa012da0a45452f32b734633ec4c99eecbf9d6228ff722b4 HEAD_REF master ) @@ -22,4 +22,6 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Plotting) 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)