Add patch to fix building with Qt 4.7.0-beta1, bug 324843. Thanks to Alec Moskvin for patch from upstream.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 103 insertions, 8 deletions

diff --git a/dev-libs/libdbusmenu-qt/ChangeLog b/dev-libs/libdbusmenu-qt/ChangeLog
index eabf694ad1db..c3928a7ce1cb 100644
--- a/dev-libs/libdbusmenu-qt/ChangeLog
+++ b/dev-libs/libdbusmenu-qt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libdbusmenu-qt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/ChangeLog,v 1.3 2010/06/19 22:10:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/ChangeLog,v 1.4 2010/06/27 20:08:25 spatz Exp $
+
+  27 Jun 2010; Dror Levin <spatz@gentoo.org> libdbusmenu-qt-0.3.5.ebuild,
+  +files/libdbusmenu-qt-0.3.5-qt-4.7.patch:
+  Add patch to fix building with Qt 4.7.0-beta1, bug 324843. Thanks to Alec
+  Moskvin for patch from upstream.
 
 *libdbusmenu-qt-0.3.5 (19 Jun 2010)
 
diff --git a/dev-libs/libdbusmenu-qt/Manifest b/dev-libs/libdbusmenu-qt/Manifest
index 2eca3a2ca582..b35f475e08bd 100644
--- a/dev-libs/libdbusmenu-qt/Manifest
+++ b/dev-libs/libdbusmenu-qt/Manifest
@@ -1,20 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX libdbusmenu-qt-0.3.0-set-link-directories.patch 315 RMD160 b88809ad598ea314f8d7393badcff36f4b8fdb9c SHA1 911795c795f9a7197263d3060925118b1c7bd378 SHA256 4aa799c9015a4ae8feb09786f4518c8b2b9caac4ba9a172d294b23c5138a2bd5
 AUX libdbusmenu-qt-0.3.2-cmake.patch 914 RMD160 ea5965d76f472869d7c2535e389703861ef440db SHA1 6b9b6cf7e1fa77c61fbb6a85ff3789763b0484b2 SHA256 fd434784063bab7d5413b7e899a5357006bf4f27bf941b6e85349d6bba9e315d
+AUX libdbusmenu-qt-0.3.5-qt-4.7.patch 2544 RMD160 e0de77dbe2e4547b2c79585e50f178623b97a098 SHA1 5c70b31e5d312c2c24b6e9528da150804028deef SHA256 a3fd7373d416881ad0eb68b2740caff80903d0979a72549209795ff6f93f8a69
 DIST libdbusmenu-qt-0.3.0.tar.bz2 24060 RMD160 2e3e6479c77186bc28b9c2197768f6a352170ebf SHA1 618c2908fcfae0547dc2aa675b8afd40f837d766 SHA256 8babcfd86e187076e0ae8855f506275bb2c03169617310ca3f8c6318a5d6bd10
 DIST libdbusmenu-qt-0.3.2.tar.bz2 24729 RMD160 75a3c5b486880d1366b136b476b1a69328291695 SHA1 ea30bac73962a36ab1050105573ee068951a383f SHA256 6b81786b1cd9d5225256fd748b1235a36f97226c5c0e3dc2d40a4891a7a57b4b
 DIST libdbusmenu-qt-0.3.5.tar.bz2 28532 RMD160 a6444783d5b29af62477e3c2bfd854052ae365d3 SHA1 24df3fb42b687b73005a9f152caac65950b0dae7 SHA256 695a844d4cb66a5e92f891e0e481df3661e19d86fed30e9a87344c97d640ea86
 EBUILD libdbusmenu-qt-0.3.0.ebuild 858 RMD160 1ecfdc746b350c192921220ee862872bccd99b9e SHA1 775f0a3433d3bd672c46491c42fa6e7c99eebb51 SHA256 98acd4803d22d739fffbf4ce6a59e81c1eb7d2cbe4ffcf7e471a382ebdd25bc3
 EBUILD libdbusmenu-qt-0.3.2-r1.ebuild 764 RMD160 1df1c3969f7f2c925cebc3440c078126b6c43229 SHA1 93afe00eff214aa2c605d87a6794829807915bd7 SHA256 78aa6981cc109d30ce2fe083e2b796c52600f5ce2d76435d9a477ca87a58bd05
-EBUILD libdbusmenu-qt-0.3.5.ebuild 776 RMD160 99f521727b159fa54b800c977bf1c50c74785188 SHA1 a7eceb8ee8bd011ca7e0a3c86a8ba12ed53b5c93 SHA256 c8179e06c59808023af2aeea56e1edc989b3c7adadda85e915257c7a54ba47b6
-MISC ChangeLog 864 RMD160 520a4f237a2cd7edee8b3164c88ad2fa00330d47 SHA1 21dd11c0618ac9a0dec6dbb7b1458906cbb4c8d9 SHA256 52afd0aba31afc5c7fd0dcb2dce558e4196460ea92f6496c4838207212e27a80
+EBUILD libdbusmenu-qt-0.3.5.ebuild 818 RMD160 49bcbf0038464142e3143045e97634b01d020243 SHA1 2a6161935641a68d544da727b46e8522932dcf48 SHA256 d924769d4af790550774b2b497289fb8ad5c8ffb73e76a0696620aa4c1cff2e7
+MISC ChangeLog 1090 RMD160 7d430973376d92643667449699ee42fe95112f68 SHA1 5105e164a098a1bc6f19fd049764c6c262803407 SHA256 8862f538cf9d6e1b9f4590580d4efcf403b328c2d6fdd57f866b03718f21a861
 MISC metadata.xml 158 RMD160 f15477b4ffb8ae0849cbae52329d1bdf99a407f4 SHA1 18cd6cdb98f781c3975c49f300d3f8b1e07333b8 SHA256 b5a2d16139d03b8af578bc87503b14b589dd7e3544d879297ccdb735d35a02e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwdQHQACgkQHB6c3gNBRYdrHQCeLzFlApVRXBJaJMlPY4Tk1qPU
-3TAAn2wVJfTV1MtMgCFc5LORD0hto6FA
-=x5+t
+iQEcBAEBCgAGBQJMJ6/BAAoJEAWF714uGAc6nG0H/jlESNnScNkBHU8+oN9RWtWc
+eGP5f3BaPZJwmDrfullZNUpEy3mPLn+Fi8zt2DIzu8jxChzXvJmpMPHQz4QXLiYU
+AJWV9Ux9tMGA9alrLfqI3bnvSAcsKckMMHNnDUWzzy4N78Y5/ClsNwwipojOKNYV
+2zWNcvXVnZXdtwWm7DTZTLbINg/tkD/E4GHoT655CiL0Tv8v0xJgxZ3IXmWQwj4g
+lcUxqBUdC9xSiLn3SxTl/GmPQPjYCg0RsccbWhlFoyF0Z3XTvtmBJnSwjU7s7O31
+Unoh0VfNBAgF799CaDsG4NXJKw96bwxx+P4eKhxdexKMZWd2vEhQ3X8Qbhf8Hu4=
+=0g3/
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..6e29787fed34
--- /dev/null
+++ b/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.3.5-qt-4.7.patch
@@ -0,0 +1,81 @@
+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
+
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.3.5.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.3.5.ebuild
index 11e64b894189..73c43fc13e1a 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.3.5.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.3.5.ebuild,v 1.1 2010/06/19 22:10:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.3.5.ebuild,v 1.2 2010/06/27 20:08:25 spatz Exp $
 
 EAPI="3"
 
@@ -26,4 +26,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-qt-4.7.patch"
+)
+
 DOCS="NEWS README"