Hello community, here is the log from the commit of package libdbusmenu-qt5 for openSUSE:Factory checked in at 2015-07-14 17:20:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdbusmenu-qt5 (Old) and /work/SRC/openSUSE:Factory/.libdbusmenu-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libdbusmenu-qt5" Changes: -------- --- /work/SRC/openSUSE:Factory/libdbusmenu-qt5/libdbusmenu-qt5.changes 2015-05-23 13:22:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libdbusmenu-qt5.new/libdbusmenu-qt5.changes 2015-07-14 17:20:10.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Jun 25 16:52:13 UTC 2015 - hrvoje.sen...@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 + +------------------------------------------------------------------- Old: ---- Clean-up-variable-naming.patch dont-leak-all-the-watchers.diff libdbusmenu-qt_0.9.3+14.10.20140619.orig.tar.gz New: ---- libdbusmenu-qt_0.9.3+15.10.20150604.orig.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdbusmenu-qt5.spec ++++++ --- /var/tmp/diff_new_pack.Qf5KnE/_old 2015-07-14 17:20:11.000000000 +0200 +++ /var/tmp/diff_new_pack.Qf5KnE/_new 2015-07-14 17:20:11.000000000 +0200 @@ -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 @@ 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 @@ %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 ++++++ libdbusmenu-qt_0.9.3+14.10.20140619.orig.tar.gz -> libdbusmenu-qt_0.9.3+15.10.20150604.orig.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdbusmenu-qt-0.9.3+14.10.20140619/src/dbusmenuimporter.cpp new/libdbusmenu-qt-0.9.3+15.10.20150604/src/dbusmenuimporter.cpp --- old/libdbusmenu-qt-0.9.3+14.10.20140619/src/dbusmenuimporter.cpp 2014-06-19 11:06:47.000000000 +0200 +++ new/libdbusmenu-qt-0.9.3+15.10.20150604/src/dbusmenuimporter.cpp 2015-06-05 01:12:58.000000000 +0200 @@ -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()) { @@ -551,8 +553,8 @@ 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)) { DMWARNING << "Application did not refresh before timeout"; } } ++++++ noqDebug-qWarnings.patch ++++++ --- /var/tmp/diff_new_pack.Qf5KnE/_old 2015-07-14 17:20:11.000000000 +0200 +++ /var/tmp/diff_new_pack.Qf5KnE/_new 2015-07-14 17:20:11.000000000 +0200 @@ -36,7 +36,7 @@ } 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 @@ 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 @@ 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 @@ #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 @@ } #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 @@ 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
