diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2008-05-30 09:08:28 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2008-05-30 09:08:28 +0000 |
| commit | 38384d9116e57ac009cf690d479a1daf46433d17 (patch) | |
| tree | 503461b9af21314963e45d047c54ae76ec45f791 /sci-physics/root | |
| parent | KDE4_BUILT_WITH_USE_CHECK is now always an array. Bug #216863. (diff) | |
| download | gentoo-2-38384d9116e57ac009cf690d479a1daf46433d17.tar.gz gentoo-2-38384d9116e57ac009cf690d479a1daf46433d17.tar.bz2 gentoo-2-38384d9116e57ac009cf690d479a1daf46433d17.zip | |
Removed cvs tags in xrootd patch, closing bug #224195
(Portage version: 2.1.5.2)
Diffstat (limited to 'sci-physics/root')
| -rw-r--r-- | sci-physics/root/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-physics/root/files/xrootd-20071116-gcc43.patch | 24 |
2 files changed, 14 insertions, 16 deletions
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog index cd9742e00aef..1f86a1808fe6 100644 --- a/sci-physics/root/ChangeLog +++ b/sci-physics/root/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-physics/root # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.25 2008/05/29 18:55:33 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.26 2008/05/30 09:08:28 bicatali Exp $ + + 30 May 2008; Sébastien Fabbro <bicatali@gentoo.org> + files/xrootd-20071116-gcc43.patch: + Removed cvs tags in xrootd patch, closing bug #224195 *root-5.18.00d (29 May 2008) diff --git a/sci-physics/root/files/xrootd-20071116-gcc43.patch b/sci-physics/root/files/xrootd-20071116-gcc43.patch index 14697d790e8b..77bceb884031 100644 --- a/sci-physics/root/files/xrootd-20071116-gcc43.patch +++ b/sci-physics/root/files/xrootd-20071116-gcc43.patch @@ -525,21 +525,17 @@ #include "XrdOuc/XrdOucEnv.hh" #include "XrdOuc/XrdOucStream.hh" ---- xrootd/src/XrdOuc/XrdOucTrace.hh.orig 2007-07-31 02:25:53.000000000 +0000 -+++ xrootd/src/XrdOuc/XrdOucTrace.hh 2008-05-26 16:38:39.779442480 +0000 -@@ -11,13 +11,8 @@ - /******************************************************************************/ +--- xrootd/src/XrdOuc/XrdOucTrace.hh.orig 2008-05-30 08:52:24.585885892 +0000 ++++ xrootd/src/XrdOuc/XrdOucTrace.hh 2008-05-30 08:52:55.919671503 +0000 +@@ -14,8 +14,5 @@ - // $Id: xrootd-20071116-gcc43.patch,v 1.1 2008/05/29 18:55:34 bicatali Exp $ -- -#ifndef WIN32 -#include <iostream.h> -#else #include <iostream> using namespace std; -#endif - - #include "XrdSys/XrdSysError.hh" ++ --- xrootd/src/XrdPosix/XrdPosix.cc.orig 2007-07-28 00:25:25.000000000 +0000 +++ xrootd/src/XrdPosix/XrdPosix.cc 2008-05-26 11:18:18.119907423 +0000 @@ -902,20 +898,18 @@ #define NOUC ((uid_t)(-1)) #define NOGC ((gid_t)(-1)) ---- xrootd/src/XrdSys/XrdSysXSLock.cc.orig 2007-07-31 02:26:53.000000000 +0000 -+++ xrootd/src/XrdSys/XrdSysXSLock.cc 2008-05-26 16:49:42.632709871 +0000 -@@ -12,12 +12,8 @@ - - const char *XrdSysXSLockCVSID = "$Id: xrootd-20071116-gcc43.patch,v 1.1 2008/05/29 18:55:34 bicatali Exp $"; +--- xrootd/src/XrdSys/XrdSysXSLock.cc.orig 2008-05-30 08:56:14.698999291 +0000 ++++ xrootd/src/XrdSys/XrdSysXSLock.cc 2008-05-30 08:57:02.805740738 +0000 +@@ -14,8 +14,6 @@ -#ifndef WIN32 -#include <iostream.h> -#else ++ #include <iostream> using namespace std; -#endif - - #include "XrdSys/XrdSysXSLock.hh" ++ --- xrootd/src/XrdXrootd/XrdXrootdConfig.cc.orig 2007-10-02 02:30:01.000000000 +0000 +++ xrootd/src/XrdXrootd/XrdXrootdConfig.cc 2008-05-26 11:18:27.808459542 +0000 |