From e9435ccc15d72d6238b529c1f5d5c5e505ba4f29 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Fri, 22 Dec 2023 21:47:59 +0100
Subject: [PATCH] [kealib] Update to 1.5.3 (#35819)

---
 ports/kealib/kealib-target.diff | 43 ---------------------------------
 ports/kealib/portfile.cmake     |  6 ++---
 ports/kealib/usage              |  4 +--
 ports/kealib/vcpkg.json         |  4 +--
 versions/baseline.json          |  4 +--
 versions/k-/kealib.json         |  5 ++++
 6 files changed, 14 insertions(+), 52 deletions(-)
 delete mode 100644 ports/kealib/kealib-target.diff

diff --git a/ports/kealib/kealib-target.diff b/ports/kealib/kealib-target.diff
deleted file mode 100644
index d89095f208..0000000000
--- a/ports/kealib/kealib-target.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index a9b19fe..3ab09c1 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -54,21 +54,8 @@ set_target_properties(${LIBKEA_LIB_NAME}
- )
- 
- add_library(Kealib INTERFACE)
--target_include_directories(Kealib INTERFACE
--  $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
--  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
--  $<INSTALL_INTERFACE:include>
--)
--# TODO: a better way??
--if(MSVC)
--    target_link_libraries(Kealib INTERFACE 
--        $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/libkea${CMAKE_IMPORT_LIBRARY_SUFFIX}>
--        $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/lib/libkea${CMAKE_IMPORT_LIBRARY_SUFFIX}>)
--else()
--    target_link_libraries(Kealib INTERFACE 
--        $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/libkea${CMAKE_SHARED_LIBRARY_SUFFIX}>
--        $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/lib/libkea${CMAKE_SHARED_LIBRARY_SUFFIX}>)
--endif(MSVC)
-+target_include_directories(Kealib INTERFACE $<INSTALL_INTERFACE:include>)
-+target_link_libraries(Kealib INTERFACE ${LIBKEA_LIB_NAME})
- ###############################################################################
- 
- ###############################################################################
-diff --git a/src/Config.cmake.in b/src/Config.cmake.in
-index 7de44f9..8a7bb8c 100644
---- a/src/Config.cmake.in
-+++ b/src/Config.cmake.in
-@@ -1,5 +1,10 @@
- @PACKAGE_INIT@
- 
-+# FindHDF5.cmake may expose exported targets in HDF5_LIBRARIES.
-+include(CMakeFindDependencyMacro)
-+set(HDF5_USE_STATIC_LIBRARIES "@HDF5_USE_STATIC_LIBRARIES@")
-+find_dependency(HDF5)
-+
- include("${CMAKE_CURRENT_LIST_DIR}/libkeaTargets.cmake")
- 
- check_required_components(libkea)
diff --git a/ports/kealib/portfile.cmake b/ports/kealib/portfile.cmake
index 5f2a2a5df0..3367edf923 100644
--- a/ports/kealib/portfile.cmake
+++ b/ports/kealib/portfile.cmake
@@ -2,10 +2,9 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ubarsc/kealib
     REF "kealib-${VERSION}"
-    SHA512 82399f1332ff2aeb6342732e9e5c897c813109fd18e77cfc8d866f06adf4faa7f080f1f3c0a3b777fb3a679912dacf4851b7ad09a338d6087dd1d26eb2d1689f
+    SHA512 ccaaf9d5031eac32bf1a0e6b9e9efb4f5245fc730d33bd9931efb1a6f529990c6da8ddd400ec0d58ee527675057b74c81393d263c9b182ac5f9a8796273b001f
     HEAD_REF master
     PATCHES
-        kealib-target.diff
         no-kea-config-script.diff
 )
 
@@ -18,7 +17,8 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libkea PACKAGE_NAME libkea)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libkea PACKAGE_NAME libkea DO_NOT_DELETE_PARENT_CONFIG_PATH)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Kealib)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
diff --git a/ports/kealib/usage b/ports/kealib/usage
index 9b42e9f066..b8a1ab4430 100644
--- a/ports/kealib/usage
+++ b/ports/kealib/usage
@@ -1,4 +1,4 @@
 kealib provides CMake targets:
 
-  find_package(libkea CONFIG REQUIRED)
-  target_link_libraries(main PRIVATE libkea::Kealib)
+  find_package(Kealib CONFIG REQUIRED)
+  target_link_libraries(main PRIVATE Kealib::Kealib)
diff --git a/ports/kealib/vcpkg.json b/ports/kealib/vcpkg.json
index 6ca70a322f..7e324a5a2c 100644
--- a/ports/kealib/vcpkg.json
+++ b/ports/kealib/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "kealib",
-  "version": "1.5.2",
-  "port-version": 1,
+  "version": "1.5.3",
   "description": "KEALib provides an implementation of the GDAL data model using HDF5.",
   "homepage": "https://github.com/ubarsc/kealib",
+  "license": "MIT",
   "dependencies": [
     {
       "name": "hdf5",
diff --git a/versions/baseline.json b/versions/baseline.json
index d4a5e35e5f..0479679977 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3745,8 +3745,8 @@
       "port-version": 0
     },
     "kealib": {
-      "baseline": "1.5.2",
-      "port-version": 1
+      "baseline": "1.5.3",
+      "port-version": 0
     },
     "keccak-tiny": {
       "baseline": "2014-09-08",
diff --git a/versions/k-/kealib.json b/versions/k-/kealib.json
index 1772d8b07a..76481aac79 100644
--- a/versions/k-/kealib.json
+++ b/versions/k-/kealib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "56a7c2f40ce5bb8f1674cf676d80c20a32e32d14",
+      "version": "1.5.3",
+      "port-version": 0
+    },
     {
       "git-tree": "a32984c499e3b89d71c221916c41d59cf8cb1834",
       "version": "1.5.2",