[neon/neon-packaging/kdsoap/Neon/unstable] debian/patches: update patch

[Carlos De Maine]

Git commit c315778b937d179393f4043cd88705852b766d70 by Carlos De Maine.
Committed on 14/07/2023 at 14:56.
Pushed by carlosdem into branch 'Neon/unstable'.

update patch

M  +64   -4    debian/patches/dual_headers.patch

https://invent.kde.org/neon/neon-packaging/kdsoap/-/commit/c315778b937d179393f4043cd88705852b766d70

diff --git a/debian/patches/dual_headers.patch b/debian/patches/dual_headers.patch
index 2bd96b5..3a923e2 100644
--- a/debian/patches/dual_headers.patch
+++ b/debian/patches/dual_headers.patch
@@ -1,7 +1,7 @@
 From 0b9e9a4ef46895c5fcaf1685ea330c2fc38f0e49 Mon Sep 17 00:00:00 2001
 From: carlosd <60242467+carlosdem at users.noreply.github.com>
 Date: Fri, 14 Jul 2023 23:22:58 +1000
-Subject: [PATCH 1/3] allow dual headers
+Subject: [PATCH 1/4] allow dual headers
 
 ---
  src/KDSoapClient/CMakeLists.txt | 2 +-
@@ -24,7 +24,7 @@ index b81ed4ae..4ecbb1ef 100644
 From 4df6c29bf97337d6ae54cbe8b07433571851e42f Mon Sep 17 00:00:00 2001
 From: carlosd <60242467+carlosdem at users.noreply.github.com>
 Date: Fri, 14 Jul 2023 23:23:36 +1000
-Subject: [PATCH 2/3] allow dual headers
+Subject: [PATCH 2/4] allow dual headers
 
 ---
  src/KDSoapServer/CMakeLists.txt | 2 +-
@@ -47,7 +47,7 @@ index a4a0e812..2e145b02 100644
 From 4f44b6cad5b49e47fb224746ec21f92af3c20e4d Mon Sep 17 00:00:00 2001
 From: carlosd <60242467+carlosdem at users.noreply.github.com>
 Date: Fri, 14 Jul 2023 23:47:58 +1000
-Subject: [PATCH 3/3] allow dual headers
+Subject: [PATCH 3/4] allow dual headers
 
 ---
  CMakeLists.txt | 2 +-
@@ -65,4 +65,64 @@ index 489af811..c029891c 100644
 +    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/kdsoap_version.h" DESTINATION ${INSTALL_INCLUDE_DIR}/KDSoap${${PROJECT_NAME}_LIBRARY_QTID}/KDSoapClient)
  
      configure_file(
-         "${CMAKE_CURRENT_SOURCE_DIR}/KDSoapConfig-buildtree.cmake.in"
\ No newline at end of file
+         "${CMAKE_CURRENT_SOURCE_DIR}/KDSoapConfig-buildtree.cmake.in"
+
+From 9a19c73ad1bb6b4b9b90da2b2aaa2dfa19e25e39 Mon Sep 17 00:00:00 2001
+From: Carlos De Maine <carlosdemaine at gmail.com>
+Date: Sat, 15 Jul 2023 00:52:59 +1000
+Subject: [PATCH 4/4] allow dual headers
+
+---
+ CMakeLists.txt                  | 4 ++--
+ KDSoapConfig-buildtree.cmake.in | 2 +-
+ KDSoapConfig.cmake.in           | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 489af811..f206f24c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -207,7 +207,7 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
+         COMPATIBILITY
+         AnyNewerVersion
+     )
+-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/kdsoap_version.h" DESTINATION ${INSTALL_INCLUDE_DIR}/KDSoapClient)
++    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/kdsoap_version.h" DESTINATION "${INSTALL_INCLUDE_DIR}/KDSoap${${PROJECT_NAME}_LIBRARY_QTID}/KDSoapClient")
+ 
+     configure_file(
+         "${CMAKE_CURRENT_SOURCE_DIR}/KDSoapConfig-buildtree.cmake.in"
+@@ -221,7 +221,7 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
+         "${CMAKE_CURRENT_SOURCE_DIR}/KDSoapConfig.cmake.in"
+         "${CMAKE_CURRENT_BINARY_DIR}/install/KDSoap${${PROJECT_NAME}_LIBRARY_QTID}Config.cmake"
+         INSTALL_DESTINATION "${INSTALL_LIBRARY_DIR}/cmake/KDSoap${${PROJECT_NAME}_LIBRARY_QTID}"
+-        PATH_VARS INSTALL_INCLUDE_DIR
++        PATH_VARS "INSTALL_INCLUDE_DIR/KDSoap${${PROJECT_NAME}_LIBRARY_QTID}"
+     )
+ 
+     install(
+diff --git a/KDSoapConfig-buildtree.cmake.in b/KDSoapConfig-buildtree.cmake.in
+index 0bdf5fca..716ffb97 100644
+--- a/KDSoapConfig-buildtree.cmake.in
++++ b/KDSoapConfig-buildtree.cmake.in
+@@ -7,7 +7,7 @@
+ #
+ 
+ 
+-set(KDSoap_INCLUDE_DIRS "@INSTALL_INCLUDE_DIR@")
++set(KDSoap_INCLUDE_DIRS "@INSTALL_INCLUDE_DIR@/KDSoap${${PROJECT_NAME}_LIBRARY_QTID}")
+ 
+ include("${CMAKE_CURRENT_LIST_DIR}/KDSoapTargets.cmake")
+ include("${CMAKE_CURRENT_LIST_DIR}/KDSoapMacros.cmake")
+diff --git a/KDSoapConfig.cmake.in b/KDSoapConfig.cmake.in
+index d20649a4..229605b3 100644
+--- a/KDSoapConfig.cmake.in
++++ b/KDSoapConfig.cmake.in
+@@ -8,7 +8,7 @@
+ 
+ @PACKAGE_INIT@
+ 
+-set_and_check(KDSoap_INCLUDE_DIR "@PACKAGE_INSTALL_INCLUDE_DIR@")
++set_and_check(KDSoap_INCLUDE_DIR "@PACKAGE_INSTALL_INCLUDE_DIR at KDSoap${${PROJECT_NAME}_LIBRARY_QTID}")
+ 
+ set(KDSoap_INCLUDE_DIRS "${KDSoap_INCLUDE_DIR}")
+ set(KDSoap_CODEGENERATOR KDSoap::kdwsdl2cpp)
\ No newline at end of file