diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2012-05-28 12:23:39 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2012-05-28 12:23:39 +0000 |
| commit | 87692f8e4f68b3eead364f0a2884294d5012eec3 (patch) | |
| tree | cac667eb9ef6d53c97d4a0707721fe1e9e689563 | |
| parent | Stable for amd64, wrt bug #417819 (diff) | |
| download | gentoo-2-87692f8e4f68b3eead364f0a2884294d5012eec3.tar.gz gentoo-2-87692f8e4f68b3eead364f0a2884294d5012eec3.tar.bz2 gentoo-2-87692f8e4f68b3eead364f0a2884294d5012eec3.zip | |
Fix build without X11. Bug #369279
(Portage version: 2.1.10.63/cvs/Linux i686)
| -rw-r--r-- | games-roguelike/tome/ChangeLog | 9 | ||||
| -rw-r--r-- | games-roguelike/tome/files/tome-2.3.5-noX.patch | 11 | ||||
| -rw-r--r-- | games-roguelike/tome/files/tome-2.3.5-overflow.patch | 13 | ||||
| -rw-r--r-- | games-roguelike/tome/tome-2.3.5.ebuild | 9 |
4 files changed, 24 insertions, 18 deletions
diff --git a/games-roguelike/tome/ChangeLog b/games-roguelike/tome/ChangeLog index 648a44eb9e97..da61e205eb11 100644 --- a/games-roguelike/tome/ChangeLog +++ b/games-roguelike/tome/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-roguelike/tome -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/ChangeLog,v 1.34 2010/03/20 20:20:33 tupone Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/ChangeLog,v 1.35 2012/05/28 12:23:39 tupone Exp $ + + 28 May 2012; Tupone Alfredo <tupone@gentoo.org> tome-2.3.5.ebuild, + +files/tome-2.3.5-noX.patch, -files/tome-2.3.5-overflow.patch: + Fix QA notice about patch with relative file addressing + Fix build without X11. Bug #369279 by Piotr Szymaniak 20 Mar 2010; Tupone Alfredo <tupone@gentoo.org> tome-2.3.5.ebuild, +files/tome-2.3.5-overflow.patch: diff --git a/games-roguelike/tome/files/tome-2.3.5-noX.patch b/games-roguelike/tome/files/tome-2.3.5-noX.patch new file mode 100644 index 000000000000..5c5982fe730d --- /dev/null +++ b/games-roguelike/tome/files/tome-2.3.5-noX.patch @@ -0,0 +1,11 @@ +--- makefile.old 2012-05-28 14:02:44.787705444 +0200 ++++ makefile 2012-05-28 14:03:44.520524011 +0200 +@@ -458,7 +458,7 @@ + $(CC) $(PROFILELDFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) + + $(TOLUA): $(TOLUAOBJS) lua/tolua.c lua/tolualua.c +- $(CC) $(CFLAGS) $(PROFILELDFLAGS) $(LDFLAGS) -o $@ $(TOLUAOBJS) lua/tolua.c lua/tolualua.c $(LIBS) ++ $(CC) $(CFLAGS) $(PROFILELDFLAGS) $(LDFLAGS) -o $@ $(TOLUAOBJS) lua/tolua.c lua/tolualua.c + + # + # An install rule. diff --git a/games-roguelike/tome/files/tome-2.3.5-overflow.patch b/games-roguelike/tome/files/tome-2.3.5-overflow.patch deleted file mode 100644 index 399fdd1536b0..000000000000 --- a/games-roguelike/tome/files/tome-2.3.5-overflow.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ../lib/edit/p_info.txt.old 2010-03-20 20:40:53.000000000 +0100 -+++ ../lib/edit/p_info.txt 2010-03-20 20:41:05.000000000 +0100 -@@ -1559,8 +1559,8 @@ - S:O:70:12:25d3 - - # Used for corruptions that can change your subrace --S:N:9:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx --S:D:A:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -+S:N:9:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -+S:D:A:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - S:S:0:0:0:0:0:0:0:100 - S:K:0:0:0:0:0:0:0:0 - S:P:0:0:0 diff --git a/games-roguelike/tome/tome-2.3.5.ebuild b/games-roguelike/tome/tome-2.3.5.ebuild index 0ed37952acde..ec84d1f648ff 100644 --- a/games-roguelike/tome/tome-2.3.5.ebuild +++ b/games-roguelike/tome/tome-2.3.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.3.5.ebuild,v 1.6 2011/03/01 07:25:39 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.3.5.ebuild,v 1.7 2012/05/28 12:23:39 tupone Exp $ EAPI=2 inherit eutils games @@ -31,7 +31,10 @@ S=${WORKDIR}/tome-${MY_PV}-src/src src_prepare() { mv makefile.std makefile epatch "${FILESDIR}/${PV}-gentoo-paths.patch" \ - "${FILESDIR}"/${P}-overflow.patch + "${FILESDIR}"/${P}-noX.patch + sed -i \ + -e "s:xx:x:" \ + ../lib/edit/p_info.txt sed -i \ -e "s:GENTOO_DIR:${GAMES_STATEDIR}:" files.c init2.c \ || die "sed failed" |