summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2008-07-23 12:36:48 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2008-07-23 12:36:48 +0000
commit6f3a850f3711d6b793d418daa7539a3ae412c27c (patch)
tree868a76bad71ea2070d4e970fda40666f952a2eba
parentRekeyword for ~sparc (allow pam_ssh), Bug #232691. (diff)
downloadgentoo-2-6f3a850f3711d6b793d418daa7539a3ae412c27c.tar.gz
gentoo-2-6f3a850f3711d6b793d418daa7539a3ae412c27c.tar.bz2
gentoo-2-6f3a850f3711d6b793d418daa7539a3ae412c27c.zip
Fix failing patch, bug #218888.
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.8 i686)
-rw-r--r--app-emulation/bochs/ChangeLog6
-rw-r--r--app-emulation/bochs/files/bochs-2.3.7-gcc43.patch4
2 files changed, 7 insertions, 3 deletions
diff --git a/app-emulation/bochs/ChangeLog b/app-emulation/bochs/ChangeLog
index 07acdefec4c2..6145d36ec90a 100644
--- a/app-emulation/bochs/ChangeLog
+++ b/app-emulation/bochs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/bochs
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v 1.78 2008/06/17 10:11:42 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v 1.79 2008/07/23 12:36:48 loki_val Exp $
+
+ 23 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+ files/bochs-2.3.7-gcc43.patch:
+ Fix failing patch, bug #218888.
17 Jun 2008; Luca Barbato <lu_zero@gentoo.org>
+files/bochs-2.3.7-gcc43.patch, bochs-2.3.7.ebuild:
diff --git a/app-emulation/bochs/files/bochs-2.3.7-gcc43.patch b/app-emulation/bochs/files/bochs-2.3.7-gcc43.patch
index c4b15617914d..4646edf6762e 100644
--- a/app-emulation/bochs/files/bochs-2.3.7-gcc43.patch
+++ b/app-emulation/bochs/files/bochs-2.3.7-gcc43.patch
@@ -1,5 +1,5 @@
---- symbols.cc 2008/03/30 14:32:14 1.11
-+++ symbols.cc 2008/06/16 17:09:52 1.12
+--- bochs-2.3.7.orig/bx_debug/symbols.cc 2008/03/30 14:32:14 1.11
++++ bochs-2.3.7/bx_debug/symbols.cc 2008/06/16 17:09:52 1.12
@@ -95,6 +95,9 @@
#endif