diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2010-05-24 12:08:51 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2010-05-24 12:08:51 +0000 |
| commit | c36263f01e2c4c1014223edc74a75a10f7ab257a (patch) | |
| tree | 996ceed4d553c0aa06fe68fbdb0d149c876dea94 /games-board/gtkboard | |
| parent | fix libpng14 problem (see Bug #321201). Thanks for patch Xarthisius. (diff) | |
| download | gentoo-2-c36263f01e2c4c1014223edc74a75a10f7ab257a.tar.gz gentoo-2-c36263f01e2c4c1014223edc74a75a10f7ab257a.tar.bz2 gentoo-2-c36263f01e2c4c1014223edc74a75a10f7ab257a.zip | |
Build with gcc-4.5 Bug #320881
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'games-board/gtkboard')
| -rw-r--r-- | games-board/gtkboard/ChangeLog | 6 | ||||
| -rw-r--r-- | games-board/gtkboard/files/gtkboard-0.11_pre0-gcc45.patch | 22 | ||||
| -rw-r--r-- | games-board/gtkboard/gtkboard-0.11_pre0.ebuild | 18 |
3 files changed, 37 insertions, 9 deletions
diff --git a/games-board/gtkboard/ChangeLog b/games-board/gtkboard/ChangeLog index 1d0f0c6c5006..08932ac6314f 100644 --- a/games-board/gtkboard/ChangeLog +++ b/games-board/gtkboard/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-board/gtkboard # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/gtkboard/ChangeLog,v 1.11 2010/05/21 16:30:44 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/gtkboard/ChangeLog,v 1.12 2010/05/24 12:08:50 tupone Exp $ + + 24 May 2010; Tupone Alfredo <tupone@gentoo.org> gtkboard-0.11_pre0.ebuild, + +files/gtkboard-0.11_pre0-gcc45.patch: + Build with gcc-4.5 Bug #320881 by flameeyes@gentoo.org 21 May 2010; Michael Sterrett <mr_bones_@gentoo.org> gtkboard-0.11_pre0.ebuild: diff --git a/games-board/gtkboard/files/gtkboard-0.11_pre0-gcc45.patch b/games-board/gtkboard/files/gtkboard-0.11_pre0-gcc45.patch new file mode 100644 index 000000000000..300e528c9ef7 --- /dev/null +++ b/games-board/gtkboard/files/gtkboard-0.11_pre0-gcc45.patch @@ -0,0 +1,22 @@ +--- src/menu.c.old 2010-05-24 12:35:15.000000000 +0200 ++++ src/menu.c 2010-05-24 12:35:48.000000000 +0200 +@@ -176,7 +176,7 @@ + { + #if GTK_MAJOR_VERSION == 2 + // FIXME: can't get existing bgcolor +- const int size = 20; ++#define size 20 + static char pixbufs [7][size*(size+1)]; + char **pixmap_data; + static GdkPixmap *pixmaps[7]; +--- src/wordtris.c.old 2010-05-24 12:36:50.000000000 +0200 ++++ src/wordtris.c 2010-05-24 12:38:30.000000000 +0200 +@@ -122,7 +122,7 @@ + + // TODO: change this so that we only need to specify pixmaps for individual squares + +-static const int lava_xpm_header_size = 253+1; ++#define lava_xpm_header_size 253+1 + static char * lava_xpm_header[] = + { + "144 504 253 2", diff --git a/games-board/gtkboard/gtkboard-0.11_pre0.ebuild b/games-board/gtkboard/gtkboard-0.11_pre0.ebuild index f2d565e9a38b..fdf31b23b0c6 100644 --- a/games-board/gtkboard/gtkboard-0.11_pre0.ebuild +++ b/games-board/gtkboard/gtkboard-0.11_pre0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/gtkboard/gtkboard-0.11_pre0.ebuild,v 1.14 2010/05/21 16:30:44 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/gtkboard/gtkboard-0.11_pre0.ebuild,v 1.15 2010/05/24 12:08:50 tupone Exp $ +EAPI="2" -EAPI=2 inherit eutils games MY_P=${P/_} @@ -16,17 +16,18 @@ KEYWORDS="amd64 ppc x86" IUSE="gnome" RDEPEND=">=x11-libs/gtk+-2 - media-libs/libsdl[audio] - media-libs/sdl-mixer[vorbis] + media-libs/libsdl + media-libs/sdl-mixer gnome? ( gnome-base/libgnomeui )" DEPEND="${RDEPEND} dev-util/pkgconfig" S=${WORKDIR}/${MY_P} -src_prepare() { - epatch "${FILESDIR}"/${P}-gcc41.patch -} +PATCHES=( + "${FILESDIR}"/${P}-gcc41.patch + "${FILESDIR}"/${P}-gcc45.patch + ) src_configure() { egamesconf \ @@ -34,7 +35,8 @@ src_configure() { --datadir="${GAMES_DATADIR}"/${PN} \ --enable-gtk2 \ --enable-sdl \ - $(use_enable gnome) + $(use_enable gnome) \ + || die } src_install() { |