Hello community,
here is the log from the commit of package plasma5-integration for
openSUSE:Factory checked in at 2018-07-14 20:19:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plasma5-integration (Old)
and /work/SRC/openSUSE:Factory/.plasma5-integration.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-integration"
Sat Jul 14 20:19:16 2018 rev:47 rq:622127 version:5.13.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/plasma5-integration/plasma5-integration.changes
2018-07-01 21:23:30.984993457 +0200
+++
/work/SRC/openSUSE:Factory/.plasma5-integration.new/plasma5-integration.changes
2018-07-14 20:19:46.415345447 +0200
@@ -1,0 +2,10 @@
+Tue Jul 10 14:02:16 CEST 2018 - [email protected]
+
+- Update to 5.13.3
+ * New bugfix release
+ * For more details please see:
+ * https://www.kde.org/announcements/plasma-5.13.3.php
+- Changes since 5.13.2:
+ * [QDBusMenuBar] Guard m_window with a QPointer (kde#376340,kde#379719)
+
+-------------------------------------------------------------------
Old:
----
plasma-integration-5.13.2.tar.xz
New:
----
plasma-integration-5.13.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plasma5-integration.spec ++++++
--- /var/tmp/diff_new_pack.BkFJ9T/_old 2018-07-14 20:19:47.635348588 +0200
+++ /var/tmp/diff_new_pack.BkFJ9T/_new 2018-07-14 20:19:47.639348599 +0200
@@ -18,7 +18,7 @@
%bcond_without lang
Name: plasma5-integration
-Version: 5.13.2
+Version: 5.13.3
Release: 0
# Full Plasma 5 version (e.g. 5.8.95)
%{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}}
++++++ plasma-integration-5.13.2.tar.xz -> plasma-integration-5.13.3.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plasma-integration-5.13.2/CMakeLists.txt
new/plasma-integration-5.13.3/CMakeLists.txt
--- old/plasma-integration-5.13.2/CMakeLists.txt 2018-06-26
13:52:50.000000000 +0200
+++ new/plasma-integration-5.13.3/CMakeLists.txt 2018-07-10
12:12:11.000000000 +0200
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.0)
project(PlasmaIntegration)
-set(PROJECT_VERSION "5.13.2")
+set(PROJECT_VERSION "5.13.3")
set(PROJECT_VERSION_MAJOR 5)
set(QT_MIN_VERSION "5.9.0")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plasma-integration-5.13.2/po/zh_CN/plasmaintegration5.po
new/plasma-integration-5.13.3/po/zh_CN/plasmaintegration5.po
--- old/plasma-integration-5.13.2/po/zh_CN/plasmaintegration5.po
2018-06-26 13:53:12.000000000 +0200
+++ new/plasma-integration-5.13.3/po/zh_CN/plasmaintegration5.po
2018-07-10 12:12:17.000000000 +0200
@@ -7,7 +7,7 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2018-04-18 03:46+0200\n"
-"PO-Revision-Date: 2018-06-19T17:12:15+0000\n"
+"PO-Revision-Date: 2018-07-03 17:38\n"
"Last-Translator: guoyunhebrave <[email protected]>\n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plasma-integration-5.13.2/src/platformtheme/qdbusmenubar.cpp
new/plasma-integration-5.13.3/src/platformtheme/qdbusmenubar.cpp
--- old/plasma-integration-5.13.2/src/platformtheme/qdbusmenubar.cpp
2018-06-26 13:52:50.000000000 +0200
+++ new/plasma-integration-5.13.3/src/platformtheme/qdbusmenubar.cpp
2018-07-10 12:12:11.000000000 +0200
@@ -122,15 +122,20 @@
void QDBusMenuBar::handleReparent(QWindow *newParentWindow)
{
- if (newParentWindow && newParentWindow != m_window) {
- QWindow *oldWindow = m_window;
+ if (newParentWindow == m_window) {
+ return;
+ }
- unregisterMenuBar();
- m_window = newParentWindow;
- registerMenuBar();
+ QWindow *oldWindow = m_window;
+
+ unregisterMenuBar();
+ m_window = newParentWindow;
- emit windowChanged(newParentWindow, oldWindow);
+ if (newParentWindow) {
+ registerMenuBar();
}
+
+ emit windowChanged(newParentWindow, oldWindow);
}
QPlatformMenu *QDBusMenuBar::menuForTag(quintptr tag) const
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plasma-integration-5.13.2/src/platformtheme/qdbusmenubar_p.h
new/plasma-integration-5.13.3/src/platformtheme/qdbusmenubar_p.h
--- old/plasma-integration-5.13.2/src/platformtheme/qdbusmenubar_p.h
2018-06-26 13:52:50.000000000 +0200
+++ new/plasma-integration-5.13.3/src/platformtheme/qdbusmenubar_p.h
2018-07-10 12:12:11.000000000 +0200
@@ -87,7 +87,7 @@
QDBusPlatformMenu *m_menu;
QDBusMenuAdaptor *m_menuAdaptor;
QHash<quintptr, QDBusPlatformMenuItem *> m_menuItems;
- QWindow *m_window = nullptr;
+ QPointer<QWindow> m_window;
QString m_objectPath;
QDBusPlatformMenuItem *menuItemForMenu(QPlatformMenu *menu);
