Update to MAD-X 5.03.07 (github!)

3 files changed, 11 insertions, 85 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eace58af396b..4457d9b4b971 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue May 30 11:20:53 UTC 2017
+# Fri Nov 10 14:59:48 UTC 2017
 pkgbase = madx-dev
 	pkgdesc = Accelerator Optics simulation code, latest development release
-	pkgver = 5.03.05
-	pkgrel = 2
+	pkgver = 5.03.07
+	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.03.05/madx-src.tgz
-	source = cmake_fix_gc.patch
-	md5sums = 133cfbfbde3323f976e880dbc70c2755
-	md5sums = 9edea53d6653e16dc1dbf8853f3d8fe5
+	source = https://github.com/MethodicalAcceleratorDesign/MAD-X/archive/5.03.07.tar.gz
+	md5sums = 5b7ad71e5733f8881ba0a463fb188b78
 
 pkgname = madx-dev
 
diff --git a/PKGBUILD b/PKGBUILD
index 1ae001ceb22e..7cbd5a992252 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Thomas Gläßle <t_glaessleATgmxDOTnet>
 
 pkgname=madx-dev
-pkgver=5.03.05
-pkgrel=2
+pkgver=5.03.07
+pkgrel=1
 pkgdesc="Accelerator Optics simulation code, latest development release"
 url="http://cern.ch/mad"
 license=("custom")
@@ -12,19 +12,11 @@ provides=('madx')
 makedepends=('cmake')
 arch=('x86_64')
 
-tarball=madx-src.tgz
-extract=madx-${pkgver}
+tarball=${pkgver}.tar.gz
+extract=MAD-X-${pkgver}
 
-source=("http://madx.web.cern.ch/madx/releases/${pkgver}/${tarball}"
-        cmake_fix_gc.patch)
-md5sums=('133cfbfbde3323f976e880dbc70c2755'
-         '9edea53d6653e16dc1dbf8853f3d8fe5')
-
-prepare() {
-    cd ${srcdir}/${extract}
-    find . -name '._*' -print0 | xargs -0 -r rm
-    patch -p1 < ${srcdir}/cmake_fix_gc.patch
-}
+source=("https://github.com/MethodicalAcceleratorDesign/MAD-X/archive/${tarball}")
+md5sums=('5b7ad71e5733f8881ba0a463fb188b78')
 
 build() {
     rm -rf ${srcdir}/build
diff --git a/cmake_fix_gc.patch b/cmake_fix_gc.patch
deleted file mode 100644
index aae8d42e562d..000000000000
--- a/cmake_fix_gc.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5a74201..56064a4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -42,7 +42,8 @@ include(setupOptions)
- # We add libraries before setting up compilers because
- # some of our options are incompatible with e.g. GC
- if(USE_GC)
--   add_subdirectory(libs/gc/gc)
-+   set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-+   add_subdirectory(libs/gc/gc-7.2f)
- endif()
- 
- # 
-diff --git a/cmake/ndifftests.cmake b/cmake/ndifftests.cmake
-index 4d04afc..b0e2344 100644
---- a/cmake/ndifftests.cmake
-+++ b/cmake/ndifftests.cmake
-@@ -74,11 +74,6 @@ ndiff_test(test-thick-quad 0)
- ndiff_test(test-thick-quad-2 0)
- ndiff_test(test-thick-quad-3 0)
- 
--if(USE_GC)
--   ndiff_test(test-memory 1)
--   set_tests_properties(test-memory_LONG PROPERTIES TIMEOUT 60)
--endif()
--
- ndiff_test(test-survey-2 0)
- 
- ndiff_test(test-cororbit 1)
-@@ -150,6 +145,7 @@ ndiff_test(test-table 0)
- ndiff_test(test-line 0)
- 
- ndiff_test(test-memory 1)
-+# set_tests_properties(test-memory_LONG PROPERTIES TIMEOUT 60)
- ndiff_test(test-beam 0)
- set_tests_properties(test-beam PROPERTIES WILL_FAIL 1)
- 
-diff --git a/cmake/setupOptions.cmake b/cmake/setupOptions.cmake
-index b27ff09..743cf3e 100644
---- a/cmake/setupOptions.cmake
-+++ b/cmake/setupOptions.cmake
-@@ -68,7 +68,7 @@ if(MADX_NTPSA)
-     add_definitions("-D_NTPSA")
- endif()
- 
--option(USE_GC "Use Garbage Collector" OFF)
-+option(USE_GC "Use Garbage Collector" ON)
- if(USE_GC)
-    add_definitions("-D_USEGC")
- endif()
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index b98b4fc..2cf346a 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -109,7 +109,7 @@ target_link_libraries(madx  ${CMAKE_THREAD_LIBS_INIT} ${STDCPP_LIBS})
- 
- # Garbage collector:
- if(USE_GC)
--   include_directories(${CMAKE_SOURCE_DIR}/libs/gc/gc/include)
-+   include_directories(${CMAKE_SOURCE_DIR}/libs/gc/gc-7.2f/include)
- endif()
- 
- # Defining specific stuff for packaging: