apply upstream patch for running against Qt-4.7 report by Longer via bug #341789

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 35 insertions, 4 deletions

diff --git a/games-strategy/hedgewars/ChangeLog b/games-strategy/hedgewars/ChangeLog
index 78a565d84020..5741dc079310 100644
--- a/games-strategy/hedgewars/ChangeLog
+++ b/games-strategy/hedgewars/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/hedgewars
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/hedgewars/ChangeLog,v 1.24 2010/04/06 21:18:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/hedgewars/ChangeLog,v 1.25 2010/10/19 17:51:44 mr_bones_ Exp $
+
+  19 Oct 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  hedgewars-0.9.13.ebuild, +files/hedgewars-0.9.13-qt47.patch:
+  apply upstream patch for running against Qt-4.7 report by Longer via bug
+  #341789
 
   06 Apr 2010; Michael Sterrett <mr_bones_@gentoo.org>
   hedgewars-0.9.13.ebuild:
diff --git a/games-strategy/hedgewars/Manifest b/games-strategy/hedgewars/Manifest
index b6d48adb28c4..aa146a384b30 100644
--- a/games-strategy/hedgewars/Manifest
+++ b/games-strategy/hedgewars/Manifest
@@ -1,6 +1,7 @@
+AUX hedgewars-0.9.13-qt47.patch 1450 RMD160 c294557a5158dbf020640ff94d85f39292feed4e SHA1 f335476d0704ccdd3dbd96b986973599b58e85c6 SHA256 994b4174ce880f59c30d0ecc72d85bf725a120c428989b86c78c58f9525cc422
 DIST hedgewars-src-0.9.11.tar.bz2 67130617 RMD160 064f952bd756f4ba7c6ab22a6ec53a98ac585949 SHA1 4df31f0fa7453b63294a9d8b4883e5b3b9016358 SHA256 baae038d6186b6c767452eac4b17afb87b8d056558d289fd123847380760896e
 DIST hedgewars-src-0.9.13.tar.bz2 85631910 RMD160 29f26872030cbf520913485f781531c0f805a74d SHA1 812510e51939e90b41b0e9ec31cccfceb94466d1 SHA256 7ee593ed5d22c046c72b2205ca6326f0a8f25ecc130cef7db7968a37a5cdc889
 EBUILD hedgewars-0.9.11.ebuild 1361 RMD160 8ec7805af0691be5fed866b800834143f8a897ad SHA1 02886c7b314467fe453fed6966c4255676387979 SHA256 33d12ae86517c86b2e8d39baa8e5b131417802c1ce37dfd875e319d0bd55f7c8
-EBUILD hedgewars-0.9.13.ebuild 1391 RMD160 dfc881c0e133fb5af1a00e662152a2dad212073a SHA1 f11eb9cf1bed4b2d0b4daa2566971bb28991f1b0 SHA256 094e1f9f324e82519f98bbf80c1c0c9c5072b767e143e4ce3c39a1bcbe9b5aa8
-MISC ChangeLog 3435 RMD160 3b66c431de4fb05cafd23a504d5a544280166b6c SHA1 2d5198a0e42ff8c1af72dfa077731113744fb228 SHA256 ea1e53275ca6f5af11cb2313bcd3b6c76fdbf4d34612cb6e29e39284fe895218
+EBUILD hedgewars-0.9.13.ebuild 1434 RMD160 60ac0c18707d32cb9188cd5494ead9076a7de7e9 SHA1 e5c420a01668e2f8a7a6531c45af8a0c51587a30 SHA256 c6f3985b6ac3fa997d053e4be0986d400d96ebbf790974a891fc6181ae7d3f18
+MISC ChangeLog 3639 RMD160 426540a6f7123f45bd1e586900a3796c59d28f7d SHA1 b7be5a2ce2697380310675f9cdfbf9f9533cde47 SHA256 a43e949a3dfae669fdc40be12ec0692767b8bd69b70940558015027166f91057
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-strategy/hedgewars/files/hedgewars-0.9.13-qt47.patch b/games-strategy/hedgewars/files/hedgewars-0.9.13-qt47.patch
new file mode 100644
index 000000000000..4178fe7997d6
--- /dev/null
+++ b/games-strategy/hedgewars/files/hedgewars-0.9.13-qt47.patch
@@ -0,0 +1,23 @@
+--- chatwidget.cpp_orig	2010-04-03 22:38:49.000000000 +0600
++++ hedgewars/QTfrontend/chatwidget.cpp	2010-10-05 22:44:33.000000000 +0600
+@@ -151,17 +151,17 @@
+ 
+     if(ignoreList.contains(nick, Qt::CaseInsensitive))
+     {
+-        item->setIcon(QIcon(showReady ? (item->data(Qt::UserRole).toBool() ? ":/res/chat_ignore_on" : ":/res/chat_ignore_off") : ":/res/chat_ignore.png"));
++        item->setIcon(QIcon(showReady ? (item->data(Qt::UserRole).toBool() ? ":/res/chat_ignore_on.png" : ":/res/chat_ignore_off.png") : ":/res/chat_ignore.png"));
+         item->setForeground(Qt::gray);
+     }
+     else if(friendsList.contains(nick, Qt::CaseInsensitive))
+     {
+-        item->setIcon(QIcon(showReady ? (item->data(Qt::UserRole).toBool() ? ":/res/chat_friend_on" : ":/res/chat_friend_off") : ":/res/chat_friend.png"));
++        item->setIcon(QIcon(showReady ? (item->data(Qt::UserRole).toBool() ? ":/res/chat_friend_on.png" : ":/res/chat_friend_off.png") : ":/res/chat_friend.png"));
+         item->setForeground(Qt::green);
+     }
+     else
+     {
+-        item->setIcon(QIcon(showReady ? (item->data(Qt::UserRole).toBool() ? ":/res/chat_default_on" : ":/res/chat_default_off") : ":/res/chat_default.png"));
++        item->setIcon(QIcon(showReady ? (item->data(Qt::UserRole).toBool() ? ":/res/chat_default_on.png" : ":/res/chat_default_off.png") : ":/res/chat_default.png"));
+         item->setForeground(QBrush(QColor(0xff, 0xcc, 0x00)));
+     }
+ }
diff --git a/games-strategy/hedgewars/hedgewars-0.9.13.ebuild b/games-strategy/hedgewars/hedgewars-0.9.13.ebuild
index 48da182109bf..4d2c86fb255f 100644
--- a/games-strategy/hedgewars/hedgewars-0.9.13.ebuild
+++ b/games-strategy/hedgewars/hedgewars-0.9.13.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/games-strategy/hedgewars/hedgewars-0.9.13.ebuild,v 1.3 2010/09/29 05:32:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/hedgewars/hedgewars-0.9.13.ebuild,v 1.4 2010/10/19 17:51:44 mr_bones_ Exp $
 
 EAPI=2
 inherit cmake-utils eutils games
@@ -29,6 +29,8 @@ RDEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=( "${FILESDIR}"/${P}-qt47.patch )
+
 src_configure() {
 	mycmakeargs="-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX} -DDATA_INSTALL_DIR=${GAMES_DATADIR} -DCMAKE_VERBOSE_MAKEFILE=TRUE"
 	cmake-utils_src_configure