[arch-commits] Commit in med/repos/community-x86_64 (3 files)

[Alexander Rødseth]

    Date: Wednesday, October 14, 2020 @ 17:49:50
  Author: arodseth
Revision: 723949

archrelease: copy trunk to community-x86_64

Added:
  med/repos/community-x86_64/PKGBUILD
    (from rev 723948, med/trunk/PKGBUILD)
Deleted:
  med/repos/community-x86_64/PKGBUILD
  med/repos/community-x86_64/pycompile.patch

-----------------+
 PKGBUILD        |   84 ++++++++++++++++++++++++++----------------------------
 pycompile.patch |   13 --------
 2 files changed, 41 insertions(+), 56 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-14 17:49:45 UTC (rev 723948)
+++ PKGBUILD	2020-10-14 17:49:50 UTC (rev 723949)
@@ -1,43 +0,0 @@
-# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
-# Contributor: Guilhem Saurel <guilhem at saurel.me>
-# Contributor: Michel Zou
-# Contributor: Oliver Goethel
-
-pkgname=med
-pkgver=4.0.0
-pkgrel=8
-pkgdesc='Generic pre- and post-processing platform for numerical simulation'
-url="https://www.salome-platform.org/downloads"
-license=(LGPL)
-arch=(x86_64)
-depends=(hdf5 python tk)
-makedepends=(cmake gcc-fortran ninja swig)
-source=("https://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')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 -i ../hdf5-1.12.patch
-  patch -p1 -i ../pycompile.patch
-}
-
-build() {
-  mkdir build
-  cd build
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMEDFILE_BUILD_PYTHON=ON \
-    -DMEDFILE_BUILD_TESTS=OFF \
-    -DMEDFILE_INSTALL_DOC=OFF \
-    -GNinja
-  ninja
-}
-
-package() {
-  DESTDIR="$pkgdir" ninja -C build install
-}

Copied: med/repos/community-x86_64/PKGBUILD (from rev 723948, med/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-10-14 17:49:50 UTC (rev 723949)
@@ -0,0 +1,41 @@
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
+# Contributor: Guilhem Saurel <guilhem at saurel.me>
+# Contributor: Michel Zou
+# Contributor: Oliver Goethel
+
+pkgname=med
+pkgver=4.1.0
+pkgrel=1
+pkgdesc='Generic pre- and post-processing platform for numerical simulation'
+url="https://www.salome-platform.org/downloads"
+license=(LGPL)
+arch=(x86_64)
+depends=(hdf5 python tk)
+makedepends=(cmake gcc-fortran ninja swig)
+source=("https://files.salome-platform.org/Salome/other/$pkgname-$pkgver.tar.gz"
+        'https://gist.githubusercontent.com/jedbrown/527ef81ff59a0dccf833da40fdd15a47/raw/7482f9a42fdd277f5f9cf0167ea7a3381032ca7a/hdf5-1.12.patch')
+sha256sums=('847db5d6fbc9ce6924cb4aea86362812c9a5ef6b9684377e4dd6879627651fce'
+            '82d28b6ae2ee6ceb3c6de9acb861a49741e2e759c7c556217f7d284216788206')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../hdf5-1.12.patch
+  sed -i 's/if H5_VERS_MINOR > 10/if 0/g' src/ci/MEDfileCompatibility.c
+}
+
+build() {
+  mkdir build
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMEDFILE_BUILD_PYTHON=ON \
+    -DMEDFILE_BUILD_TESTS=OFF \
+    -DMEDFILE_INSTALL_DOC=OFF \
+    -GNinja
+  ninja
+}
+
+package() {
+  DESTDIR="$pkgdir" ninja -C build install
+}

Deleted: pycompile.patch
===================================================================
--- pycompile.patch	2020-10-14 17:49:45 UTC (rev 723948)
+++ pycompile.patch	2020-10-14 17:49:50 UTC (rev 723949)
@@ -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})