Update version

5 files changed, 9 insertions, 84 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4ba4c5f41428..ca7b44b952a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gtsam-mkl
 	pkgdesc = A library of C++ classes that implement smoothing and mapping (SAM) in robotics and vision, using factor graphs and Bayes networks as the underlying computing paradigm rather than sparse matrices.
-	pkgver = 4.0.2
-	pkgrel = 5
+	pkgver = 4.0.3
+	pkgrel = 1
 	url = https://gtsam.org/
 	arch = x86_64
 	arch = i686
@@ -12,17 +12,11 @@ pkgbase = gtsam-mkl
 	depends = eigen
 	depends = intel-tbb
 	depends = intel-mkl
-	provides = gtsam=4.0.2
+	provides = gtsam=4.0.3
 	conflicts = gtsam
 	conflicts = gtsam-git
-	source = https://github.com/borglab/gtsam-mkl/archive/4.0.2.tar.gz
-	source = rename-included-libmetis.patch
-	source = skip-boost-debug-libs.patch
-	source = fix-findmkl.patch
-	md5sums = fc24394cf59ccf034ae4150d8613384b
-	md5sums = 63093f474f5574e8dd3e300289dab47f
-	md5sums = 3df2bbd13382765fbe40f503f3a99219
-	md5sums = 3ba08e16a06755c8cdf637b896d186a3
+	source = https://github.com/borglab/gtsam/archive/4.0.3.tar.gz
+	md5sums = 1e5c09da035c6b3d8cce3e23aeab6865
 
 pkgname = gtsam-mkl
 
diff --git a/PKGBUILD b/PKGBUILD
index 8ab171326a97..6f30481180cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Kartik Mohta <kartikmohta@gmail.com>
 pkgname=gtsam-mkl
-pkgver=4.0.2
-pkgrel=5
+pkgver=4.0.3
+pkgrel=1
 pkgdesc="A library of C++ classes that implement smoothing and mapping (SAM) in\
   robotics and vision, using factor graphs and Bayes networks as the underlying\
   computing paradigm rather than sparse matrices."
@@ -12,22 +12,8 @@ conflicts=('gtsam' 'gtsam-git')
 license=('BSD')
 depends=('boost-libs' 'eigen' 'intel-tbb' 'intel-mkl')
 makedepends=('boost' 'cmake')
-source=("https://github.com/borglab/${pkgname}/archive/${pkgver}.tar.gz"
-        "rename-included-libmetis.patch"
-        "skip-boost-debug-libs.patch"
-        "fix-findmkl.patch")
-md5sums=('fc24394cf59ccf034ae4150d8613384b'
-         '63093f474f5574e8dd3e300289dab47f'
-         '3df2bbd13382765fbe40f503f3a99219'
-         '3ba08e16a06755c8cdf637b896d186a3')
-
-
-prepare() {
-  cd "${srcdir}/gtsam-${pkgver}"
-  patch -p1 -i ../rename-included-libmetis.patch
-  patch -p1 -i ../skip-boost-debug-libs.patch
-  patch -p1 -i ../fix-findmkl.patch
-}
+source=("https://github.com/borglab/gtsam/archive/${pkgver}.tar.gz")
+md5sums=('1e5c09da035c6b3d8cce3e23aeab6865')
 
 build() {
   cd "${srcdir}/gtsam-${pkgver}"
diff --git a/fix-findmkl.patch b/fix-findmkl.patch
deleted file mode 100644
index fe94f7b92a7c..000000000000
--- a/fix-findmkl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- gtsam-4.0.2/cmake/FindMKL.cmake	2020-05-07 11:28:45.694001386 -0700
-+++ gtsam-4.0.2/cmake/FindMKL.cmake	2020-05-07 11:29:16.708231150 -0700
-@@ -221,7 +221,7 @@
-                         FIND_LIBRARY(MKL_IOMP5_LIBRARY
-                           iomp5
-                           PATHS
--                                ${MKL_ROOT_DIR}/../lib/ia32
-+                                ${MKL_ROOT_DIR}/lib/ia32
-                         )
-                 ELSE()
-                         SET(MKL_IOMP5_LIBRARY "") # no need for mac
-@@ -231,7 +231,7 @@
-                         FIND_LIBRARY(MKL_IOMP5_LIBRARY
-                           iomp5
-                           PATHS
--                                ${MKL_ROOT_DIR}/../lib/intel64
-+                                ${MKL_ROOT_DIR}/lib/intel64
-                         )
-                 ELSE()
-                         SET(MKL_IOMP5_LIBRARY "") # no need for mac
diff --git a/rename-included-libmetis.patch b/rename-included-libmetis.patch
deleted file mode 100644
index a38a2115b308..000000000000
--- a/rename-included-libmetis.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gtsam/3rdparty/metis/libmetis/CMakeLists.txt	2019-05-19 18:35:20.000000000 -0700
-+++ b/gtsam/3rdparty/metis/libmetis/CMakeLists.txt	2019-07-06 13:51:47.634206733 -0700
-@@ -9,6 +9,8 @@
-   target_link_libraries(metis m)
- endif()
- 
-+set_target_properties(metis PROPERTIES OUTPUT_NAME "gtsam_metis")
-+
- if(WIN32)
- 		set_target_properties(metis PROPERTIES
- 			PREFIX ""
diff --git a/skip-boost-debug-libs.patch b/skip-boost-debug-libs.patch
deleted file mode 100644
index 4facf979df48..000000000000
--- a/skip-boost-debug-libs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- gtsam-4.0.2/CMakeLists.txt.old	2019-10-12 17:14:32.067880953 -0700
-+++ gtsam-4.0.2/CMakeLists.txt	2019-10-12 17:14:43.756628849 -0700
-@@ -185,12 +185,6 @@
-   optimized ${Boost_THREAD_LIBRARY_RELEASE}
-   optimized ${Boost_DATE_TIME_LIBRARY_RELEASE}
-   optimized ${Boost_REGEX_LIBRARY_RELEASE}
--  debug ${Boost_SERIALIZATION_LIBRARY_DEBUG}
--  debug ${Boost_SYSTEM_LIBRARY_DEBUG}
--  debug ${Boost_FILESYSTEM_LIBRARY_DEBUG}
--  debug ${Boost_THREAD_LIBRARY_DEBUG}
--  debug ${Boost_DATE_TIME_LIBRARY_DEBUG}
--  debug ${Boost_REGEX_LIBRARY_DEBUG}
- )
- message(STATUS "GTSAM_BOOST_LIBRARIES: ${GTSAM_BOOST_LIBRARIES}")
- if (GTSAM_DISABLE_NEW_TIMERS)
-@@ -201,8 +195,6 @@
-       list(APPEND GTSAM_BOOST_LIBRARIES
-         optimized ${Boost_TIMER_LIBRARY_RELEASE}
-         optimized ${Boost_CHRONO_LIBRARY_RELEASE}
--        debug ${Boost_TIMER_LIBRARY_DEBUG}
--        debug ${Boost_CHRONO_LIBRARY_DEBUG}
-         )
-     else()
-       list(APPEND GTSAM_BOOST_LIBRARIES rt) # When using the header-only boost timer library, need -lrt