summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--PKGBUILD10
-rw-r--r--pmass.diff11
2 files changed, 17 insertions, 4 deletions
diff --git a/PKGBUILD b/PKGBUILD
index abf44e3f6f4..6a93181566c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=madx-dev
pkgver=5.02.13
-pkgrel=2
+pkgrel=3
pkgdesc="Accelerator Optics simulation code, latest development release"
url="http://cern.ch/mad"
license=("custom")
@@ -16,14 +16,16 @@ arch=('x86_64')
tarball=madx-src.tgz
extract=madx-${pkgver}
-source=("http://madx.web.cern.ch/madx/releases/${pkgver}/${tarball}" madx_vim.diff)
+source=("http://madx.web.cern.ch/madx/releases/${pkgver}/${tarball}" madx_vim.diff pmass.diff)
md5sums=('11307450b9a25a9d75c7bca42ae18c2c'
- 'befa90472e7b5725406c1dab5811102d')
+ 'befa90472e7b5725406c1dab5811102d'
+ '99a1f46963d8db5d933e2ac941a1fdcf')
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
@@ -35,7 +37,7 @@ prepare() {
-DMADX_ONLINE=OFF \
-DBUILD_SHARED_LIBS=ON \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DBINARY_POSTFIX=_dev \
+ -DBINARY_POSTFIX= \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_RPATH='$ORIGIN' \
${srcdir}/${extract}
diff --git a/pmass.diff b/pmass.diff
new file mode 100644
index 00000000000..b627f185ad5
--- /dev/null
+++ b/pmass.diff
@@ -0,0 +1,11 @@
+--- 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