pool/libdbusmenu-qt5
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 211448 from KDE:Qt5

Browse Source 
Update to 0.9.2+14.04.20131209

OBS-URL: https://build.opensuse.org/request/show/211448
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libdbusmenu-qt5?expand=0&rev=2
This commit is contained in:
Stephan Kulow 2013-12-19 11:14:11 +00:00 committed by Git OBS Bridge
commit d136dce8d4
5 changed files with 54 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libdbusmenu-qt5.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
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.
- Rebase noqDebug-qWarnings.patch to this release
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 6 22:50:10 UTC 2013 - hrvoje.senjan@gmail.com Wed Nov 6 22:50:10 UTC 2013 - hrvoje.senjan@gmail.com

10
libdbusmenu-qt5.spec
View File

@ -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. # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -15,16 +15,17 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
%define rname libdbusmenu-qt %define rname libdbusmenu-qt
Name: libdbusmenu-qt5 Name: libdbusmenu-qt5
Version: 0.9.2+13.10.20130826 Version: 0.9.2+14.04.20131209
Release: 0 Release: 0
Url: https://launchpad.net/libdbusmenu-qt/ Url: https://launchpad.net/libdbusmenu-qt/
Summary: A Qt implementation of the DBusMenu protocol Summary: A Qt implementation of the DBusMenu protocol
License: LGPL-2.0+ License: LGPL-2.0+
Group: System/Libraries 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 Source99: baselibs.conf
# PATCH-FIX-UPSTREAM noqDebug-qWarnings.patch -- libdbusmenu uses it's own qDebug's and qWarnings, # 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 # 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: gcc-c++
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Core)
BuildRoot: %{_tmppath}/%{rname}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
This library provides a Qt implementation of the DBusMenu protocol. This library provides a Qt implementation of the DBusMenu protocol.
@ -110,5 +111,6 @@ install -pm 0644 COPYING NEWS README %{buildroot}%{_docdir}/libdbusmenu-qt5-deve
%{_libdir}/libdbusmenu-qt5.so %{_libdir}/libdbusmenu-qt5.so
%{_includedir}/dbusmenu-qt5/ %{_includedir}/dbusmenu-qt5/
%{_libdir}/pkgconfig/dbusmenu-qt5.pc %{_libdir}/pkgconfig/dbusmenu-qt5.pc
%{_libdir}/cmake/dbusmenu-qt5/
%changelog %changelog

3
libdbusmenu-qt_0.9.2+13.10.20130826.orig.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6699a34eb4ff27371543f8499600f5f9f7267dfe7468c505a4411b0ee74a0d43
size 45394

3
libdbusmenu-qt_0.9.2+14.04.20131209.orig.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f7caf94fe27ce146a637af3062aa5bac90caec37cc30cd5ef638e46ccd4f264b
size 45800

38
noqDebug-qWarnings.patch
View File

@ -1,7 +1,7 @@
diff -Naur libdbusmenu-qt-0.9.2.orig/CMakeLists.txt libdbusmenu-qt-0.9.2/CMakeLists.txt 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.orig/CMakeLists.txt 2012-03-29 17:47:52.000000000 +0200 --- libdbusmenu-qt-0.9.2+14.04.20131209.orig/CMakeLists.txt 2013-12-09 03:29:47.000000000 +0100
+++ libdbusmenu-qt-0.9.2/CMakeLists.txt 2013-08-25 22:31:17.238891142 +0200 +++ libdbusmenu-qt-0.9.2+14.04.20131209/CMakeLists.txt 2013-12-18 21:58:01.847669366 +0100
@@ -88,7 +88,7 @@ @@ -91,7 +91,7 @@
add_subdirectory(src) add_subdirectory(src)
if (NOT USE_QT5) # TODO port tests to Qt5 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() endif()
add_subdirectory(tools) add_subdirectory(tools)
diff -Naur libdbusmenu-qt-0.9.2.orig/src/dbusmenuexporter.cpp libdbusmenu-qt-0.9.2/src/dbusmenuexporter.cpp 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.orig/src/dbusmenuexporter.cpp 2012-03-29 17:47:52.000000000 +0200 --- 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/src/dbusmenuexporter.cpp 2013-08-25 21:53:59.005872906 +0200 +++ libdbusmenu-qt-0.9.2+14.04.20131209/src/dbusmenuexporter.cpp 2013-12-18 21:59:13.984767528 +0100
@@ -160,7 +160,9 @@ @@ -160,7 +160,9 @@
Q_FOREACH(QAction *action, menu->actions()) { Q_FOREACH(QAction *action, menu->actions()) {
int actionId = m_idForAction.value(action, -1); 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; return;
} }
QVariantMap map = propertiesForAction(action); QVariantMap map = propertiesForAction(action);
diff -Naur libdbusmenu-qt-0.9.2.orig/src/dbusmenuimporter.cpp libdbusmenu-qt-0.9.2/src/dbusmenuimporter.cpp 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.orig/src/dbusmenuimporter.cpp 2012-03-29 17:47:52.000000000 +0200 --- 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/src/dbusmenuimporter.cpp 2013-08-25 21:53:10.844475006 +0200 +++ libdbusmenu-qt-0.9.2+14.04.20131209/src/dbusmenuimporter.cpp 2013-12-18 22:06:44.057140849 +0100
@@ -190,7 +190,9 @@ @@ -191,7 +191,9 @@
} else if (key == "shortcut") {
updateActionShortcut(action, value); updateActionShortcut(action, value);
} else if (key == "children-display") {
} else { } else {
+#ifndef QT_NO_DEBUG +#ifndef QT_NO_DEBUG
DMWARNING << "Unhandled property update" << key; DMWARNING << "Unhandled property update" << key;
@ -46,7 +46,7 @@ diff -Naur libdbusmenu-qt-0.9.2.orig/src/dbusmenuimporter.cpp libdbusmenu-qt-0.9
} }
} }
@@ -238,7 +240,9 @@ @@ -239,7 +241,9 @@
action->setProperty(DBUSMENU_PROPERTY_ICON_DATA_HASH, dataHash); action->setProperty(DBUSMENU_PROPERTY_ICON_DATA_HASH, dataHash);
QPixmap pix; QPixmap pix;
if (!pix.loadFromData(data)) { if (!pix.loadFromData(data)) {
@ -76,7 +76,7 @@ diff -Naur libdbusmenu-qt-0.9.2.orig/src/dbusmenuimporter.cpp libdbusmenu-qt-0.9
return; return;
} }
@@ -489,7 +497,9 @@ @@ -494,7 +502,9 @@
QPointer<QObject> guard(this); QPointer<QObject> guard(this);
if (!waitForWatcher(watcher, ABOUT_TO_SHOW_TIMEOUT)) { if (!waitForWatcher(watcher, ABOUT_TO_SHOW_TIMEOUT)) {
@ -86,7 +86,7 @@ diff -Naur libdbusmenu-qt-0.9.2.orig/src/dbusmenuimporter.cpp libdbusmenu-qt-0.9
} }
#ifdef BENCHMARK #ifdef BENCHMARK
@@ -517,7 +527,9 @@ @@ -522,7 +532,9 @@
QDBusPendingReply<bool> reply = *watcher; QDBusPendingReply<bool> reply = *watcher;
if (reply.isError()) { if (reply.isError()) {
@ -96,7 +96,7 @@ diff -Naur libdbusmenu-qt-0.9.2.orig/src/dbusmenuimporter.cpp libdbusmenu-qt-0.9
return; return;
} }
bool needRefresh = reply.argumentAt<0>(); bool needRefresh = reply.argumentAt<0>();
@@ -529,7 +541,9 @@ @@ -534,7 +546,9 @@
d->m_idsRefreshedByAboutToShow << id; d->m_idsRefreshedByAboutToShow << id;
watcher = d->refresh(id); watcher = d->refresh(id);
if (!waitForWatcher(watcher, REFRESH_TIMEOUT)) { if (!waitForWatcher(watcher, REFRESH_TIMEOUT)) {
@ -106,9 +106,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 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.orig/src/debug_p.h 2012-03-29 17:47:52.000000000 +0200 --- 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/src/debug_p.h 2013-08-25 22:28:20.231104044 +0200 +++ libdbusmenu-qt-0.9.2+14.04.20131209/src/debug_p.h 2013-12-18 22:02:33.923267953 +0100
@@ -36,12 +36,10 @@ @@ -36,12 +36,10 @@
#define DMVAR(var) DMDEBUG << #var ":" << var #define DMVAR(var) DMDEBUG << #var ":" << var