From ed885a16348a9862ffa0baf61d69e096c4da6793 Mon Sep 17 00:00:00 2001
From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com>
Date: Fri, 29 Mar 2024 03:41:45 +0800
Subject: [PATCH] [sdbus-cpp] update to 1.5.0 (#37775)

---
 ports/sdbus-cpp/pic.patch      | 14 --------------
 ports/sdbus-cpp/portfile.cmake |  4 +---
 ports/sdbus-cpp/vcpkg.json     |  3 +--
 versions/baseline.json         |  4 ++--
 versions/s-/sdbus-cpp.json     |  5 +++++
 5 files changed, 9 insertions(+), 21 deletions(-)
 delete mode 100644 ports/sdbus-cpp/pic.patch

diff --git a/ports/sdbus-cpp/pic.patch b/ports/sdbus-cpp/pic.patch
deleted file mode 100644
index 3b2c06c45c..0000000000
--- a/ports/sdbus-cpp/pic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7332b23..822a594 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -130,7 +130,7 @@ target_compile_definitions(sdbus-c++-objlib PRIVATE
- target_include_directories(sdbus-c++-objlib PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-                                                    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>)
--if(DEFINED BUILD_SHARED_LIBS)
-+if(BUILD_SHARED_LIBS)
--    set_target_properties(sdbus-c++-objlib PROPERTIES POSITION_INDEPENDENT_CODE ${BUILD_SHARED_LIBS})
-+    set_target_properties(sdbus-c++-objlib PROPERTIES POSITION_INDEPENDENT_CODE ON)
- endif()
- if(BUILD_LIBSYSTEMD)
-     add_dependencies(sdbus-c++-objlib LibsystemdBuildProject)
diff --git a/ports/sdbus-cpp/portfile.cmake b/ports/sdbus-cpp/portfile.cmake
index d561f9eb77..270c63d974 100644
--- a/ports/sdbus-cpp/portfile.cmake
+++ b/ports/sdbus-cpp/portfile.cmake
@@ -4,9 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Kistler-Group/sdbus-cpp
     REF "v${VERSION}"
-    SHA512 8f4cb9ae88b1ec0db0bcc27e131fcb9ad8a8bc88e39721b3b73f63e057bae4cd36619894e25114ccddb1a8e6c21db2f80adcabb3263ff5d8b34b72af7563afe2
-    PATCHES
-        pic.patch # can be dropped once https://github.com/Kistler-Group/sdbus-cpp/pull/361 is merged+released
+    SHA512 08dd88f59049c1d0760677561c1a441698e8a154143197e78721ac3ba144ae58f0ad856ca3a718e37d91cd8c83bfdd3bef90d83436adc529c68441283a2a7fbd
 )
 
 
diff --git a/ports/sdbus-cpp/vcpkg.json b/ports/sdbus-cpp/vcpkg.json
index 10b4b06528..a2ac244cb1 100644
--- a/ports/sdbus-cpp/vcpkg.json
+++ b/ports/sdbus-cpp/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "sdbus-cpp",
-  "version": "1.3.0",
-  "port-version": 1,
+  "version": "1.5.0",
   "description": "High-level C++ D-Bus library for Linux designed to provide easy-to-use yet powerful API in modern C++",
   "homepage": "https://github.com/Kistler-Group/sdbus-cpp",
   "license": "LGPL-2.1",
diff --git a/versions/baseline.json b/versions/baseline.json
index 7015569a26..0f2dac553c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7873,8 +7873,8 @@
       "port-version": 3
     },
     "sdbus-cpp": {
-      "baseline": "1.3.0",
-      "port-version": 1
+      "baseline": "1.5.0",
+      "port-version": 0
     },
     "sdformat10": {
       "baseline": "10.0.0",
diff --git a/versions/s-/sdbus-cpp.json b/versions/s-/sdbus-cpp.json
index b069067cc5..3639dea7bc 100644
--- a/versions/s-/sdbus-cpp.json
+++ b/versions/s-/sdbus-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8c914d7e0e5a7ffa13a5059721bdd9bbb95be9e8",
+      "version": "1.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "31c0a3bedc3ced9d4ffdeb92b241546f13b9a1fc",
       "version": "1.3.0",