Hello community, here is the log from the commit of package linphoneqt for openSUSE:Leap:15.2 checked in at 2020-04-17 13:37:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/linphoneqt (Old) and /work/SRC/openSUSE:Leap:15.2/.linphoneqt.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linphoneqt" Fri Apr 17 13:37:41 2020 rev:18 rq:794200 version:4.1.1 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/linphoneqt/linphoneqt.changes 2020-01-15 15:27:09.698634899 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.linphoneqt.new.2738/linphoneqt.changes 2020-04-17 13:38:07.348246019 +0200 @@ -1,0 +2,16 @@ +Sat Aug 31 12:09:47 UTC 2019 - Fabian Vogt <[email protected]> + +- Add fix-qm-generation.patch to fix abort on startup (boo#1140595) + +------------------------------------------------------------------- +Wed Aug 15 14:36:31 UTC 2018 - [email protected] + +- Add linphoneqt-fix-no-git.patch: Fix building out-of-git. + +------------------------------------------------------------------- +Tue Aug 14 15:45:18 UTC 2018 - [email protected] + +- Change the RPM group to the more appropriate and precise + Productivity/Telephony/SIP/Clients. + +------------------------------------------------------------------- New: ---- fix-qm-generation.patch linphoneqt-fix-no-git.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linphoneqt.spec ++++++ --- /var/tmp/diff_new_pack.hqI02l/_old 2020-04-17 13:38:07.800246359 +0200 +++ /var/tmp/diff_new_pack.hqI02l/_new 2020-04-17 13:38:07.808246365 +0200 @@ -1,7 +1,7 @@ # # spec file for package linphoneqt # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -22,7 +22,7 @@ Release: 0 Summary: Qt interface for Linphone License: GPL-2.0-or-later -Group: Productivity/Networking/Other +Group: Productivity/Telephony/SIP/Clients Url: https://linphone.org/ Source: https://linphone.org/releases/sources/%{name}/%{name}-%{version}.tar.gz Source1: %{_name}.appdata.xml @@ -34,6 +34,10 @@ 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 BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme @@ -62,7 +66,7 @@ %package -n %{_name} Summary: Web Phone -Group: Productivity/Networking/Other +Group: Productivity/Telephony/SIP/Clients Requires: lib%{_name}-data Requires: libqt5-qtgraphicaleffects Requires: libqt5-qtquickcontrols @@ -79,11 +83,7 @@ with high speed connections as well as 28k modems. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%autosetup -p1 cp %{SOURCE1} linphone.appdata.xml %build ++++++ fix-qm-generation.patch ++++++ From: Fabian Vogt <[email protected]> Subject: Fix .qm generation Currently there's weird stuff in assets/languages/CMakeLists.txt. This leads to broken .qm files which can't be loaded and cause the application to abort on startup. Index: linphoneqt-4.1.1/assets/languages/CMakeLists.txt =================================================================== --- linphoneqt-4.1.1.orig/assets/languages/CMakeLists.txt +++ linphoneqt-4.1.1/assets/languages/CMakeLists.txt @@ -27,13 +27,6 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/ # Create `qm` files from `ts` files. qt5_create_translation(QM_FILES ${TS_FILES} ${SOURCES} ${HEADERS} ${QML_SOURCES} OPTIONS -no-obsolete) -# Workaround: Create empty files for some cmake versions. Otherwise, the qm rules can't be used. -foreach (qm ${QM_FILES}) - if (NOT EXISTS "${qm}") - file(GENERATE OUTPUT "${qm}" CONTENT "") - endif () -endforeach () - # Update translations. add_custom_target(update_translations COMMAND ${CMAKE_COMMAND} "-DLANGUAGES=\"${LANGUAGES}\"" -P "${CMAKE_CURRENT_SOURCE_DIR}/clean_translations.cmake" ++++++ linphoneqt-fix-no-git.patch ++++++ --- a/config.h.cmake +++ b/config.h.cmake @@ -20,5 +20,7 @@ * *******************************************************************************/ +#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" #include "gitversion.h" #include "AppController.hpp" +#ifndef LINPHONE_QT_GIT_VERSION +#define LINPHONE_QT_GIT_VERSION LINPHONE_QT_VERSION +#endif + // Must be unique. Used by `SingleApplication` and `Paths`. #define APPLICATION_NAME "linphone" #define APPLICATION_VERSION LINPHONE_QT_GIT_VERSION
