Hello community, here is the log from the commit of package libdbusmenu-qt5 for openSUSE:Factory checked in at 2013-12-19 12:14:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-12-02 17:02:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libdbusmenu-qt5.new/libdbusmenu-qt5.changes 2013-12-19 12:14:12.000000000 +0100 @@ -1,0 +2,17 @@ +Wed Dec 18 20:52:32 UTC 2013 - [email protected] + +- 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. +- Rebase noqDebug-qWarnings.patch to this release + +------------------------------------------------------------------- Old: ---- libdbusmenu-qt_0.9.2+13.10.20130826.orig.tar.gz New: ---- libdbusmenu-qt_0.9.2+14.04.20131209.orig.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdbusmenu-qt5.spec ++++++ --- /var/tmp/diff_new_pack.zDClu8/_old 2013-12-19 12:14:12.000000000 +0100 +++ /var/tmp/diff_new_pack.zDClu8/_new 2013-12-19 12:14:12.000000000 +0100 @@ -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: 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. @@ -110,5 +111,6 @@ %{_libdir}/libdbusmenu-qt5.so %{_includedir}/dbusmenu-qt5/ %{_libdir}/pkgconfig/dbusmenu-qt5.pc +%{_libdir}/cmake/dbusmenu-qt5/ %changelog ++++++ libdbusmenu-qt_0.9.2+13.10.20130826.orig.tar.gz -> libdbusmenu-qt_0.9.2+14.04.20131209.orig.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdbusmenu-qt-0.9.2+13.10.20130826/CMakeLists.txt new/libdbusmenu-qt-0.9.2+14.04.20131209/CMakeLists.txt --- old/libdbusmenu-qt-0.9.2+13.10.20130826/CMakeLists.txt 2013-08-26 12:07:20.000000000 +0200 +++ new/libdbusmenu-qt-0.9.2+14.04.20131209/CMakeLists.txt 2013-12-09 03:29:47.000000000 +0100 @@ -1,5 +1,5 @@ project(dbusmenu-qt) -cmake_minimum_required(VERSION 2.6.0) +cmake_minimum_required(VERSION 2.8.0) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules") # Build options @@ -57,8 +57,11 @@ set(QT_SUFFIX "qt") endif() +include(CMakePackageConfigHelpers) include(GNUInstallDirs) set(LIB_DESTINATION "${CMAKE_INSTALL_LIBDIR}") +set(CMAKECONFIG_INSTALL_DIR "${LIB_DESTINATION}/cmake/dbusmenu-${QT_SUFFIX}") +set(INCLUDE_INSTALL_DIR "include/dbusmenu-${QT_SUFFIX}") # dist targets set(ARCHIVE_NAME libdbusmenu-${QT_SUFFIX}-${dbusmenu_qt_VERSION}) @@ -103,3 +106,25 @@ DESTINATION share/doc/libdbusmenu-${QT_SUFFIX}-doc ) endif(WITH_DOC) + +# Generate dbusmenu-qt-config* files +configure_package_config_file( + dbusmenu-qt-config.cmake.in + ${CMAKE_BINARY_DIR}/dbusmenu-${QT_SUFFIX}-config.cmake + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} + PATH_VARS INCLUDE_INSTALL_DIR + ) + +write_basic_package_version_file( + ${CMAKE_BINARY_DIR}/dbusmenu-${QT_SUFFIX}-config-version.cmake + VERSION ${dbusmenu_qt_VERSION} + COMPATIBILITY SameMajorVersion + ) + +# Install dbusmenu-qt-config* files +install(FILES + ${CMAKE_BINARY_DIR}/dbusmenu-${QT_SUFFIX}-config.cmake + ${CMAKE_BINARY_DIR}/dbusmenu-${QT_SUFFIX}-config-version.cmake + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + COMPONENT Devel + ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdbusmenu-qt-0.9.2+13.10.20130826/dbusmenu-qt-config.cmake.in new/libdbusmenu-qt-0.9.2+14.04.20131209/dbusmenu-qt-config.cmake.in --- old/libdbusmenu-qt-0.9.2+13.10.20130826/dbusmenu-qt-config.cmake.in 1970-01-01 01:00:00.000000000 +0100 +++ new/libdbusmenu-qt-0.9.2+14.04.20131209/dbusmenu-qt-config.cmake.in 2013-12-09 03:29:47.000000000 +0100 @@ -0,0 +1,5 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/dbusmenu-@[email protected]") + +set_and_check(dbusmenu-@QT_SUFFIX@_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdbusmenu-qt-0.9.2+13.10.20130826/src/CMakeLists.txt new/libdbusmenu-qt-0.9.2+14.04.20131209/src/CMakeLists.txt --- old/libdbusmenu-qt-0.9.2+13.10.20130826/src/CMakeLists.txt 2013-08-26 12:07:20.000000000 +0200 +++ new/libdbusmenu-qt-0.9.2+14.04.20131209/src/CMakeLists.txt 2013-12-09 03:29:47.000000000 +0100 @@ -89,15 +89,20 @@ endif() install(TARGETS dbusmenu-${QT_SUFFIX} + EXPORT dbusmenu-${QT_SUFFIX}-targets LIBRARY DESTINATION ${LIB_DESTINATION} - RUNTIME DESTINATION bin) + RUNTIME DESTINATION bin + ) + +install(EXPORT dbusmenu-${QT_SUFFIX}-targets + DESTINATION ${CMAKECONFIG_INSTALL_DIR}) install(DIRECTORY . - DESTINATION include/dbusmenu-${QT_SUFFIX} + DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN "*_p.h" EXCLUDE ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dbusmenu_version.h - DESTINATION include/dbusmenu-${QT_SUFFIX} + DESTINATION ${INCLUDE_INSTALL_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdbusmenu-qt-0.9.2+13.10.20130826/src/dbusmenu_p.h new/libdbusmenu-qt-0.9.2+14.04.20131209/src/dbusmenu_p.h --- old/libdbusmenu-qt-0.9.2+13.10.20130826/src/dbusmenu_p.h 2013-08-26 12:07:20.000000000 +0200 +++ new/libdbusmenu-qt-0.9.2+14.04.20131209/src/dbusmenu_p.h 2013-12-09 03:29:47.000000000 +0100 @@ -39,7 +39,7 @@ Q_OBJECT public: DBusMenu(QMenu *menu, DBusMenuExporter *exporter, int parentId); - ~DBusMenu(); + virtual ~DBusMenu(); protected: virtual bool eventFilter(QObject *obj, QEvent *event); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdbusmenu-qt-0.9.2+13.10.20130826/src/dbusmenuexporter.h new/libdbusmenu-qt-0.9.2+14.04.20131209/src/dbusmenuexporter.h --- old/libdbusmenu-qt-0.9.2+13.10.20130826/src/dbusmenuexporter.h 2013-08-26 12:07:20.000000000 +0200 +++ new/libdbusmenu-qt-0.9.2+14.04.20131209/src/dbusmenuexporter.h 2013-12-09 03:29:47.000000000 +0100 @@ -47,7 +47,7 @@ */ DBusMenuExporter(const QString &dbusObjectPath, QMenu *menu, const QDBusConnection &dbusConnection = QDBusConnection::sessionBus()); - ~DBusMenuExporter(); + virtual ~DBusMenuExporter(); /** * Asks the matching DBusMenuImporter to activate @p action. For menus it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdbusmenu-qt-0.9.2+13.10.20130826/src/dbusmenuimporter.cpp new/libdbusmenu-qt-0.9.2+14.04.20131209/src/dbusmenuimporter.cpp --- old/libdbusmenu-qt-0.9.2+13.10.20130826/src/dbusmenuimporter.cpp 2013-08-26 12:07:20.000000000 +0200 +++ new/libdbusmenu-qt-0.9.2+14.04.20131209/src/dbusmenuimporter.cpp 2013-12-09 03:29:47.000000000 +0100 @@ -189,6 +189,7 @@ updateActionVisible(action, value); } else if (key == "shortcut") { updateActionShortcut(action, value); + } else if (key == "children-display") { } else { DMWARNING << "Unhandled property update" << key; } @@ -420,6 +421,11 @@ connect(action, SIGNAL(triggered()), &d->m_mapper, SLOT(map())); d->m_mapper.setMapping(action, dbusMenuItem.id); + + if( action->menu() ) + { + d->refresh( dbusMenuItem.id )->waitForFinished(); + } } #ifdef BENCHMARK DMDEBUG << "- Menu filled:" << sChrono.elapsed() << "ms"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdbusmenu-qt-0.9.2+13.10.20130826/src/dbusmenuimporter.h new/libdbusmenu-qt-0.9.2+14.04.20131209/src/dbusmenuimporter.h --- old/libdbusmenu-qt-0.9.2+13.10.20130826/src/dbusmenuimporter.h 2013-08-26 12:07:20.000000000 +0200 +++ new/libdbusmenu-qt-0.9.2+14.04.20131209/src/dbusmenuimporter.h 2013-12-09 03:29:47.000000000 +0100 @@ -48,7 +48,7 @@ */ DBusMenuImporter(const QString &service, const QString &path, QObject *parent = 0); - ~DBusMenuImporter(); + virtual ~DBusMenuImporter(); /** * The menu created from listening to the DBusMenuExporter over DBus ++++++ noqDebug-qWarnings.patch ++++++ --- /var/tmp/diff_new_pack.zDClu8/_old 2013-12-19 12:14:13.000000000 +0100 +++ /var/tmp/diff_new_pack.zDClu8/_new 2013-12-19 12:14:13.000000000 +0100 @@ -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 @@ 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 @@ 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:06:44.057140849 +0100 +@@ -191,7 +191,9 @@ updateActionShortcut(action, value); + } else if (key == "children-display") { } else { +#ifndef QT_NO_DEBUG DMWARNING << "Unhandled property update" << key; @@ -46,7 +46,7 @@ } } -@@ -238,7 +240,9 @@ +@@ -239,7 +241,9 @@ action->setProperty(DBUSMENU_PROPERTY_ICON_DATA_HASH, dataHash); QPixmap pix; if (!pix.loadFromData(data)) { @@ -76,7 +76,7 @@ return; } -@@ -489,7 +497,9 @@ +@@ -494,7 +502,9 @@ QPointer<QObject> guard(this); if (!waitForWatcher(watcher, ABOUT_TO_SHOW_TIMEOUT)) { @@ -86,7 +86,7 @@ } #ifdef BENCHMARK -@@ -517,7 +527,9 @@ +@@ -522,7 +532,9 @@ QDBusPendingReply<bool> reply = *watcher; if (reply.isError()) { @@ -96,7 +96,7 @@ return; } bool needRefresh = reply.argumentAt<0>(); -@@ -529,7 +541,9 @@ +@@ -534,7 +546,9 @@ d->m_idsRefreshedByAboutToShow << id; watcher = d->refresh(id); if (!waitForWatcher(watcher, REFRESH_TIMEOUT)) { @@ -106,9 +106,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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
