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.changes 2018-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 - [email protected] + +- 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 }
