diff options
| author |   Tristan Heaven <nyhm@gentoo.org> | 2009-07-24 00:35:26 +0000 |
|---|---|---|
| committer | Tristan Heaven <nyhm@gentoo.org> | 2009-07-24 00:35:26 +0000 |
| commit | fe9d4a0bb82120cfe8dcc284f4a6247cf97cc59a (patch) | |
| tree | babb164512d23111e39ebff307089932607bd6da /games-strategy/widelands | |
| parent | Removing security vulnerable versions (diff) | |
| download | gentoo-2-fe9d4a0bb82120cfe8dcc284f4a6247cf97cc59a.tar.gz gentoo-2-fe9d4a0bb82120cfe8dcc284f4a6247cf97cc59a.tar.bz2 gentoo-2-fe9d4a0bb82120cfe8dcc284f4a6247cf97cc59a.zip | |
Fix building locales with bzr installed, bug #278011
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'games-strategy/widelands')
| -rw-r--r-- | games-strategy/widelands/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/widelands/files/widelands-0.0.13-build.patch | 21 |
2 files changed, 26 insertions, 1 deletions
diff --git a/games-strategy/widelands/ChangeLog b/games-strategy/widelands/ChangeLog index 6c65f49a042f..ac83e6420e53 100644 --- a/games-strategy/widelands/ChangeLog +++ b/games-strategy/widelands/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/widelands # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.17 2009/07/15 12:34:23 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.18 2009/07/24 00:35:26 nyhm Exp $ + + 24 Jul 2009; Tristan Heaven <nyhm@gentoo.org> + files/widelands-0.0.13-build.patch: + Fix building locales with bzr installed, bug #278011 *widelands-0.0.13 (15 Jul 2009) diff --git a/games-strategy/widelands/files/widelands-0.0.13-build.patch b/games-strategy/widelands/files/widelands-0.0.13-build.patch index 2ae88df69501..9e1b141ca2dd 100644 --- a/games-strategy/widelands/files/widelands-0.0.13-build.patch +++ b/games-strategy/widelands/files/widelands-0.0.13-build.patch @@ -1,3 +1,24 @@ +--- build/scons-tools/detect_revision.py ++++ build/scons-tools/detect_revision.py +@@ -8,17 +8,10 @@ + + import os,sys + +-# Support for bzr local branches +-try: +- from bzrlib.branch import Branch +- from bzrlib.bzrdir import BzrDir +- from bzrlib.errors import NotBranchError +- __has_bzr = True +-except ImportError: +- __has_bzr = False + + def detect_revision(): + revstring='UNKNOWN-REVISION' ++ return revstring + + # All code below relies on posix-isms, don't even try on other systems for now + # TODO: find out how revision detection can be done cross platform instead of returning "UNKNOWN" --- Makefile +++ Makefile @@ -26,7 +26,7 @@ |