Hello community, here is the log from the commit of package linphoneqt for openSUSE:Factory checked in at 2020-08-03 14:15:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linphoneqt (Old) and /work/SRC/openSUSE:Factory/.linphoneqt.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linphoneqt" Mon Aug 3 14:15:28 2020 rev:9 rq:823447 version:4.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/linphoneqt/linphoneqt.changes 2019-09-02 13:25:56.441305755 +0200 +++ /work/SRC/openSUSE:Factory/.linphoneqt.new.3592/linphoneqt.changes 2020-08-03 14:16:19.132555215 +0200 @@ -1,0 +2,12 @@ +Wed Jul 29 14:46:36 UTC 2020 - Alexei Sorokin <[email protected]> + +- Update to version 4.2.1: + * See https://gitlab.linphone.org/BC/public/linphone-desktop/blob/4.2.1/CHANGELOG.md +- Update licence to GPLv3+. +- Rebase linphoneqt-fix-no-git.patch. +- Drop linphoneqt-fix-cmake-i18n.patch, + linphoneqt-fix-qt-5.11.patch, fix-qm-generation.patch, + linphoneqt-force-default-style.patch: fixed upstream. +- Drop linphoneqt-qt-5.9-fix-buttons.patch: no longer supported. + +------------------------------------------------------------------- Old: ---- fix-qm-generation.patch linphoneqt-4.1.1.tar.gz linphoneqt-fix-cmake-i18n.patch linphoneqt-fix-qt-5.11.patch linphoneqt-force-default-style.patch linphoneqt-qt-5.9-fix-buttons.patch New: ---- linphone-desktop-4.2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linphoneqt.spec ++++++ --- /var/tmp/diff_new_pack.sAz1Yh/_old 2020-08-03 14:16:20.160556246 +0200 +++ /var/tmp/diff_new_pack.sAz1Yh/_new 2020-08-03 14:16:20.160556246 +0200 @@ -1,7 +1,7 @@ # # spec file for package linphoneqt # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,43 +18,32 @@ %define _name linphone Name: linphoneqt -Version: 4.1.1 +Version: 4.2.1 Release: 0 Summary: Qt interface for Linphone -License: GPL-2.0-or-later -Group: Productivity/Telephony/SIP/Clients -Url: https://linphone.org/ -Source: https://linphone.org/releases/sources/%{name}/%{name}-%{version}.tar.gz +License: GPL-3.0-or-later +URL: https://linphone.org/ +Source: https://gitlab.linphone.org/BC/public/linphone-desktop/-/archive/%{version}/%{_name}-desktop-%{version}.tar.bz2 Source1: %{_name}.appdata.xml -# PATCH-FIX-UPSTREAM linphoneqt-fix-cmake-i18n.patch -- Support new CMake versions for translations (commit e70c077). -Patch0: linphoneqt-fix-cmake-i18n.patch -# PATCH-FIX-UPSTREAM linphoneqt-force-default-style.patch boo#1083654 -- Force default theme style (commit 313aa68). -Patch1: linphoneqt-force-default-style.patch -# PATCH-FIX-UPSTREAM linphoneqt-fix-qt-5.11.patch boo#1083654 -- Fix issues with Qt 5.10 and 5.11 (commits ecaab0f, d95f523, 5dd0161, 7f62ae9, 8720931, 4f908ef). -Patch2: linphoneqt-fix-qt-5.11.patch -# PATCH-FIX-OPENSUSE linphoneqt-qt-5.9-fix-buttons.patch boo#1095273 -- Fix button invisibility with Qt 5.9. -Patch3: linphoneqt-qt-5.9-fix-buttons.patch # PATCH-FIX-OPENSUSE linphoneqt-fix-no-git.patch -- Fix building out-of-git. -Patch4: linphoneqt-fix-no-git.patch -# PATCH-FIX-OPENSUSE fix-qm-generation.patch -Patch5: fix-qm-generation.patch +Patch0: linphoneqt-fix-no-git.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme -BuildRequires: libqt5-linguist-devel >= 5.9 +BuildRequires: libqt5-linguist-devel BuildRequires: pkgconfig BuildRequires: update-desktop-files -BuildRequires: pkgconfig(Qt5Concurrent) >= 5.9 -BuildRequires: pkgconfig(Qt5Core) >= 5.9 -BuildRequires: pkgconfig(Qt5DBus) >= 5.9 -BuildRequires: pkgconfig(Qt5Gui) >= 5.9 -BuildRequires: pkgconfig(Qt5Network) >= 5.9 -BuildRequires: pkgconfig(Qt5Quick) >= 5.9 -BuildRequires: pkgconfig(Qt5QuickControls2) >= 5.9 -BuildRequires: pkgconfig(Qt5Svg) >= 5.9 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.9 -BuildRequires: pkgconfig(linphone) >= 3.12.0 -BuildRequires: pkgconfig(mediastreamer) >= 2.16.0 +BuildRequires: pkgconfig(Qt5Concurrent) +BuildRequires: pkgconfig(Qt5Core) >= 5.12 +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5Quick) +BuildRequires: pkgconfig(Qt5QuickControls2) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(linphone) >= 4.4.0 +BuildRequires: pkgconfig(mediastreamer) >= 4.4.0 %description Linphone is a Web phone with a Qt interface. It lets you make @@ -66,7 +55,6 @@ %package -n %{_name} Summary: Web Phone -Group: Productivity/Telephony/SIP/Clients Requires: lib%{_name}-data Requires: libqt5-qtgraphicaleffects Requires: libqt5-qtquickcontrols @@ -83,41 +71,34 @@ with high speed connections as well as 28k modems. %prep -%autosetup -p1 +%autosetup -n %{_name}-desktop-%{version} -p1 cp %{SOURCE1} linphone.appdata.xml +touch linphone-sdk/CMakeLists.txt +mkdir -p build/linphone-sdk/desktop/{bin,share} %build %cmake \ - -DENABLE_DBUS=ON \ - -DENABLE_PRECOMPILED_HEADERS=OFF \ + -DLINPHONE_OUTPUT_DIR="$PWD" \ + -DENABLE_UPDATE_CHECK=OFF \ -DENABLE_STRICT=OFF \ -DENABLE_STATIC=OFF -make %{?_smp_mflags} V=1 +%cmake_build %install %cmake_install install -Dpm 0644 linphone.appdata.xml \ - %{buildroot}%{_datadir}/metainfo/linphone.appdata.xml + %{buildroot}%{_datadir}/metainfo/org.linphone.appdata.xml -%if 0%{?suse_version} < 1500 -%post -n %{_name} -%desktop_database_post -%icon_theme_cache_post - -%postun -n %{_name} -%desktop_database_postun -%icon_theme_cache_postun -%endif +rm %{buildroot}%{_bindir}/qt.conf %files -n %{_name} -%license LICENSE -%doc README.md +%license LICENSE.txt +%doc CHANGELOG.md README.md %{_bindir}/linphone -%{_bindir}/linphone-tester %{_datadir}/linphone/ %{_datadir}/applications/linphone.desktop %{_datadir}/icons/hicolor/*/apps/linphone.* %dir %{_datadir}/metainfo/ -%{_datadir}/metainfo/linphone.appdata.xml +%{_datadir}/metainfo/org.linphone.appdata.xml %changelog ++++++ linphone.appdata.xml ++++++ --- /var/tmp/diff_new_pack.sAz1Yh/_old 2020-08-03 14:16:20.188556275 +0200 +++ /var/tmp/diff_new_pack.sAz1Yh/_new 2020-08-03 14:16:20.188556275 +0200 @@ -3,7 +3,7 @@ <component type="desktop"> <id>linphone.desktop</id> <metadata_license>CC0-1.0</metadata_license> - <project_license>GPL-2.0+</project_license> + <project_license>GPL-3.0+</project_license> <name>Linphone</name> <summary>SIP video soft-phone</summary> <description> ++++++ linphoneqt-fix-no-git.patch ++++++ --- /var/tmp/diff_new_pack.sAz1Yh/_old 2020-08-03 14:16:20.196556282 +0200 +++ /var/tmp/diff_new_pack.sAz1Yh/_new 2020-08-03 14:16:20.196556282 +0200 @@ -1,29 +1,42 @@ ---- a/config.h.cmake -+++ b/config.h.cmake -@@ -20,5 +20,7 @@ - * - *******************************************************************************/ +--- a/linphone-app/application_info.cmake ++++ b/linphone-app/application_info.cmake +@@ -1,6 +1,7 @@ + set(APPLICATION_DESCRIPTION "A libre SIP client") + set(APPLICATION_ID "com.belledonnecommunications.linphone") + set(APPLICATION_NAME Linphone) ++set(APPLICATION_VERSION "${PROJECT_VERSION}") + set(APPLICATION_URL "https://www.linphone.org";) + set(APPLICATION_VENDOR "Belledonne Communications") -+#define LINPHONE_QT_VERSION "${PROJECT_VERSION}" -+ - #cmakedefine MSPLUGINS_DIR "${MSPLUGINS_DIR}" - #cmakedefine ENABLE_UPDATE_CHECK 1 -\ No newline at end of file ---- a/src/app/AppController.cpp -+++ b/src/app/AppController.cpp -@@ -25,10 +25,15 @@ - #include <QMessageBox> - #include <QQuickStyle> - -+#include "config.h" +--- a/linphone-app/src/app/AppController.cpp ++++ b/linphone-app/src/app/AppController.cpp +@@ -26,6 +26,10 @@ + #include "config.h" #include "gitversion.h" - #include "AppController.hpp" - -+#ifndef LINPHONE_QT_GIT_VERSION -+#define LINPHONE_QT_GIT_VERSION LINPHONE_QT_VERSION ++#ifdef LINPHONE_QT_GIT_VERSION ++#define APPLICATION_VERSION LINPHONE_QT_GIT_VERSION +#endif + - // Must be unique. Used by `SingleApplication` and `Paths`. - #define APPLICATION_NAME "linphone" - #define APPLICATION_VERSION LINPHONE_QT_GIT_VERSION + #include "AppController.hpp" + + #include "components/other/desktop-tools/DesktopTools.hpp" +@@ -52,7 +56,7 @@ AppController::AppController (int &argc, + // The EXECUTABLE_NAME will be used in qt standard paths. It's our goal. + QCoreApplication::setApplicationName(EXECUTABLE_NAME); + QApplication::setOrganizationDomain(EXECUTABLE_NAME); +- QCoreApplication::setApplicationVersion(LINPHONE_QT_GIT_VERSION); ++ QCoreApplication::setApplicationVersion(APPLICATION_VERSION); + + mApp = new App(argc, argv); + +--- a/linphone-app/src/config.h.cmake ++++ b/linphone-app/src/config.h.cmake +@@ -23,6 +23,7 @@ + #cmakedefine APPLICATION_DESCRIPTION "${APPLICATION_DESCRIPTION}" + #cmakedefine APPLICATION_ID "${APPLICATION_ID}" + #cmakedefine APPLICATION_NAME "${APPLICATION_NAME}" ++#cmakedefine APPLICATION_VERSION "${APPLICATION_VERSION}" + #cmakedefine APPLICATION_VENDOR "${APPLICATION_VENDOR}" + #cmakedefine APPLICATION_URL "${APPLICATION_URL}" + #cmakedefine ENABLE_UPDATE_CHECK 1
