From dd05e79a979f1002b2ecd63c003c7de646510925 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 2 Jan 2025 11:31:36 -0800 Subject: [PATCH] [thor] Deindex. This port: * Blocks updating SFML to version 3 * Has been archived upstream since April 2022 * Is unpopular Replaces https://github.com/microsoft/vcpkg/pull/43016 --- ports/thor/fix-dependency-sfml.patch | 13 ------ ports/thor/portfile.cmake | 64 ---------------------------- ports/thor/vcpkg.json | 15 ------- versions/baseline.json | 4 -- 4 files changed, 96 deletions(-) delete mode 100644 ports/thor/fix-dependency-sfml.patch delete mode 100644 ports/thor/portfile.cmake delete mode 100644 ports/thor/vcpkg.json diff --git a/ports/thor/fix-dependency-sfml.patch b/ports/thor/fix-dependency-sfml.patch deleted file mode 100644 index 2ebe6f219c2fca..00000000000000 --- a/ports/thor/fix-dependency-sfml.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 352fea9..01c1695 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -111,7 +111,7 @@ endif() - if(NOT THOR_SHARED_LIBS) - set(SFML_STATIC_LIBRARIES TRUE) - endif() --find_package(SFML 2.5 COMPONENTS audio graphics window system REQUIRED) -+find_package(SFML COMPONENTS audio graphics window system CONFIG REQUIRED) - - if(NOT SFML_FOUND) - set(SFML_DIR "" CACHE PATH "SFML top-level directory") diff --git a/ports/thor/portfile.cmake b/ports/thor/portfile.cmake deleted file mode 100644 index 780c42dfcbf883..00000000000000 --- a/ports/thor/portfile.cmake +++ /dev/null @@ -1,64 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Bromeon/Thor - REF 3e320cb52606f0b44fd9d2bb272b3cb6d01d7f20 - SHA512 de5eeee0f3f7142ffa1fcb7694cf157a65e95af4ad22e3dc7eaa199b98c9fa2dc0dd0635d057c9ba8601a22a6b36ef7d4d420a09ade1c77360c3a6582534f12b - HEAD_REF master - PATCHES - fix-dependency-sfml.patch -) -file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindSFML.cmake") - -file(REMOVE_RECURSE "${SOURCE_PATH}/extlibs") -file(COPY "${CURRENT_INSTALLED_DIR}/include/Aurora" DESTINATION "${SOURCE_PATH}/extlibs/aurora/include") -file(WRITE "${SOURCE_PATH}/extlibs/aurora/License.txt") - -string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" THOR_STATIC_STD_LIBS) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" THOR_SHARED_LIBS) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DTHOR_SHARED_LIBS=${THOR_SHARED_LIBS} - -DTHOR_STATIC_STD_LIBS=${THOR_STATIC_STD_LIBS} - MAYBE_UNUSED_VARIABLES - THOR_STATIC_STD_LIBS # Only on Windows -) - -vcpkg_cmake_install() - -vcpkg_copy_pdbs() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Thor/Config.hpp" - "defined(SFML_STATIC)" "1" - ) -else() - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Thor/Config.hpp" - "defined(SFML_STATIC)" "0" - ) -endif() - -file(GLOB LICENSE - "${CURRENT_PACKAGES_DIR}/debug/LicenseThor.txt" - "${CURRENT_PACKAGES_DIR}/debug/LicenseAurora.txt" - "${CURRENT_PACKAGES_DIR}/LicenseThor.txt" - "${CURRENT_PACKAGES_DIR}/LicenseAurora.txt" -) - -if(LICENSE) - file(REMOVE ${LICENSE}) -endif() - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/include/Aurora" - "${CURRENT_PACKAGES_DIR}/cmake" - "${CURRENT_PACKAGES_DIR}/debug/cmake" -) - -if(NOT VCPKG_TARGET_IS_WINDOWS) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -endif() - -file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/thor/vcpkg.json b/ports/thor/vcpkg.json deleted file mode 100644 index e00041eb925199..00000000000000 --- a/ports/thor/vcpkg.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "thor", - "version-date": "2022-04-16", - "description": "Extends the multimedia library SFML with higher-level features", - "homepage": "https://bromeon.ch/libraries/thor/", - "license": "Zlib", - "dependencies": [ - "aurora", - "sfml", - { - "name": "vcpkg-cmake", - "host": true - } - ] -} diff --git a/versions/baseline.json b/versions/baseline.json index 99aa2f6c86ab25..ba98608a77f26e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8932,10 +8932,6 @@ "baseline": "2023-01-16", "port-version": 2 }, - "thor": { - "baseline": "2022-04-16", - "port-version": 0 - }, "thorvg": { "baseline": "0.15.6", "port-version": 0