summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-08-07 11:53:13 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-08-07 11:53:13 +0000
commit06896c6295252ff6a2ad5053fd34d340b17e3579 (patch)
tree92d0e1ecaa2ee2063bf8630711da48ce65f05718 /dev-embedded
parentFix building with GLIBC 2.10+ wrt #277237, thanks to Martin Väth for patch. (diff)
downloadgentoo-2-06896c6295252ff6a2ad5053fd34d340b17e3579.tar.gz
gentoo-2-06896c6295252ff6a2ad5053fd34d340b17e3579.tar.bz2
gentoo-2-06896c6295252ff6a2ad5053fd34d340b17e3579.zip
CVS broke the patch due to header in it, fix it
(Portage version: 2.2_rc36/cvs/Linux x86_64)
Diffstat (limited to 'dev-embedded')
-rw-r--r--dev-embedded/avarice/Manifest2
-rw-r--r--dev-embedded/avarice/files/avarice-2.10-gcc44.patch11
2 files changed, 2 insertions, 11 deletions
diff --git a/dev-embedded/avarice/Manifest b/dev-embedded/avarice/Manifest
index b81baab1e672..263cc0476ff2 100644
--- a/dev-embedded/avarice/Manifest
+++ b/dev-embedded/avarice/Manifest
@@ -1,4 +1,4 @@
-AUX avarice-2.10-gcc44.patch 1302 RMD160 19cebe40927fa51226f56872e493b4048612c14a SHA1 04f1af3c807e64d5e2283967b92589b38b45df0c SHA256 012783acca12ed191eff9135963cec42ae5a299d6960d5e6e0238a525b5d9a9a
+AUX avarice-2.10-gcc44.patch 1038 RMD160 c0ef9a3bd0e5626115b82fe9cfff106e1ad34b5f SHA1 2e53aba6115c7a14dfd62d5ce0f3815d79da0cf4 SHA256 9a385eeea97f94afcab37f05f7571fcea8ca0fb93033d3e43266ba9d50a8b6e8
DIST avarice-2.10.tar.bz2 172136 RMD160 f093126485a99ad05f038b9c2a7018e57f2c01b8 SHA1 fbac00e37f90185f24a17023eccc111493792cb1 SHA256 5f32157ed2aaa8b44549fff9e2e520f8cda804072d5fbc1d9e9ce376c1ba4352
DIST avarice-2.6.tar.bz2 151100 RMD160 c99175e848cc816a5a22e15eaf881a0c58d95547 SHA1 d559d0096de798b3078e501e5770767ce635ac00 SHA256 c916cc130755c38cebf2d09b84fce6530e78c8bf28acab87afedbc77ac464a5a
DIST avarice-2.9.tar.bz2 171433 RMD160 8acdc5040ef08b52028a8d6554526e2be37682ef SHA1 67fcbfd7ec9a26ebfbe386c380e1a21322573726 SHA256 c101f8458d2acd46e259b18632919bdfa541bedc08165b06d8d002d55e5221fa
diff --git a/dev-embedded/avarice/files/avarice-2.10-gcc44.patch b/dev-embedded/avarice/files/avarice-2.10-gcc44.patch
index 25dbd0d107db..30a521547da8 100644
--- a/dev-embedded/avarice/files/avarice-2.10-gcc44.patch
+++ b/dev-embedded/avarice/files/avarice-2.10-gcc44.patch
@@ -1,15 +1,6 @@
diff -ur avarice-2.10.orig/src/jtag2usb.cc avarice-2.10/src/jtag2usb.cc
--- avarice-2.10.orig/src/jtag2usb.cc 2007-02-18 00:41:46.000000000 +0200
-+++ avarice-2.10/src/jtag2usb.cc 2009-08-07 11:53:46.000000000 +0300
-@@ -18,7 +18,7 @@
- * This file implements the libusb-based USB connection to a JTAG ICE
- * mkII.
- *
-- * $Id: avarice-2.10-gcc44.patch,v 1.1 2009/08/07 08:53:45 ssuominen Exp $
-+ * $Id: avarice-2.10-gcc44.patch,v 1.1 2009/08/07 08:53:45 ssuominen Exp $
- */
-
-
++++ avarice-2.10/src/jtag2usb.cc 2009-08-07 14:55:04.000000000 +0300
@@ -70,7 +70,7 @@
struct usb_bus *bus;
struct usb_device *dev;