Hello community,
here is the log from the commit of package frameworkintegration for
openSUSE:Factory checked in at 2016-04-12 19:09:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/frameworkintegration (Old)
and /work/SRC/openSUSE:Factory/.frameworkintegration.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "frameworkintegration"
Changes:
--------
---
/work/SRC/openSUSE:Factory/frameworkintegration/frameworkintegration.changes
2016-03-16 10:33:00.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.frameworkintegration.new/frameworkintegration.changes
2016-04-12 19:10:13.000000000 +0200
@@ -1,0 +2,10 @@
+Mon Apr 4 14:18:29 UTC 2016 - [email protected]
+
+- Update to 5.21.0 (boo#974793)
+ * Fallback to QCommonStyle implementation of standardIcon
+ * Set a default menu close timeout
+ * Upgrade Qt version requirement to 5.4.0
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.21.0.php
+
+-------------------------------------------------------------------
Old:
----
frameworkintegration-5.20.0.tar.xz
New:
----
frameworkintegration-5.21.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ frameworkintegration.spec ++++++
--- /var/tmp/diff_new_pack.EL7Edf/_old 2016-04-12 19:10:13.000000000 +0200
+++ /var/tmp/diff_new_pack.EL7Edf/_new 2016-04-12 19:10:13.000000000 +0200
@@ -18,9 +18,9 @@
%bcond_without lang
%define lname libKF5Style5
-%define _tar_path 5.20
+%define _tar_path 5.21
Name: frameworkintegration
-Version: 5.20.0
+Version: 5.21.0
Release: 0
%define kf5_version %{version}
BuildRequires: cmake >= 2.8.12
@@ -34,10 +34,10 @@
BuildRequires: kio-devel >= %{_tar_path}
BuildRequires: knotifications-devel >= %{_tar_path}
BuildRequires: kwidgetsaddons-devel >= %{_tar_path}
-BuildRequires: libQt5Gui-private-headers-devel >= 5.3.0
-BuildRequires: cmake(Qt5DBus) >= 5.3.0
-BuildRequires: cmake(Qt5Widgets) >= 5.3.0
-BuildRequires: cmake(Qt5X11Extras) >= 5.3.0
+BuildRequires: libQt5Gui-private-headers-devel >= 5.4.0
+BuildRequires: cmake(Qt5DBus) >= 5.4.0
+BuildRequires: cmake(Qt5Widgets) >= 5.4.0
+BuildRequires: cmake(Qt5X11Extras) >= 5.4.0
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcb)
BuildRequires: pkgconfig(xcursor)
++++++ frameworkintegration-5.20.0.tar.xz -> frameworkintegration-5.21.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.20.0/CMakeLists.txt
new/frameworkintegration-5.21.0/CMakeLists.txt
--- old/frameworkintegration-5.20.0/CMakeLists.txt 2016-03-05
19:45:12.000000000 +0100
+++ new/frameworkintegration-5.21.0/CMakeLists.txt 2016-04-03
22:42:57.000000000 +0200
@@ -3,7 +3,7 @@
project(FrameworkIntegration)
include(FeatureSummary)
-find_package(ECM 5.20.0 NO_MODULE)
+find_package(ECM 5.21.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake
Modules." URL
"https://projects.kde.org/projects/kdesupport/extra-cmake-modules";)
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND
FATAL_ON_MISSING_REQUIRED_PACKAGES)
@@ -20,11 +20,11 @@
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
-set(REQUIRED_QT_VERSION 5.3.0)
+set(REQUIRED_QT_VERSION 5.4.0)
find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus)
-set(KF5_VERSION "5.20.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.20.0") # handled by release scripts
+set(KF5_VERSION "5.21.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.21.0") # handled by release scripts
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX FRAMEWORKINTEGRATION
VERSION_HEADER
"${CMAKE_CURRENT_BINARY_DIR}/frameworkintegration_version.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.20.0/po/ast/frameworkintegration5.po
new/frameworkintegration-5.21.0/po/ast/frameworkintegration5.po
--- old/frameworkintegration-5.20.0/po/ast/frameworkintegration5.po
2016-03-05 19:45:12.000000000 +0100
+++ new/frameworkintegration-5.21.0/po/ast/frameworkintegration5.po
2016-04-03 22:42:57.000000000 +0200
@@ -1,15 +1,15 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
#
-# enolp <[email protected]>, 2015.
+# enolp <[email protected]>, 2015, 2016.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2016-02-16 08:46+0000\n"
-"PO-Revision-Date: 2015-11-10 23:51+0100\n"
+"PO-Revision-Date: 2016-03-06 22:20+0100\n"
"Last-Translator: enolp <[email protected]>\n"
-"Language-Team: Asturian <[email protected]>\n"
+"Language-Team: Asturian <>\n"
"Language: ast\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -48,7 +48,7 @@
#: platformtheme/kdeplatformtheme.cpp:242
msgctxt "@action:button"
msgid "Retry"
-msgstr "Reintentar"
+msgstr "Retentar"
#: platformtheme/kdeplatformtheme.cpp:244
msgctxt "@action:button"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.20.0/src/kstyle/kstyle.cpp
new/frameworkintegration-5.21.0/src/kstyle/kstyle.cpp
--- old/frameworkintegration-5.20.0/src/kstyle/kstyle.cpp 2016-03-05
19:45:12.000000000 +0100
+++ new/frameworkintegration-5.21.0/src/kstyle/kstyle.cpp 2016-04-03
22:42:57.000000000 +0200
@@ -292,8 +292,8 @@
return KColorScheme::createApplicationPalette(KSharedConfig::openConfig());
}
-QIcon KStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption
*/*option*/,
- const QWidget */*widget*/) const
+QIcon KStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption
*option,
+ const QWidget *widget) const
{
switch (standardIcon) {
case QStyle::SP_DesktopIcon:
@@ -409,8 +409,10 @@
return QIcon::fromTheme(QStringLiteral("audio-volume-muted"));
default:
- return QIcon();
+ break;
}
+
+ return QCommonStyle::standardIcon(standardIcon, option, widget);
}
int KStyle::styleHint(StyleHint hint, const QStyleOption *option, const
QWidget *widget, QStyleHintReturn *returnData) const
@@ -430,6 +432,10 @@
return g.readEntry("GraphicEffectsLevel", true);
}
+ #if QT_VERSION >= QT_VERSION_CHECK(5,5,0)
+ case QStyle::SH_Menu_SubMenuSloppyCloseTimeout: return 300;
+ #endif
+
case SH_ToolButtonStyle: {
KConfigGroup g(KSharedConfig::openConfig(), "Toolbar style");
