- Update libdbusmenu-qt to 0.8.0.

- Update akonadi to 1.5.1.
- Update soprano to 2.6.0.

3 files changed, 3 insertions, 93 deletions

diff --git a/devel/libdbusmenu-qt/files/patch-src__CMakeLists.txt b/devel/libdbusmenu-qt/files/patch-src__CMakeLists.txt
index 08e86c283bc7..c3d1c17a1364 100644
--- a/devel/libdbusmenu-qt/files/patch-src__CMakeLists.txt
+++ b/devel/libdbusmenu-qt/files/patch-src__CMakeLists.txt
@@ -1,6 +1,6 @@
---- ./src/CMakeLists.txt.orig	2010-12-08 10:29:39.000000000 +0100
-+++ ./src/CMakeLists.txt	2010-12-20 12:18:44.673410726 +0100
-@@ -74,7 +74,10 @@
+--- ./src/CMakeLists.txt.orig	2011-02-25 03:13:16.133359336 +0000
++++ ./src/CMakeLists.txt	2011-02-25 03:13:53.113370403 +0000
+@@ -73,7 +73,10 @@
      )
  
  install(TARGETS dbusmenu-qt
diff --git a/devel/libdbusmenu-qt/files/patch-src__dbusmenuexporter.cpp b/devel/libdbusmenu-qt/files/patch-src__dbusmenuexporter.cpp
deleted file mode 100644
index d16fde80fe59..000000000000
--- a/devel/libdbusmenu-qt/files/patch-src__dbusmenuexporter.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/dbusmenuexporter.cpp.orig	2010-12-08 10:29:39.000000000 +0100
-+++ ./src/dbusmenuexporter.cpp	2010-12-20 12:18:44.673410726 +0100
-@@ -84,6 +84,7 @@
- {
-     QVariantMap map;
-     map.insert("enabled", false);
-+    map.insert("x-kde-title", true);
- 
-     const QWidgetAction *widgetAction = qobject_cast<const QWidgetAction *>(action_);
-     DMRETURN_VALUE_IF_FAIL(widgetAction, map);
diff --git a/devel/libdbusmenu-qt/files/patch-src__dbusmenuimporter.cpp b/devel/libdbusmenu-qt/files/patch-src__dbusmenuimporter.cpp
deleted file mode 100644
index c252a3d9f8cc..000000000000
--- a/devel/libdbusmenu-qt/files/patch-src__dbusmenuimporter.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
---- ./src/dbusmenuimporter.cpp.orig	2010-09-23 10:08:35.000000000 +0000
-+++ ./src/dbusmenuimporter.cpp	2010-11-12 14:49:39.000000000 +0000
-@@ -32,6 +32,8 @@
- #include <QSignalMapper>
- #include <QTime>
- #include <QTimer>
-+#include <QToolButton>
-+#include <QWidgetAction>
- 
- // Local
- #include "dbusmenuitem_p.h"
-@@ -41,7 +43,6 @@
- 
- //#define BENCHMARK
- #ifdef BENCHMARK
--#include <QTime>
- static QTime sChrono;
- #endif
- 
-@@ -66,6 +67,29 @@
-     DBusMenuImporterMethod m_method;
- };
- 
-+class EventSniffer : public QObject
-+{
-+public:
-+    EventSniffer(QObject *parent = 0)
-+        : QObject(parent) { }
-+
-+    ~EventSniffer() { }
-+
-+    bool eventFilter(QObject *object, QEvent *event)
-+    {
-+        Q_UNUSED(object);
-+
-+        if (event->type() == QEvent::Paint ||
-+            event->type() == QEvent::KeyPress ||
-+            event->type() == QEvent::KeyRelease) {
-+            return false;
-+        }
-+
-+        event->accept();
-+        return true;
-+    }
-+};
-+
- class DBusMenuImporterPrivate
- {
- public:
-@@ -143,8 +167,30 @@
-                 group->addAction(action);
-             }
-         }
-+
-+        bool isMenuTitle = map.take("x-kde-title").toBool();
-+
-         updateAction(action, map, map.keys());
- 
-+        if (isMenuTitle) {
-+            QAction *buttonAction = action;
-+            QFont font = buttonAction->font();
-+            font.setBold(true);
-+            buttonAction->setFont(font);
-+            buttonAction->setEnabled(true);
-+
-+            QWidgetAction *action = new QWidgetAction(parent);
-+            action->setObjectName("kmenu_title");
-+            QToolButton *titleButton = new QToolButton(0);
-+            EventSniffer *eventSniffer = new EventSniffer(titleButton);
-+            titleButton->installEventFilter(eventSniffer); // prevent clicks on the title of the menu
-+            titleButton->setDefaultAction(buttonAction);
-+            titleButton->setDown(true); // prevent hover style changes in some styles
-+            titleButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-+            action->setDefaultWidget(titleButton);
-+            return action;
-+        }
-+
-         return action;
-     }
-