diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b55397cde7d4b3..24151ab9fe503c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,7 +56,7 @@ jobs: qt5-script qt5-svg qt5-translations - qtkeychain-qt5 + qtkeychain rubberband soundtouch taglib diff --git a/overlay/ports/qtkeychain-qt5/portfile.cmake b/overlay/ports/qtkeychain-qt5/portfile.cmake deleted file mode 100644 index 75c462236be0bf..00000000000000 --- a/overlay/ports/qtkeychain-qt5/portfile.cmake +++ /dev/null @@ -1,38 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO frankosterfeld/qtkeychain - REF v0.12.0 - SHA512 ad8f7b3e8f59894a09892aeb78118f5ed93aa4593eece782c1879a4f3c37d9d63e8d40ad4b2e6a2e286e0da39f45cd4ed46181a1a05c078a59134114b2456a03 - HEAD_REF master -) - -list(APPEND QTKEYCHAIN_OPTIONS -DBUILD_TEST_APPLICATION:BOOL=OFF) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - list(APPEND QTKEYCHAIN_OPTIONS -DQTKEYCHAIN_STATIC:BOOL=ON) -else() - list(APPEND QTKEYCHAIN_OPTIONS -DQTKEYCHAIN_STATIC:BOOL=OFF) -endif() - -if (CMAKE_HOST_WIN32) - list(APPEND QTKEYCHAIN_OPTIONS -DBUILD_TRANSLATIONS:BOOL=OFF) -else() - list(APPEND QTKEYCHAIN_OPTIONS -DBUILD_TRANSLATIONS:BOOL=ON) -endif() - -vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS -DBUILD_WITH_QT6=OFF ${QTKEYCHAIN_OPTIONS} -) -vcpkg_cmake_install() - -vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Qt5Keychain PACKAGE_NAME Qt5Keychain) - -# Remove unneeded dirs -file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share -) - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/overlay/ports/qtkeychain-qt5/vcpkg.json b/overlay/ports/qtkeychain-qt5/vcpkg.json deleted file mode 100644 index b79c03eeb60a25..00000000000000 --- a/overlay/ports/qtkeychain-qt5/vcpkg.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "qtkeychain-qt5", - "version-string": "0.12.0", - "description": "qtkeychain - Platform-independent Qt API for storing passwords securely, built with Qt5", - "homepage": "https://github.com/frankosterfeld/qtkeychain", - "dependencies": [ - "qt5-tools", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/overlay/ports/qtkeychain/cmakeconfig.patch b/overlay/ports/qtkeychain/cmakeconfig.patch deleted file mode 100644 index 1bbd9673b7a263..00000000000000 --- a/overlay/ports/qtkeychain/cmakeconfig.patch +++ /dev/null @@ -1,33 +0,0 @@ -commit ae1f9a479001d519d209d19da1b9319bf4d05a28 -Author: Nicolas Fella -Date: Fri Feb 5 15:19:16 2021 +0100 - - Fix QtKeyChainConfig when building against Qt6 - - 6 isn't 5 and thus the resulting QtKeyChainConfig would look for Qt4. - - Since Qt4 was dropped we can simplify the code. - -diff --git a/QtKeychainConfig.cmake.in b/QtKeychainConfig.cmake.in -index 26a8ca6..0c7779d 100644 ---- a/QtKeychainConfig.cmake.in -+++ b/QtKeychainConfig.cmake.in -@@ -9,14 +9,10 @@ include("${CMAKE_CURRENT_LIST_DIR}/Qt@QTKEYCHAIN_VERSION_INFIX@KeychainLibraryDe - - include(CMakeFindDependencyMacro) - --if("@QTKEYCHAIN_VERSION_INFIX@" STREQUAL "5") -- find_dependency(Qt5Core) -- -- if(UNIX AND NOT APPLE) -- find_dependency(Qt5DBus) -- endif() --else() -- find_dependency(Qt4 COMPONENTS QtCore) -+find_dependency(Qt@QTKEYCHAIN_VERSION_INFIX@Core) -+ -+if(UNIX AND NOT APPLE) -+ find_dependency(Qt@QTKEYCHAIN_VERSION_INFIX@DBus) - endif() - - set(QTKEYCHAIN_LIBRARIES "@QTKEYCHAIN_TARGET_NAME@") diff --git a/overlay/ports/qtkeychain/portfile.cmake b/overlay/ports/qtkeychain/portfile.cmake deleted file mode 100644 index ef07cf18afa707..00000000000000 --- a/overlay/ports/qtkeychain/portfile.cmake +++ /dev/null @@ -1,50 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO frankosterfeld/qtkeychain - REF v0.12.0 - SHA512 ad8f7b3e8f59894a09892aeb78118f5ed93aa4593eece782c1879a4f3c37d9d63e8d40ad4b2e6a2e286e0da39f45cd4ed46181a1a05c078a59134114b2456a03 - HEAD_REF master - PATCHES cmakeconfig.patch -) - -if(VCPKG_CROSSCOMPILING) - list(APPEND QTKEYCHAIN_OPTIONS -DQT_HOST_PATH=${CURRENT_HOST_INSTALLED_DIR}) - list(APPEND QTKEYCHAIN_OPTIONS -DQT_HOST_PATH_CMAKE_DIR:PATH=${CURRENT_HOST_INSTALLED_DIR}/share) - # remove when https://github.com/microsoft/vcpkg/pull/16111 is merged - if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 AND VCPKG_TARGET_IS_WINDOWS) - list(APPEND QTKEYCHAIN_OPTIONS -DCMAKE_CROSSCOMPILING=ON -DCMAKE_SYSTEM_PROCESSOR:STRING=ARM64 -DCMAKE_SYSTEM_NAME:STRING=Windows) - endif() -endif() - -list(APPEND QTKEYCHAIN_OPTIONS -DBUILD_TEST_APPLICATION:BOOL=OFF) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - list(APPEND QTKEYCHAIN_OPTIONS -DQTKEYCHAIN_STATIC:BOOL=ON) -else() - list(APPEND QTKEYCHAIN_OPTIONS -DQTKEYCHAIN_STATIC:BOOL=OFF) -endif() - -if (CMAKE_HOST_WIN32) - list(APPEND QTKEYCHAIN_OPTIONS -DBUILD_TRANSLATIONS:BOOL=OFF) -else() - list(APPEND QTKEYCHAIN_OPTIONS -DBUILD_TRANSLATIONS:BOOL=ON) -endif() - -vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS -DBUILD_WITH_QT6=ON - -DBUILD_TRANSLATIONS=OFF - ${QTKEYCHAIN_OPTIONS} -) -vcpkg_cmake_install() - -vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Qt6Keychain PACKAGE_NAME Qt6Keychain) - -# Remove unneeded dirs -file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share -) - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/overlay/ports/qtkeychain/vcpkg.json b/overlay/ports/qtkeychain/vcpkg.json deleted file mode 100644 index effde8083568e5..00000000000000 --- a/overlay/ports/qtkeychain/vcpkg.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "qtkeychain", - "version-string": "0.12.0", - "description": "qtkeychain - Platform-independent Qt API for storing passwords securely", - "homepage": "https://github.com/frankosterfeld/qtkeychain", - "dependencies": [ - "qttools", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -}