Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package linphone for openSUSE:Factory checked in at 2023-08-07 15:29:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linphone (Old) and /work/SRC/openSUSE:Factory/.linphone.new.22712 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linphone" Mon Aug 7 15:29:19 2023 rev:16 rq:1102633 version:5.2.75 Changes: -------- --- /work/SRC/openSUSE:Factory/linphone/linphone.changes 2023-05-27 20:38:15.198877704 +0200 +++ /work/SRC/openSUSE:Factory/.linphone.new.22712/linphone.changes 2023-08-07 15:29:40.340528139 +0200 @@ -1,0 +2,6 @@ +Wed Jul 12 06:09:29 UTC 2023 - Paolo Stivanin <[email protected]> + +- Update to 5.2.75 (no changelog). This fixes boo#1212956. +- Add set_current_version.patch. + +------------------------------------------------------------------- Old: ---- liblinphone-5.2.50.tar.bz2 New: ---- liblinphone-5.2.75.tar.bz2 set_current_version.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linphone.spec ++++++ --- /var/tmp/diff_new_pack.SBORCd/_old 2023-08-07 15:29:41.100532803 +0200 +++ /var/tmp/diff_new_pack.SBORCd/_new 2023-08-07 15:29:41.104532828 +0200 @@ -26,7 +26,7 @@ %endif %define sover 10 Name: linphone -Version: 5.2.50 +Version: 5.2.75 Release: 0 Summary: Web Phone License: AGPL-3.0-or-later @@ -45,6 +45,7 @@ Patch3: linphone-link-soci-sqlite3.patch # PATCH-FIX-OPENSUSE linphone-build-jsoncpp.patch -- use pkgconfig to find jsoncpp and link against jsoncpp, not jsoncpp_object Patch4: linphone-build-jsoncpp.patch +Patch5: set_current_version.patch BuildRequires: cmake BuildRequires: doxygen BuildRequires: fdupes @@ -75,11 +76,11 @@ BuildRequires: soci-sqlite3-devel BuildRequires: xsd BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(bctoolbox) >= 5.0.0 +BuildRequires: pkgconfig(bctoolbox) >= 5.2.73 BuildRequires: pkgconfig(belcard) >= 4.5.0 -BuildRequires: pkgconfig(belle-sip) >= 5.0.0 +BuildRequires: pkgconfig(belle-sip) >= 5.2.73 BuildRequires: pkgconfig(libavcodec) >= 51.0.0 -BuildRequires: pkgconfig(libbzrtp) >= 5.0.0 +BuildRequires: pkgconfig(libbzrtp) >= 5.2.73 BuildRequires: pkgconfig(libosip2) BuildRequires: pkgconfig(libsasl2) BuildRequires: pkgconfig(libswscale) >= 0.7.0 @@ -88,9 +89,9 @@ BuildRequires: pkgconfig(libupnp) BuildRequires: pkgconfig(libv4l2) >= 0.8.4 BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(mediastreamer) >= 5.0.0 +BuildRequires: pkgconfig(mediastreamer) >= 5.2.73 BuildRequires: pkgconfig(opus) -BuildRequires: pkgconfig(ortp) >= 5.0.0 +BuildRequires: pkgconfig(ortp) >= 5.2.73 BuildRequires: pkgconfig(speex) >= 1.1.6 BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(xerces-c) @@ -383,6 +384,6 @@ %{_libdir}/pkgconfig/%{name}.pc %{_datadir}/Linphone/ %{_datadir}/LinphoneCxx/ -%{_datadir}/doc/lib%{name}-5.2.0/ +%{_datadir}/doc/lib%{name}-%{version}/ %changelog ++++++ liblinphone-5.2.50.tar.bz2 -> liblinphone-5.2.75.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/linphone/liblinphone-5.2.50.tar.bz2 /work/SRC/openSUSE:Factory/.linphone.new.22712/liblinphone-5.2.75.tar.bz2 differ: char 11, line 1 ++++++ linphone-build-jsoncpp.patch ++++++ --- /var/tmp/diff_new_pack.SBORCd/_old 2023-08-07 15:29:41.160533171 +0200 +++ /var/tmp/diff_new_pack.SBORCd/_new 2023-08-07 15:29:41.164533196 +0200 @@ -1,34 +1,27 @@ -diff -Nraub liblinphone-5.0.22.ori/CMakeLists.txt liblinphone-5.0.22/CMakeLists.txt ---- liblinphone-5.0.22.ori/CMakeLists.txt 2021-09-09 23:33:57.000000000 -0400 -+++ liblinphone-5.0.22/CMakeLists.txt 2021-09-11 22:31:10.816277962 -0400 -@@ -207,7 +207,8 @@ +Index: liblinphone-5.2.75/CMakeLists.txt +=================================================================== +--- liblinphone-5.2.75.orig/CMakeLists.txt ++++ liblinphone-5.2.75/CMakeLists.txt +@@ -244,7 +244,8 @@ if(ENABLE_LDAP) endif() if (ENABLE_FLEXIAPI) - find_package(jsoncpp REQUIRED) -+ find_package(PkgConfig REQUIRED) -+ pkg_check_modules(JSONCPP REQUIRED jsoncpp) ++ find_package(PkgConfig REQUIRED) ++ pkg_check_modules(JSONCPP REQUIRED jsoncpp) set(HAVE_FLEXIAPI TRUE) endif() -diff -Nraub liblinphone-5.0.22.ori/src/CMakeLists.txt liblinphone-5.0.22/src/CMakeLists.txt ---- liblinphone-5.0.22.ori/src/CMakeLists.txt 2021-09-09 23:33:57.000000000 -0400 -+++ liblinphone-5.0.22/src/CMakeLists.txt 2021-09-11 22:29:46.614904584 -0400 -@@ -589,7 +589,7 @@ - if (XCODE) - target_link_libraries(linphone PRIVATE jsoncpp_static) +Index: liblinphone-5.2.75/src/CMakeLists.txt +=================================================================== +--- liblinphone-5.2.75.orig/src/CMakeLists.txt ++++ liblinphone-5.2.75/src/CMakeLists.txt +@@ -740,7 +740,7 @@ if(ENABLE_SHARED) + # so we need static link on osx/ios + target_link_libraries(linphone PUBLIC jsoncpp_static) else() -- target_link_libraries(linphone PRIVATE jsoncpp_object) -+ target_link_libraries(linphone PRIVATE jsoncpp) - endif() - endif() - -@@ -640,7 +640,7 @@ - if (XCODE) - target_link_libraries(linphone PRIVATE jsoncpp_static) - else() -- target_link_libraries(linphone PRIVATE jsoncpp_object) -+ target_link_libraries(linphone PRIVATE jsoncpp) +- target_link_libraries(linphone PUBLIC jsoncpp_lib) ++ target_link_libraries(linphone PUBLIC jsoncpp) endif() endif() ++++++ linphone-build-readline.patch ++++++ --- /var/tmp/diff_new_pack.SBORCd/_old 2023-08-07 15:29:41.172533245 +0200 +++ /var/tmp/diff_new_pack.SBORCd/_new 2023-08-07 15:29:41.176533269 +0200 @@ -1,5 +1,7 @@ ---- a/cmake/FindReadline.cmake -+++ b/cmake/FindReadline.cmake +Index: liblinphone-5.2.88/cmake/FindReadline.cmake +=================================================================== +--- /dev/null ++++ liblinphone-5.2.88/cmake/FindReadline.cmake @@ -0,0 +1,58 @@ +############################################################################ +# FindReadline.cmake @@ -59,9 +61,11 @@ +) + +mark_as_advanced(READLINE_INCLUDE_DIRS READLINE_LIBRARIES HAVE_READLINE_H HAVE_HISTORY_H) ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -69,6 +69,7 @@ option(ENABLE_ASSETS "Package sound asse +Index: liblinphone-5.2.88/CMakeLists.txt +=================================================================== +--- liblinphone-5.2.88.orig/CMakeLists.txt ++++ liblinphone-5.2.88/CMakeLists.txt +@@ -81,6 +81,7 @@ option(ENABLE_ASSETS "Package sound asse option(ENABLE_PACKAGE_SOURCE "Create 'package_source' target for source archive making (CMake >= 3.11)" OFF) cmake_dependent_option(ENABLE_NOTIFY "Enable libnotify support." YES "ENABLE_GTK_UI;NOT APPLE" NO) @@ -69,7 +73,7 @@ cmake_dependent_option(ENABLE_ASSISTANT "Turn on assistant compiling." YES "ENABLE_GTK_UI" NO) option(ENABLE_SRTP "Build with the SRTP transport support." YES) -@@ -156,6 +157,15 @@ if(ENABLE_TUNNEL) +@@ -202,6 +203,15 @@ if(ENABLE_TUNNEL) set(ENABLE_TUNNEL OFF CACHE BOOL "Enable tunnel support." FORCE) endif() endif() @@ -85,7 +89,7 @@ if(ENABLE_NOTIFY) find_package(Notify) if(NOTIFY_FOUND) -@@ -302,7 +312,7 @@ else() +@@ -369,7 +379,7 @@ else() if (SUGGEST_OVERRIDE) list(APPEND STRICT_OPTIONS_CXX "-Wsuggest-override" "-Wno-error=suggest-override" ) endif () @@ -94,8 +98,10 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU") list(APPEND STRICT_OPTIONS_C "-fno-inline-small-functions") endif() ---- a/config.h.cmake -+++ b/config.h.cmake +Index: liblinphone-5.2.88/config.h.cmake +=================================================================== +--- liblinphone-5.2.88.orig/config.h.cmake ++++ liblinphone-5.2.88/config.h.cmake @@ -42,6 +42,9 @@ #cmakedefine BUILD_WIZARD #cmakedefine HAVE_NOTIFY4 @@ -106,9 +112,11 @@ #cmakedefine HAVE_CU_GET_SUITE 1 #cmakedefine HAVE_CU_CURSES 1 #cmakedefine HAVE_LIBUDEV_H 0 ---- a/console/CMakeLists.txt -+++ b/console/CMakeLists.txt -@@ -41,6 +41,10 @@ target_link_libraries(linphonec ${LINPHO +Index: liblinphone-5.2.88/console/CMakeLists.txt +=================================================================== +--- liblinphone-5.2.88.orig/console/CMakeLists.txt ++++ liblinphone-5.2.88/console/CMakeLists.txt +@@ -42,6 +42,10 @@ target_link_libraries(linphonec ${LINPHO set_target_properties(linphonec PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}") set_target_properties(linphonec PROPERTIES LINKER_LANGUAGE CXX) @@ -119,7 +127,7 @@ if(INTL_FOUND) target_link_libraries(linphonec ${INTL_LIBRARIES}) endif() -@@ -48,6 +52,10 @@ endif() +@@ -49,6 +53,10 @@ endif() if(WIN32) add_executable(linphoned WIN32 ${LINPHONEC_SOURCE_FILES}) target_link_libraries(linphoned ${LINPHONE_LIBS_FOR_TOOLS} bctoolbox ortp mediastreamer ${XSD_LIBRARIES}) @@ -130,7 +138,7 @@ if(INTL_FOUND) target_link_libraries(linphoned ${INTL_LIBRARIES}) endif() -@@ -58,6 +66,11 @@ target_link_libraries(linphonecsh ${LINP +@@ -59,6 +67,11 @@ target_link_libraries(linphonecsh ${LINP set_target_properties(linphonecsh PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}") set_target_properties(linphonecsh PROPERTIES LINKER_LANGUAGE CXX) @@ -142,9 +150,11 @@ set(INSTALL_TARGETS linphonec linphonecsh) if(WIN32) list(APPEND INSTALL_TARGETS linphoned) ---- a/daemon/CMakeLists.txt -+++ b/daemon/CMakeLists.txt -@@ -123,6 +123,11 @@ target_link_libraries(linphone-daemon ${ +Index: liblinphone-5.2.88/daemon/CMakeLists.txt +=================================================================== +--- liblinphone-5.2.88.orig/daemon/CMakeLists.txt ++++ liblinphone-5.2.88/daemon/CMakeLists.txt +@@ -130,6 +130,11 @@ target_link_libraries(linphone-daemon ${ set_target_properties(linphone-daemon PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}") set_target_properties(linphone-daemon PROPERTIES LINKER_LANGUAGE CXX) @@ -156,9 +166,11 @@ add_executable(linphone-daemon-pipetest ${DAEMON_PIPETEST_SOURCE_FILES}) target_link_libraries(linphone-daemon-pipetest ${LINPHONE_LIBS_FOR_TOOLS} ortp mediastreamer) set_target_properties(linphone-daemon-pipetest PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}") ---- a/daemon/daemon.cc -+++ b/daemon/daemon.cc -@@ -31,11 +31,6 @@ +Index: liblinphone-5.2.88/daemon/daemon.cc +=================================================================== +--- liblinphone-5.2.88.orig/daemon/daemon.cc ++++ liblinphone-5.2.88/daemon/daemon.cc +@@ -32,11 +32,6 @@ #include <functional> #include <limits> ++++++ linphone-fix-pkgconfig.patch ++++++ --- /var/tmp/diff_new_pack.SBORCd/_old 2023-08-07 15:29:41.188533344 +0200 +++ /var/tmp/diff_new_pack.SBORCd/_new 2023-08-07 15:29:41.188533344 +0200 @@ -1,6 +1,8 @@ ---- a/share/CMakeLists.txt -+++ b/share/CMakeLists.txt -@@ -35,6 +35,15 @@ install(FILES ${GRAMMAR_FILES} +Index: liblinphone-5.2.88/share/CMakeLists.txt +=================================================================== +--- liblinphone-5.2.88.orig/share/CMakeLists.txt ++++ liblinphone-5.2.88/share/CMakeLists.txt +@@ -30,6 +30,15 @@ set(GRAMMAR_FILES PARENT_SCOPE ) @@ -16,8 +18,10 @@ if(ENABLE_ASSETS) set(SOUND_FILES "${CMAKE_CURRENT_SOURCE_DIR}/hello16000.wav" ---- a/share/linphone.pc.in -+++ b/share/linphone.pc.in +Index: liblinphone-5.2.88/share/linphone.pc.in +=================================================================== +--- liblinphone-5.2.88.orig/share/linphone.pc.in ++++ liblinphone-5.2.88/share/linphone.pc.in @@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ ++++++ linphone-link-soci-sqlite3.patch ++++++ --- /var/tmp/diff_new_pack.SBORCd/_old 2023-08-07 15:29:41.200533417 +0200 +++ /var/tmp/diff_new_pack.SBORCd/_new 2023-08-07 15:29:41.208533466 +0200 @@ -1,8 +1,8 @@ -Index: liblinphone-4.4.0/CMakeLists.txt +Index: liblinphone-5.2.88/CMakeLists.txt =================================================================== ---- liblinphone-4.4.0.orig/CMakeLists.txt -+++ liblinphone-4.4.0/CMakeLists.txt -@@ -138,12 +138,7 @@ find_package(Sqlite3 REQUIRED) +--- liblinphone-5.2.88.orig/CMakeLists.txt ++++ liblinphone-5.2.88/CMakeLists.txt +@@ -174,12 +174,7 @@ find_package(XML2 REQUIRED) if (ENABLE_DB_STORAGE) if(NOT DISABLE_SOCI_PACKAGE_SEARCH) @@ -16,12 +16,11 @@ else() set(SOCI_FOUND YES) set(SOCI_LIBRARIES soci_core) - -Index: liblinphone-4.4.0/src/CMakeLists.txt +Index: liblinphone-5.2.88/src/CMakeLists.txt =================================================================== ---- liblinphone-4.4.0.orig/src/CMakeLists.txt -+++ liblinphone-4.4.0/src/CMakeLists.txt -@@ -60,11 +60,8 @@ if(ZLIB_FOUND) +--- liblinphone-5.2.88.orig/src/CMakeLists.txt ++++ liblinphone-5.2.88/src/CMakeLists.txt +@@ -70,11 +70,8 @@ if(ZLIB_FOUND) endif() if (ENABLE_DB_STORAGE) if (SOCI_FOUND) ++++++ openldap-bc.tar.bz2 ++++++ ++++ 15576 lines of diff (skipped) ++++++ reproducible.patch ++++++ --- /var/tmp/diff_new_pack.SBORCd/_old 2023-08-07 15:29:45.816561750 +0200 +++ /var/tmp/diff_new_pack.SBORCd/_new 2023-08-07 15:29:45.820561775 +0200 @@ -20,11 +20,11 @@ tools/genapixml.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linphone-3.12.0/tools/genapixml.py +Index: liblinphone-5.2.88/tools/genapixml.py =================================================================== ---- linphone-3.12.0.orig/tools/genapixml.py -+++ linphone-3.12.0/tools/genapixml.py -@@ -617,7 +617,7 @@ class Project: +--- liblinphone-5.2.88.orig/tools/genapixml.py ++++ liblinphone-5.2.88/tools/genapixml.py +@@ -655,7 +655,7 @@ class Project: self.__discoverClasses() def initFromDir(self, xmldir): ++++++ set_current_version.patch ++++++ --- liblinphone-5.2.75/CMakeLists.txt.orig 2023-07-12 08:53:53.544794515 +0200 +++ liblinphone-5.2.75/CMakeLists.txt 2023-07-12 08:54:00.012832825 +0200 @@ -30,7 +30,7 @@ cmake_policy(SET CMP0077 NEW) endif() -project(linphone VERSION 5.2.0 LANGUAGES C CXX) +project(linphone VERSION 5.2.75 LANGUAGES C CXX) set(LINPHONE_MAJOR_VERSION ${PROJECT_VERSION_MAJOR})
