Hello community, here is the log from the commit of package qqc2-desktop-style for openSUSE:Factory checked in at 2019-02-25 17:57:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qqc2-desktop-style (Old) and /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qqc2-desktop-style" Mon Feb 25 17:57:21 2019 rev:19 rq:678730 version:5.55.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qqc2-desktop-style/qqc2-desktop-style.changes 2019-02-15 10:01:57.351634373 +0100 +++ /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.28833/qqc2-desktop-style.changes 2019-02-25 17:57:24.722287322 +0100 @@ -1,0 +2,7 @@ +Fri Feb 15 09:25:42 UTC 2019 - [email protected] + +- Add 0001-Fix-MobileTextActionsToolBar.qml-with-Qt-5.9.patch (by Fabian Vogt) + to fix an issue with Qt 5.9 +- Downgrade the Qt version requirement to build with 5.9 + +------------------------------------------------------------------- New: ---- 0001-Fix-MobileTextActionsToolBar.qml-with-Qt-5.9.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qqc2-desktop-style.spec ++++++ --- /var/tmp/diff_new_pack.pj72la/_old 2019-02-25 17:57:25.242286879 +0100 +++ /var/tmp/diff_new_pack.pj72la/_new 2019-02-25 17:57:25.242286879 +0100 @@ -27,6 +27,8 @@ Source: https://download.kde.org/stable/frameworks/%{_tar_path}/qqc2-desktop-style-%{version}.tar.xz # PATCH-FIX-OPENSUSE Patch0: fix-build-with-gcc48.patch +# PATCH-FIX-OPENSUSE +Patch1: 0001-Fix-MobileTextActionsToolBar.qml-with-Qt-5.9.patch BuildRequires: extra-cmake-modules >= 0.0.8 # For dir ownership BuildRequires: kconfigwidgets-devel @@ -70,6 +72,10 @@ %if 0%{?suse_version} < 1500 %patch0 -p1 %endif +%patch1 -p1 +%if 0%{?suse_version} == 1500 +sed -i -e "s/^set *(REQUIRED_QT_VERSION 5.10.0)$/set(REQUIRED_QT_VERSION 5.9.0)/" CMakeLists.txt +%endif %build %cmake_kf5 -d build ++++++ 0001-Fix-MobileTextActionsToolBar.qml-with-Qt-5.9.patch ++++++ >From c6955b5afe087bf995c301c2a822533277539fa9 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <[email protected]> Date: Sat, 9 Feb 2019 17:16:10 +0100 Subject: [PATCH] Fix MobileTextActionsToolBar.qml with Qt 5.9 --- org.kde.desktop/private/MobileTextActionsToolBar.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/org.kde.desktop/private/MobileTextActionsToolBar.qml b/org.kde.desktop/private/MobileTextActionsToolBar.qml index e1e0043..c0953a2 100644 --- a/org.kde.desktop/private/MobileTextActionsToolBar.qml +++ b/org.kde.desktop/private/MobileTextActionsToolBar.qml @@ -57,7 +57,7 @@ Popup { contentItem: RowLayout { ToolButton { focusPolicy: Qt.NoFocus - icon.name: "edit-cut" + @DISABLE_UNDER_QQC2_2_3@ icon.name: "edit-cut" visible: controlRoot.selectedText.length > 0 onClicked: { controlRoot.cut(); @@ -65,7 +65,7 @@ Popup { } ToolButton { focusPolicy: Qt.NoFocus - icon.name: "edit-copy" + @DISABLE_UNDER_QQC2_2_3@ icon.name: "edit-copy" visible: controlRoot.selectedText.length > 0 onClicked: { controlRoot.copy(); @@ -73,7 +73,7 @@ Popup { } ToolButton { focusPolicy: Qt.NoFocus - icon.name: "edit-paste" + @DISABLE_UNDER_QQC2_2_3@ icon.name: "edit-paste" onClicked: { controlRoot.paste(); } -- 2.20.1
