diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2010-10-19 17:51:44 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2010-10-19 17:51:44 +0000 |
| commit | 414010ff8b5e0f3054ffa9a190c0ece45dc4bb9c (patch) | |
| tree | d51216c35c33fcfa3aa3591e6ab1ba5c8ad6174c /games-strategy/hedgewars | |
| parent | x86 stable per bug 338652 (diff) | |
| download | gentoo-2-414010ff8b5e0f3054ffa9a190c0ece45dc4bb9c.tar.gz gentoo-2-414010ff8b5e0f3054ffa9a190c0ece45dc4bb9c.tar.bz2 gentoo-2-414010ff8b5e0f3054ffa9a190c0ece45dc4bb9c.zip | |
apply upstream patch for running against Qt-4.7 report by Longer via bug #341789
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'games-strategy/hedgewars')
| -rw-r--r-- | games-strategy/hedgewars/ChangeLog | 7 | ||||
| -rw-r--r-- | games-strategy/hedgewars/files/hedgewars-0.9.13-qt47.patch | 23 | ||||
| -rw-r--r-- | games-strategy/hedgewars/hedgewars-0.9.13.ebuild | 4 |
3 files changed, 32 insertions, 2 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/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 |