pool/libdbusmenu-qt5
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 313712 from KDE:Qt5

Browse Source 
- Update to 0.9.3+15.10.20150604:
  * Fixed memory leaks
- Drop Clean-up-variable-naming.patch and dont-leak-all-the-watchers.diff,
  merged upstream

OBS-URL: https://build.opensuse.org/request/show/313712
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libdbusmenu-qt5?expand=0&rev=8
This commit is contained in:
Stephan Kulow 2015-07-14 15:20:09 +00:00 committed by Git OBS Bridge
commit ce9d18a33a
7 changed files with 20 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Clean-up-variable-naming.patch
View File

@ -1,20 +0,0 @@
=== modified file 'src/dbusmenuimporter.cpp'
--- src/dbusmenuimporter.cpp 2015-05-05 19:42:58 +0000
+++ src/dbusmenuimporter.cpp 2015-05-05 19:54:13 +0000
@@ -571,12 +571,13 @@
if (needRefresh || menu->actions().isEmpty()) {
d->m_idsRefreshedByAboutToShow << id;
- watcher = d->refresh(id);
- if (!d->waitForWatcher(watcher, REFRESH_TIMEOUT)) {
+ QDBusPendingCallWatcher *watcher2 = d->refresh(id);
+ if (!d->waitForWatcher(watcher2, REFRESH_TIMEOUT)) {
#ifndef QT_NO_DEBUG
DMWARNING << "Application did not refresh before timeout";
#endif
}
+ //watcher2->deleteLater();
}
}

20
dont-leak-all-the-watchers.diff
View File

@ -1,20 +0,0 @@
=== modified file 'src/dbusmenuimporter.cpp'
--- src/dbusmenuimporter.cpp 2014-03-05 09:53:39 +0000
+++ src/dbusmenuimporter.cpp 2015-05-05 19:42:58 +0000
@@ -433,6 +433,7 @@
void DBusMenuImporter::slotGetLayoutFinished(QDBusPendingCallWatcher *watcher)
{
int parentId = watcher->property(DBUSMENU_PROPERTY_ID).toInt();
+ watcher->deleteLater();
QDBusPendingReply<uint, DBusMenuLayoutItem> reply = *watcher;
if (!reply.isValid()) {
@@ -538,6 +539,7 @@
void DBusMenuImporter::slotAboutToShowDBusCallFinished(QDBusPendingCallWatcher *watcher)
{
int id = watcher->property(DBUSMENU_PROPERTY_ID).toInt();
+ watcher->deleteLater();
QDBusPendingReply<bool> reply = *watcher;
if (reply.isError()) {

8
libdbusmenu-qt5.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Jun 25 16:52:13 UTC 2015 - hrvoje.senjan@gmail.com
- Update to 0.9.3+15.10.20150604:
* Fixed memory leaks
- Drop Clean-up-variable-naming.patch and dont-leak-all-the-watchers.diff,
merged upstream
-------------------------------------------------------------------
Fri May 15 19:29:14 UTC 2015 - hrvoje.senjan@gmail.com

8
libdbusmenu-qt5.spec
View File

@ -19,7 +19,7 @@
%define rname libdbusmenu-qt
Name: libdbusmenu-qt5
Version: 0.9.3+14.10.20140619
Version: 0.9.3+15.10.20150604
Release: 0
Url: https://launchpad.net/libdbusmenu-qt/
Summary: A Qt implementation of the DBusMenu protocol
@ -32,10 +32,6 @@ Source1: baselibs.conf
Patch1: noqDebug-qWarnings.patch
# PATCH-FIX-UPSTREAM full_include_dir.patch -- CMake 2.8.12 creates a fatal error on relative include dirs for a target. silence that policy
Patch2: full_include_dir.patch
# PATCH-FIX-UPSTREAM dont-leak-all-the-watchers.diff
Patch3: dont-leak-all-the-watchers.diff
# PATCH-FIX-UPSTREAM Clean-up-variable-naming.patch
Patch4: Clean-up-variable-naming.patch
#Needed for DISABLE_FIND_PACKAGE
BuildRequires: cmake >= 2.8.6
BuildRequires: doxygen
@ -78,8 +74,6 @@ This package contains development files for libdbusmenu-qt5.
%if 0%{?suse_version} <= 1310
%patch2 -p1
%endif
%patch3 -p0
%patch4 -p0
# Remove build time references so build-compare can do its work
sed -i "s/HTML_TIMESTAMP = YES/HTML_TIMESTAMP = NO/" Doxyfile.in

3
libdbusmenu-qt_0.9.3+14.10.20140619.orig.tar.gz
View File

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

3
libdbusmenu-qt_0.9.3+15.10.20150604.orig.tar.gz Normal file
View File

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

16
noqDebug-qWarnings.patch
View File

@ -36,7 +36,7 @@ index f25718d..8868efb 100644
}
QVariantMap map = propertiesForAction(action);
diff --git a/src/dbusmenuimporter.cpp b/src/dbusmenuimporter.cpp
index 2a4c514..2f03729 100644
index 39f5995..d629d69 100644
--- a/src/dbusmenuimporter.cpp
+++ b/src/dbusmenuimporter.cpp
@@ -94,7 +94,9 @@ public:
@ -79,7 +79,7 @@ index 2a4c514..2f03729 100644
return false;
}
@@ -436,18 +444,24 @@ void DBusMenuImporter::slotGetLayoutFinished(QDBusPendingCallWatcher *watcher)
@@ -437,18 +445,24 @@ void DBusMenuImporter::slotGetLayoutFinished(QDBusPendingCallWatcher *watcher)
QDBusPendingReply<uint, DBusMenuLayoutItem> reply = *watcher;
if (!reply.isValid()) {
@ -104,7 +104,7 @@ index 2a4c514..2f03729 100644
return;
}
@@ -474,7 +488,9 @@ void DBusMenuImporter::slotGetLayoutFinished(QDBusPendingCallWatcher *watcher)
@@ -475,7 +489,9 @@ void DBusMenuImporter::slotGetLayoutFinished(QDBusPendingCallWatcher *watcher)
}
}
#ifdef BENCHMARK
@ -114,7 +114,7 @@ index 2a4c514..2f03729 100644
#endif
}
@@ -513,7 +529,9 @@ void DBusMenuImporter::slotMenuAboutToShow()
@@ -514,7 +530,9 @@ void DBusMenuImporter::slotMenuAboutToShow()
QPointer<QObject> guard(this);
if (!d->waitForWatcher(watcher, ABOUT_TO_SHOW_TIMEOUT)) {
@ -124,7 +124,7 @@ index 2a4c514..2f03729 100644
}
#ifdef BENCHMARK
@@ -541,7 +559,9 @@ void DBusMenuImporter::slotAboutToShowDBusCallFinished(QDBusPendingCallWatcher *
@@ -543,7 +561,9 @@ void DBusMenuImporter::slotAboutToShowDBusCallFinished(QDBusPendingCallWatcher *
QDBusPendingReply<bool> reply = *watcher;
if (reply.isError()) {
@ -134,10 +134,10 @@ index 2a4c514..2f03729 100644
return;
}
bool needRefresh = reply.argumentAt<0>();
@@ -553,7 +573,9 @@ void DBusMenuImporter::slotAboutToShowDBusCallFinished(QDBusPendingCallWatcher *
@@ -555,7 +575,9 @@ void DBusMenuImporter::slotAboutToShowDBusCallFinished(QDBusPendingCallWatcher *
d->m_idsRefreshedByAboutToShow << id;
watcher = d->refresh(id);
if (!d->waitForWatcher(watcher, REFRESH_TIMEOUT)) {
QDBusPendingCallWatcher *watcher2 = d->refresh(id);
if (!d->waitForWatcher(watcher2, REFRESH_TIMEOUT)) {
+#ifndef QT_NO_DEBUG
DMWARNING << "Application did not refresh before timeout";
+#endif