$ git diff --patch-with-stat --summary 52a909f8421daa3e0f04fd03985564587c97bb85..9f23f1f37a9531ac6e15df7ae4d873e2103f3a9f
.abf.yml | 2 +-
linphone-4.4.24-cmake-config-location.patch | 26 -------------------
linphone-4.4.24-dont_check_bctools_version.patch | 18 -------------
linphone-4.4.24-fix-pkgconfig.patch | 33 ------------------------
linphone-5.1.45-fix-pkgconfig.patch | 33 ------------------------
linphone-5.1.45-port_to_python_3.11.patch | 11 --------
linphone-5.2.23-force-cpp17-standard.patch | 11 ++++++++
linphone.spec | 13 ++++++----
8 files changed, 20 insertions(+), 127 deletions(-)
delete mode 100644 linphone-4.4.24-cmake-config-location.patch
delete mode 100644 linphone-4.4.24-dont_check_bctools_version.patch
delete mode 100644 linphone-4.4.24-fix-pkgconfig.patch
delete mode 100644 linphone-5.1.45-fix-pkgconfig.patch
delete mode 100644 linphone-5.1.45-port_to_python_3.11.patch
create mode 100644 linphone-5.2.23-force-cpp17-standard.patch
diff --git a/.abf.yml b/.abf.yml
index 88cf9a0..004a693 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- liblinphone-5.2.12.tar.bz2: 74058d898cb80589d662c8c4875d2106f9cc9560
+ liblinphone-5.2.40.tar.bz2: 0602696e7e154772ba4ebb26c409f53bbdce60bd
diff --git a/linphone-4.4.24-cmake-config-location.patch b/linphone-4.4.24-cmake-config-location.patch
deleted file mode 100644
index a641beb..0000000
--- a/linphone-4.4.24-cmake-config-location.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -397,7 +397,7 @@
- endif()
-
- include(CMakePackageConfigHelpers)
--set(CONFIG_PACKAGE_LOCATION "${CMAKE_INSTALL_DATADIR}/Linphone/cmake")
-+set(CONFIG_PACKAGE_LOCATION "${CMAKE_INSTALL_DATADIR}/cmake/Linphone")
-
- write_basic_package_version_file(
- "${CMAKE_CURRENT_BINARY_DIR}/LinphoneConfigVersion.cmake"
---- a/wrappers/cpp/CMakeLists.txt
-+++ b/wrappers/cpp/CMakeLists.txt
-@@ -98,10 +98,10 @@
-
- install(EXPORT LinphoneCxxTargets
- FILE LinphoneCxxTargets.cmake
-- DESTINATION "${CMAKE_INSTALL_DATADIR}/LinphoneCxx/cmake"
-+ DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/LinphoneCxx"
- )
- install(FILES
- "${CMAKE_CURRENT_BINARY_DIR}/LinphoneCxxConfig.cmake"
- "${CMAKE_CURRENT_BINARY_DIR}/LinphoneCxxVersion.cmake"
-- DESTINATION "${CMAKE_INSTALL_DATADIR}/LinphoneCxx/cmake"
-+ DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/LinphoneCxx"
- )
diff --git a/linphone-4.4.24-dont_check_bctools_version.patch b/linphone-4.4.24-dont_check_bctools_version.patch
deleted file mode 100644
index dca4080..0000000
--- a/linphone-4.4.24-dont_check_bctools_version.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -118,11 +118,11 @@
- find_package(BelleSIP CONFIG REQUIRED)
- find_package(Mediastreamer2 CONFIG REQUIRED)
- find_package(ortp CONFIG REQUIRED)
--find_package(bctoolbox 0.0.3 CONFIG REQUIRED OPTIONAL_COMPONENTS tester)
-+find_package(bctoolbox CONFIG REQUIRED OPTIONAL_COMPONENTS tester)
- find_package(belr CONFIG REQUIRED)
-
- # the version shuold be defined here because bctoolbox is required
--bc_compute_lib_version(LIB_VERSION "4.4.0")
-+bc_compute_lib_version(LIB_VERSION "4.4.0" "4.4.0")
- project(linphone VERSION ${LIB_VERSION})
-
- set(LINPHONE_MAJOR_VERSION ${PROJECT_VERSION_MAJOR})
-
-
diff --git a/linphone-4.4.24-fix-pkgconfig.patch b/linphone-4.4.24-fix-pkgconfig.patch
deleted file mode 100644
index 814d083..0000000
--- a/linphone-4.4.24-fix-pkgconfig.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/share/CMakeLists.txt
-+++ b/share/CMakeLists.txt
-@@ -25,6 +25,16 @@
- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
- )
-
-+
-+set(LINPHONE_CFLAGS ${LINPHONE_CPPFLAGS})
-+set(LINPHONE_LIBS ${LINPHONE_LDFLAGS})
-+set(prefix ${CMAKE_INSTALL_PREFIX})
-+set(exec_prefix ${prefix}/libexec)
-+set(libdir ${CMAKE_INSTALL_LIBDIR})
-+set(includedir ${prefix}/include)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/linphone.pc.in ${CMAKE_CURRENT_BINARY_DIR}/linphone.pc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/linphone.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-+
- set(GRAMMAR_FILES
- cpim_grammar
- identity_grammar
---- a/share/linphone.pc.in
-+++ b/share/linphone.pc.in
-@@ -3,9 +3,9 @@
- libdir=@libdir@
- includedir=@includedir@
-
--Requires: mediastreamer ortp bctoolbox
-+Requires: mediastreamer belle-sip bctoolbox
- Name: liblinphone
- Description: All in one linphone libs.
--Version: @VERSION@
-+Version: @LINPHONE_VERSION@
- Libs: @LINPHONE_LIBS@
- Cflags: @LINPHONE_CFLAGS@
diff --git a/linphone-5.1.45-fix-pkgconfig.patch b/linphone-5.1.45-fix-pkgconfig.patch
deleted file mode 100644
index 982d043..0000000
--- a/linphone-5.1.45-fix-pkgconfig.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/share/CMakeLists.txt
-+++ b/share/CMakeLists.txt
-@@ -25,6 +25,16 @@
- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
- )
-
-+
-+set(LINPHONE_CFLAGS ${LINPHONE_CPPFLAGS})
-+set(LINPHONE_LIBS ${LINPHONE_LDFLAGS})
-+set(prefix ${CMAKE_INSTALL_PREFIX})
-+set(exec_prefix ${prefix}/libexec)
-+set(libdir ${CMAKE_INSTALL_LIBDIR})
-+set(includedir ${prefix}/include)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/linphone.pc.in ${CMAKE_CURRENT_BINARY_DIR}/linphone.pc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/linphone.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-+
- set(GRAMMAR_FILES
- cpim_grammar
- ics_grammar
---- a/share/linphone.pc.in
-+++ b/share/linphone.pc.in
-@@ -3,9 +3,9 @@
- libdir=@libdir@
- includedir=@includedir@
-
--Requires: mediastreamer ortp bctoolbox
-+Requires: mediastreamer belle-sip bctoolbox
- Name: liblinphone
- Description: All in one linphone libs.
--Version: @VERSION@
-+Version: @LINPHONE_VERSION@
- Libs: @LINPHONE_LIBS@
- Cflags: @LINPHONE_CFLAGS@
diff --git a/linphone-5.1.45-port_to_python_3.11.patch b/linphone-5.1.45-port_to_python_3.11.patch
deleted file mode 100644
index c30ac0e..0000000
--- a/linphone-5.1.45-port_to_python_3.11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/wrappers/cpp/genwrapper.py
-+++ b/wrappers/cpp/genwrapper.py
-@@ -493,7 +493,7 @@
- content = ''
- with open(tmppath, mode='w') as f:
- f.write(self.renderer.render(item))
-- with open(tmppath, mode='rU') as f:
-+ with open(tmppath, mode='r') as f:
- content = f.read()
- with open(path, mode='w') as f:
- f.write(content)
diff --git a/linphone-5.2.23-force-cpp17-standard.patch b/linphone-5.2.23-force-cpp17-standard.patch
new file mode 100644
index 0000000..10adee3
--- /dev/null
+++ b/linphone-5.2.23-force-cpp17-standard.patch
@@ -0,0 +1,11 @@
+--- a/src/xml/generate.py
++++ b/src/xml/generate.py
+@@ -51,7 +51,7 @@
+ "--generate-ostream",
+ "--generate-detach",
+ "--generate-polymorphic",
+- "--std", "c++11",
++ "--std", "c++17",
+ "--type-naming", "java",
+ "--function-naming", "java",
+ "--hxx-suffix", ".h",
diff --git a/linphone.spec b/linphone.spec
index 74dba10..f7d8702 100644
--- a/linphone.spec
+++ b/linphone.spec
@@ -8,13 +8,15 @@
%bcond_without db
%bcond_with ldap
%bcond_without notify
+# (mandian) qrcode support requires c++17 standard enabled
+%bcond_with qrcode_support
%bcond_with static
%bcond_with strict
%bcond_with tests
Summary: Voice over IP Application
Name: linphone
-Version: 5.2.12
+Version: 5.2.40
Release: 1
License: GPLv2+
Group: Communications
@@ -28,8 +30,11 @@ Patch3: linphone-4.4.24-fix_xds_version.patch
Patch4: linphone-5.0.44-dont_check_bctools_version.patch
Patch5: linphone-5.1.61-fix_compiler_strict-prototypes_warinig.patch
Patch6: linphone-5.1.61-fix_clang.patch
+# required by zxing-cpp
+#Patch7: linphone-5.2.23-force-cpp17-standard.patch
# (upstream)
-Patch7: linphone-5.2.0-use_shared_libs.patch
+Patch10: linphone-5.2.0-use_shared_libs.patch
+
BuildRequires: cmake
BuildRequires: ninja
@@ -160,7 +165,6 @@ Libraries and includes files for developing programs based on %{name}.
%prep
%autosetup -p1 -n lib%{name}-%{version}
-#find '(' -name '*.c' -o -name '*.h' ')' -print0 | xargs -0 sed -i -e 's,\r$,,'
%build
%cmake \
@@ -173,8 +177,7 @@ Libraries and includes files for developing programs based on %{name}.
-DENABLE_LDAP:BOOL=%{?with_ldap:ON}%{?!without_ldap:OFF} \
-DENABLE_ASSISTANT:BOOL=%{?with_assistant:ON}%{?!without_assistant:OFF} \
-DENABLE_NOTIFY:BOOL=%{?with_notify:ON}%{?!without_notify:OFF} \
- -DENABLE_BUILD_VERBOSE:BOOL=OFF \
- -DENABLE_DEBUG_LOGS:BOOOL=%{?with_debug:ON}%{?!without_debug:OFF} \
+ -DENABLE_QRCODE:BOOL=%{?with_qrcode_support:ON}%{?!without_qrcode_support:OFF} \
-G Ninja
%ninja_build