diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 9 | ||||
| -rw-r--r-- | signature_conflict_fix.patch | 13 |
3 files changed, 23 insertions, 5 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Tue Feb 2 16:15:03 UTC 2016 +# Sun May 8 17:13:41 UTC 2016 pkgbase = med-openmpi 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.1.0 - pkgrel = 1 + pkgrel = 2 url = http://www.code-aster.org/outils/med/ arch = i686 arch = x86_64 @@ -19,8 +19,10 @@ pkgbase = med-openmpi replaces = med source = http://files.salome-platform.org/Salome/other/med-3.1.0.tar.gz source = h5public_extract.patch + source = signature_conflict_fix.patch md5sums = a1e1eb068f20634f5ea797914241eb51 md5sums = 156ab9456bab7b70237d0fc785b97e7c + md5sums = 1e9f5c1ff2ecc08d8179178eebe03882 pkgname = med-openmpi @@ -6,7 +6,7 @@ pkgname=med-openmpi pkgver=3.1.0 -pkgrel=1 +pkgrel=2 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") @@ -17,13 +17,16 @@ conflicts=('med') replaces=('med') arch=('i686' 'x86_64') source=("http://files.salome-platform.org/Salome/other/${pkgname//-openmpi/}-${pkgver}.tar.gz" - h5public_extract.patch) + "h5public_extract.patch" + "signature_conflict_fix.patch") md5sums=('a1e1eb068f20634f5ea797914241eb51' - '156ab9456bab7b70237d0fc785b97e7c') + '156ab9456bab7b70237d0fc785b97e7c' + '1e9f5c1ff2ecc08d8179178eebe03882') prepare() { cd ${srcdir}/${pkgname//-openmpi/}-${pkgver}_SRC || return 1 patch -Np1 -i ../h5public_extract.patch + patch -Np1 -i ../signature_conflict_fix.patch } build() { diff --git a/signature_conflict_fix.patch b/signature_conflict_fix.patch new file mode 100644 index 000000000000..8fa5d0f51718 --- /dev/null +++ b/signature_conflict_fix.patch @@ -0,0 +1,13 @@ +diff -aur med-3.1.0_SRC.pristine/src/2.3.6/ci/MEDequivInfo.c med-3.1.0_SRC.new/src/2.3.6/ci/MEDequivInfo.c +--- med-3.1.0_SRC.pristine/src/2.3.6/ci/MEDequivInfo.c 2016-05-08 12:24:29.143170143 -0400 ++++ med-3.1.0_SRC.new/src/2.3.6/ci/MEDequivInfo.c 2016-05-08 12:26:31.226111423 -0400 +@@ -24,7 +24,7 @@ + #include <stdlib.h> + + int +-MEDequivInfo(int fid, char *maa, int ind, char *eq, char *des) ++MEDequivInfo(med_idt fid, char *maa, int ind, char *eq, char *des) + { + med_idt eqid; + med_err ret; + |