commit libdbusmenu-qt for openSUSE:Factory
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.0 +0200 +++ /work/SRC/openSUSE:Factory/.libdbusmenu-qt.new/libdbusmenu-qt.changes 2013-12-22 19:34:57.0 +0100 @@ -1,0 +2,27 @@ +Wed Dec 18 20:52:32 UTC 2013 - hrvoje.sen...@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. +- 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 - hrvoje.sen...@gmail.com + +- 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.0 +0100 +++ /var/tmp/diff_new_pack.Ms2Hjl/_new 2013-12-22 19:34:57.0 +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.0 +0100 +++ /var/tmp/diff_new_pack.Ms2Hjl/_new 2013-12-22 19:34:57.0 +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.0 +0200 -+++ libdbusmenu-qt-0.9.2/CMakeLists.txt2013-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.txt2013-12-09 03:29:47.0 +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
commit libdbusmenu-qt for openSUSE:Factory
Hello community, here is the log from the commit of package libdbusmenu-qt for openSUSE:Factory checked in at 2013-09-11 12:18:28 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 2012-04-17 21:59:03.0 +0200 +++ /work/SRC/openSUSE:Factory/.libdbusmenu-qt.new/libdbusmenu-qt.changes 2013-09-11 12:18:30.0 +0200 @@ -1,0 +2,8 @@ +Sun Aug 25 20:00:50 UTC 2013 - hrvoje.sen...@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 + useless debug + +--- New: 237_236.diff noqDebug-qWarnings.patch Other differences: -- ++ libdbusmenu-qt.spec ++ --- /var/tmp/diff_new_pack.ysr55x/_old 2013-09-11 12:18:30.0 +0200 +++ /var/tmp/diff_new_pack.ysr55x/_new 2013-09-11 12:18:30.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package libdbusmenu-qt # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,11 @@ Group: System/Libraries Source0: http://launchpad.net/libdbusmenu-qt/trunk/%{version}/+download/%{name}-%{version}.tar.bz2 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 BuildRequires: cmake BuildRequires: doxygen BuildRequires: fdupes @@ -65,6 +70,8 @@ %prep %setup -q +%patch0 -p0 +%patch1 -p1 # Remove build time references so build-compare can do its work sed -i s/HTML_TIMESTAMP = YES/HTML_TIMESTAMP = NO/ Doxyfile.in @@ -72,8 +79,8 @@ %build mkdir build cd build -export CFLAGS=%{optflags} -export CXXFLAGS=%{optflags} +export CFLAGS=%{optflags} -DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT -DQT_NO_WARNING_OUTPUT +export CXXFLAGS=%{optflags} -DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT -DQT_NO_WARNING_OUTPUT export LDFLAGS=-Wl,-Bsymbolic-functions $LDFLAGS _libsuffix=$(echo %{_lib} | cut -b4-) cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ ++ 237_236.diff ++ === modified file 'src/dbusmenuexporter.cpp' --- src/dbusmenuexporter.cpp2012-04-10 15:18:15 + +++ src/dbusmenuexporter.cpp2012-10-24 14:43:10 + @@ -233,19 +233,20 @@ void DBusMenuExporterPrivate::insertIconProperty(QVariantMap *map, QAction *action) const { -QString iconName = q-iconNameForAction(action); +// provide the icon name for per-theme lookups +const QString iconName = q-iconNameForAction(action); if (!iconName.isEmpty()) { map-insert(icon-name, iconName); -return; -} -QIcon icon = action-icon(); -if (icon.isNull()) { -return; } -QBuffer buffer; -icon.pixmap(16).save(buffer, PNG); -map-insert(icon-data, buffer.data()); +// provide the serialized icon data in case the icon +// is unnamed or the name isn't supported by the theme +const QIcon icon = action-icon(); +if (!icon.isNull()) { +QBuffer buffer; +icon.pixmap(16).save(buffer, PNG); +map-insert(icon-data, buffer.data()); +} } static void collapseSeparator(QAction* action) ++ noqDebug-qWarnings.patch ++ diff -Naur libdbusmenu-qt-0.9.2.orig/CMakeLists.txt libdbusmenu-qt-0.9.2/CMakeLists.txt --- libdbusmenu-qt-0.9.2.orig/CMakeLists.txt2012-03-29 17:47:52.0 +0200 +++ libdbusmenu-qt-0.9.2/CMakeLists.txt 2013-08-25 22:31:17.238891142 +0200 @@ -60,7 +60,7 @@ ) add_subdirectory(src) -add_subdirectory(tests) +#add_subdirectory(tests) 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.0 +0200 +++ libdbusmenu-qt-0.9.2/src/dbusmenuexporter.cpp 2013-08-25 21:53:59.005872906 +0200 @@ -160,7 +160,9 @@ Q_FOREACH(QAction *action, menu-actions()) { int actionId = m_idForAction.value(action, -1); if (actionId == -1) { +#ifndef QT_NO_DEBUG
commit libdbusmenu-qt for openSUSE:Factory
Hello community, here is the log from the commit of package libdbusmenu-qt for openSUSE:Factory checked in at 2012-04-17 21:58:57 Comparing /work/SRC/openSUSE:Factory/libdbusmenu-qt (Old) and /work/SRC/openSUSE:Factory/.libdbusmenu-qt.new (New) Package is libdbusmenu-qt, Maintainer is Changes: --- /work/SRC/openSUSE:Factory/libdbusmenu-qt/libdbusmenu-qt.changes 2011-09-23 02:08:05.0 +0200 +++ /work/SRC/openSUSE:Factory/.libdbusmenu-qt.new/libdbusmenu-qt.changes 2012-04-17 21:59:03.0 +0200 @@ -1,0 +2,12 @@ +Wed Apr 11 20:02:44 UTC 2012 - asterios.dra...@gmail.com + +- Update to 0.9.2: + * Fix disabling and hiding actions + * Avoid spamming dbus at startup + * Do not print warnings when not necessary + From 0.9.1: + * Add support for opened and closed events + * Add support for icon-data (LP BUG 69) +- Install also the development documentation. + +--- Old: libdbusmenu-qt-0.9.0.tar.bz2 New: libdbusmenu-qt-0.9.2.tar.bz2 Other differences: -- ++ libdbusmenu-qt.spec ++ --- /var/tmp/diff_new_pack.Jkw1w7/_old 2012-04-17 21:59:05.0 +0200 +++ /var/tmp/diff_new_pack.Jkw1w7/_new 2012-04-17 21:59:05.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package libdbusmenu-qt # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,27 +15,26 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: libdbusmenu-qt -Version:0.9.0 -Release:1 -License:LGPL-2.0+ +Version:0.9.2 +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 Source99: baselibs.conf -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: doxygen +BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libqjson-devel BuildRequires: libqt4-devel BuildRequires: pkg-config Provides: dbusmenu-qt = 0.3.3 Obsoletes: dbusmenu-qt 0.3.3 +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This library provides a Qt implementation of the DBusMenu protocol. @@ -44,7 +43,6 @@ their menus over DBus. %package devel -License:LGPL-2.0+ Summary:Development package for libdbusmenu-qt Group: Development/Libraries/Other Requires: libdbusmenu-qt2 = %{version} @@ -55,7 +53,6 @@ This package contains development files for libdbusmenu-qt. %package -n libdbusmenu-qt2 -License:LGPL-2.0+ Summary:Development package for dbusmenu-qt Group: System/Libraries %requires_gelibqt4-x11 @@ -69,6 +66,9 @@ %prep %setup -q +# Remove build time references so build-compare can do its work +sed -i s/HTML_TIMESTAMP = YES/HTML_TIMESTAMP = NO/ Doxyfile.in + %build mkdir build cd build @@ -87,22 +87,25 @@ %makeinstall cd .. -rm -rf %{buildroot}%{_datadir}/doc/dbusmenu-qt/ +# Install the documentation in the correct location +mkdir -p %{buildroot}%{_docdir}/%{name}-devel +mv %{buildroot}%{_datadir}/doc/dbusmenu-qt/ %{buildroot}%{_docdir}/%{name}-devel/html/ +# Install additional documentation +install -pm 0644 COPYING NEWS README %{buildroot}%{_docdir}/%{name}-devel/ + +%fdupes -s %{buildroot} %post -n libdbusmenu-qt2 -p /sbin/ldconfig %postun -n libdbusmenu-qt2 -p /sbin/ldconfig -%clean -rm -rf %{buildroot} - %files -n libdbusmenu-qt2 %defattr(-,root,root,-) %{_libdir}/libdbusmenu-qt.so.2* %files devel %defattr(-,root,root,-) -%doc COPYING NEWS README +%doc %{_docdir}/%{name}-devel/ %{_libdir}/libdbusmenu-qt.so %{_includedir}/dbusmenu-qt/ %{_libdir}/pkgconfig/dbusmenu-qt.pc ++ libdbusmenu-qt-0.9.0.tar.bz2 - libdbusmenu-qt-0.9.2.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdbusmenu-qt-0.9.0/CMakeLists.txt new/libdbusmenu-qt-0.9.2/CMakeLists.txt --- old/libdbusmenu-qt-0.9.0/CMakeLists.txt 2011-08-30 11:40:07.0 +0200 +++ new/libdbusmenu-qt-0.9.2/CMakeLists.txt 2012-03-29 17:47:52.0 +0200 @@ -9,7 +9,7 @@ ## Package version set(dbusmenu_qt_VERSION_MAJOR 0) set(dbusmenu_qt_VERSION_MINOR 9) -set(dbusmenu_qt_VERSION_PATCH 0)
commit libdbusmenu-qt for openSUSE:Factory
Hello community, here is the log from the commit of package libdbusmenu-qt for openSUSE:Factory checked in at Fri Sep 2 09:53:17 CEST 2011. --- KDE/libdbusmenu-qt/libdbusmenu-qt.changes 2011-06-25 12:58:44.0 +0200 +++ /mounts/work_src_done/STABLE/libdbusmenu-qt/libdbusmenu-qt.changes 2011-09-01 20:12:30.0 +0200 @@ -1,0 +2,12 @@ +Thu Sep 1 18:12:05 UTC 2011 - asterios.dra...@gmail.com + +- Update to 0.9.0: + * Add support for the Status dbusmenu property. Will be used by appmenu-qt +for LP BUG 737419 + - Collapse multiple separators, get rid of starting and trailing separators +(LP BUG 793339) (Aurelien Gateau) +- Spec file updates: + * Changed License: to LGPL-2.0+. + * Minor other updates. + +--- calling whatdependson for head-i586 Old: libdbusmenu-qt-0.8.3.tar.bz2 New: libdbusmenu-qt-0.9.0.tar.bz2 Other differences: -- ++ libdbusmenu-qt.spec ++ --- /var/tmp/diff_new_pack.jI3ezi/_old 2011-09-02 09:50:49.0 +0200 +++ /var/tmp/diff_new_pack.jI3ezi/_new 2011-09-02 09:50:49.0 +0200 @@ -19,9 +19,9 @@ Name: libdbusmenu-qt -Version:0.8.3 +Version:0.9.0 Release:1 -License:LGPLv2+ +License:LGPL-2.0+ Url:https://launchpad.net/libdbusmenu-qt/ Summary:A Qt implementation of the DBusMenu protocol Group: System/Libraries @@ -44,7 +44,7 @@ their menus over DBus. %package devel -License:LGPLv2+ +License:LGPL-2.0+ Summary:Development package for libdbusmenu-qt Group: Development/Libraries/Other Requires: libdbusmenu-qt2 = %{version} @@ -55,7 +55,7 @@ This package contains development files for libdbusmenu-qt. %package -n libdbusmenu-qt2 -License:LGPLv2+ +License:LGPL-2.0+ Summary:Development package for dbusmenu-qt Group: System/Libraries %requires_gelibqt4-x11 @@ -70,22 +70,22 @@ %setup -q %build - mkdir build - cd build - export CFLAGS=%{optflags} - export CXXFLAGS=%{optflags} - export LDFLAGS=-Wl,-Bsymbolic-functions $LDFLAGS - _libsuffix=$(echo %{_lib} | cut -b4-) - cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ +mkdir build +cd build +export CFLAGS=%{optflags} +export CXXFLAGS=%{optflags} +export LDFLAGS=-Wl,-Bsymbolic-functions $LDFLAGS +_libsuffix=$(echo %{_lib} | cut -b4-) +cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ -DLIB_SUFFIX=$_libsuffix \ -DCMAKE_BUILD_TYPE=release .. - make %{?_smp_mflags} VERBOSE=1 - cd .. +make %{?_smp_mflags} VERBOSE=1 +cd .. %install - cd build - %makeinstall - cd .. +cd build +%makeinstall +cd .. rm -rf %{buildroot}%{_datadir}/doc/dbusmenu-qt/ ++ libdbusmenu-qt-0.8.3.tar.bz2 - libdbusmenu-qt-0.9.0.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdbusmenu-qt-0.8.3/CMakeLists.txt new/libdbusmenu-qt-0.9.0/CMakeLists.txt --- old/libdbusmenu-qt-0.8.3/CMakeLists.txt 2011-06-21 10:54:36.0 +0200 +++ new/libdbusmenu-qt-0.9.0/CMakeLists.txt 2011-08-30 11:40:07.0 +0200 @@ -8,8 +8,8 @@ # Versions ## Package version set(dbusmenu_qt_VERSION_MAJOR 0) -set(dbusmenu_qt_VERSION_MINOR 8) -set(dbusmenu_qt_VERSION_PATCH 3) +set(dbusmenu_qt_VERSION_MINOR 9) +set(dbusmenu_qt_VERSION_PATCH 0) set(dbusmenu_qt_VERSION ${dbusmenu_qt_VERSION_MAJOR}.${dbusmenu_qt_VERSION_MINOR}.${dbusmenu_qt_VERSION_PATCH}) ## Lib version @@ -17,10 +17,10 @@ set(dbusmenu_qt_lib_SOVERSION 2) ### Bump this one when the API is extended in a binary-compatible way -set(dbusmenu_qt_lib_API_VERSION 5) +set(dbusmenu_qt_lib_API_VERSION 6) ### Bump this one when changes do not extend the API -set(dbusmenu_qt_lib_PATCH_VERSION 2) +set(dbusmenu_qt_lib_PATCH_VERSION 0) set(dbusmenu_qt_lib_VERSION ${dbusmenu_qt_lib_SOVERSION}.${dbusmenu_qt_lib_API_VERSION}.${dbusmenu_qt_lib_PATCH_VERSION}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdbusmenu-qt-0.8.3/NEWS new/libdbusmenu-qt-0.9.0/NEWS --- old/libdbusmenu-qt-0.8.3/NEWS 2011-06-21 10:54:36.0 +0200 +++ new/libdbusmenu-qt-0.9.0/NEWS 2011-08-30 11:40:07.0 +0200 @@ -1,3 +1,7 @@ +# 0.9.0 - 2011.08.30 +- Add support for the Status dbusmenu property. Will be used by appmenu-qt for LP BUG 737419 (Aurelien Gateau) +- Collapse multiple separators, get rid of starting and trailing separators (LP BUG 793339) (Aurelien Gateau) + # 0.8.3 - 2011.06.21 - If DBusMenuExporter is deleted, delete all DBusMenu instances which were working with it (Aurelien Gateau) - Only show icons in menu if the platform allows them (Michael Terry) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore'
commit libdbusmenu-qt for openSUSE:Factory
Hello community, here is the log from the commit of package libdbusmenu-qt for openSUSE:Factory checked in at Mon Jun 27 13:50:33 CEST 2011. --- KDE/libdbusmenu-qt/libdbusmenu-qt.changes 2011-05-15 20:04:06.0 +0200 +++ /mounts/work_src_done/STABLE/libdbusmenu-qt/libdbusmenu-qt.changes 2011-06-25 12:58:44.0 +0200 @@ -1,0 +2,8 @@ +Sat Jun 25 10:57:05 UTC 2011 - asterios.dra...@gmail.com + +- Update to 0.8.3: + * If DBusMenuExporter is deleted, delete all DBusMenu instances which were +working with it + * Only show icons in menu if the platform allows them + +--- calling whatdependson for head-i586 Old: libdbusmenu-qt-0.8.2.tar.bz2 New: libdbusmenu-qt-0.8.3.tar.bz2 Other differences: -- ++ libdbusmenu-qt.spec ++ --- /var/tmp/diff_new_pack.LzrIGp/_old 2011-06-27 13:50:05.0 +0200 +++ /var/tmp/diff_new_pack.LzrIGp/_new 2011-06-27 13:50:05.0 +0200 @@ -19,7 +19,7 @@ Name: libdbusmenu-qt -Version:0.8.2 +Version:0.8.3 Release:1 License:LGPLv2+ Url:https://launchpad.net/libdbusmenu-qt/ ++ libdbusmenu-qt-0.8.2.tar.bz2 - libdbusmenu-qt-0.8.3.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdbusmenu-qt-0.8.2/CMakeLists.txt new/libdbusmenu-qt-0.8.3/CMakeLists.txt --- old/libdbusmenu-qt-0.8.2/CMakeLists.txt 2011-04-12 14:28:50.0 +0200 +++ new/libdbusmenu-qt-0.8.3/CMakeLists.txt 2011-06-21 10:54:36.0 +0200 @@ -9,7 +9,7 @@ ## Package version set(dbusmenu_qt_VERSION_MAJOR 0) set(dbusmenu_qt_VERSION_MINOR 8) -set(dbusmenu_qt_VERSION_PATCH 2) +set(dbusmenu_qt_VERSION_PATCH 3) set(dbusmenu_qt_VERSION ${dbusmenu_qt_VERSION_MAJOR}.${dbusmenu_qt_VERSION_MINOR}.${dbusmenu_qt_VERSION_PATCH}) ## Lib version @@ -20,7 +20,7 @@ set(dbusmenu_qt_lib_API_VERSION 5) ### Bump this one when changes do not extend the API -set(dbusmenu_qt_lib_PATCH_VERSION 1) +set(dbusmenu_qt_lib_PATCH_VERSION 2) set(dbusmenu_qt_lib_VERSION ${dbusmenu_qt_lib_SOVERSION}.${dbusmenu_qt_lib_API_VERSION}.${dbusmenu_qt_lib_PATCH_VERSION}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdbusmenu-qt-0.8.2/NEWS new/libdbusmenu-qt-0.8.3/NEWS --- old/libdbusmenu-qt-0.8.2/NEWS 2011-04-12 14:28:50.0 +0200 +++ new/libdbusmenu-qt-0.8.3/NEWS 2011-06-21 10:54:36.0 +0200 @@ -1,3 +1,7 @@ +# 0.8.3 - 2011.06.21 +- If DBusMenuExporter is deleted, delete all DBusMenu instances which were working with it (Aurelien Gateau) +- Only show icons in menu if the platform allows them (Michael Terry) + # 0.8.2 - 2011.04.12 - Shortcut handling: Translate + into plus and - into minus (LP BUG 712565) (Aurelien Gateau) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdbusmenu-qt-0.8.2/src/dbusmenuexporter.cpp new/libdbusmenu-qt-0.8.3/src/dbusmenuexporter.cpp --- old/libdbusmenu-qt-0.8.2/src/dbusmenuexporter.cpp 2011-04-12 14:28:50.0 +0200 +++ new/libdbusmenu-qt-0.8.3/src/dbusmenuexporter.cpp 2011-06-21 10:54:36.0 +0200 @@ -358,7 +358,11 @@ DMRETURN_VALUE_IF_FAIL(action, QString()); #ifdef HAVE_QICON_NAME QIcon icon = action-icon(); -return icon.isNull() ? QString() : icon.name(); +if (action-isIconVisibleInMenu() !icon.isNull()) { +return icon.name(); +} else { +return QString(); +} #else return QString(); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdbusmenu-qt-0.8.2/src/dbusmenu_p.cpp new/libdbusmenu-qt-0.8.3/src/dbusmenu_p.cpp --- old/libdbusmenu-qt-0.8.2/src/dbusmenu_p.cpp 2011-04-12 14:28:50.0 +0200 +++ new/libdbusmenu-qt-0.8.3/src/dbusmenu_p.cpp 2011-06-21 10:54:36.0 +0200 @@ -36,6 +36,7 @@ , m_parentId(parentId) { menu-installEventFilter(this); +connect(m_exporter, SIGNAL(destroyed(QObject*)), SLOT(deleteMe())); } DBusMenu::~DBusMenu() @@ -72,23 +73,22 @@ void DBusMenu::addAction(QAction *action) { -if (m_exporter.data()) { -m_exporter.data()-d-addAction(action, m_parentId); -} +m_exporter-d-addAction(action, m_parentId); } void DBusMenu::updateAction(QAction *action) { -if (m_exporter.data()) { -m_exporter.data()-d-updateAction(action); -} +m_exporter-d-updateAction(action); } void DBusMenu::removeAction(QAction *action) { -if (m_exporter.data()) { -m_exporter.data()-d-removeAction(action, m_parentId); -} +m_exporter-d-removeAction(action, m_parentId); +} + +void DBusMenu::deleteMe() +{ +delete this; } #include dbusmenu_p.moc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
commit libdbusmenu-qt for openSUSE:Factory
Hello community, here is the log from the commit of package libdbusmenu-qt for openSUSE:Factory checked in at Mon Jun 6 10:29:46 CEST 2011. --- KDE/libdbusmenu-qt/libdbusmenu-qt.changes 2010-12-22 11:45:48.0 +0100 +++ /mounts/work_src_done/STABLE/libdbusmenu-qt/libdbusmenu-qt.changes 2011-05-15 20:04:06.0 +0200 @@ -1,0 +2,22 @@ +Sun May 15 18:01:13 UTC 2011 - asterios.dra...@gmail.com + +- Update to 0.8.2: + * Shortcut handling: Translate + into plus and - into minus (LP BUG +712565) + From 0.8.1: + * Added target to build documentation with Doxygen + From 0.8.0: + * Implements version 2 of the dbusmenu protocol + * Merged support for KMenu titles + From 0.7.0: + * Switched DBus domain from org.ayatana to com.canonical +- Spec file updates: + * Changes based on spec-cleaner run. + * Changed License: to LGPLv2+. + * Removed dbus-1-devel from BuildRequires:. + * Added doxygen and libqjson-devel in BuildRequires:. + * Updates in Summary, %description and Group entries. + * Removed /sbin/ldconfig from devel package %post* scripts (not needed). + * Minor other updates. + +--- calling whatdependson for head-i586 Old: libdbusmenu-qt-0.6.6.tar.bz2 New: libdbusmenu-qt-0.8.2.tar.bz2 Other differences: -- ++ libdbusmenu-qt.spec ++ --- /var/tmp/diff_new_pack.p6VWaq/_old 2011-06-06 10:13:23.0 +0200 +++ /var/tmp/diff_new_pack.p6VWaq/_new 2011-06-06 10:13:23.0 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libdbusmenu-qt (Version 0.6.6) +# spec file for package libdbusmenu-qt # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,16 +19,21 @@ Name: libdbusmenu-qt -BuildRequires: cmake gcc-c++ libqt4-devel -BuildRequires: dbus-1-devel pkg-config -Summary:This library provides a Qt implementation of the DBusMenu protocol. -Version:0.6.6 +Version:0.8.2 Release:1 -License:GPL -Group: System/GUI/KDE -Source0:%{name}-%{version}.tar.bz2 +License:LGPLv2+ +Url:https://launchpad.net/libdbusmenu-qt/ +Summary:A Qt implementation of the DBusMenu protocol +Group: System/Libraries +Source0: http://launchpad.net/libdbusmenu-qt/trunk/%{version}/+download/%{name}-%{version}.tar.bz2 Source99: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: cmake +BuildRequires: doxygen +BuildRequires: gcc-c++ +BuildRequires: libqjson-devel +BuildRequires: libqt4-devel +BuildRequires: pkg-config Provides: dbusmenu-qt = 0.3.3 Obsoletes: dbusmenu-qt 0.3.3 @@ -38,36 +43,21 @@ The DBusMenu protocol makes it possible for applications to export and import their menus over DBus. - -Author - - -Canonical DX Team, Aurélien Gâteau aurelien.gat...@canonical.com - %package devel -Summary:Development package for dbusmenu-qt -License:GPL +License:LGPLv2+ +Summary:Development package for libdbusmenu-qt Group: Development/Libraries/Other Requires: libdbusmenu-qt2 = %{version} Provides: dbusmenu-qt-devel = 0.3.3 Obsoletes: dbusmenu-qt-devel 0.3.3 %description devel -This library provides a Qt implementation of the DBusMenu protocol. - -The DBusMenu protocol makes it possible for applications to export and import -their menus over DBus. - - -Author - - -Canonical DX Team, Aurélien Gâteau aurelien.gat...@canonical.com +This package contains development files for libdbusmenu-qt. %package -n libdbusmenu-qt2 +License:LGPLv2+ Summary:Development package for dbusmenu-qt -License:GPL -Group: Development/Libraries/Other +Group: System/Libraries %requires_gelibqt4-x11 %description -n libdbusmenu-qt2 @@ -76,52 +66,45 @@ The DBusMenu protocol makes it possible for applications to export and import their menus over DBus. - -Author - - -Canonical DX Team, Aurélien Gâteau aurelien.gat...@canonical.com - - %prep -%setup +%setup -q %build mkdir build cd build - export CFLAGS=$RPM_OPT_FLAGS - export CXXFLAGS=$RPM_OPT_FLAGS + export CFLAGS=%{optflags} + export CXXFLAGS=%{optflags} export LDFLAGS=-Wl,-Bsymbolic-functions $LDFLAGS - _libsuffix=$(echo %_lib | cut -b4-) - cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + _libsuffix=$(echo %{_lib} | cut -b4-) + cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ -DLIB_SUFFIX=$_libsuffix \ -DCMAKE_BUILD_TYPE=release .. - %{__make} %{?jobs:-j %{jobs}} VERBOSE=1 + make %{?_smp_mflags} VERBOSE=1 +