upgpkg: med-3.2.0-3

3 files changed, 120 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6b6060c0f518..08f105ea8011 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
 # Generated by mksrcinfo v8
-# Thu Sep 15 14:46:50 UTC 2016
+# Sat Oct  1 00:01:22 UTC 2016
 pkgbase = med
 	pkgdesc = MED stands for Modelisation et Echanges de Donnees, i.e. Data Modelization and Exchanges - MED is code-aster exchange module linked to hdf5
 	pkgver = 3.2.0
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.code-aster.org/outils/med/
 	arch = i686
 	arch = x86_64
 	license = LGPL
 	makedepends = gcc-fortran
 	makedepends = coreutils
-	depends = hdf5_18
+	depends = hdf5-cpp-fortran
 	depends = openmpi
 	depends = swig
 	optdepends = tk
@@ -21,10 +21,12 @@ pkgbase = med
 	source = patch-include_2.3.6_med.h.in
 	source = patch-include_med.h.in
 	source = patch-src_2.3.6_ci_MEDequivInfo.c
+	source = patch-int2long
 	md5sums = eb61df92f0624feb6328f517cd756a23
 	md5sums = b83949326d7ae0ca77a06822b754a329
 	md5sums = 14a151cea108388d7a3b4c62887169f6
 	md5sums = 8f0cbf6f08783a6ba68ff5ab240dd62e
+	md5sums = 5cb73821913eaffc642a72882033e62c
 
 pkgname = med
 
diff --git a/PKGBUILD b/PKGBUILD
index 1ba730c43ebc..f3de7ca1848e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,11 +7,11 @@
      
 pkgname=med
 pkgver=3.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="MED stands for Modelisation et Echanges de Donnees, i.e. Data Modelization and Exchanges - MED is code-aster exchange module linked to hdf5"
 url="http://www.code-aster.org/outils/med/"
 license=('LGPL')
-depends=('hdf5_18' 'openmpi' 'swig')
+depends=('hdf5-cpp-fortran' 'openmpi' 'swig')
 makedepends=('gcc-fortran' 'coreutils')
 optdepends=('tk' 'python2')
 provides=()
@@ -22,11 +22,13 @@ arch=('i686' 'x86_64')
 source=("http://files.salome-platform.org/Salome/other/${pkgname}-${pkgver}.tar.gz"
         "patch-include_2.3.6_med.h.in"
         "patch-include_med.h.in"
-        "patch-src_2.3.6_ci_MEDequivInfo.c")
+        "patch-src_2.3.6_ci_MEDequivInfo.c"
+        "patch-int2long")
 md5sums=('eb61df92f0624feb6328f517cd756a23'
          'b83949326d7ae0ca77a06822b754a329'
          '14a151cea108388d7a3b4c62887169f6'
-         '8f0cbf6f08783a6ba68ff5ab240dd62e')
+         '8f0cbf6f08783a6ba68ff5ab240dd62e'
+         '5cb73821913eaffc642a72882033e62c')
  
 build() {
   if [ "$CARCH" = "x86_64" ]; then
@@ -53,6 +55,7 @@ build() {
   patch -p0 < ${srcdir}/patch-include_2.3.6_med.h.in
   patch -p0 < ${srcdir}/patch-include_med.h.in
   patch -p0 < ${srcdir}/patch-src_2.3.6_ci_MEDequivInfo.c
+  patch -p0 < ${srcdir}/patch-int2long
  
   ./configure --with-f90=mpif90 --prefix=/usr --datadir=/usr/share/med --with-swig=yes || return 1
   make || return 1
diff --git a/patch-int2long b/patch-int2long
new file mode 100644
index 000000000000..c7f9dccb0cf1
--- /dev/null
+++ b/patch-int2long
@@ -0,0 +1,108 @@
+diff -Nur src.orig/2.3.6/hdfi/MEDattrNumEcrire.c src/2.3.6/hdfi/MEDattrNumEcrire.c
+--- src.orig/2.3.6/hdfi/MEDattrNumEcrire.c	2015-09-07 18:55:34.000000000 +0200
++++ src/2.3.6/hdfi/MEDattrNumEcrire.c	2016-05-24 02:15:27.450098778 +0200
+@@ -36,7 +36,7 @@
+ {
+   med_idt aid,attr;
+   med_err ret;
+-  int type_hdf;
++  long   type_hdf;
+   med_mode_acces MED_MODE_ACCES;
+ 
+   if ( (MED_MODE_ACCES = _MEDmodeAcces(pere) ) == MED_UNDEF_MODE_ACCES ) {
+diff -Nur src.orig/hdfi/_MEDattributeNumRdByName.c src/hdfi/_MEDattributeNumRdByName.c
+--- src.orig/hdfi/_MEDattributeNumRdByName.c	2015-09-07 18:55:16.000000000 +0200
++++ src/hdfi/_MEDattributeNumRdByName.c	2016-05-24 02:15:27.443432111 +0200
+@@ -27,7 +27,7 @@
+ {
+   med_idt _attid=0;
+   med_err _ret=-1;
+-  int type_hdf;
++  long   type_hdf;
+ 
+   switch(type)
+     {
+diff -Nur src.orig/hdfi/_MEDattributeNumWrByName.c src/hdfi/_MEDattributeNumWrByName.c
+--- src.orig/hdfi/_MEDattributeNumWrByName.c	2015-09-07 18:55:17.000000000 +0200
++++ src/hdfi/_MEDattributeNumWrByName.c	2016-05-24 02:15:27.443432111 +0200
+@@ -32,7 +32,7 @@
+ {
+   med_idt _attid=0,aid=0;
+   med_err _ret=-1;
+-  int     type_hdf;
++  long   type_hdf;
+   med_access_mode MED_ACCESS_MODE;
+   H5O_info_t      _oinfo;
+ 
+diff -Nur src.orig/hdfi/_MEDattributeNumWr.c src/hdfi/_MEDattributeNumWr.c
+--- src.orig/hdfi/_MEDattributeNumWr.c	2015-09-07 18:55:16.000000000 +0200
++++ src/hdfi/_MEDattributeNumWr.c	2016-05-24 02:15:27.443432111 +0200
+@@ -32,7 +32,7 @@
+ {
+   med_idt _attid=0,aid=0;
+   med_err _ret=-1;
+-  int     type_hdf;
++  long     type_hdf;
+   med_access_mode MED_ACCESS_MODE;
+   H5O_info_t      _oinfo;
+ 
+diff -Nur src.orig/hdfi/_MEDattributeStringRdByName.c src/hdfi/_MEDattributeStringRdByName.c
+--- src.orig/hdfi/_MEDattributeStringRdByName.c	2015-09-07 18:55:15.000000000 +0200
++++ src/hdfi/_MEDattributeStringRdByName.c	2016-05-24 02:15:27.443432111 +0200
+@@ -29,7 +29,7 @@
+ {
+   med_err _ret=-1;
+   med_idt _attid=0;
+-  int     type_hdf=0;
++  long   type_hdf=0;
+ 
+   if ( (type_hdf = H5Tcopy(H5T_C_S1)) < 0) {
+     MED_ERR_(_ret,MED_ERR_CREATE,MED_ERR_HDFTYPE, MED_ERR_NAME_MSG );
+diff -Nur src.orig/hdfi/_MEDattributeStringWrByName.c src/hdfi/_MEDattributeStringWrByName.c
+--- src.orig/hdfi/_MEDattributeStringWrByName.c	2015-09-07 18:55:16.000000000 +0200
++++ src/hdfi/_MEDattributeStringWrByName.c	2016-05-24 02:15:27.443432111 +0200
+@@ -31,7 +31,7 @@
+   med_access_mode MED_ACCESS_MODE;
+   med_idt _attid=0,aid=0;
+   med_err _ret=-1;
+-  int     type_hdf=0;
++  long   type_hdf=0;
+   med_bool        _attmustbecreated= MED_FALSE;
+   hsize_t         _attsize=0;
+   med_size        _valsize=0;
+diff -Nur src.orig/hdfi/_MEDattributeStringWr.c src/hdfi/_MEDattributeStringWr.c
+--- src.orig/hdfi/_MEDattributeStringWr.c	2015-09-07 18:55:17.000000000 +0200
++++ src/hdfi/_MEDattributeStringWr.c	2016-05-24 02:15:27.443432111 +0200
+@@ -30,7 +30,7 @@
+   med_access_mode MED_ACCESS_MODE;
+   med_idt _attid=0,aid=0;
+   med_err _ret=-1;
+-  int     type_hdf=0;
++  long    type_hdf=0;
+   med_bool        _attmustbecreated= MED_FALSE;
+   hsize_t         _attsize=0;
+   med_size        _valsize=0;
+diff -Nur src.orig/hdfi/_MEDdatasetRd.c src/hdfi/_MEDdatasetRd.c
+--- src.orig/hdfi/_MEDdatasetRd.c	2015-09-07 18:55:15.000000000 +0200
++++ src/hdfi/_MEDdatasetRd.c	2016-05-24 02:15:27.443432111 +0200
+@@ -32,7 +32,7 @@
+   med_idt         _dataset=0, _dataspace=0;
+   med_size        _datasetsize[1]={0};
+   med_err         _ret=-1;
+-  int             _hdftype=0;
++  long            _hdftype=0;
+   int             _datasetsizeEqualTosizespace = 0;
+   med_access_mode _MED_ACCESS_MODE;
+   med_int         _nvaluesperentity=0,_nconstituentpervalue=0;
+diff -Nur src.orig/hdfi/_MEDdatasetWr.c src/hdfi/_MEDdatasetWr.c
+--- src.orig/hdfi/_MEDdatasetWr.c	2015-09-07 18:55:15.000000000 +0200
++++ src/hdfi/_MEDdatasetWr.c	2016-05-24 02:15:27.443432111 +0200
+@@ -30,7 +30,7 @@
+   med_idt         _dataset=0, _dataspace=0,_datadiskspace=0;
+   med_size        _datasetsize[1]={0};
+   med_err         _ret=-1;
+-  int             _hdftype=0;
++  long            _hdftype=0;
+   int             _datasetsizeEqualTosizespace = 0;
+   med_access_mode _MED_ACCESS_MODE;
+   med_int         _nvaluesperentity=0,_nconstituentpervalue=0;
\ No newline at end of file