2 files changed, 0 insertions, 111 deletions
diff --git a/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.3.2-cmake.patch b/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.3.2-cmake.patch
deleted file mode 100644
index e8e13c480bf4..000000000000
--- a/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.3.2-cmake.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Only in .: build
-diff -ru ../libdbusmenu-qt-0.3.2/cmake/modules/FindQJSON.cmake ./cmake/modules/FindQJSON.cmake
---- ../libdbusmenu-qt-0.3.2/cmake/modules/FindQJSON.cmake	2010-04-27 15:20:49.187784398 +0200
-+++ ./cmake/modules/FindQJSON.cmake	2010-04-27 15:21:06.515858660 +0200
-@@ -17,14 +17,14 @@
-     # use pkg-config to get the values of QJSON_INCLUDE_DIRS
-     # and QJSON_LIBRARY_DIRS to add as hints to the find commands.
-     include (FindPkgConfig)
--    pkg_check_modules (QJSON QJson>=0.5)
-+    pkg_check_modules (PC_QJSON QJson>=0.5)
-   endif (NOT WIN32)
- 
-   find_library (QJSON_LIBRARIES
-     NAMES
-     qjson
-     PATHS
--    ${QJSON_LIBRARY_DIRS}
-+    ${PC_QJSON_LIBRARY_DIRS}
-     ${LIB_INSTALL_DIR}
-     ${KDE4_LIB_DIR}
-   )
-@@ -35,7 +35,7 @@
-     PATH_SUFFIXES
-     qjson
-     PATHS
--    ${QJSON_INCLUDE_DIRS}
-+    ${PC_QJSON_INCLUDE_DIRS}
-     ${INCLUDE_INSTALL_DIR}
-     ${KDE4_INCLUDE_DIR}
-   )
diff --git a/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.3.5-qt-4.7.patch b/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.3.5-qt-4.7.patch
deleted file mode 100644
index 6e29787fed34..000000000000
--- a/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.3.5-qt-4.7.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From f3c2fb90e1c2b94e561ccf33e4c2049f96ce45e2 Mon Sep 17 00:00:00 2001
-From: Aurelien Gateau <aurelien.gateau@canonical.com>
-Date: Thu, 24 Jun 2010 10:04:35 +0200
-Subject: [PATCH] Better build check for QIcon::name()
-
----
- src/CMakeLists.txt       |   21 +++++++++++++++++++++
- src/dbusmenu_config.h.in |    2 ++
- src/dbusmenuexporter.cpp |    3 ++-
- 3 files changed, 25 insertions(+), 1 deletions(-)
- create mode 100644 src/dbusmenu_config.h.in
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 2f4f5fd..ef555a3 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,4 +1,7 @@
-+include(CheckCXXSourceCompiles)
- include (CheckCXXCompilerFlag)
-+
-+# Check some compiler flags
- check_cxx_compiler_flag(-fvisibility=hidden __DBUSMENU_HAVE_GCC_VISIBILITY)
- if (__DBUSMENU_HAVE_GCC_VISIBILITY AND NOT WIN32)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
-@@ -18,6 +21,24 @@ if (MSVC)
- 	add_definitions(-D__PRETTY_FUNCTION__=__FUNCTION__)
- endif (MSVC)
- 
-+# Check whether QIcon::name() exists. It was added in late Qt 4.7 cycle, and is
-+# not present in betas.
-+set(CMAKE_REQUIRED_INCLUDES "${QT_INCLUDE_DIR}")
-+set(CMAKE_REQUIRED_LIBRARIES "QtGui")
-+check_cxx_source_compiles("
-+#include <QtGui/QIcon>
-+int main() {
-+    QIcon icon;
-+    icon.name();
-+    return 0;
-+}
-+" HAVE_QICON_NAME)
-+if (NOT HAVE_QICON_NAME)
-+    message(STATUS "QIcon::name() does not exist, DBusMenuExporter will not export icon names by itself")
-+endif()
-+configure_file(dbusmenu_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/dbusmenu_config.h @ONLY)
-+
-+
- set(dbusmenu_qt_SRCS
-     dbusmenu_p.cpp
-     dbusmenuexporter.cpp
-diff --git a/src/dbusmenu_config.h.in b/src/dbusmenu_config.h.in
-new file mode 100644
-index 0000000..c884fb7
---- /dev/null
-+++ b/src/dbusmenu_config.h.in
-@@ -0,0 +1,2 @@
-+/* Whether QIcon::name() exists */
-+#cmakedefine HAVE_QICON_NAME
-diff --git a/src/dbusmenuexporter.cpp b/src/dbusmenuexporter.cpp
-index af37eaa..e77681c 100644
---- a/src/dbusmenuexporter.cpp
-+++ b/src/dbusmenuexporter.cpp
-@@ -30,6 +30,7 @@
- #include <QXmlStreamWriter>
- 
- // Local
-+#include "dbusmenu_config.h"
- #include "dbusmenu_p.h"
- #include "dbusmenuexporterdbus_p.h"
- #include "dbusmenuexporterprivate_p.h"
-@@ -277,7 +278,7 @@ void DBusMenuExporter::doEmitLayoutUpdated()
- QString DBusMenuExporter::iconNameForAction(QAction *action)
- {
-     DMRETURN_VALUE_IF_FAIL(action, QString());
--#if QT_VERSION >= 0x040700
-+#ifdef HAVE_QICON_NAME
-     QIcon icon = action->icon();
-     return icon.isNull() ? QString() : icon.name();
- #else
--- 
-1.6.1
-