diff --git a/noqDebug-qWarnings.patch b/noqDebug-qWarnings.patch index cacbe58..d92bdbb 100644 --- a/noqDebug-qWarnings.patch +++ b/noqDebug-qWarnings.patch @@ -1,7 +1,7 @@ -diff -Naur libdbusmenu-qt-0.9.2.orig/CMakeLists.txt libdbusmenu-qt-0.9.2/CMakeLists.txt ---- libdbusmenu-qt-0.9.2.orig/CMakeLists.txt 2012-03-29 17:47:52.000000000 +0200 -+++ libdbusmenu-qt-0.9.2/CMakeLists.txt 2013-08-25 22:31:17.238891142 +0200 -@@ -88,7 +88,7 @@ +diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/CMakeLists.txt libdbusmenu-qt-0.9.2+14.04.20131209/CMakeLists.txt +--- libdbusmenu-qt-0.9.2+14.04.20131209.orig/CMakeLists.txt 2013-12-09 03:29:47.000000000 +0100 ++++ libdbusmenu-qt-0.9.2+14.04.20131209/CMakeLists.txt 2013-12-18 21:58:01.847669366 +0100 +@@ -91,7 +91,7 @@ add_subdirectory(src) if (NOT USE_QT5) # TODO port tests to Qt5 @@ -10,9 +10,9 @@ diff -Naur libdbusmenu-qt-0.9.2.orig/CMakeLists.txt libdbusmenu-qt-0.9.2/CMakeLi endif() add_subdirectory(tools) -diff -Naur libdbusmenu-qt-0.9.2.orig/src/dbusmenuexporter.cpp libdbusmenu-qt-0.9.2/src/dbusmenuexporter.cpp ---- libdbusmenu-qt-0.9.2.orig/src/dbusmenuexporter.cpp 2012-03-29 17:47:52.000000000 +0200 -+++ libdbusmenu-qt-0.9.2/src/dbusmenuexporter.cpp 2013-08-25 21:53:59.005872906 +0200 +diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuexporter.cpp libdbusmenu-qt-0.9.2+14.04.20131209/src/dbusmenuexporter.cpp +--- libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuexporter.cpp 2013-12-09 03:29:47.000000000 +0100 ++++ libdbusmenu-qt-0.9.2+14.04.20131209/src/dbusmenuexporter.cpp 2013-12-18 21:59:13.984767528 +0100 @@ -160,7 +160,9 @@ Q_FOREACH(QAction *action, menu->actions()) { int actionId = m_idForAction.value(action, -1); @@ -33,12 +33,12 @@ diff -Naur libdbusmenu-qt-0.9.2.orig/src/dbusmenuexporter.cpp libdbusmenu-qt-0.9 return; } QVariantMap map = propertiesForAction(action); -diff -Naur libdbusmenu-qt-0.9.2.orig/src/dbusmenuimporter.cpp libdbusmenu-qt-0.9.2/src/dbusmenuimporter.cpp ---- libdbusmenu-qt-0.9.2.orig/src/dbusmenuimporter.cpp 2012-03-29 17:47:52.000000000 +0200 -+++ libdbusmenu-qt-0.9.2/src/dbusmenuimporter.cpp 2013-08-25 21:53:10.844475006 +0200 -@@ -190,7 +190,9 @@ - } else if (key == "shortcut") { +diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuimporter.cpp libdbusmenu-qt-0.9.2+14.04.20131209/src/dbusmenuimporter.cpp +--- libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuimporter.cpp 2013-12-09 03:29:47.000000000 +0100 ++++ libdbusmenu-qt-0.9.2+14.04.20131209/src/dbusmenuimporter.cpp 2013-12-18 22:02:02.663658752 +0100 +@@ -191,7 +191,9 @@ updateActionShortcut(action, value); + } else if (key == "children-display") { } else { +#ifndef QT_NO_DEBUG DMWARNING << "Unhandled property update" << key; @@ -46,17 +46,7 @@ diff -Naur libdbusmenu-qt-0.9.2.orig/src/dbusmenuimporter.cpp libdbusmenu-qt-0.9 } } -@@ -238,7 +240,9 @@ - action->setProperty(DBUSMENU_PROPERTY_ICON_DATA_HASH, dataHash); - QPixmap pix; - if (!pix.loadFromData(data)) { -+#ifndef QT_NO_DEBUG - DMWARNING << "Failed to decode icon-data property for action" << action->text(); -+#endif - action->setIcon(QIcon()); - return; - } -@@ -390,7 +394,9 @@ +@@ -390,7 +392,9 @@ QDBusPendingReply reply = *watcher; if (!reply.isValid()) { @@ -66,7 +56,7 @@ diff -Naur libdbusmenu-qt-0.9.2.orig/src/dbusmenuimporter.cpp libdbusmenu-qt-0.9 return; } -@@ -401,7 +407,9 @@ +@@ -401,7 +405,9 @@ QMenu *menu = d->menuForId(parentId); if (!menu) { @@ -76,7 +66,7 @@ diff -Naur libdbusmenu-qt-0.9.2.orig/src/dbusmenuimporter.cpp libdbusmenu-qt-0.9 return; } -@@ -489,7 +497,9 @@ +@@ -494,7 +500,9 @@ QPointer guard(this); if (!waitForWatcher(watcher, ABOUT_TO_SHOW_TIMEOUT)) { @@ -86,7 +76,7 @@ diff -Naur libdbusmenu-qt-0.9.2.orig/src/dbusmenuimporter.cpp libdbusmenu-qt-0.9 } #ifdef BENCHMARK -@@ -517,7 +527,9 @@ +@@ -522,7 +530,9 @@ QDBusPendingReply reply = *watcher; if (reply.isError()) { @@ -96,7 +86,7 @@ diff -Naur libdbusmenu-qt-0.9.2.orig/src/dbusmenuimporter.cpp libdbusmenu-qt-0.9 return; } bool needRefresh = reply.argumentAt<0>(); -@@ -529,7 +541,9 @@ +@@ -534,7 +544,9 @@ d->m_idsRefreshedByAboutToShow << id; watcher = d->refresh(id); if (!waitForWatcher(watcher, REFRESH_TIMEOUT)) { @@ -106,9 +96,9 @@ diff -Naur libdbusmenu-qt-0.9.2.orig/src/dbusmenuimporter.cpp libdbusmenu-qt-0.9 } } } -diff -Naur libdbusmenu-qt-0.9.2.orig/src/debug_p.h libdbusmenu-qt-0.9.2/src/debug_p.h ---- libdbusmenu-qt-0.9.2.orig/src/debug_p.h 2012-03-29 17:47:52.000000000 +0200 -+++ libdbusmenu-qt-0.9.2/src/debug_p.h 2013-08-25 22:28:20.231104044 +0200 +diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/debug_p.h libdbusmenu-qt-0.9.2+14.04.20131209/src/debug_p.h +--- libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/debug_p.h 2013-12-09 03:29:47.000000000 +0100 ++++ libdbusmenu-qt-0.9.2+14.04.20131209/src/debug_p.h 2013-12-18 22:02:33.923267953 +0100 @@ -36,12 +36,10 @@ #define DMVAR(var) DMDEBUG << #var ":" << var