Bug#1058849: linphone: diff for NMU version 5.2.0-4.1

[Boyuan Yang]

Control: tags 1058849 + patch
Control: tags 1058849 + pending

Dear maintainer,

I've prepared an NMU for linphone (versioned as 5.2.0-4.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer or cancel it.

Regards.

diff -Nru linphone-5.2.0/debian/changelog linphone-5.2.0/debian/changelog
--- linphone-5.2.0/debian/changelog	2023-07-29 16:10:37.000000000 -0400
+++ linphone-5.2.0/debian/changelog	2023-12-17 11:31:05.000000000 -0500
@@ -1,3 +1,12 @@
+linphone (5.2.0-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches/use-cxx17-standard.patch: Build the whole project
+    with C++17 instead of C++14 due to new requirement from zxing-cpp
+    headers. (Closes: #1058849)
+
+ -- Boyuan Yang <byang at debian.org>  Sun, 17 Dec 2023 11:31:05 -0500
+
 linphone (5.2.0-4) unstable; urgency=medium
 
   * Release to unstable.
diff -Nru linphone-5.2.0/debian/patches/series linphone-
5.2.0/debian/patches/series
--- linphone-5.2.0/debian/patches/series	2023-07-29 16:10:37.000000000
-0400
+++ linphone-5.2.0/debian/patches/series	2023-12-17 11:30:43.000000000
-0500
@@ -1,4 +1,3 @@
-#desktop-file-keywords
 fix-jsoncpp-include-path.patch
 fix-jsoncpp-linker-flag.patch
 ldap-hostname-override.patch
@@ -16,3 +15,4 @@
 fix-ldap-abandon.patch
 fix-L_STRING_TO_C-inlining-errors.patch
 bc-b52e8f62-build-with-gcc13.patch
+use-cxx17-standard.patch
diff -Nru linphone-5.2.0/debian/patches/use-cxx17-standard.patch linphone-
5.2.0/debian/patches/use-cxx17-standard.patch
--- linphone-5.2.0/debian/patches/use-cxx17-standard.patch	1969-12-31
19:00:00.000000000 -0500
+++ linphone-5.2.0/debian/patches/use-cxx17-standard.patch	2023-12-17
11:30:20.000000000 -0500
@@ -0,0 +1,25 @@
+From: Boyuan Yang <byang at debian.org>
+Date: Sun, 17 Dec 2023 11:29:16 -0500
+Subject: Use C++17 Standard
+
+New zxing-cpp header uses C++17 features. This requires building
+the project with C++17 instead of C++14.
+
+Bug-Debian: https://bugs.debian.org/1058849
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b3060af..c846dc7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -93,7 +93,7 @@ cmake_dependent_option(ENABLE_QRCODE "Enable QRCode
support" YES "ENABLE_VIDEO"
+ # * DISABLE_BC_PACKAGE_SEARCH: skip find_package() for every BC package
(bctoolbox, ortp, etc.)
+ # * DISABLE_SOCI_PACKAGE_SEARCH: skip find_package() for Soci.
+ 
+-set(CMAKE_CXX_STANDARD 14)
++set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_EXTENSIONS NO)
+ 
+ if(NOT CMAKE_BUILD_TYPE)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part
URL: <http://alioth-lists.debian.net/pipermail/pkg-voip-maintainers/attachments/20231217/d2aaee13/attachment.sig>