[packages/linphone: 2/2] - updated to 5.2.2
qboosh
qboosh at pld-linux.org
Mon Apr 1 22:08:38 CEST 2024
commit ad8ce64aa628527ddd0b17ffce0b6c3ce5fa8433
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Apr 1 22:01:12 2024 +0200
- updated to 5.2.2
linphone-cmake.patch | 57 +++++++++++++++++++++++------------------------
linphone-install.patch | 11 ---------
linphone-ispell.patch | 22 ++++++++++++++++++
linphone-no-sdk.patch | 18 +++++++--------
linphone-qtkeychain.patch | 34 ++++++++++++++++++++++++++++
linphone.spec | 37 +++++++++++++++++++-----------
6 files changed, 117 insertions(+), 62 deletions(-)
---
diff --git a/linphone.spec b/linphone.spec
index e3f5a53..48ab292 100644
--- a/linphone.spec
+++ b/linphone.spec
@@ -1,36 +1,41 @@
Summary: Linphone Internet Phone
Summary(pl.UTF-8): Linphone - telefon internetowy
Name: linphone
-Version: 5.0.15
+Version: 5.2.2
Release: 1
# linphone itself is GPL, but ortp+mediastreamer+liblinphone 5.2 are AGPL
License: GPL v3+/AGPL v3+ or proprietary
Group: Applications/Communications
#Source0Download: https://gitlab.linphone.org/BC/public/linphone-desktop/-/tags
Source0: https://gitlab.linphone.org/BC/public/linphone-desktop/-/archive/%{version}/linphone-desktop-%{version}.tar.bz2
-# Source0-md5: f2e6513759255f2c24323af7f403ab34
+# Source0-md5: 5851162d0d8a954ff8ccebf323ad5d69
Patch0: %{name}-no-sdk.patch
Patch1: %{name}-cmake.patch
-Patch2: %{name}-install.patch
+Patch2: %{name}-qtkeychain.patch
+Patch3: %{name}-ispell.patch
URL: http://www.linphone.org/
BuildRequires: Qt5Concurrent-devel >= 5.12
BuildRequires: Qt5Core-devel >= 5.12
BuildRequires: Qt5DBus-devel >= 5.12
BuildRequires: Qt5Gui-devel >= 5.12
+BuildRequires: Qt5Keychain-devel
+BuildRequires: Qt5Multimedia-devel >= 5.12
BuildRequires: Qt5Network-devel >= 5.12
+BuildRequires: Qt5Qml-devel >= 5.12
BuildRequires: Qt5Quick-devel >= 5.12
BuildRequires: Qt5Quick-controls2-devel >= 5.12
# optional
BuildRequires: Qt5Speech-devel >= 5.12
BuildRequires: Qt5Svg-devel >= 5.12
BuildRequires: Qt5Widgets-devel >= 5.12
+BuildRequires: bc-ispell-devel
BuildRequires: bctoolbox-devel >= 5.2
BuildRequires: belcard-devel >= 5.2
BuildRequires: cmake >= 3.1
BuildRequires: doxygen
-BuildRequires: liblinphone-devel >= 5.2
-BuildRequires: liblinphone-c++-devel >= 5.2
-BuildRequires: libstdc++-devel >= 6:4.7
+BuildRequires: liblinphone-devel >= 5.3
+BuildRequires: liblinphone-c++-devel >= 5.3
+BuildRequires: libstdc++-devel >= 6:7
BuildRequires: mediastreamer-devel >= 5.2
BuildRequires: ortp-devel >= 5.2
BuildRequires: pkgconfig
@@ -38,8 +43,8 @@ BuildRequires: qt5-build >= 5.12
BuildRequires: qt5-linguist >= 5.12
BuildRequires: rpmbuild(macros) >= 1.605
Requires: belcard >= 5.2
-Requires: liblinphone >= 5.2
-Requires: liblinphone-c++ >= 5.2
+Requires: liblinphone >= 5.3
+Requires: liblinphone-c++ >= 5.3
Requires: mediastreamer >= 5.2
Requires: ortp >= 5.2
Obsoletes: linphoneqt < 4.2
@@ -66,7 +71,7 @@ Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: Qt5Core-devel >= 5.12
Requires: Qt5Network-devel >= 5.12
-Requires: libstdc++-devel >= 6:4.7
+Requires: libstdc++-devel >= 6:7
%description devel
Header files for Linphone plugins.
@@ -79,20 +84,23 @@ Pliki nagłówkowe dla wtyczek Linphone.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
# hack versions (git describe doesn't work on dist tarballs)
-%{__sed} -i -e 's/set(FULL_VERSION )/set(FULL_VERSION %{version})/; /^bc_compute_full_version/d' linphone-app/CMakeLists.txt
%{__sed} -i -e 's/bc_compute_full_version(PROJECT_VERSION_BUILD)/set(PROJECT_VERSION_BUILD %{version})/' linphone-app/build/CMakeLists.txt
-%{__sed} -i -e 's/bc_compute_full_version(APP_PROJECT_VERSION)/set(APP_PROJECT_VERSION %{version})/' linphone-app/cmake_builder/linphone_package/CMakeLists.txt
-%{__sed} -i -e 's/LINPHONE_QT_GIT_VERSION/"%{version}"/' linphone-app/src/app/AppController.cpp
# adjust locales path
%{__sed} -i -e '/LanguagePath/ s,"[^"]*","%{_datadir}/linphone/languages",' linphone-app/src/utils/Constants.hpp
+# hide Find... macros relying on external projects
+%{__mv} linphone-app/cmake{,.hidden}
+
%build
install -d build
cd build
%cmake .. \
- -DLINPHONE_QT_ONLY=ON
+ -DLINPHONEAPP_VERSION="%{version}" \
+ -DLINPHONE_QT_ONLY=ON \
+ -DLinphoneCxx_TARGET="liblinphone++"
%{__make}
@@ -108,6 +116,9 @@ install -d $RPM_BUILD_ROOT%{_datadir}/linphone/languages
cp -p build/linphone-app/assets/languages/*.qm $RPM_BUILD_ROOT%{_datadir}/linphone/languages
%{__mv} $RPM_BUILD_ROOT%{_datadir}/linphone/languages/{fr_FR,fr}.qm
+# because of buggy linphone-app/cmake_builder/linphone_package/CMakeLists.txt
+%{__mv} $RPM_BUILD_ROOT%{_includedir}/include/LinphoneApp $RPM_BUILD_ROOT%{_includedir}
+
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/linphone-cmake.patch b/linphone-cmake.patch
index 88289ac..7ce1208 100644
--- a/linphone-cmake.patch
+++ b/linphone-cmake.patch
@@ -1,33 +1,32 @@
---- linphone-desktop-5.0.15/CMakeLists.txt.orig 2023-04-19 21:14:47.137607063 +0200
-+++ linphone-desktop-5.0.15/CMakeLists.txt 2023-04-19 21:17:02.070209404 +0200
-@@ -44,7 +44,7 @@ if( APPLE )
- endif()
- endif()
+--- linphone-desktop-5.2.2/linphone-app/CMakeLists.txt.orig 2024-03-11 18:30:37.000000000 +0100
++++ linphone-desktop-5.2.2/linphone-app/CMakeLists.txt 2024-03-12 21:45:48.707479838 +0100
+@@ -24,7 +24,7 @@ cmake_minimum_required(VERSION 3.22)
--project(linphoneqt)
-+project(linphoneqt C CXX)
- include(GNUInstallDirs)
- include(CheckCXXCompilerFlag)
-@@ -250,8 +250,8 @@ if ( NOT Qt5_FOUND )
- message(FATAL_ERROR "Minimum supported Qt5 version is 5.10!")
- endif()
+ #Linphone targets
+-set(LINPHONE_PACKAGES LinphoneCxx Mediastreamer2 Belcard LibLinphone)
++set(LINPHONE_PACKAGES LinphoneCxx Mediastreamer2 BelCard LibLinphone)
--find_package(LinphoneCxx CONFIG QUIET)
- find_package(Linphone CONFIG QUIET)
-+find_package(LinphoneCxx CONFIG QUIET)
- find_package(bctoolbox CONFIG QUIET)
- find_package(belcard CONFIG QUIET)
- find_package(Mediastreamer2 CONFIG QUIET)
---- linphone-desktop-4.2.5/linphone-app/CMakeLists.txt.orig 2021-07-17 17:21:38.970225216 +0200
-+++ linphone-desktop-4.2.5/linphone-app/CMakeLists.txt 2021-07-17 20:21:15.985174448 +0200
-@@ -66,8 +66,8 @@
- endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES )
- endif()
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
--find_package(LinphoneCxx CONFIG)
- find_package(Linphone CONFIG)
-+find_package(LinphoneCxx CONFIG)
- find_package(belcard CONFIG)
- find_package(Mediastreamer2 CONFIG)
- find_package(ortp CONFIG)
+@@ -105,10 +105,7 @@ set(ENABLE_DB_STORAGE ON CACHE BOOLEAN "
+
+ foreach(PACKAGE ${LINPHONE_PACKAGES})
+ message(STATUS "Trying to find ${PACKAGE}")
+- find_package(${PACKAGE})
+- if(NOT ${PACKAGE}_FOUND)
+- find_package(${PACKAGE} CONFIG REQUIRED)
+- endif()
++ find_package(${PACKAGE} CONFIG REQUIRED)
+ endforeach()
+
+ set(PLUGIN_TARGETS ${LinphoneCxx_TARGET})
+@@ -112,7 +112,7 @@ set(PLUGIN_TARGETS ${LinphoneCxx_TARGET}
+ set(APP_TARGETS ${LinphoneCxx_TARGET}
+ ${BCToolbox_TARGET}#Logger/App
+ ${Mediastreamer2_TARGET}#MediastreamerUtils
+- ${Belcard_TARGET}#VCard Model
++ ${BelCard_TARGET}#VCard Model
+ ${LibLinphone_TARGET})#MediastreamerUtils
+
+ ####################################
diff --git a/linphone-install.patch b/linphone-install.patch
deleted file mode 100644
index d65793e..0000000
--- a/linphone-install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- linphone-desktop-4.4.11/linphone-app/CMakeLists.txt.orig 2023-04-19 22:48:35.440449263 +0200
-+++ linphone-desktop-4.4.11/linphone-app/CMakeLists.txt 2023-04-20 06:19:44.933446816 +0200
-@@ -645,7 +645,7 @@ add_custom_command(TARGET ${APP_PLUGIN}
-
-
- #configure_file("${CMAKE_CURRENT_SOURCE_DIR}/include/*" "${CMAKE_INSTALL_PREFIX}/include/LinphoneApp/" COPYONLY)
--install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include" DESTINATION ".")
-+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/LinphoneApp" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-
-
- add_subdirectory(build)
diff --git a/linphone-ispell.patch b/linphone-ispell.patch
new file mode 100644
index 0000000..67bbae6
--- /dev/null
+++ b/linphone-ispell.patch
@@ -0,0 +1,22 @@
+--- linphone-desktop-5.2.2/linphone-app/src/components/other/spell-checker/SpellCheckerLinux.cpp.orig 2024-03-11 18:30:37.000000000 +0100
++++ linphone-desktop-5.2.2/linphone-app/src/components/other/spell-checker/SpellCheckerLinux.cpp 2024-03-31 18:17:09.041543370 +0200
+@@ -20,7 +20,7 @@
+
+
+ #include "SpellChecker.hpp"
+-#include <libispell.h>
++#include <ISpell/libispell.h>
+ #include "app/paths/Paths.hpp"
+ #include <unistd.h>
+ #include <cstdio>
+--- linphone-desktop-5.2.2/linphone-app/cmake_builder/linphone_package/CMakeLists.txt.orig 2024-04-01 08:06:42.275231951 +0200
++++ linphone-desktop-5.2.2/linphone-app/cmake_builder/linphone_package/CMakeLists.txt 2024-04-01 17:44:16.670826307 +0200
+@@ -338,8 +338,6 @@ else()# Not Windows and Apple
+ if(ENABLE_APP_WEBVIEW)
+ install(FILES "${QT_PATH}/plugins/webview/libqtwebview_webengine.so" DESTINATION "plugins/webview") #Workaround : linuxdeploy doesn't deploy it
+ endif()
+-# ISPELL
+- install(DIRECTORY "${ISpell_SOURCE_DIR}/ispell_dictionaries" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${EXECUTABLE_NAME}" USE_SOURCE_PERMISSIONS)
+ endif ()
+
+
diff --git a/linphone-no-sdk.patch b/linphone-no-sdk.patch
index f4ebaea..deaa952 100644
--- a/linphone-no-sdk.patch
+++ b/linphone-no-sdk.patch
@@ -1,16 +1,16 @@
---- linphone-desktop-5.0.15/linphone-app/cmake_builder/linphone_package/CMakeLists.txt.orig 2023-04-11 15:14:58.000000000 +0200
-+++ linphone-desktop-5.0.15/linphone-app/cmake_builder/linphone_package/CMakeLists.txt 2023-04-19 21:14:24.354397157 +0200
-@@ -241,7 +241,9 @@ else()# Not Windows and Apple
+--- linphone-desktop-5.2.2/linphone-app/cmake_builder/linphone_package/CMakeLists.txt.orig 2024-03-11 18:30:37.000000000 +0100
++++ linphone-desktop-5.2.2/linphone-app/cmake_builder/linphone_package/CMakeLists.txt 2024-03-12 19:55:18.290066556 +0100
+@@ -259,7 +259,9 @@ else()# Not Windows and Apple
execute_process(COMMAND install_name_tool -rpath "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}" "$ORIGIN/../lib" "${LIBRARY}")
execute_process(COMMAND install_name_tool -addrpath "$ORIGIN/../lib64" "${LIBRARY}")
endforeach ()
+ if (EXISTS "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_BINDIR}")
install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_BINDIR}/" DESTINATION "${CMAKE_INSTALL_BINDIR}" USE_SOURCE_PERMISSIONS)
+ endif()
- #Just in case. This is useless because we have to use CMAKE_INSTALL_LIBDIR
- if( EXISTS "${LINPHONE_OUTPUT_DIR}/lib/")
- file(GLOB SHARED_LIBRARIES "${LINPHONE_OUTPUT_DIR}/lib/*.so*")
-@@ -267,6 +269,7 @@ else()# Not Windows and Apple
+ if(ENABLE_QT_KEYCHAIN)
+ install(DIRECTORY "${QTKEYCHAIN_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/" DESTINATION "${CMAKE_INSTALL_LIBDIR}" USE_SOURCE_PERMISSIONS)
+ endif()
+@@ -288,6 +290,7 @@ else()# Not Windows and Apple
endif()
install(FILES ${SHARED_LIBRARIES} DESTINATION "lib64")
endif()
@@ -18,7 +18,7 @@
install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}" USE_SOURCE_PERMISSIONS
PATTERN "linphone" EXCLUDE
PATTERN "sounds" EXCLUDE
-@@ -284,8 +287,11 @@ else()# Not Windows and Apple
+@@ -305,8 +308,11 @@ else()# Not Windows and Apple
if(ENABLE_BUILD_VERBOSE)
message("INSTALLATION : ${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/" )
endif()
@@ -27,6 +27,6 @@
file(GLOB PLUGINS_FILES "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/mediastreamer/plugins/*")
install(FILES ${PLUGINS_FILES} DESTINATION "plugins/mediastreamer/" )
+ endif()
+ ]]
# Install desktop/icon files.
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../../assets/linphone.desktop.cmake" "${CMAKE_CURRENT_BINARY_DIR}/../../${EXECUTABLE_NAME}.desktop" @ONLY)
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/../../${EXECUTABLE_NAME}.desktop" DESTINATION "${CMAKE_INSTALL_DATADIR}/applications" PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
diff --git a/linphone-qtkeychain.patch b/linphone-qtkeychain.patch
new file mode 100644
index 0000000..1e0ae6a
--- /dev/null
+++ b/linphone-qtkeychain.patch
@@ -0,0 +1,34 @@
+--- linphone-desktop-5.2.2/CMakeLists.txt.orig 2024-03-11 18:30:37.000000000 +0100
++++ linphone-desktop-5.2.2/CMakeLists.txt 2024-03-31 17:21:32.069621299 +0200
+@@ -168,7 +168,7 @@ add_option(OPTION_LIST LIBSECRET_SUPPORT
+ if(WIN32)
+ add_cache(OPTION_LIST QTKEYCHAIN_TARGET_NAME "Override Qt5Keychain library name for a workaround with windeployqt" "EQt5Keychain")
+ else()
+- add_cache(OPTION_LIST QTKEYCHAIN_TARGET_NAME "Override Qt5Keychain library name" "Qt5Keychain")
++ add_cache(OPTION_LIST QTKEYCHAIN_TARGET_NAME "Override Qt5Keychain library name" "qt5keychain")
+ endif()
+ if(WIN32)
+ add_option(OPTION_LIST ENABLE_OPENSSL_EXPORT "Enable OpenSSL deployment" YES)
+--- linphone-desktop-5.2.2/linphone-app/CMakeLists.txt.orig 2024-03-31 16:15:24.501115462 +0200
++++ linphone-desktop-5.2.2/linphone-app/CMakeLists.txt 2024-03-31 16:27:54.837050544 +0200
+@@ -118,10 +118,7 @@ set(APP_TARGETS ${LinphoneCxx_TARGET}
+ ####################################
+
+ if(ENABLE_QT_KEYCHAIN)
+- find_package(QtKeychain)
+- if(NOT QtKeychain_FOUND)
+- find_package(${QTKEYCHAIN_TARGET_NAME} CONFIG REQUIRED)
+- endif()
++ find_package(Qt5Keychain)
+
+ add_compile_definitions("ENABLE_QT_KEYCHAIN")
+ if(QtKeychain_USE_BUILD_INTERFACE)
+@@ -197,7 +194,7 @@ if(ENABLE_VIDEO)
+ endif()
+ if( ENABLE_QT_KEYCHAIN)
+ if(NOT QTKEYCHAIN_TARGET_NAME)
+- set(QTKEYCHAIN_TARGET_NAME "Qt5Keychain")
++ set(QTKEYCHAIN_TARGET_NAME "qt5keychain")
+ endif()
+ list(APPEND APP_TARGETS ${QTKEYCHAIN_TARGET_NAME})
+ endif()
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/linphone.git/commitdiff/ad8ce64aa628527ddd0b17ffce0b6c3ce5fa8433
More information about the pld-cvs-commit
mailing list