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

[Carlos De Maine]

Git commit 7a92b45e704db31bf2d813355fd6a64a45e57efa by Carlos De Maine.
Committed on 16/07/2023 at 10:29.
Pushed by carlosdem into branch 'Neon/unstable'.

new patch

M  +2    -50   debian/patches/dual_headers.diff

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

diff --git a/debian/patches/dual_headers.diff b/debian/patches/dual_headers.diff
index 5572516..9a56f6f 100644
--- a/debian/patches/dual_headers.diff
+++ b/debian/patches/dual_headers.diff
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 489af811..f206f24c 100644
+index 489af811..22efb0cc 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -207,7 +207,7 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
@@ -11,15 +11,6 @@ index 489af811..f206f24c 100644
  
      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
@@ -32,43 +23,4 @@ index 0bdf5fca..716ffb97 100644
 +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)
-diff --git a/src/KDSoapClient/CMakeLists.txt b/src/KDSoapClient/CMakeLists.txt
-index b81ed4ae..4ecbb1ef 100644
---- a/src/KDSoapClient/CMakeLists.txt
-+++ b/src/KDSoapClient/CMakeLists.txt
-@@ -107,7 +107,7 @@ if(KDSoap_IS_ROOT_PROJECT)
-               KDSoapEndpointReference.h
-               KDQName.h
-               KDSoapUdpClient.h
--        DESTINATION ${INSTALL_INCLUDE_DIR}/KDSoapClient
-+        DESTINATION "${INSTALL_INCLUDE_DIR}/KDSoap${${PROJECT_NAME}_LIBRARY_QTID}/KDSoapClient"
-     )
- 
-     install(
-diff --git a/src/KDSoapServer/CMakeLists.txt b/src/KDSoapServer/CMakeLists.txt
-index a4a0e812..2e145b02 100644
---- a/src/KDSoapServer/CMakeLists.txt
-+++ b/src/KDSoapServer/CMakeLists.txt
-@@ -88,7 +88,7 @@ if(KDSoap_IS_ROOT_PROJECT)
-               KDSoapServerObjectInterface.h
-               KDSoapServerGlobal.h
-               KDSoapThreadPool.h
--        DESTINATION ${INSTALL_INCLUDE_DIR}/KDSoapServer
-+        DESTINATION "${INSTALL_INCLUDE_DIR}/KDSoap${${PROJECT_NAME}_LIBRARY_QTID}/KDSoapServer"
-     )
- 
-     install(
\ No newline at end of file
+ include("${CMAKE_CURRENT_LIST_DIR}/KDSoapMacros.cmake")
\ No newline at end of file