summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuilhem Saurel2021-01-01 11:09:57 +0100
committerGuilhem Saurel2021-01-01 11:17:07 +0100
commit0847ab598f55592d68ead3811161d05d9afb55e5 (patch)
treea01d752b27b697f28d2d9bd83bf53312f4cee309
parentd415a3683f8c9d36d16ab2335632462437535123 (diff)
downloadaur-med-openmpi.tar.gz
v4.1.0
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD14
-rw-r--r--pycompile.patch13
3 files changed, 10 insertions, 27 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0163b65fc25..a42a8dee316 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = med-openmpi
pkgdesc = Modelisation et Echanges de Donnees, i.e. Data Modelization and Exchanges - code-aster exchange module linked to hdf5
- pkgver = 4.0.0
- pkgrel = 4
+ pkgver = 4.1.0
+ pkgrel = 1
url = https://www.salome-platform.org/downloads
arch = x86_64
license = LGPL
@@ -12,12 +12,10 @@ pkgbase = med-openmpi
depends = hdf5-openmpi
depends = tk
depends = python
- source = http://files.salome-platform.org/Salome/other/med-4.0.0.tar.gz
+ source = http://files.salome-platform.org/Salome/other/med-4.1.0.tar.gz
source = https://gist.githubusercontent.com/jedbrown/527ef81ff59a0dccf833da40fdd15a47/raw/7482f9a42fdd277f5f9cf0167ea7a3381032ca7a/hdf5-1.12.patch
- source = pycompile.patch
- sha256sums = a474e90b5882ce69c5e9f66f6359c53b8b73eb448c5f631fa96e8cd2c14df004
+ sha256sums = 847db5d6fbc9ce6924cb4aea86362812c9a5ef6b9684377e4dd6879627651fce
sha256sums = 82d28b6ae2ee6ceb3c6de9acb861a49741e2e759c7c556217f7d284216788206
- sha256sums = fec659efc391376eeb73c2e749d98ae504a178dde2d2e9d7b81d26537a043300
pkgname = med-openmpi
provides = med
diff --git a/PKGBUILD b/PKGBUILD
index 2d792076e2f..91cea11be63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,8 +9,8 @@
_pkgname='med'
pkgname=('med-openmpi' 'med-openmpi-docs')
-pkgver=4.0.0
-pkgrel=4
+pkgver=4.1.0
+pkgrel=1
pkgdesc="Modelisation et Echanges de Donnees, i.e. Data Modelization and Exchanges - code-aster exchange module linked to hdf5"
url="https://www.salome-platform.org/downloads"
license=('LGPL')
@@ -18,16 +18,14 @@ depends=('hdf5-openmpi' 'tk' 'python')
makedepends=('gcc-fortran' 'swig' 'openmpi' 'cmake')
arch=('x86_64')
source=("http://files.salome-platform.org/Salome/other/${_pkgname}-${pkgver}.tar.gz"
- "https://gist.githubusercontent.com/jedbrown/527ef81ff59a0dccf833da40fdd15a47/raw/7482f9a42fdd277f5f9cf0167ea7a3381032ca7a/hdf5-1.12.patch"
- "pycompile.patch")
-sha256sums=('a474e90b5882ce69c5e9f66f6359c53b8b73eb448c5f631fa96e8cd2c14df004'
- '82d28b6ae2ee6ceb3c6de9acb861a49741e2e759c7c556217f7d284216788206'
- 'fec659efc391376eeb73c2e749d98ae504a178dde2d2e9d7b81d26537a043300')
+ "https://gist.githubusercontent.com/jedbrown/527ef81ff59a0dccf833da40fdd15a47/raw/7482f9a42fdd277f5f9cf0167ea7a3381032ca7a/hdf5-1.12.patch")
+sha256sums=('847db5d6fbc9ce6924cb4aea86362812c9a5ef6b9684377e4dd6879627651fce'
+ '82d28b6ae2ee6ceb3c6de9acb861a49741e2e759c7c556217f7d284216788206')
prepare() {
cd ${_pkgname}-${pkgver}
patch -p1 -i "$srcdir/hdf5-1.12.patch"
- patch -p1 -i "$srcdir/pycompile.patch"
+ sed -i 's/if H5_VERS_MINOR > 10/if 0/g' src/ci/MEDfileCompatibility.c
}
build() {
diff --git a/pycompile.patch b/pycompile.patch
deleted file mode 100644
index 464ff91db98..00000000000
--- a/pycompile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/config/cmake_files/medMacros.cmake b/config/cmake_files/medMacros.cmake
-index 7c82cec..f6ca6d0 100644
---- a/config/cmake_files/medMacros.cmake
-+++ b/config/cmake_files/medMacros.cmake
-@@ -457,7 +457,7 @@ MACRO(INSTALL_AND_COMPILE_PYTHON_FILE PYFILE2COMPINST PYFILELOC)
- GET_FILENAME_COMPONENT(inputname ${input} NAME)
- INSTALL(FILES ${input} DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYFILELOC})
- INSTALL(CODE "MESSAGE(STATUS \"py compiling ${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}\")")
-- INSTALL(CODE "SET(CMD \"import py_compile ; py_compile.compile('${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}')\")")
-+ INSTALL(CODE "SET(CMD \"import py_compile, os ; py_compile.compile(os.environ.get('DESTDIR', '') + '/' + '${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}', dfile='${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}')\")")
- INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"\${CMD}\")")
- INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -O -c \"\${CMD}\")")
- ENDFOREACH(input ${PYFILE2COMPINST})