[neon/neon-packaging/digikam/Neon/stable_jammy] debian/patches: patch unneccessary on master

[Carlos De Maine]

Git commit 717a1260ad91510923ec461015bcab2dfee9f41f by Carlos De Maine.
Committed on 02/07/2024 at 23:16.
Pushed by carlosdem into branch 'Neon/stable_jammy'.

patch unneccessary on master

(cherry picked from commit e6b0dbd626bca282e650b99e25bc7937fba121ec)

Co-authored-by: Carlos De Maine <carlosdemaine at gmail.com>

D  +0    -64   debian/patches/fix_upnp_cpp17.diff
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/neon-packaging/digikam/-/commit/717a1260ad91510923ec461015bcab2dfee9f41f

diff --git a/debian/patches/fix_upnp_cpp17.diff b/debian/patches/fix_upnp_cpp17.diff
deleted file mode 100644
index f7731f8..0000000
--- a/debian/patches/fix_upnp_cpp17.diff
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2c3f0538860ffa989e26a7bf7cce717a47dc1611..a2380f63e2b17678b58e794ef809f4f0b3dec8bc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -55,7 +55,7 @@ project(digikam
-         LANGUAGES CXX C)
- 
- # Settings from ECM
--set(CMAKE_CXX_STANDARD          17)
-+set(CMAKE_CXX_STANDARD          20)
- set(CMAKE_CXX_STANDARD_REQUIRED ON)
- set(CMAKE_CXX_EXTENSIONS        OFF)
-
-diff --git a/core/dplugins/generic/tools/mediaserver/CMakeLists.txt b/core/dplugins/generic/tools/mediaserver/CMakeLists.txt
-index 54d1961cef81ed3f6df4ce8f590a6887bf42682d..633b687347f3902763acb78b877903bb0013c440 100644
---- a/core/dplugins/generic/tools/mediaserver/CMakeLists.txt
-+++ b/core/dplugins/generic/tools/mediaserver/CMakeLists.txt
-@@ -160,7 +160,9 @@ endif()
- file(GLOB_RECURSE upnpsdk_headers ${CMAKE_CURRENT_SOURCE_DIR}/upnpsdk/*.h)
- 
- foreach(_file ${upnpsdk_headers})
-+
-     set_property(SOURCE ${_file} PROPERTY SKIP_AUTOMOC ON)
-+
- endforeach()
- 
- set(libmediaserver_SRCS
-@@ -173,6 +175,7 @@ set(libmediaserver_SRCS
- 
- # For Unit-tests and plugin
- add_library(mediaserverbackend STATIC ${libmediaserver_SRCS})
-+set_property(TARGET mediaserverbackend PROPERTY CXX_STANDARD 17)
- 
- if(MSVC)
- 
-@@ -191,12 +194,14 @@ target_link_libraries(mediaserverbackend
- )
- 
- if(WIN32)
-+
-     target_link_libraries(mediaserverbackend
-                           PRIVATE
-                           # Defined in RulesWindows.cmake
-                           ${WSOCK32_LIBRARY}
-                           ${WS2_32_LIBRARY}
-     )
-+
- endif()
- 
- # ---------------------------------------------------------------------------------------------------
-
-diff --git a/core/tests/mediaserver/CMakeLists.txt b/core/tests/mediaserver/CMakeLists.txt
-index e4e3ba080d544b0eced337da2814d6c0927de327..1b8ee6800480da7fb104f71880684585d7c8231a 100644
---- a/core/tests/mediaserver/CMakeLists.txt
-+++ b/core/tests/mediaserver/CMakeLists.txt
-@@ -30,6 +30,8 @@ add_executable(filemediaserver_cli
-                ${CMAKE_SOURCE_DIR}/core/dplugins/generic/tools/mediaserver/upnpsdk/Platinum/Source/Tests/FileMediaServer/FileMediaServerTest.cpp
- )
- 
-+set_property(TARGET filemediaserver_cli PROPERTY CXX_STANDARD 17)
-+
- target_link_libraries(filemediaserver_cli
- 
-                       digikamcore
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 77ba7c9..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_upnp_cpp17.diff
\ No newline at end of file