[neon/neon-packaging/kdsoap/Neon/unstable] debian/patches: clean up patch
Carlos De Maine
null at kde.org
Fri Jul 14 16:05:47 BST 2023
Git commit 7c59925e3bf18d587da32474b0d45a87a9a484b7 by Carlos De Maine.
Committed on 14/07/2023 at 15:05.
Pushed by carlosdem into branch 'Neon/unstable'.
clean up patch
M +1 -60 debian/patches/dual_headers.patch
https://invent.kde.org/neon/neon-packaging/kdsoap/-/commit/7c59925e3bf18d587da32474b0d45a87a9a484b7
diff --git a/debian/patches/dual_headers.patch b/debian/patches/dual_headers.patch
index 3a923e2..be57d30 100644
--- a/debian/patches/dual_headers.patch
+++ b/debian/patches/dual_headers.patch
@@ -1,12 +1,3 @@
-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/4] allow dual headers
-
----
- src/KDSoapClient/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
diff --git a/src/KDSoapClient/CMakeLists.txt b/src/KDSoapClient/CMakeLists.txt
index b81ed4ae..4ecbb1ef 100644
--- a/src/KDSoapClient/CMakeLists.txt
@@ -21,19 +12,6 @@ index b81ed4ae..4ecbb1ef 100644
install(
-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/4] allow dual headers
-
----
- src/KDSoapServer/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-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
@@ -44,44 +22,6 @@ index a4a0e812..2e145b02 100644
install(
-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/4] allow dual headers
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 489af811..c029891c 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"
-
-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
@@ -91,6 +31,7 @@ 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"
More information about the Neon-commits
mailing list