[neon/neon-packaging/kdsoap/Neon/release-lts] debian/patches: throw away patches

Harald Sitter null at kde.org
Fri Oct 2 10:11:00 BST 2020


Git commit 44696b73b58af620874090617b654c0a1718089e by Harald Sitter.
Committed on 02/10/2020 at 09:09.
Pushed by sitter into branch 'Neon/release-lts'.

throw away patches

none of these should be applicable

specifically the soversion was duplicated by winterz upstream recently.
and the arm hack should have become unnecessary as I believe the culprit there
was a bug in the compiler

D  +0    -10   debian/patches/01-missing_qt5xml_library.patch
D  +0    -26   debian/patches/02-soversion.patch
D  +0    -10   debian/patches/03-testtools_link_qt_libs.patch
D  +0    -14   debian/patches/neon_fails_on_arm.diff
D  +0    -2    debian/patches/series

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

diff --git a/debian/patches/01-missing_qt5xml_library.patch b/debian/patches/01-missing_qt5xml_library.patch
deleted file mode 100644
index 87a730f..0000000
--- a/debian/patches/01-missing_qt5xml_library.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -48,6 +48,7 @@
- 
- if(Qt5Core_FOUND)
-   find_package(Qt5Network REQUIRED)
-+  find_package(Qt5Xml REQUIRED)
-   set(QT_LIBRARIES Qt5::Core)
-   set(QT_USE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Qt5Portability.cmake")
- 
diff --git a/debian/patches/02-soversion.patch b/debian/patches/02-soversion.patch
deleted file mode 100644
index 1c6727e..0000000
--- a/debian/patches/02-soversion.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: kdsoap-1.9.0/src/KDSoapClient/CMakeLists.txt
-===================================================================
---- kdsoap-1.9.0.orig/src/KDSoapClient/CMakeLists.txt
-+++ kdsoap-1.9.0/src/KDSoapClient/CMakeLists.txt
-@@ -34,7 +34,7 @@ set(SOURCES
- 
- add_library(kdsoap ${KDSoap_LIBRARY_MODE} ${SOURCES})
- target_link_libraries(kdsoap ${QT_LIBRARIES})
--set_target_properties(kdsoap PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})
-+set_target_properties(kdsoap PROPERTIES VERSION ${${PROJECT_NAME}_VERSION} SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR})
- target_include_directories(kdsoap INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDE_DIR}>")
- 
- # append d to debug libraries for windows builds
-Index: kdsoap-1.9.0/src/KDSoapServer/CMakeLists.txt
-===================================================================
---- kdsoap-1.9.0.orig/src/KDSoapServer/CMakeLists.txt
-+++ kdsoap-1.9.0/src/KDSoapServer/CMakeLists.txt
-@@ -29,7 +29,7 @@ set(SOURCES
- set_source_files_properties(KDSoapServerObjectInterface.cpp PROPERTIES SKIP_AUTOMOC TRUE)
- add_library(kdsoap-server ${KDSoap_LIBRARY_MODE} ${SOURCES})
- target_link_libraries(kdsoap-server kdsoap ${QT_LIBRARIES})
--set_target_properties(kdsoap-server PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})
-+set_target_properties(kdsoap-server PROPERTIES VERSION ${${PROJECT_NAME}_VERSION} SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR})
- target_include_directories(kdsoap-server INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDE_DIR}>")
- 
- # append d to debug libraries for windows builds
diff --git a/debian/patches/03-testtools_link_qt_libs.patch b/debian/patches/03-testtools_link_qt_libs.patch
deleted file mode 100644
index 0063719..0000000
--- a/debian/patches/03-testtools_link_qt_libs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/testtools/CMakeLists.txt
-+++ b/testtools/CMakeLists.txt
-@@ -10,6 +10,7 @@
- qt4_add_resources(testtools_srcs testtools.qrc)
- 
- add_library(testtools STATIC ${testtools_srcs})
-+target_link_libraries(testtools ${QT_LIBRARIES})
- if(Qt5_POSITION_INDEPENDENT_CODE)
-   set_target_properties(testtools PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
- endif()
diff --git a/debian/patches/neon_fails_on_arm.diff b/debian/patches/neon_fails_on_arm.diff
deleted file mode 100644
index c1c46d7..0000000
--- a/debian/patches/neon_fails_on_arm.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: kdsoap-1.9.0/examples/CMakeLists.txt
-===================================================================
---- kdsoap-1.9.0.orig/examples/CMakeLists.txt
-+++ kdsoap-1.9.0/examples/CMakeLists.txt
-@@ -9,9 +9,3 @@ endif()
- 
- include(../KDSoapMacros.cmake)
- include_directories(../src/ ../src/KDSoapClient/ ../src/KDSoapServer/)
--if(Qt5Widgets_FOUND)
--  add_subdirectory(helloworld_client)
--  add_subdirectory(helloworld_server)
--  add_subdirectory(bank_gui)
--endif()
--add_subdirectory(bank_wsdl)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 8d7a6e8..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-neon_fails_on_arm.diff
-02-soversion.patch


More information about the Neon-commits mailing list