commit linphoneqt for openSUSE:Factory
Hello community, here is the log from the commit of package linphoneqt for openSUSE:Factory checked in at 2020-10-14 15:40:11 Comparing /work/SRC/openSUSE:Factory/linphoneqt (Old) and /work/SRC/openSUSE:Factory/.linphoneqt.new.3486 (New) Package is "linphoneqt" Wed Oct 14 15:40:11 2020 rev:10 rq:841645 version:4.2.1 Changes: --- /work/SRC/openSUSE:Factory/linphoneqt/linphoneqt.changes2020-08-03 14:16:19.132555215 +0200 +++ /work/SRC/openSUSE:Factory/.linphoneqt.new.3486/linphoneqt.changes 2020-10-14 15:40:53.946398167 +0200 @@ -1,0 +2,5 @@ +Tue Oct 6 22:18:20 UTC 2020 - Benjamin Greiner + +- CMake Release build type to remove QML debugging boo#1140595 + +--- Other differences: -- ++ linphoneqt.spec ++ --- /var/tmp/diff_new_pack.Oz9vbk/_old 2020-10-14 15:40:54.522398369 +0200 +++ /var/tmp/diff_new_pack.Oz9vbk/_new 2020-10-14 15:40:54.526398370 +0200 @@ -78,6 +78,7 @@ %build %cmake \ + -DCMAKE_BUILD_TYPE=Release \ -DLINPHONE_OUTPUT_DIR="$PWD" \ -DENABLE_UPDATE_CHECK=OFF \ -DENABLE_STRICT=OFF \
commit linphoneqt for openSUSE:Factory
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.changes2019-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 + +- 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 @@ %pac
commit linphoneqt for openSUSE:Factory
Hello community, here is the log from the commit of package linphoneqt for openSUSE:Factory checked in at 2019-09-02 13:25:52 Comparing /work/SRC/openSUSE:Factory/linphoneqt (Old) and /work/SRC/openSUSE:Factory/.linphoneqt.new.7948 (New) Package is "linphoneqt" Mon Sep 2 13:25:52 2019 rev:8 rq:727451 version:4.1.1 Changes: --- /work/SRC/openSUSE:Factory/linphoneqt/linphoneqt.changes2018-08-18 00:05:18.243290991 +0200 +++ /work/SRC/openSUSE:Factory/.linphoneqt.new.7948/linphoneqt.changes 2019-09-02 13:25:56.441305755 +0200 @@ -1,0 +2,5 @@ +Sat Aug 31 12:09:47 UTC 2019 - Fabian Vogt + +- Add fix-qm-generation.patch to fix abort on startup (boo#1140595) + +--- New: fix-qm-generation.patch Other differences: -- ++ linphoneqt.spec ++ --- /var/tmp/diff_new_pack.tMld10/_old 2019-09-02 13:25:57.337305586 +0200 +++ /var/tmp/diff_new_pack.tMld10/_new 2019-09-02 13:25:57.353305583 +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/ # @@ -36,6 +36,8 @@ 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 @@ -81,12 +83,7 @@ with high speed connections as well as 28k modems. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 +%autosetup -p1 cp %{SOURCE1} linphone.appdata.xml %build ++ fix-qm-generation.patch ++ From: Fabian Vogt 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"
commit linphoneqt for openSUSE:Factory
Hello community, here is the log from the commit of package linphoneqt for openSUSE:Factory checked in at 2018-08-18 00:05:15 Comparing /work/SRC/openSUSE:Factory/linphoneqt (Old) and /work/SRC/openSUSE:Factory/.linphoneqt.new (New) Package is "linphoneqt" Sat Aug 18 00:05:15 2018 rev:7 rq:629597 version:4.1.1 Changes: --- /work/SRC/openSUSE:Factory/linphoneqt/linphoneqt.changes2018-08-15 10:39:32.568417300 +0200 +++ /work/SRC/openSUSE:Factory/.linphoneqt.new/linphoneqt.changes 2018-08-18 00:05:18.243290991 +0200 @@ -1,0 +2,5 @@ +Wed Aug 15 14:36:31 UTC 2018 - sor.ale...@meowr.ru + +- Add linphoneqt-fix-no-git.patch: Fix building out-of-git. + +--- New: linphoneqt-fix-no-git.patch Other differences: -- ++ linphoneqt.spec ++ --- /var/tmp/diff_new_pack.ksqiBN/_old 2018-08-18 00:05:18.791292631 +0200 +++ /var/tmp/diff_new_pack.ksqiBN/_new 2018-08-18 00:05:18.791292631 +0200 @@ -34,6 +34,8 @@ 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 BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme @@ -84,6 +86,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 cp %{SOURCE1} linphone.appdata.xml %build ++ 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 #include +#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
commit linphoneqt for openSUSE:Factory
Hello community, here is the log from the commit of package linphoneqt for openSUSE:Factory checked in at 2018-08-15 10:39:27 Comparing /work/SRC/openSUSE:Factory/linphoneqt (Old) and /work/SRC/openSUSE:Factory/.linphoneqt.new (New) Package is "linphoneqt" Wed Aug 15 10:39:27 2018 rev:6 rq:629302 version:4.1.1 Changes: --- /work/SRC/openSUSE:Factory/linphoneqt/linphoneqt.changes2018-08-06 11:54:40.961286556 +0200 +++ /work/SRC/openSUSE:Factory/.linphoneqt.new/linphoneqt.changes 2018-08-15 10:39:32.568417300 +0200 @@ -1,0 +2,13 @@ +Tue Aug 14 15:45:18 UTC 2018 - sor.ale...@meowr.ru + +- Change the RPM group to the more appropriate and precise + Productivity/Telephony/SIP/Clients. + +--- +Sun Aug 12 19:44:07 UTC 2018 - sor.ale...@meowr.ru + +- Add linphoneqt-force-default-style.patch: Force default theme + style (commit 313aa68). + This fixes issues with tabs reported in boo#1095273. + +--- New: linphoneqt-force-default-style.patch Other differences: -- ++ linphoneqt.spec ++ --- /var/tmp/diff_new_pack.AqxCXz/_old 2018-08-15 10:39:33.352418729 +0200 +++ /var/tmp/diff_new_pack.AqxCXz/_new 2018-08-15 10:39:33.356418736 +0200 @@ -22,16 +22,18 @@ 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 # 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). -Patch1: linphoneqt-fix-qt-5.11.patch +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. -Patch2: linphoneqt-qt-5.9-fix-buttons.patch +Patch3: linphoneqt-qt-5.9-fix-buttons.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme @@ -60,7 +62,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 @@ -81,6 +83,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 cp %{SOURCE1} linphone.appdata.xml %build ++ linphoneqt-force-default-style.patch ++ --- a/src/app/AppController.cpp +++ b/src/app/AppController.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include "gitversion.h" @@ -83,6 +84,7 @@ AppController::AppController (int &argc, QCoreApplication::setApplicationVersion(APPLICATION_VERSION); mApp = new App(argc, argv); + QQuickStyle::setStyle("Default"); if (mApp->isSecondary()) { QString command = mApp->getCommandArgument(); mApp->sendMessage(command.isEmpty() ? "show" : command.toLocal8Bit(), -1);
commit linphoneqt for openSUSE:Factory
Hello community, here is the log from the commit of package linphoneqt for openSUSE:Factory checked in at 2018-08-06 11:54:38 Comparing /work/SRC/openSUSE:Factory/linphoneqt (Old) and /work/SRC/openSUSE:Factory/.linphoneqt.new (New) Package is "linphoneqt" Mon Aug 6 11:54:38 2018 rev:5 rq:627542 version:4.1.1 Changes: --- /work/SRC/openSUSE:Factory/linphoneqt/linphoneqt.changes2018-08-03 12:40:05.775818990 +0200 +++ /work/SRC/openSUSE:Factory/.linphoneqt.new/linphoneqt.changes 2018-08-06 11:54:40.961286556 +0200 @@ -1,0 +2,8 @@ +Sat Aug 4 15:23:14 UTC 2018 - sor.ale...@meowr.ru + +- Add linphoneqt-qt-5.9-fix-buttons.patch: Fix button invisibility + with Qt 5.9 (boo#1095273). +- Improve linphoneqt-fix-qt-5.11.patch: Add a fix for + DefaultTranslator dealing with Qt 5.9 (commit d95f523). + +--- New: linphoneqt-qt-5.9-fix-buttons.patch Other differences: -- ++ linphoneqt.spec ++ --- /var/tmp/diff_new_pack.FGUfWx/_old 2018-08-06 11:54:41.485287466 +0200 +++ /var/tmp/diff_new_pack.FGUfWx/_new 2018-08-06 11:54:41.485287466 +0200 @@ -28,8 +28,10 @@ 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-fix-qt-5.11.patch boo#1083654 -- Fix issues with Qt 5.10 and 5.11 (commits ecaab0f, 5dd0161, 7f62ae9, 8720931, 4f908ef). +# 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). Patch1: 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. +Patch2: linphoneqt-qt-5.9-fix-buttons.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme @@ -78,6 +80,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 cp %{SOURCE1} linphone.appdata.xml %build ++ linphoneqt-fix-qt-5.11.patch ++ --- /var/tmp/diff_new_pack.FGUfWx/_old 2018-08-06 11:54:41.513287515 +0200 +++ /var/tmp/diff_new_pack.FGUfWx/_new 2018-08-06 11:54:41.517287521 +0200 @@ -35,6 +35,32 @@ qInfo() << QStringLiteral("Activated selectors:") << QQmlFileSelector::get(mEngine)->selector()->allSelectors(); // Set modules paths. +--- a/src/app/translator/DefaultTranslator.cpp b/src/app/translator/DefaultTranslator.cpp +@@ -33,10 +33,12 @@ DefaultTranslator::DefaultTranslator (QObject *parent) : QTranslator(parent) { + QFileInfo info(it.next()); + + if (info.suffix() == "qml") { +- // Ignore extra selectors. + QString dir = info.absoluteDir().absolutePath(); +- if (dir.contains("+linux") || dir.contains("+mac") || dir.contains("+windows")) +-continue; ++ ++ // Ignore extra selectors. ++ for (const auto &selector : { "+linux", "+mac", "+windows", "+5.9" }) ++if (dir.contains(selector)) ++ goto end; + + // Ignore default imports. + if (dir.startsWith(":/QtQuick")) +@@ -48,6 +51,7 @@ DefaultTranslator::DefaultTranslator (QObject *parent) : QTranslator(parent) { + else + mContexts << basename; + } ++end:; + } + } + --- a/ui/modules/Common/Form/Buttons/ExclusiveButtons.spec.qml +++ b/ui/modules/Common/Form/Buttons/ExclusiveButtons.spec.qml @@ -27,13 +27,6 @@ Item { ++ linphoneqt-qt-5.9-fix-buttons.patch ++ --- a/ui/modules/Common/Form/Buttons/AbstractTextButton.qml +++ b/ui/modules/Common/Form/Buttons/AbstractTextButton.qml @@ -58,6 +58,8 @@ Item { background: Rectangle { color: _getBackgroundColor() + height: parent.height + width: parent.width radius: AbstractTextButtonStyle.background.radius }
commit linphoneqt for openSUSE:Factory
Hello community, here is the log from the commit of package linphoneqt for openSUSE:Factory checked in at 2018-08-03 12:40:03 Comparing /work/SRC/openSUSE:Factory/linphoneqt (Old) and /work/SRC/openSUSE:Factory/.linphoneqt.new (New) Package is "linphoneqt" Fri Aug 3 12:40:03 2018 rev:4 rq:627176 version:4.1.1 Changes: --- /work/SRC/openSUSE:Factory/linphoneqt/linphoneqt.changes2018-03-09 10:46:38.850566835 +0100 +++ /work/SRC/openSUSE:Factory/.linphoneqt.new/linphoneqt.changes 2018-08-03 12:40:05.775818990 +0200 @@ -1,0 +2,15 @@ +Thu Aug 2 20:00:29 UTC 2018 - sor.ale...@meowr.ru + +- Replace linphoneqt-fix-qt-5.10.patch with + linphoneqt-fix-qt-5.11.patch, adding more fixes: + * Try to support menu bar on Qt 5.10 (commit 5dd0161). + * Fix ComboBox by importing named QtQuick.Controls (commit +7f62ae9). + * Do not use SignalSpy as click is emitted twice instead of one +in Qt 5.11 (commit 8720931), + * Avoid a crash in Calls with a bad binding (Qt 5.11) on +ConferenceControls (commit 4f908ef). +- Do not bother installing the appstream file to + /usr/share/appdata/ on openSUSE Leap 42.x or older. + +--- Old: linphoneqt-fix-qt-5.10.patch New: linphoneqt-fix-qt-5.11.patch Other differences: -- ++ linphoneqt.spec ++ --- /var/tmp/diff_new_pack.5KMCb9/_old 2018-08-03 12:40:06.791820504 +0200 +++ /var/tmp/diff_new_pack.5KMCb9/_new 2018-08-03 12:40:06.827820557 +0200 @@ -28,8 +28,8 @@ 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-fix-qt-5.10.patch boo#1083654 -- Rename the icon property of TabButton to iconName (an issue with Qt 5.10 and the new icon property, commit ecaab0f). -Patch1: linphoneqt-fix-qt-5.10.patch +# PATCH-FIX-UPSTREAM linphoneqt-fix-qt-5.11.patch boo#1083654 -- Fix issues with Qt 5.10 and 5.11 (commits ecaab0f, 5dd0161, 7f62ae9, 8720931, 4f908ef). +Patch1: linphoneqt-fix-qt-5.11.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme @@ -90,13 +90,8 @@ %install %cmake_install -%if 0%{?suse_version} >= 1500 install -Dpm 0644 linphone.appdata.xml \ %{buildroot}%{_datadir}/metainfo/linphone.appdata.xml -%else -install -Dpm 0644 linphone.appdata.xml \ - %{buildroot}%{_datadir}/appdata/linphone.appdata.xml -%endif %if 0%{?suse_version} < 1500 %post -n %{_name} @@ -109,23 +104,14 @@ %endif %files -n %{_name} -%if 0%{?suse_version} >= 1500 %license LICENSE -%else -%doc LICENSE -%endif %doc README.md %{_bindir}/linphone %{_bindir}/linphone-tester %{_datadir}/linphone/ %{_datadir}/applications/linphone.desktop %{_datadir}/icons/hicolor/*/apps/linphone.* -%if 0%{?suse_version} >= 1500 %dir %{_datadir}/metainfo/ %{_datadir}/metainfo/linphone.appdata.xml -%else -%dir %{_datadir}/appdata/ -%{_datadir}/appdata/linphone.appdata.xml -%endif %changelog ++ linphoneqt-fix-qt-5.10.patch -> linphoneqt-fix-qt-5.11.patch ++ --- /work/SRC/openSUSE:Factory/linphoneqt/linphoneqt-fix-qt-5.10.patch 2018-03-09 10:46:38.754570293 +0100 +++ /work/SRC/openSUSE:Factory/.linphoneqt.new/linphoneqt-fix-qt-5.11.patch 2018-08-03 12:40:05.739818936 +0200 @@ -1,3 +1,122 @@ +--- a/resources.qrc b/resources.qrc +@@ -388,6 +388,7 @@ + ui/views/App/Calls/IncomingCall.qml + ui/views/App/Calls/OutgoingCall.qml + ui/views/App/Calls/ZrtpTokenAuthentication.qml ++ui/views/App/Main/+5.9/MainWindowMenuBar.qml + ui/views/App/Main/Assistant/ActivateLinphoneSipAccountWithEmail.qml + ui/views/App/Main/Assistant/ActivateLinphoneSipAccountWithPhoneNumber.qml + ui/views/App/Main/Assistant/AssistantAbstractView.qml +--- a/src/app/App.cpp b/src/app/App.cpp +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -176,8 +177,14 @@ void App::initContentApp () { + // Init engine content. + mEngine = new QQmlApplicationEngine(); + +- // Provide `+custom` folders for custom components. +- (new QQmlFileSelector(mEngine, mEngine))->setExtraSelectors(QStringList("custom")); ++ // Provide `+custom` folders for custom components and `5.9` for old components. ++ { ++QStringList selectors("custom"); ++const QVersionNumber &version = QLibraryInfo::version(); ++if (version.majorVersion() == 5 && version.minorVersion() == 9) ++ selectors.push_back("5.9"); ++(new QQmlFileSelector(mEngine, mEngine))->setExtraSelectors(selectors); ++ } + qInfo() << QStringLiteral("Activated selectors:") << QQm
commit linphoneqt for openSUSE:Factory
Hello community, here is the log from the commit of package linphoneqt for openSUSE:Factory checked in at 2018-03-09 10:46:35 Comparing /work/SRC/openSUSE:Factory/linphoneqt (Old) and /work/SRC/openSUSE:Factory/.linphoneqt.new (New) Package is "linphoneqt" Fri Mar 9 10:46:35 2018 rev:3 rq:584478 version:4.1.1 Changes: --- /work/SRC/openSUSE:Factory/linphoneqt/linphoneqt.changes2017-11-10 14:58:32.753585645 +0100 +++ /work/SRC/openSUSE:Factory/.linphoneqt.new/linphoneqt.changes 2018-03-09 10:46:38.850566835 +0100 @@ -1,0 +2,7 @@ +Thu Mar 8 15:19:49 UTC 2018 - sor.ale...@meowr.ru + +- Add linphoneqt-fix-qt-5.10.patch: Rename the icon property of + TabButton to iconName (an issue with Qt 5.10 and the new icon + property, commit ecaab0f, boo#1083654). + +--- New: linphoneqt-fix-qt-5.10.patch Other differences: -- ++ linphoneqt.spec ++ --- /var/tmp/diff_new_pack.0xTYoE/_old 2018-03-09 10:46:39.514542918 +0100 +++ /var/tmp/diff_new_pack.0xTYoE/_new 2018-03-09 10:46:39.514542918 +0100 @@ -1,7 +1,7 @@ # # spec file for package linphoneqt # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -21,13 +21,15 @@ Version:4.1.1 Release:0 Summary:Qt interface for Linphone -License:GPL-2.0+ +License:GPL-2.0-or-later Group: Productivity/Networking/Other Url:https://linphone.org/ Source: https://linphone.org/releases/sources/%{name}/%{name}-%{version}.tar.gz 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-fix-qt-5.10.patch boo#1083654 -- Rename the icon property of TabButton to iconName (an issue with Qt 5.10 and the new icon property, commit ecaab0f). +Patch1: linphoneqt-fix-qt-5.10.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme @@ -75,6 +77,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 cp %{SOURCE1} linphone.appdata.xml %build @@ -87,7 +90,7 @@ %install %cmake_install -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} >= 1500 install -Dpm 0644 linphone.appdata.xml \ %{buildroot}%{_datadir}/metainfo/linphone.appdata.xml %else @@ -95,7 +98,7 @@ %{buildroot}%{_datadir}/appdata/linphone.appdata.xml %endif -%if 0%{?suse_version} <= 1320 +%if 0%{?suse_version} < 1500 %post -n %{_name} %desktop_database_post %icon_theme_cache_post @@ -106,13 +109,18 @@ %endif %files -n %{_name} -%doc LICENSE README.md +%if 0%{?suse_version} >= 1500 +%license LICENSE +%else +%doc LICENSE +%endif +%doc README.md %{_bindir}/linphone %{_bindir}/linphone-tester %{_datadir}/linphone/ %{_datadir}/applications/linphone.desktop %{_datadir}/icons/hicolor/*/apps/linphone.* -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} >= 1500 %dir %{_datadir}/metainfo/ %{_datadir}/metainfo/linphone.appdata.xml %else ++ linphoneqt-fix-qt-5.10.patch ++ --- a/ui/modules/Common/Form/Tab/TabButton.qml +++ b/ui/modules/Common/Form/Tab/TabButton.qml @@ -12,8 +12,8 @@ Controls.TabButton { // --- - property string icon property int iconSize: TabButtonStyle.icon.size + property string iconName readonly property bool _isSelected: parent.parent.currentItem === button @@ -66,9 +66,9 @@ Controls.TabButton { Layout.leftMargin: TabButtonStyle.text.leftPadding icon: { -var icon = button.icon -return icon.length - ? (icon + '_' + (button._isSelected ? 'selected' : 'normal')) +var iconName = button.iconName +return iconName.length + ? (iconName + '_' + (button._isSelected ? 'selected' : 'normal')) : '' } iconSize: button.iconSize --- a/ui/views/App/Settings/SettingsWindow.qml +++ b/ui/views/App/Settings/SettingsWindow.qml @@ -48,43 +48,43 @@ ApplicationWindow { id: tabBar TabButton { - icon: 'settings_sip_accounts' + iconName: 'settings_sip_accounts' text: qsTr('sipAccountsTab') width: implicitWidth } TabButton { - icon: 'settings_audio' + iconName: 'settings_audio' text: qsTr('audioTab') width: implicitWidth } TabButton { - icon
commit linphoneqt for openSUSE:Factory
Hello community, here is the log from the commit of package linphoneqt for openSUSE:Factory checked in at 2017-11-10 14:58:18 Comparing /work/SRC/openSUSE:Factory/linphoneqt (Old) and /work/SRC/openSUSE:Factory/.linphoneqt.new (New) Package is "linphoneqt" Fri Nov 10 14:58:18 2017 rev:2 rq:540269 version:4.1.1 Changes: --- /work/SRC/openSUSE:Factory/linphoneqt/linphoneqt.changes2017-10-03 23:16:26.689513290 +0200 +++ /work/SRC/openSUSE:Factory/.linphoneqt.new/linphoneqt.changes 2017-11-10 14:58:32.753585645 +0100 @@ -3,0 +4,7 @@ +- Add the missing libqt5-qtquickcontrols dependency (boo#1065173). +- Install the appstream file to the /usr/share/metainfo/ directory + on openSUSE Leap 15.x or newer. + +--- +Sun Sep 10 14:23:13 UTC 2017 - sor.ale...@meowr.ru + Other differences: -- ++ linphoneqt.spec ++ --- /var/tmp/diff_new_pack.ZreB9f/_old 2017-11-10 14:58:33.737550053 +0100 +++ /var/tmp/diff_new_pack.ZreB9f/_new 2017-11-10 14:58:33.741549909 +0100 @@ -56,8 +56,10 @@ %package -n %{_name} Summary:Web Phone +Group: Productivity/Networking/Other Requires: lib%{_name}-data Requires: libqt5-qtgraphicaleffects +Requires: libqt5-qtquickcontrols Requires: libqt5-qtquickcontrols2 Recommends: %{_name}-cli Obsoletes: %{_name}-lang < %{version} @@ -85,9 +87,15 @@ %install %cmake_install +%if 0%{?suse_version} > 1320 +install -Dpm 0644 linphone.appdata.xml \ + %{buildroot}%{_datadir}/metainfo/linphone.appdata.xml +%else install -Dpm 0644 linphone.appdata.xml \ %{buildroot}%{_datadir}/appdata/linphone.appdata.xml +%endif +%if 0%{?suse_version} <= 1320 %post -n %{_name} %desktop_database_post %icon_theme_cache_post @@ -95,6 +103,7 @@ %postun -n %{_name} %desktop_database_postun %icon_theme_cache_postun +%endif %files -n %{_name} %doc LICENSE README.md @@ -103,7 +112,12 @@ %{_datadir}/linphone/ %{_datadir}/applications/linphone.desktop %{_datadir}/icons/hicolor/*/apps/linphone.* +%if 0%{?suse_version} > 1320 +%dir %{_datadir}/metainfo/ +%{_datadir}/metainfo/linphone.appdata.xml +%else %dir %{_datadir}/appdata/ %{_datadir}/appdata/linphone.appdata.xml +%endif %changelog
commit linphoneqt for openSUSE:Factory
Hello community, here is the log from the commit of package linphoneqt for openSUSE:Factory checked in at 2017-10-03 23:16:26 Comparing /work/SRC/openSUSE:Factory/linphoneqt (Old) and /work/SRC/openSUSE:Factory/.linphoneqt.new (New) Package is "linphoneqt" Tue Oct 3 23:16:26 2017 rev:1 rq:522896 version:4.1.1 Changes: New Changes file: --- /dev/null 2017-07-20 07:30:00.335470106 +0200 +++ /work/SRC/openSUSE:Factory/.linphoneqt.new/linphoneqt.changes 2017-10-03 23:16:26.689513290 +0200 @@ -0,0 +1,10 @@ +--- +Sun Sep 10 14:23:13 UTC 2017 - sor.ale...@meowr.ru + +- Add linphoneqt-fix-cmake-i18n.patch: Support new CMake versions + for translations (commit e70c077). + +--- +Fri Jul 21 13:30:37 UTC 2017 - sor.ale...@meowr.ru + +- Initial package. New: linphone.appdata.xml linphoneqt-4.1.1.tar.gz linphoneqt-fix-cmake-i18n.patch linphoneqt.changes linphoneqt.spec Other differences: -- ++ linphoneqt.spec ++ # # spec file for package linphoneqt # # Copyright (c) 2017 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # 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/ # %define _name linphone Name: linphoneqt Version:4.1.1 Release:0 Summary:Qt interface for Linphone License:GPL-2.0+ Group: Productivity/Networking/Other Url:https://linphone.org/ Source: https://linphone.org/releases/sources/%{name}/%{name}-%{version}.tar.gz 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 BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme BuildRequires: libqt5-linguist-devel >= 5.9 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 %description Linphone is a Web phone with a Qt interface. It lets you make two-party calls over IP networks such as the Internet. It uses the IETF protocols SIP (Session Initiation Protocol) and RTP (Realtime TransporT Protocol) to make calls, so it should be able to communicate with other SIP-based Web phones. With several codecs available, it can be used with high speed connections as well as 28k modems. %package -n %{_name} Summary:Web Phone Requires: lib%{_name}-data Requires: libqt5-qtgraphicaleffects Requires: libqt5-qtquickcontrols2 Recommends: %{_name}-cli Obsoletes: %{_name}-lang < %{version} %description -n %{_name} Linphone is a Web phone with a Qt interface. It lets you make two-party calls over IP networks such as the Internet. It uses the IETF protocols SIP (Session Initiation Protocol) and RTP (Realtime TransporT Protocol) to make calls, so it should be able to communicate with other SIP-based Web phones. With several codecs available, it can be used with high speed connections as well as 28k modems. %prep %setup -q %patch0 -p1 cp %{SOURCE1} linphone.appdata.xml %build %cmake \ -DENABLE_DBUS=ON \ -DENABLE_PRECOMPILED_HEADERS=OFF \ -DENABLE_STRICT=OFF \ -DENABLE_STATIC=OFF make %{?_smp_mflags} V=1 %install %cmake_install install -Dpm 0644 linphone.appdata.xml \ %{buildroot}%{_datadir}/appdata/linphone.appdata.xml %post -n %{_name} %desktop_database_post %icon_theme_cache_post %postun -n %{_name} %desktop_database_postun %icon_theme_cache_postun %files -n %{_name} %doc LICENSE README.md %{_bindir}/linphone %{_bindir}/linphone-tester %{_datadir}/linphone/ %{_datadir}/applications/linphone.desktop %{