From d911f55222d68c8f7fc347f32145e2f3e054104762aa36cdcfbbd4668c10a2d7 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Wed, 18 Dec 2013 20:51:22 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/libdbusmenu-qt5?expand=0&rev=5 --- libdbusmenu-qt5.changes | 34 ++++++++++++++----- libdbusmenu-qt5.spec | 9 ++--- ...usmenu-qt_0.9.2+13.10.20130826.orig.tar.gz | 3 -- ...usmenu-qt_0.9.2+14.04.20131209.orig.tar.gz | 3 ++ 4 files changed, 33 insertions(+), 16 deletions(-) delete mode 100644 libdbusmenu-qt_0.9.2+13.10.20130826.orig.tar.gz create mode 100644 libdbusmenu-qt_0.9.2+14.04.20131209.orig.tar.gz diff --git a/libdbusmenu-qt5.changes b/libdbusmenu-qt5.changes index ff7fa96..25790ab 100644 --- a/libdbusmenu-qt5.changes +++ b/libdbusmenu-qt5.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Dec 18 20:52:32 UTC 2013 - hrvoje.senjan@gmail.com + +- Update to 0.9.2+14.04.20131209 + * Install CMake config files for dbusmenu-qt and dbusmenu-qt5. + This makes it easy for other projects to use the library with + find(dbusmenu-qt) or find(dbusmenu-qt5) without having to ship + a FindDBusMenuQt.cmake file. (More about this topic here: + http://www.cmake.org/Wiki/CMake/Tutorials/Packaging ). Test + programs available here: + http://agateau.com/tmp/dmqt-samples.tar.bz2. + * Destructors of classes intended to be base classes updated to + virtual. + * When adding a new submenu action, refresh() that action to + ensure full menu hierarchy is built. + ------------------------------------------------------------------- Wed Nov 6 22:50:10 UTC 2013 - hrvoje.senjan@gmail.com @@ -10,9 +26,9 @@ Wed Nov 6 22:50:10 UTC 2013 - hrvoje.senjan@gmail.com ------------------------------------------------------------------- Sun Aug 25 20:00:50 UTC 2013 - hrvoje.senjan@gmail.com -- Added 237_236.diff from upstream, fixes lp#1068050 (Some icons of - kate menu are wrong when run with the global menubar) and - noqDebug-qWarnings.patch, which disables spamming users with +- Added 237_236.diff from upstream, fixes lp#1068050 (Some icons of + kate menu are wrong when run with the global menubar) and + noqDebug-qWarnings.patch, which disables spamming users with useless debug ------------------------------------------------------------------- @@ -76,13 +92,13 @@ Wed Dec 22 10:42:32 UTC 2010 - rwooninck@opensuse.org * Avoid false warnings * Make sure we don't track actions twice (bko254066) * CMake-parser-friendly of dbusmenu_version.h - * Trigger action asynchronously when the "clicked" event is + * Trigger action asynchronously when the "clicked" event is received (LP bug 643393) * Fixed copyright headers * Removed all code which did not belong to Canonical. * Fix some memory leaks * Do not keep dangling pointers to deleted actions (LP bug 624964) - * Added the DBusMenuImporter::actionActivationRequested(QAction*) + * Added the DBusMenuImporter::actionActivationRequested(QAction*) signal * Fix hardcoded libdir in pkgconfig file (LP BUG 610633) @@ -98,18 +114,18 @@ Fri Aug 13 09:44:41 UTC 2010 - tittiatcoke@gmail.com * Fix implementation of GetGroupProperties() * Fix detection of QIcon::name() with gold * Add support for KMenu titles - * Queue calls to refresh() because we may be spammed with many + * Queue calls to refresh() because we may be spammed with many LayoutUpdated() signals at once * Turned DBusMenuImporter::updateMenu() into a slot * Introduce a dbusmenu_version.h file - * Introduce updateMenu() and menuUpdated(), deprecate + * Introduce updateMenu() and menuUpdated(), deprecate menuReadyToBeShown() * Better build check for QIcon::name() (LP BUG 597975) * Rework the way menuReadyToBeShown() is emitted * Queue LayoutUpdated() signal to avoid emitting it too often - * Increase timeouts: prefer slow but complete menus to fast + * Increase timeouts: prefer slow but complete menus to fast but incomplete - * Use QIcon::name() to return the icon name, when built + * Use QIcon::name() to return the icon name, when built with Qt 4.7 * Correctly handle non-exclusive action groups * bugfix (bko#237156) diff --git a/libdbusmenu-qt5.spec b/libdbusmenu-qt5.spec index c6df990..27ecbf1 100644 --- a/libdbusmenu-qt5.spec +++ b/libdbusmenu-qt5.spec @@ -1,5 +1,5 @@ # -# spec file for package libdbusmenu-qt +# spec file for package libdbusmenu-qt5 # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,16 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define rname libdbusmenu-qt Name: libdbusmenu-qt5 -Version: 0.9.2+13.10.20130826 +Version: 0.9.2+14.04.20131209 Release: 0 Url: https://launchpad.net/libdbusmenu-qt/ Summary: A Qt implementation of the DBusMenu protocol License: LGPL-2.0+ Group: System/Libraries -Source0: https://launchpad.net/ubuntu/trusty/+source/%{rname}/%{version}-0ubuntu1/+files/%{rname}_%{version}.orig.tar.gz +Source0: http://archive.ubuntu.com/ubuntu/pool/main/libd/%{rname}/%{rname}_%{version}.orig.tar.gz Source99: baselibs.conf # PATCH-FIX-UPSTREAM noqDebug-qWarnings.patch -- libdbusmenu uses it's own qDebug's and qWarnings, # which are useless, and annoy users, so this patch just disables them in release mode @@ -36,7 +37,7 @@ BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRequires: pkgconfig(Qt5Core) -BuildRoot: %{_tmppath}/%{rname}-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This library provides a Qt implementation of the DBusMenu protocol. diff --git a/libdbusmenu-qt_0.9.2+13.10.20130826.orig.tar.gz b/libdbusmenu-qt_0.9.2+13.10.20130826.orig.tar.gz deleted file mode 100644 index d559053..0000000 --- a/libdbusmenu-qt_0.9.2+13.10.20130826.orig.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6699a34eb4ff27371543f8499600f5f9f7267dfe7468c505a4411b0ee74a0d43 -size 45394 diff --git a/libdbusmenu-qt_0.9.2+14.04.20131209.orig.tar.gz b/libdbusmenu-qt_0.9.2+14.04.20131209.orig.tar.gz new file mode 100644 index 0000000..8e67d8e --- /dev/null +++ b/libdbusmenu-qt_0.9.2+14.04.20131209.orig.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7caf94fe27ce146a637af3062aa5bac90caec37cc30cd5ef638e46ccd4f264b +size 45800 From e647eaa3f75a66ead3d50a493fc12105afeeed71b1b89197e3c9497471b514bc Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Wed, 18 Dec 2013 21:00:02 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/libdbusmenu-qt5?expand=0&rev=6 --- noqDebug-qWarnings.patch | 50 ++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 30 deletions(-) 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 From 4d60e9e7aabeaa0b980062c5cda3efded996f551018a7b8c16f0c0a4be02681d Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Wed, 18 Dec 2013 21:03:50 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/libdbusmenu-qt5?expand=0&rev=7 --- noqDebug-qWarnings.patch | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/noqDebug-qWarnings.patch b/noqDebug-qWarnings.patch index d92bdbb..8ef4018 100644 --- a/noqDebug-qWarnings.patch +++ b/noqDebug-qWarnings.patch @@ -35,7 +35,7 @@ diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuexporter.cpp lib QVariantMap map = propertiesForAction(action); 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 ++++ libdbusmenu-qt-0.9.2+14.04.20131209/src/dbusmenuimporter.cpp 2013-12-18 22:06:44.057140849 +0100 @@ -191,7 +191,9 @@ updateActionShortcut(action, value); } else if (key == "children-display") { @@ -46,7 +46,17 @@ diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuimporter.cpp lib } } -@@ -390,7 +392,9 @@ +@@ -239,7 +241,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 @@ QDBusPendingReply reply = *watcher; if (!reply.isValid()) { @@ -56,7 +66,7 @@ diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuimporter.cpp lib return; } -@@ -401,7 +405,9 @@ +@@ -401,7 +407,9 @@ QMenu *menu = d->menuForId(parentId); if (!menu) { @@ -66,7 +76,7 @@ diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuimporter.cpp lib return; } -@@ -494,7 +500,9 @@ +@@ -494,7 +502,9 @@ QPointer guard(this); if (!waitForWatcher(watcher, ABOUT_TO_SHOW_TIMEOUT)) { @@ -76,7 +86,7 @@ diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuimporter.cpp lib } #ifdef BENCHMARK -@@ -522,7 +530,9 @@ +@@ -522,7 +532,9 @@ QDBusPendingReply reply = *watcher; if (reply.isError()) { @@ -86,7 +96,7 @@ diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuimporter.cpp lib return; } bool needRefresh = reply.argumentAt<0>(); -@@ -534,7 +544,9 @@ +@@ -534,7 +546,9 @@ d->m_idsRefreshedByAboutToShow << id; watcher = d->refresh(id); if (!waitForWatcher(watcher, REFRESH_TIMEOUT)) { From 9a7d35aa1e50c4e1d25a4247047715bd2fe19527184a0ef9ba4f8da9b95dc095 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Wed, 18 Dec 2013 21:09:56 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/libdbusmenu-qt5?expand=0&rev=8 --- libdbusmenu-qt5.changes | 1 + libdbusmenu-qt5.spec | 1 + 2 files changed, 2 insertions(+) diff --git a/libdbusmenu-qt5.changes b/libdbusmenu-qt5.changes index 25790ab..89354e5 100644 --- a/libdbusmenu-qt5.changes +++ b/libdbusmenu-qt5.changes @@ -13,6 +13,7 @@ Wed Dec 18 20:52:32 UTC 2013 - hrvoje.senjan@gmail.com virtual. * When adding a new submenu action, refresh() that action to ensure full menu hierarchy is built. +- Rebase noqDebug-qWarnings.patch to this release ------------------------------------------------------------------- Wed Nov 6 22:50:10 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/libdbusmenu-qt5.spec b/libdbusmenu-qt5.spec index 27ecbf1..57f63a8 100644 --- a/libdbusmenu-qt5.spec +++ b/libdbusmenu-qt5.spec @@ -111,5 +111,6 @@ install -pm 0644 COPYING NEWS README %{buildroot}%{_docdir}/libdbusmenu-qt5-deve %{_libdir}/libdbusmenu-qt5.so %{_includedir}/dbusmenu-qt5/ %{_libdir}/pkgconfig/dbusmenu-qt5.pc +%{_libdir}/cmake/dbusmenu-qt5/ %changelog