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.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libdbusmenu-qt.new/libdbusmenu-qt.changes 2013-09-11 12:18:30.000000000 +0200
@@ -1,0 +2,8 @@
+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
+ 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.000000000 +0200
+++ /var/tmp/diff_new_pack.ysr55x/_new 2013-09-11 12:18:30.000000000 +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.cpp 2012-04-10 15:18:15 +0000
+++ src/dbusmenuexporter.cpp 2012-10-24 14:43:10 +0000
@@ -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.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 @@
)
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.000000000 +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
DMWARNING << "No id for action";
+#endif
continue;
}
@@ -185,7 +187,9 @@
{
int id = m_idForAction.value(action, -1);
if (id != -1) {
+#ifndef QT_NO_DEBUG
DMWARNING << "Already tracking action" << action->text() << "under id" << id;
+#endif
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") {
updateActionShortcut(action, value);
} else {
+#ifndef QT_NO_DEBUG
DMWARNING << "Unhandled property update" << key;
+#endif
}
}
@@ -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 @@
QDBusPendingReply
participants (1)
-
root@hilbert.suse.de