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 | 5aa351f3aafc98b5f8f4fd44713e385b7c2bf9ba (patch) | |
| tree | 73ec6e6d044787f216bbfca472fc377d5eccdeb7 /games-board/gtkboard | |
| parent | fix libpng14 problem (see Bug #321201). Thanks for patch Xarthisius. (diff) | |
| download | historical-5aa351f3aafc98b5f8f4fd44713e385b7c2bf9ba.tar.gz historical-5aa351f3aafc98b5f8f4fd44713e385b7c2bf9ba.tar.bz2 historical-5aa351f3aafc98b5f8f4fd44713e385b7c2bf9ba.zip | |
Build with gcc-4.5 Bug #320881
Package-Manager: portage-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/Manifest | 5 | ||||
| -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 |
4 files changed, 40 insertions, 11 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/Manifest b/games-board/gtkboard/Manifest index df563adce04f..56f5743d528d 100644 --- a/games-board/gtkboard/Manifest +++ b/games-board/gtkboard/Manifest @@ -1,5 +1,6 @@ AUX gtkboard-0.11_pre0-gcc41.patch 583 RMD160 a96cdfcd1805ac4b56f12eaf48e9c10afcda9bc0 SHA1 ae184df64745e77dd647e6ea16d8ffe85f1bfc87 SHA256 3af90808f928e689729e3a88f01bd2681e6a92a4279afc008422f72599385e90 +AUX gtkboard-0.11_pre0-gcc45.patch 696 RMD160 9d7c7f840252f2c0da8433c8c50c5c519c502cca SHA1 cd625627f3ca968867a4b0e2d1ac4c77deb7c28f SHA256 08440e1b91cf8dcb90f0c6cc46d44017afe65805abc06c7d56ff0378978340b0 DIST gtkboard-0.11pre0.tar.gz 459581 RMD160 1381f11a5a83a1de60c5ce1c7f672bafde840920 SHA1 3f7549ba163e6223167a6f3dd20b8a5a65bb01f0 SHA256 e67ffbec822ce989c9b480b9ef0429bcc75fb2dcdf349940d7d5f9f85da902c5 -EBUILD gtkboard-0.11_pre0.ebuild 1079 RMD160 4098460bd9d0f1e7893be1b84b6707872b024c74 SHA1 f83604bb59985210c14fa7d284660d047e395d22 SHA256 ae24357c17978ad27b3591c2ba15f6388d29782e9192c7f2b687d5860e1a600c -MISC ChangeLog 1500 RMD160 fff6e56c59ec951323e93140c9133c6f20e7bc3d SHA1 9b7192318380ffae854a170b2f0bca3e377f842c SHA256 b88781688c92768d49d529056b1e8fc4e251e94cf9cd4303e949cae1945f4f02 +EBUILD gtkboard-0.11_pre0.ebuild 1094 RMD160 ba97ef88c01965bed8e8b641c898ba5ebfc8f509 SHA1 36293475339ba7c6ea7dd6d4e282ea4bdca0de4a SHA256 f3dbdf11b85f41cefeddb0c954ec23ef56169b735518337a83f1ba6ca92ef247 +MISC ChangeLog 1673 RMD160 8bb89e5d4c8e33a48fa0a3dfe574d207cf33c336 SHA1 39d5c3993b01d6f8d27ecd2df969201c91fb80bf SHA256 c4283b457f6f54e88ac002b12719f3c8c09574926914ed8c9aef3bf616e89773 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 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() { |