Accepting request 461473 from KDE:Frameworks5

Update to KDE Frameworks 5.31 and KDE Plasma 5.9.3

OBS-URL: https://build.opensuse.org/request/show/461473
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kxmlgui?expand=0&rev=40
This commit is contained in:
Dominique Leuenberger 2017-03-03 16:22:49 +00:00 committed by Git OBS Bridge
commit 05a2d3526a
5 changed files with 25 additions and 18 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:da3f6f59aed6d7970f78a040e387fcec6509a2bac3e6efaa965b6600c9b1ac00
size 879344

3
kxmlgui-5.31.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f9db5759690e0397476410a10df40222b29f36b2684a308d79d4ed70afb2dfe6
size 882240

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Feb 9 09:35:22 UTC 2017 - hrvoje.senjan@gmail.com
- Update to 5.31.0
* For more details please see:
https://www.kde.org/announcements/kde-frameworks-5.31.0.php
-------------------------------------------------------------------
Sun Jan 8 23:44:30 UTC 2017 - hrvoje.senjan@gmail.com

View File

@ -18,9 +18,9 @@
%bcond_without lang
%define lname libKF5XmlGui5
%define _tar_path 5.30
%define _tar_path 5.31
Name: kxmlgui
Version: 5.30.0
Version: 5.31.0
Release: 0
%define kf5_version %{version}
BuildRequires: attica-qt5-devel >= %{_tar_path}
@ -38,13 +38,13 @@ BuildRequires: kitemviews-devel >= %{_tar_path}
BuildRequires: ktextwidgets-devel >= %{_tar_path}
BuildRequires: kwidgetsaddons-devel >= %{_tar_path}
BuildRequires: kwindowsystem-devel >= %{_tar_path}
BuildRequires: cmake(Qt5Core) >= 5.5.0
BuildRequires: cmake(Qt5DBus) >= 5.5.0
BuildRequires: cmake(Qt5Network) >= 5.5.0
BuildRequires: cmake(Qt5PrintSupport) >= 5.5.0
BuildRequires: cmake(Qt5Test) >= 5.5.0
BuildRequires: cmake(Qt5Widgets) >= 5.5.0
BuildRequires: cmake(Qt5Xml) >= 5.5.0
BuildRequires: cmake(Qt5Core) >= 5.6.0
BuildRequires: cmake(Qt5DBus) >= 5.6.0
BuildRequires: cmake(Qt5Network) >= 5.6.0
BuildRequires: cmake(Qt5PrintSupport) >= 5.6.0
BuildRequires: cmake(Qt5Test) >= 5.6.0
BuildRequires: cmake(Qt5Widgets) >= 5.6.0
BuildRequires: cmake(Qt5Xml) >= 5.6.0
BuildRequires: pkgconfig(x11)
Summary: Framework for managing menu and toolbar actions
License: LGPL-2.1+ and GPL-2.0+
@ -53,7 +53,7 @@ Url: http://www.kde.org
Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
Source1: baselibs.conf
# PATCH-FIX-UPSTREAM use-setFallbackSessionManagementEnabled-API-with-5.5.1.patch -- We can enable usage of setFallbackSessionManagementEnabled function
# with Qt 5.5.1, as we have the qtbase patch backported. For now only apppy patch on 42.1 Leap, as TW doesn't have that patch yet -- #354724, boo#95.300
# with Qt 5.5.1, as we have the qtbase patch backported. For now only apppy patch on 42.1 Leap, as TW doesn't have that patch yet -- #354724, boo#95.310
Patch0: use-setFallbackSessionManagementEnabled-API-with-5.5.1.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -84,9 +84,9 @@ Requires: %lname = %{version}
Requires: extra-cmake-modules
Requires: kconfig-devel >= %{_tar_path}
Requires: kconfigwidgets-devel >= %{_tar_path}
Requires: cmake(Qt5DBus) >= 5.5.0
Requires: cmake(Qt5Widgets) >= 5.5.0
Requires: cmake(Qt5Xml) >= 5.5.0
Requires: cmake(Qt5DBus) >= 5.6.0
Requires: cmake(Qt5Widgets) >= 5.6.0
Requires: cmake(Qt5Xml) >= 5.6.0
%description devel
libkxmlgui provides a framework for managing menu and toolbar actions in an

View File

@ -2,7 +2,7 @@ diff --git a/src/kmainwindow.cpp b/src/kmainwindow.cpp
index c384b67..b8fd216 100644
--- a/src/kmainwindow.cpp
+++ b/src/kmainwindow.cpp
@@ -216,7 +216,7 @@ KMainWindow::KMainWindow(KMainWindowPrivate &dd, QWidget *parent, Qt::WindowFlag
@@ -216,7 +216,7 @@ KMainWindow::KMainWindow(KMainWindowPriv
void KMainWindowPrivate::init(KMainWindow *_q)
{
q = _q;
@ -10,4 +10,4 @@ index c384b67..b8fd216 100644
+#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 1)
QGuiApplication::setFallbackSessionManagementEnabled(false);
#endif
q->setAnimated(q->style()->styleHint(QStyle::SH_Widget_Animate, 0, q));
q->setAnimated(q->style()->styleHint(QStyle::SH_Widget_Animate, nullptr, q));