Upgrade Code_Aster to 9.2.0-2.

4 files changed, 53 insertions, 21 deletions

diff --git a/french/aster/files/patch-as_setup.py b/french/aster/files/patch-as_setup.py
index 43e3a50eace2..86a08f9e1c69 100644
--- a/french/aster/files/patch-as_setup.py
+++ b/french/aster/files/patch-as_setup.py
@@ -1,6 +1,17 @@
---- as_setup.py.orig	Wed Jun 28 18:04:25 2006
-+++ as_setup.py	Sun Sep 24 12:23:18 2006
-@@ -1170,7 +1170,10 @@
+--- as_setup.py.orig	2007-12-21 17:08:17.000000000 +0100
++++ as_setup.py	2008-01-08 22:32:14.000000000 +0100
+@@ -397,6 +397,10 @@
+                traceback.print_exc()
+                self.exit_code=iret
+                raise SetupExtractError, _('error during extracting archive %s') % archive
++            # Insert FreeBSD patches here
++            self._print('Handle gfortran C-like pre-processor directives')
++            os.rename(os.path.join(self.content, 'bibf90/utilitai/traceb.f'), os.path.join(self.content, 'bibf90/utilitai/traceb.F'))
++            # End of FreeBSD patches
+ 
+       if iextr_as:
+          iret=0
+@@ -1216,7 +1220,10 @@
        from socket import gethostname, gethostbyaddr
        if host==None:
           host = gethostname()
diff --git a/french/aster/files/patch-products.py b/french/aster/files/patch-products.py
index 04a4796528ba..bce46bd277ef 100644
--- a/french/aster/files/patch-products.py
+++ b/french/aster/files/patch-products.py
@@ -1,6 +1,6 @@
---- products.py.orig	Tue Jan  2 17:13:15 2007
-+++ products.py	Fri Feb  2 23:13:35 2007
-@@ -833,16 +833,18 @@
+--- products.py.orig	2007-12-21 17:08:17.000000000 +0100
++++ products.py	2008-01-08 14:20:12.000000000 +0100
+@@ -863,16 +863,18 @@
             'HOME_PYTHON', 'PYTHON_EXE', 'PYTHONLIB', 'PYMODULES_PREFIX',
             'HOME_MUMPS', 'HOME_ZMAT', 'HOME_MPI',
             'HOME_MED', 'HOME_HDF', 'HOME_CRPCRS',
@@ -25,7 +25,7 @@
             'NOBUILD', ],
     )
     cfg['ENV_SH']   = cfg.get('ENV_SH', '')
-@@ -885,6 +887,18 @@
+@@ -911,6 +913,18 @@
        cxxlibs.extend(['stdc++', 'supc++'])
        zmat_platform='Linux'
        mpilibs.extend(['mpich'])
@@ -44,7 +44,7 @@
     elif cfg['IFDEF'] == 'LINUX64':
        opt['MATH_LIST']  = ['lapack', 'blas', 'g2c']
        opt['SYSLIB']     = '-Wl,--allow-multiple-definition -Wl,--export-dynamic -lieee -ldl -lpthread -lutil -lm'
-@@ -939,8 +953,8 @@
+@@ -965,8 +979,8 @@
        opt['FINCLUDE']   = ''
  
     # ----- F90
@@ -55,7 +55,7 @@
     opt['F90INCLUDE']=''
  
     # ----- check for MED and HDF5 libraries, and HDF5 includes
-@@ -973,11 +987,14 @@
+@@ -999,11 +1013,14 @@
  
     # ----- MUMPS
     if cfg['HOME_MUMPS'] != '':
@@ -72,10 +72,10 @@
 +               kargs['libdirs'], cfg['HOME_MUMPS'],
 +               err=False, append=True)
 +            ftools.CheckFromLastFound(cfg, 'HOME_MUMPS', 'lib')
-       opt['F90INCLUDE'] += ' -I%s' % os.path.join(cfg['ASTER_ROOT'],cfg['ASTER_VERSION'],'bibf90','include_mumps')
+       opt['F90INCLUDE'] += ' -I%s' % os.path.join(cfg['ASTER_ROOT'],cfg['ASTER_VERSION'],'bibf90',cfg['INCLUDE_MUMPS'])
     else:
        opt['MUMPSLIB'] = ''
-@@ -1033,7 +1050,7 @@
+@@ -1059,7 +1076,7 @@
           ftools.findlib_and_set(cfg, 'SCOTCHLIB', lib,
              kargs['libdirs'], cfg['HOME_SCOTCH'],
              err=True, append=True)
diff --git a/french/aster/files/patch-setup.cfg b/french/aster/files/patch-setup.cfg
index aa1ac2a3d9f3..cfdc9fa7213b 100644
--- a/french/aster/files/patch-setup.cfg
+++ b/french/aster/files/patch-setup.cfg
@@ -1,11 +1,24 @@
---- setup.cfg.orig	Wed Jan  5 13:43:56 2005
-+++ setup.cfg	Sun Jan 16 14:45:27 2005
-@@ -16,7 +16,7 @@
- # C and Fortran compilers and linker for Code_Aster
+--- setup.cfg.orig	2007-12-21 17:08:17.000000000 +0100
++++ setup.cfg	2008-01-08 14:30:05.000000000 +0100
+@@ -28,7 +28,7 @@
+ # classical values for GNU compilers
  CC='/usr/bin/gcc'
  F77='/usr/bin/g77'
--LD='/usr/bin/g77'
+-LD=F77
 +LD='/usr/bin/gcc'
  
- # Uncomment (remove first # character) the two following lines
- # to skip tcl/tk installation
+ # not use by Code_Aster but by med for example...
+ CXX='/usr/bin/g++'
+@@ -136,9 +136,9 @@
+ 
+ #-------------------------------------------------------------------------------
+ # Future packages : not yet used by Code_Aster !
+-_install_omniORB   = True
+-_install_omniORBpy = True
+-_install_pylotage  = True
++_install_omniORB   = False
++_install_omniORBpy = False
++_install_pylotage  = False
+ # Salome version supported by pylotage
+ SALOME_VERSION = 'DEFAULT'    # DEFAULT means the last one supported by pylotage
+ 
diff --git a/french/aster/files/patch-setup.py b/french/aster/files/patch-setup.py
index 19b55ecf1656..3990bea609c1 100644
--- a/french/aster/files/patch-setup.py
+++ b/french/aster/files/patch-setup.py
@@ -1,6 +1,6 @@
---- setup.py.orig	Fri Dec 22 17:56:58 2006
-+++ setup.py	Sun Dec 24 11:00:55 2006
-@@ -278,6 +278,8 @@
+--- setup.py.orig	2007-12-21 17:08:17.000000000 +0100
++++ setup.py	2008-01-08 14:56:44.000000000 +0100
+@@ -286,6 +286,8 @@
           cfg['IFDEF'] = 'LINUX64'
        else:
           cfg['IFDEF'] = 'LINUX'
@@ -9,3 +9,11 @@
     elif sys.platform[:4] == 'osf1':
        cfg['IFDEF']='TRU64'
     elif sys.platform == 'sunos5':
+@@ -397,6 +399,7 @@
+    # and modify command line of those which don't have a --display= option
+    ListEdit=[
+       ['nedit' , 'nedit',],
++      ['gvim' , 'gvim --display=@D',],
+       ['gedit' , 'gedit --display=@D',],
+       ['kwrite', 'kwrite --display @D',],
+       ['xemacs', 'xemacs -display @D',],