[neon/neon-packaging/digikam/Neon/release] debian/patches: patch out comilation error until 8.4 release

[Carlos De Maine]

Git commit 2f4772bbd121cbf43d1ea85bae8a2b1fd8fa41f6 by Carlos De Maine.
Committed on 02/07/2024 at 22:39.
Pushed by carlosdem into branch 'Neon/release'.

patch out comilation error until 8.4 release

(cherry picked from commit 119e7f9bc66761fa1320635f64d4c2702f9f03d6)

A  +80   -0    debian/patches/fix_upnp_cpp17.diff
A  +1    -0    debian/patches/series

https://invent.kde.org/neon/neon-packaging/digikam/-/commit/2f4772bbd121cbf43d1ea85bae8a2b1fd8fa41f6

diff --git a/debian/patches/fix_upnp_cpp17.diff b/debian/patches/fix_upnp_cpp17.diff
new file mode 100644
index 0000000..708bf8a
--- /dev/null
+++ b/debian/patches/fix_upnp_cpp17.diff
@@ -0,0 +1,80 @@
+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/NEWS b/NEWS
+index 98ba4dcffae4573c8ee22003165c80673e1c6042..0eecc8bdb7bb596c87f95ac1eb190a2485040276 100644
+--- a/NEWS
++++ b/NEWS
+@@ -67,8 +67,8 @@ BUGFIXES:
+ 044 ==> 485157 - Filter for Color or Pick Labels can not be activated.
+ 045 ==> 485282 - Customizing "Open with" 'command' no more available in Digikam git version.
+ 046 ==> 485246 - Main photo view shows original and all versions of edited photos even when the corresponding settings are disabled.
+-047 ==> 
+-048 ==> 
++047 ==> 484946 - FTBFS with Qt 6.7.
++048 ==> 485131 - Compilation failed with Qt 6.7.0.
+ 049 ==> 
+ 050 ==> 
+ 051 ==> 
+
+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
new file mode 100644
index 0000000..77ba7c9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_upnp_cpp17.diff
\ No newline at end of file