diff --git a/Clean-up-variable-naming.patch b/Clean-up-variable-naming.patch new file mode 100644 index 0000000..fcb7dba --- /dev/null +++ b/Clean-up-variable-naming.patch @@ -0,0 +1,20 @@ +=== 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(); + } + } + + diff --git a/dont-leak-all-the-watchers.diff b/dont-leak-all-the-watchers.diff new file mode 100644 index 0000000..52725d0 --- /dev/null +++ b/dont-leak-all-the-watchers.diff @@ -0,0 +1,20 @@ +=== 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 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 reply = *watcher; + if (reply.isError()) { + diff --git a/libdbusmenu-qt5.changes b/libdbusmenu-qt5.changes index 2ffb99e..7e0cefe 100644 --- a/libdbusmenu-qt5.changes +++ b/libdbusmenu-qt5.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri May 15 19:29:14 UTC 2015 - hrvoje.senjan@gmail.com + +- Replace avoid-shadowing-variable+fix-leak.diff with Clean-up-variable-naming.patch + +------------------------------------------------------------------- +Mon May 11 20:38:21 UTC 2015 - hrvoje.senjan@gmail.com + +- Add patches from upstream: + dont-leak-all-the-watchers.diff and + avoid-shadowing-variable+fix-leak.diff + ------------------------------------------------------------------- Mon Sep 15 19:31:29 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/libdbusmenu-qt5.spec b/libdbusmenu-qt5.spec index 0cb52d1..d729139 100644 --- a/libdbusmenu-qt5.spec +++ b/libdbusmenu-qt5.spec @@ -1,7 +1,7 @@ # # spec file for package libdbusmenu-qt5 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,6 +32,10 @@ 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 @@ -74,6 +78,8 @@ 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