Hello community, here is the log from the commit of package libdbusmenu-qt for openSUSE:Factory checked in at 2013-12-22 19:34:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdbusmenu-qt (Old) and /work/SRC/openSUSE:Factory/.libdbusmenu-qt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libdbusmenu-qt" Changes: -------- --- /work/SRC/openSUSE:Factory/libdbusmenu-qt/libdbusmenu-qt.changes 2013-09-11 12:18:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libdbusmenu-qt.new/libdbusmenu-qt.changes 2013-12-22 19:34:57.000000000 +0100 @@ -1,0 +2,27 @@ +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 +- Explicitly disable Qt5 build, in case both Qt4 and Qt5 are present + in build enviroment + +------------------------------------------------------------------- +Wed Nov 6 22:50:10 UTC 2013 - [email protected] + +- Update to 0.9.2+13.10.20130826 + * Various bugfixes + * Qt5 port +- Droped 237_236.diff, merged upstream + +------------------------------------------------------------------- Old: ---- 237_236.diff libdbusmenu-qt-0.9.2.tar.bz2 New: ---- libdbusmenu-qt_0.9.2+14.04.20131209.orig.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdbusmenu-qt.spec ++++++ --- /var/tmp/diff_new_pack.Ms2Hjl/_old 2013-12-22 19:34:57.000000000 +0100 +++ /var/tmp/diff_new_pack.Ms2Hjl/_new 2013-12-22 19:34:57.000000000 +0100 @@ -17,16 +17,14 @@ Name: libdbusmenu-qt -Version: 0.9.2 +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: http://launchpad.net/libdbusmenu-qt/trunk/%{version}/+download/%{name}-%{version}.tar.bz2 +Source0: http://archive.ubuntu.com/ubuntu/pool/main/libd/%{name}/%{name}_%{version}.orig.tar.gz Source99: baselibs.conf -# PATCH-FIX-UPSTREAM 237_236.diff -- lp#1068050 -Patch0: 237_236.diff # 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 Patch1: noqDebug-qWarnings.patch @@ -70,7 +68,6 @@ %prep %setup -q -%patch0 -p0 %patch1 -p1 # Remove build time references so build-compare can do its work @@ -85,18 +82,17 @@ _libsuffix=$(echo %{_lib} | cut -b4-) cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ -DLIB_SUFFIX="$_libsuffix" \ + -DUSE_QT5=OFF \ -DCMAKE_BUILD_TYPE=release .. make %{?_smp_mflags} VERBOSE=1 cd .. %install -cd build -%makeinstall -cd .. +%makeinstall -C build # Install the documentation in the correct location mkdir -p %{buildroot}%{_docdir}/%{name}-devel -mv %{buildroot}%{_datadir}/doc/dbusmenu-qt/ %{buildroot}%{_docdir}/%{name}-devel/html/ +mv %{buildroot}%{_datadir}/doc/libdbusmenu-qt-doc/ %{buildroot}%{_docdir}/%{name}-devel/html/ # Install additional documentation install -pm 0644 COPYING NEWS README %{buildroot}%{_docdir}/%{name}-devel/ @@ -116,5 +112,6 @@ %{_libdir}/libdbusmenu-qt.so %{_includedir}/dbusmenu-qt/ %{_libdir}/pkgconfig/dbusmenu-qt.pc +%{_libdir}/cmake/dbusmenu-qt/ %changelog ++++++ noqDebug-qWarnings.patch ++++++ --- /var/tmp/diff_new_pack.Ms2Hjl/_old 2013-12-22 19:34:57.000000000 +0100 +++ /var/tmp/diff_new_pack.Ms2Hjl/_new 2013-12-22 19:34:57.000000000 +0100 @@ -1,18 +1,18 @@ -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 -@@ -60,7 +60,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 -add_subdirectory(tests) +#add_subdirectory(tests) + endif() add_subdirectory(tools) - if(WITH_DOC) -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]
