From 4c1f5cffebf3aa79e6511a70282b76e706d24cc3 Mon Sep 17 00:00:00 2001 From: SunBlack Date: Tue, 4 Aug 2026 17:34:02 +0200 Subject: [PATCH] [libdatrie] Update to 0.2.14 (#53172) Co-authored-by: Billy Robert O'Neal III Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- ports/libdatrie/portfile.cmake | 10 ++++------ ports/libdatrie/usage | 24 +++++++++++------------- ports/libdatrie/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libdatrie.json | 5 +++++ 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ports/libdatrie/portfile.cmake b/ports/libdatrie/portfile.cmake index 76e8804601..0e8cf9f689 100644 --- a/ports/libdatrie/portfile.cmake +++ b/ports/libdatrie/portfile.cmake @@ -1,10 +1,8 @@ -set(LIBDATRIE_VERSION 0.2.13) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tlwg/libdatrie - REF v${LIBDATRIE_VERSION} - SHA512 38f5a3ee1f3ca0f0601a5fcfeec3892cb34857d4b4720b8e018ca1beb6520c4c10af3bd2f0e4d64367cb256e8e2bca4d0a59b1c81fb36782613d2c258b64df59 + REF "v${VERSION}" + SHA512 293c04a80d767b7fc7762f5ec1d8b7dd9bfff8bce2267120de320c5c06bbc7e371dc3385f3f7f4a505ddf159bcfc58d1b721a9d662f1012e1d5e4f73e1e976a7 HEAD_REF master PATCHES fix-exports.patch @@ -21,7 +19,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DVERSION=${LIBDATRIE_VERSION} + -DVERSION=${VERSION} ${FEATURE_OPTIONS} OPTIONS_DEBUG -DSKIP_TOOL=ON @@ -37,4 +35,4 @@ if(NOT SKIP_TOOL) endif() file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libdatrie/usage b/ports/libdatrie/usage index e63cedeeda..f9fe2606dc 100644 --- a/ports/libdatrie/usage +++ b/ports/libdatrie/usage @@ -1,13 +1,11 @@ -The package libdatrie can be used via CMake: - - find_path(LIBDATRIE_INCLUDE_DIR datrie/trie.h) - find_library(LIBDATRIE_LIBRARY NAMES datrie) - target_include_directories(main PRIVATE "${LIBDATRIE_INCLUDE_DIR}") - target_link_libraries(main PRIVATE "${LIBDATRIE_LIBRARY}") - -The package libdatrie can be imported via CMake FindPkgConfig module: - - find_package(PkgConfig) - pkg_check_modules(LIBDATRIE REQUIRED IMPORTED_TARGET datrie-0.2) - - target_link_libraries(main PRIVATE PkgConfig::LIBDATRIE) +libdatrie can be used via CMake: + + find_path(LIBDATRIE_INCLUDE_DIR datrie/trie.h) + find_library(LIBDATRIE_LIBRARY NAMES datrie) + target_include_directories(main PRIVATE "${LIBDATRIE_INCLUDE_DIR}") + target_link_libraries(main PRIVATE "${LIBDATRIE_LIBRARY}") + +libdatrie provides pkg-config modules: + + # Double-array trie library + datrie-0.2 diff --git a/ports/libdatrie/vcpkg.json b/ports/libdatrie/vcpkg.json index e143b035f9..6b2eeaa2b2 100644 --- a/ports/libdatrie/vcpkg.json +++ b/ports/libdatrie/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libdatrie", - "version": "0.2.13", - "port-version": 1, + "version": "0.2.14", "description": "Implementation of double-array structure for representing trie", "homepage": "https://linux.thai.net/pub/ThaiLinux/software/libthai", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 1ad310b70a..39a0297a71 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4921,8 +4921,8 @@ "port-version": 0 }, "libdatrie": { - "baseline": "0.2.13", - "port-version": 1 + "baseline": "0.2.14", + "port-version": 0 }, "libdc1394": { "baseline": "2.2.7", diff --git a/versions/l-/libdatrie.json b/versions/l-/libdatrie.json index 14fe147508..225e505657 100644 --- a/versions/l-/libdatrie.json +++ b/versions/l-/libdatrie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c4ffc70e3f6d9a11b34b83a4c6535b9aedf6dd9", + "version": "0.2.14", + "port-version": 0 + }, { "git-tree": "60d1568dadc94ddb1b894b33a8da7b20802a96e8", "version": "0.2.13",