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.changes 2017-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 - [email protected] + +- 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: 'settings_video' + iconName: 'settings_video' text: qsTr('videoTab') width: implicitWidth } TabButton { - icon: 'settings_call' + iconName: 'settings_call' text: qsTr('callsAndChatTab') width: implicitWidth } TabButton { - icon: 'settings_network' + iconName: 'settings_network' text: qsTr('networkTab') width: implicitWidth } TabButton { - icon: 'settings_advanced' + iconName: 'settings_advanced' text: qsTr('uiTab') width: implicitWidth } TabButton { - icon: 'settings_advanced' + iconName: 'settings_advanced' text: qsTr('uiAdvanced') width: implicitWidth }
