summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gläßle2017-04-28 11:51:06 +0200
committerThomas Gläßle2017-04-28 11:51:23 +0200
commit52ddbb801aae1f3cee1d1e0706d3dc996e9097e5 (patch)
treea824335a3ff5584609523e3573f715f11564ac67
parent057089cd44edd30eee9943d2766662593abf96e3 (diff)
downloadaur-52ddbb801aae1f3cee1d1e0706d3dc996e9097e5.tar.gz
Update to MAD-X 5.03.04
Remove custom patches (included in MAD-X).
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD14
-rw-r--r--madx_vim.diff21
-rw-r--r--pmass.diff11
4 files changed, 10 insertions, 48 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 67afa6b4039..1bcc8abbda7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Mar 14 14:25:27 UTC 2017
+# Fri Apr 28 09:50:50 UTC 2017
pkgbase = madx-dev
pkgdesc = Accelerator Optics simulation code, latest development release
- pkgver = 5.02.13
- pkgrel = 2
+ pkgver = 5.03.04
+ pkgrel = 1
url = http://cern.ch/mad
arch = x86_64
license = custom
@@ -13,10 +13,8 @@ pkgbase = madx-dev
depends = lapack
provides = madx
conflicts = madx-svn
- source = http://madx.web.cern.ch/madx/releases/5.02.13/madx-src.tgz
- source = madx_vim.diff
- md5sums = 11307450b9a25a9d75c7bca42ae18c2c
- md5sums = befa90472e7b5725406c1dab5811102d
+ source = http://madx.web.cern.ch/madx/releases/5.03.04/madx-src.tgz
+ md5sums = efd9df109045cb7937621ec647d86ec0
pkgname = madx-dev
diff --git a/PKGBUILD b/PKGBUILD
index 6a93181566c..3e38bd3de56 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Thomas Gläßle <t_glaessleATgmxDOTnet>
pkgname=madx-dev
-pkgver=5.02.13
-pkgrel=3
+pkgver=5.03.04
+pkgrel=1
pkgdesc="Accelerator Optics simulation code, latest development release"
url="http://cern.ch/mad"
license=("custom")
@@ -12,20 +12,15 @@ provides=('madx')
makedepends=('cmake')
arch=('x86_64')
-
tarball=madx-src.tgz
extract=madx-${pkgver}
-source=("http://madx.web.cern.ch/madx/releases/${pkgver}/${tarball}" madx_vim.diff pmass.diff)
-md5sums=('11307450b9a25a9d75c7bca42ae18c2c'
- 'befa90472e7b5725406c1dab5811102d'
- '99a1f46963d8db5d933e2ac941a1fdcf')
+source=("http://madx.web.cern.ch/madx/releases/${pkgver}/${tarball}")
+md5sums=('efd9df109045cb7937621ec647d86ec0')
prepare() {
cd ${srcdir}/${extract}
find . -name '._*' -print0 | xargs -0 -r rm
- patch -p0 < ${srcdir}/madx_vim.diff
- patch -p0 < ${srcdir}/pmass.diff
mkdir -p ${srcdir}/build
cd ${srcdir}/build
@@ -50,6 +45,7 @@ build() {
check() {
cd ${srcdir}/build
+ # export GFORTRAN_UNBUFFERED_PRECONNECTED=y
# ctest -E LONG
}
diff --git a/madx_vim.diff b/madx_vim.diff
deleted file mode 100644
index 53284c77c95..00000000000
--- a/madx_vim.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- syntax/vim/madx.vim 2013-04-30 14:30:21.000000000 +0200
-+++ syntax/vim/madx.vim 2016-10-07 14:14:39.414427774 +0200
-@@ -9,11 +9,11 @@
- " au BufNewFile,BufRead *.madx,*.seq,*.str,*.mask setf madx
- "
-
--set ignorecase
-+setlocal ignorecase
-
- syntax clear
- syntax case ignore
--set iskeyword=a-z,A-Z,48-57,_,.
-+setlocal iskeyword=a-z,A-Z,48-57,_,.
-
-
-
-@@ -127,4 +127,3 @@
-
- highlight link madxOutput Comment
- highlight link madxOutput2 Comment
--
diff --git a/pmass.diff b/pmass.diff
deleted file mode 100644
index b627f185ad5..00000000000
--- a/pmass.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mad_dict.c 2017-03-29 13:55:41.817866790 +0200
-+++ src/mad_dict.c 2017-03-29 13:56:31.942043640 +0200
-@@ -40,7 +40,7 @@
- "const emass = 0.510998928e-3; "
- "const mumass = 0.1056583715; "
- "const nmass = 0.931494061; "
--"const pmass = 0.938272046; "
-+"const pmass = 0.9382720813; "
- "const clight = 299792458.; "
- "const qelect = 1.602176565e-19; "
- "const hbar = 6.58211928e-25; " // GeV.s