Updated the gcc-4.3 patch for salome-kernel (Thanks Bart K.)

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1184 32389bae-6d03-0410-99cf-db05cde120eb

3 files changed, 50 insertions, 13 deletions

diff --git a/sci-misc/salome-kernel/Changelog b/sci-misc/salome-kernel/Changelog
index 1dc37bd0c..afff2123b 100644
--- a/sci-misc/salome-kernel/Changelog
+++ b/sci-misc/salome-kernel/Changelog
@@ -1,5 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
+  6 July 2008; Daniel Tourde <daniel.tourde@caelae.se>
+  Updated to a new gcc-4.3 patch provided by Bert K.
+
   29 May 2008; Daniel Tourde <daniel.tourde@caelae.se>
   +salome-kernel-3.2.6-gcc-4.3.patch
   Added support to gcc-4.3. Patch provided by Bert Karwatzki <spasswolf@web.de>
@@ -8,4 +11,4 @@
   Initial import.
   +salome-kernel-3.2.6.ebuild, +salome-kernel-3.2.6_omniorg.patch, +salome-kernel-gcc4.patch, +salome-kernel-3.2.6-Batch_Couple.patch, +salome-kernel-3.2.6_openpbs.patch, +salome-kernel.png, +salome-kernel-3.2.6-mpich2.patch, +salome-kernel-3.2.6-pyobject.patch
   A major thank to Francois Dorin <f.dorin@free.fr>, Jon Hood <squinky86@gmail.com>, Dewald Pietersen <dewald.pieterse@gmail.com>, <etienne.lorriaux@gmail.com> and Richard Westwell <garlicbread@ntlworld.com> for their respective contributions and feedback. Without you guys, the Salome ebuilds would not exist today. Thanks!
-  See bug #155974 for more info
\ No newline at end of file
+  See bug #155974 for more info
diff --git a/sci-misc/salome-kernel/Manifest b/sci-misc/salome-kernel/Manifest
index 7bffe2b3c..83c4387bb 100644
--- a/sci-misc/salome-kernel/Manifest
+++ b/sci-misc/salome-kernel/Manifest
@@ -1,5 +1,5 @@
 AUX salome-kernel-3.2.6-Batch_Couple.patch 324 RMD160 42284ee163672fc686f9ae3dc79b485058781de2 SHA1 8f9b1aba0e80dc41214290c59e233f000e93d8bc SHA256 fec452f836727542d86d126b17e4143c2a8cd2ecce890a159b9c6dd40964b605
-AUX salome-kernel-3.2.6-gcc-4.3.patch 2841 RMD160 4c77d45f706cba13e03b338c12f6bf95ebf97d95 SHA1 e30d7186cbdd0f848b2182eb587ef0503534f9e7 SHA256 13fab12559ac078c287d22f789b8b733cd79e57f558e9cad706183172ebff2b5
+AUX salome-kernel-3.2.6-gcc-4.3.patch 4380 RMD160 f55a29d5562da3382ee315cbcd99420a9c0cd487 SHA1 6e92bd60f81582c2fcb73bddd25c11641bc5c84b SHA256 7f982e04fb492070c84126d08a9d2e7028c28cd1da8b2ea7234d8e5b04e3ac4c
 AUX salome-kernel-3.2.6-mpich2.patch 1421 RMD160 be3b85bf0799e90e57c32541aaf76ab9a0492f98 SHA1 99871487a1276356a1ceba1dd575f5b95561eb20 SHA256 793a1b0536329733d0ad65819e97a6ea0a328b72661eebe49ea6828a34de08fa
 AUX salome-kernel-3.2.6-pyobject.patch 7085 RMD160 db7d5bcccc78f9f1a2a2a0148bd7eadcdcb89fc5 SHA1 d661823bac9249065a3e55055f4947876289c97f SHA256 88f19a09ce6f81e18f6f908a74c683cb2940e0fae413e5e6d8c8a499874b0a09
 AUX salome-kernel-3.2.6_omniorg.patch 159 RMD160 6071fe5caa4b2d38bc34e26dfeb5c2b56a501b1d SHA1 1e441ed3543def24cf3fd06fc569b62efa078c10 SHA256 b7effbbb105a57c0f342d55881733d125aff63435605fbf4c2036e556e2a71a0
@@ -8,4 +8,4 @@ AUX salome-kernel-gcc4.patch 5928 RMD160 9fa81eeac2d5dbb64b3137e711553b4b76bc9e0
 AUX salome-kernel.png 1934 RMD160 700c6d3a96df0576582af4c2d77f1588cf385ab6 SHA1 4aca0bb3b2331ec4253fdc299777012501841508 SHA256 df2ee182545ccaf1081bd3687b984ccd0b4d0166698cd7a403f138055bcb8ec2
 DIST salome-3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258
 EBUILD salome-kernel-3.2.6.ebuild 5629 RMD160 864e79d24d2b7f098683aa534e96daefffd8148f SHA1 b8e212a51b06ba6c18d56e7e75d1d43758648d43 SHA256 6d45b5f0cc6de5cc55aca49add2e87135cbfdb181d4f66e5f69db97b167b0c61
-MISC Changelog 947 RMD160 6186f62a12842f043a018857248b92eeef8b43be SHA1 e6a1db7e1e8da1feda40a14631a7bcb8cc63ca34 SHA256 b6327993044e57db12c967de7492267a5d5a10585798f13bb21652bbc8de2d60
+MISC Changelog 1057 RMD160 7199fd581065a42ce6f0a196c90af808d7cba7b0 SHA1 830d1108f90b73fe9d9c1eb242ceb0922a5fcaf7 SHA256 d8c7b7cf61606435f52432a937cd729e79153c9a6be9084dadcce372974630f7
diff --git a/sci-misc/salome-kernel/files/salome-kernel-3.2.6-gcc-4.3.patch b/sci-misc/salome-kernel/files/salome-kernel-3.2.6-gcc-4.3.patch
index 94257b4b2..b563cbf1c 100644
--- a/sci-misc/salome-kernel/files/salome-kernel-3.2.6-gcc-4.3.patch
+++ b/sci-misc/salome-kernel/files/salome-kernel-3.2.6-gcc-4.3.patch
@@ -1,6 +1,6 @@
 diff -aur src3.2.6.old/KERNEL_SRC_3.2.6/src/Batch/Batch_BatchManager_Local.cxx src3.2.6/KERNEL_SRC_3.2.6/src/Batch/Batch_BatchManager_Local.cxx
---- src3.2.6.old/KERNEL_SRC_3.2.6/src/Batch/Batch_BatchManager_Local.cxx	2008-05-25 19:32:46.000000000 +0200
-+++ src3.2.6/KERNEL_SRC_3.2.6/src/Batch/Batch_BatchManager_Local.cxx	2008-05-25 23:14:01.000000000 +0200
+--- src3.2.6.old/KERNEL_SRC_3.2.6/src/Batch/Batch_BatchManager_Local.cxx	2008-06-27 00:33:32.000000000 +0200
++++ src3.2.6/KERNEL_SRC_3.2.6/src/Batch/Batch_BatchManager_Local.cxx	2008-06-27 00:34:52.000000000 +0200
 @@ -32,6 +32,7 @@
  #include <cstdlib>
  #include <sys/types.h>
@@ -9,9 +9,43 @@ diff -aur src3.2.6.old/KERNEL_SRC_3.2.6/src/Batch/Batch_BatchManager_Local.cxx s
  #include <ctime>
  #include <unistd.h>
  #include <pthread.h>
+diff -aur src3.2.6.old/KERNEL_SRC_3.2.6/src/Batch/Batch_BatchManager_PBS.cxx src3.2.6/KERNEL_SRC_3.2.6/src/Batch/Batch_BatchManager_PBS.cxx
+--- src3.2.6.old/KERNEL_SRC_3.2.6/src/Batch/Batch_BatchManager_PBS.cxx	2008-06-27 00:33:32.000000000 +0200
++++ src3.2.6/KERNEL_SRC_3.2.6/src/Batch/Batch_BatchManager_PBS.cxx	2008-06-27 00:44:06.000000000 +0200
+@@ -34,6 +34,7 @@
+ #include <iostream>
+ #include <fstream>
+ #include <sstream>
++#include <cstdlib>
+ //#include "MEDMEM_STRING.hxx"
+ #include "Batch_BatchManager_PBS.hxx"
+ using namespace std;
+diff -aur src3.2.6.old/KERNEL_SRC_3.2.6/src/Batch/Batch_JobInfo_PBS.cxx src3.2.6/KERNEL_SRC_3.2.6/src/Batch/Batch_JobInfo_PBS.cxx
+--- src3.2.6.old/KERNEL_SRC_3.2.6/src/Batch/Batch_JobInfo_PBS.cxx	2008-06-27 00:33:32.000000000 +0200
++++ src3.2.6/KERNEL_SRC_3.2.6/src/Batch/Batch_JobInfo_PBS.cxx	2008-06-27 00:36:07.000000000 +0200
+@@ -29,6 +29,8 @@
+ 
+ #include <cstdio>
+ #include <sstream>
++#include <cstring>
++#include <cstdlib>
+ //#include "MEDMEM_STRING.hxx"
+ #include "Batch_Parametre.hxx"
+ #include "Batch_Environnement.hxx"
+diff -aur src3.2.6.old/KERNEL_SRC_3.2.6/src/Batch/Batch_Job_PBS.cxx src3.2.6/KERNEL_SRC_3.2.6/src/Batch/Batch_Job_PBS.cxx
+--- src3.2.6.old/KERNEL_SRC_3.2.6/src/Batch/Batch_Job_PBS.cxx	2008-06-27 00:33:32.000000000 +0200
++++ src3.2.6/KERNEL_SRC_3.2.6/src/Batch/Batch_Job_PBS.cxx	2008-06-27 00:49:11.000000000 +0200
+@@ -30,6 +30,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <cstring>
+ #include "Batch_Job_PBS.hxx"
+ using namespace std;
+ 
 diff -aur src3.2.6.old/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server.hxx src3.2.6/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server.hxx
---- src3.2.6.old/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server.hxx	2008-05-25 19:32:46.000000000 +0200
-+++ src3.2.6/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server.hxx	2008-05-25 22:59:09.000000000 +0200
+--- src3.2.6.old/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server.hxx	2008-06-27 00:33:32.000000000 +0200
++++ src3.2.6/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server.hxx	2008-06-27 00:34:52.000000000 +0200
 @@ -12,7 +12,8 @@
  #define SALOME_Logger_Server_include
  
@@ -32,8 +66,8 @@ diff -aur src3.2.6.old/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server.hxx src3
  		std::ofstream m_outputFile; 
  #endif
 diff -aur src3.2.6.old/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server_main.cxx src3.2.6/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server_main.cxx
---- src3.2.6.old/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server_main.cxx	2008-05-25 19:32:46.000000000 +0200
-+++ src3.2.6/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server_main.cxx	2008-05-25 22:06:37.000000000 +0200
+--- src3.2.6.old/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server_main.cxx	2008-06-27 00:33:32.000000000 +0200
++++ src3.2.6/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server_main.cxx	2008-06-27 00:34:52.000000000 +0200
 @@ -9,6 +9,7 @@
  //  Module : SALOME
  
@@ -43,8 +77,8 @@ diff -aur src3.2.6.old/KERNEL_SRC_3.2.6/src/Logger/SALOME_Logger_Server_main.cxx
  #include <SALOMEconfig.h>
  #include <sys/types.h>
 diff -aur src3.2.6.old/KERNEL_SRC_3.2.6/src/SALOMELocalTrace/LocalTraceBufferPool.cxx src3.2.6/KERNEL_SRC_3.2.6/src/SALOMELocalTrace/LocalTraceBufferPool.cxx
---- src3.2.6.old/KERNEL_SRC_3.2.6/src/SALOMELocalTrace/LocalTraceBufferPool.cxx	2008-05-25 19:32:46.000000000 +0200
-+++ src3.2.6/KERNEL_SRC_3.2.6/src/SALOMELocalTrace/LocalTraceBufferPool.cxx	2008-05-25 19:34:23.000000000 +0200
+--- src3.2.6.old/KERNEL_SRC_3.2.6/src/SALOMELocalTrace/LocalTraceBufferPool.cxx	2008-06-27 00:33:32.000000000 +0200
++++ src3.2.6/KERNEL_SRC_3.2.6/src/SALOMELocalTrace/LocalTraceBufferPool.cxx	2008-06-27 00:34:52.000000000 +0200
 @@ -27,6 +27,7 @@
  #include <iostream>
  #include <limits.h>
@@ -54,8 +88,8 @@ diff -aur src3.2.6.old/KERNEL_SRC_3.2.6/src/SALOMELocalTrace/LocalTraceBufferPoo
  #ifndef WNT
  #include <dlfcn.h>
 diff -aur src3.2.6.old/KERNEL_SRC_3.2.6/src/TOOLSDS/SALOMEDS_Tool.cxx src3.2.6/KERNEL_SRC_3.2.6/src/TOOLSDS/SALOMEDS_Tool.cxx
---- src3.2.6.old/KERNEL_SRC_3.2.6/src/TOOLSDS/SALOMEDS_Tool.cxx	2008-05-25 19:32:46.000000000 +0200
-+++ src3.2.6/KERNEL_SRC_3.2.6/src/TOOLSDS/SALOMEDS_Tool.cxx	2008-05-25 23:04:39.000000000 +0200
+--- src3.2.6.old/KERNEL_SRC_3.2.6/src/TOOLSDS/SALOMEDS_Tool.cxx	2008-06-27 00:33:32.000000000 +0200
++++ src3.2.6/KERNEL_SRC_3.2.6/src/TOOLSDS/SALOMEDS_Tool.cxx	2008-06-27 00:34:52.000000000 +0200
 @@ -41,8 +41,8 @@
  
  #ifndef WNT