diff options
| author |   Tristan Heaven <tristan@gentoo.org> | 2009-07-24 00:35:26 +0000 |
|---|---|---|
| committer | Tristan Heaven <tristan@gentoo.org> | 2009-07-24 00:35:26 +0000 |
| commit | 6aee96bbcd0009cf271708ba29c79017f0f5d7c0 (patch) | |
| tree | 73d7000d154e1c2cf59bb047da3ae4af422ae834 /games-strategy | |
| parent | Removing security vulnerable versions (diff) | |
| download | historical-6aee96bbcd0009cf271708ba29c79017f0f5d7c0.tar.gz historical-6aee96bbcd0009cf271708ba29c79017f0f5d7c0.tar.bz2 historical-6aee96bbcd0009cf271708ba29c79017f0f5d7c0.zip | |
Fix building locales with bzr installed, bug #278011
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/widelands/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/widelands/Manifest | 14 | ||||
| -rw-r--r-- | games-strategy/widelands/files/widelands-0.0.13-build.patch | 21 |
3 files changed, 38 insertions, 3 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/Manifest b/games-strategy/widelands/Manifest index ff815482f8a2..6a8af765db58 100644 --- a/games-strategy/widelands/Manifest +++ b/games-strategy/widelands/Manifest @@ -1,5 +1,15 @@ -AUX widelands-0.0.13-build.patch 2510 RMD160 ffb9bb5f5c89e52d9ddad82851ed0ae3d6dd11c8 SHA1 b2f7126ec90b85f92f3c7b23694c0187652bd061 SHA256 fe730bf0f9cb109fe10334ac948671f4f00cda504d79c28e7b7a9f836f306499 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX widelands-0.0.13-build.patch 3128 RMD160 12555ad32d7ba79d303cf9fffa12eab7bd3e891a SHA1 7fa6182c03071f6e416a93ad27f42332425ee359 SHA256 80fd6bf47e600701fe35b97222127f6c372b78ff6c0bbd2f883a7e2e2b4255e2 DIST Widelands-Build13-src.tar.bz2 59030617 RMD160 d900401a27d3d98c447d5bf18037f35d4c74d740 SHA1 1634a536a45c52f656020168d1529d7e5ff092f3 SHA256 acbb4f6405e7429a8510eae5414a51cff198c1d4bef374303e3b4a47aae930b3 EBUILD widelands-0.0.13.ebuild 1920 RMD160 54defb6152036ae8781038738c2addddb4ee9e32 SHA1 5dcea00eab3c81d3543ef8b3c3f005c9efe62d86 SHA256 14a23fb23dd6411f58320bb980e6a7acda14f75a2cc3a120880852166c81890c -MISC ChangeLog 3264 RMD160 3c193d1116e14ef028cd503e70713c9261d86369 SHA1 c7d341096408eeabe8e60ccdcfa01e627e25230d SHA256 2e3565db9c8b90d79625843a4ced4c56ea90538c25865eebcfddd7541f759ed5 +MISC ChangeLog 3406 RMD160 83e3a6a92cb4ebadab751d55e83fcf86dcb29513 SHA1 7e6fd5fd40cdfb83cc77d73405cb6c5a21cb98de SHA256 9f47470709a4e1845acffcc9cc74fe48dfc73a4a3102b65d435af97cd00e0d8f MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEARECAAYFAkppAdUACgkQdz7hIScOURHhNACff/WcxzYFjJzC6qoVM0RrXn8O +O2cAn09PSWYrNKVbwk63XXBSjlMhf735 +=i2CK +-----END PGP SIGNATURE----- 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 @@ |