From ed202616edd14cfef848f476b8e9e4871e256c7b Mon Sep 17 00:00:00 2001 From: toge Date: Thu, 1 Jan 2026 01:10:23 +0900 Subject: [PATCH] [wt] update to 4.12.1 (#48337) --- ports/wt/0006-GraphicsMagick.patch | 18 ++++++++++-------- ports/wt/portfile.cmake | 7 +++++-- ports/wt/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/w-/wt.json | 5 +++++ 5 files changed, 22 insertions(+), 12 deletions(-) diff --git a/ports/wt/0006-GraphicsMagick.patch b/ports/wt/0006-GraphicsMagick.patch index 03ea0689c0..a4ebc11341 100644 --- a/ports/wt/0006-GraphicsMagick.patch +++ b/ports/wt/0006-GraphicsMagick.patch @@ -1,10 +1,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 96eff0a..c31fd49 100644 +index 7466193..5826718 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -352,9 +356,9 @@ SET(WT_WRASTERIMAGE_IMPLEMENTATION ${WT_WRASTERIMAGE_DEFAULT_IMPLEMENTATION} CAC +@@ -374,9 +374,9 @@ SET(WT_WRASTERIMAGE_IMPLEMENTATION ${WT_WRASTERIMAGE_DEFAULT_IMPLEMENTATION} CAC SET_PROPERTY(CACHE WT_WRASTERIMAGE_IMPLEMENTATION PROPERTY STRINGS GraphicsMagick Direct2D none) - + IF (${WT_WRASTERIMAGE_IMPLEMENTATION} STREQUAL "GraphicsMagick") - IF (NOT GM_FOUND) + IF (0) @@ -15,17 +15,19 @@ index 96eff0a..c31fd49 100644 ELSEIF (${WT_WRASTERIMAGE_IMPLEMENTATION} STREQUAL "Direct2D") IF (WIN32) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 4bc0e5d..eb52234 100644 +index f22e7eb..6565e9e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -637,8 +637,8 @@ else() +@@ -663,8 +663,10 @@ else() endif() - + IF("${WT_WRASTERIMAGE_IMPLEMENTATION}" STREQUAL "GraphicsMagick") - TARGET_LINK_LIBRARIES(wt PRIVATE ${GM_LIBRARIES}) - INCLUDE_DIRECTORIES(${GM_INCLUDE_DIRS}) -+ find_package(unofficial-graphicsmagick REQUIRED) -+ TARGET_LINK_LIBRARIES(wt PRIVATE unofficial::graphicsmagick::graphicsmagick) ++ find_package(PkgConfig) ++ pkg_check_modules(GRAPHICSMAGICK REQUIRED GraphicsMagick) ++ target_include_directories(wt PRIVATE ${GRAPHICSMAGICK_INCLUDE_DIRS}) ++ target_link_libraries(wt PRIVATE ${GRAPHICSMAGICK_LINK_LIBRARIES}) ADD_DEFINITIONS(-DHAVE_GRAPHICSMAGICK) ELSEIF("${WT_WRASTERIMAGE_IMPLEMENTATION}" STREQUAL "Direct2D") TARGET_LINK_LIBRARIES(wt PRIVATE d2d1 dwrite windowscodecs shlwapi) diff --git a/ports/wt/portfile.cmake b/ports/wt/portfile.cmake index 4075e8909e..dd60db829d 100644 --- a/ports/wt/portfile.cmake +++ b/ports/wt/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO emweb/wt REF "${VERSION}" - SHA512 89754567b823105de694ee1c2f6e8cecd0b6c1231531f2b791ff95f29039567273329ac9ecc612a96e44232cf80371e947a7a424903c2be8e8c14d0d7260e4d5 + SHA512 5e0f8f5a7ca88822fbfd142571fb5a6482ed8e75d8c962819feff0d3441ef2dcfaa17b78865c4200de5c8da584b79da37f4b6e6a488e0d65735a2069ccb9de2c HEAD_REF master PATCHES 0005-XML_file_path.patch @@ -11,6 +11,9 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIBS) +vcpkg_find_acquire_program(PKGCONFIG) +set(ENV{PKG_CONFIG} "${PKGCONFIG}") + vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -74,7 +77,7 @@ vcpkg_cmake_configure( # see https://redmine.webtoolkit.eu/issues/9646 -DWTHTTP_CONFIGURATION= -DCONFIGURATION= - + "-DUSERLIB_PREFIX=${CURRENT_INSTALLED_DIR}" MAYBE_UNUSED_VARIABLES USE_SYSTEM_SQLITE3 diff --git a/ports/wt/vcpkg.json b/ports/wt/vcpkg.json index aff4711946..39ff624d6a 100644 --- a/ports/wt/vcpkg.json +++ b/ports/wt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wt", - "version": "4.12.0", + "version": "4.12.1", "description": "Wt is a C++ library for developing web applications", "homepage": "https://github.com/emweb/wt", "license": "GPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index 844bc4bf6d..38cbbb2b38 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -10605,7 +10605,7 @@ "port-version": 0 }, "wt": { - "baseline": "4.12.0", + "baseline": "4.12.1", "port-version": 0 }, "wtl": { diff --git a/versions/w-/wt.json b/versions/w-/wt.json index f7b5ae2ce4..9559ea7611 100644 --- a/versions/w-/wt.json +++ b/versions/w-/wt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f3bb1d5df5750aa6f518109e039a2892cb75315", + "version": "4.12.1", + "port-version": 0 + }, { "git-tree": "a3890aea6e4fea89d6fd92006a96fbe7fe7ac57f", "version": "4.12.0",