summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Berquist2017-01-11 00:01:47 -0500
committerEric Berquist2017-01-11 00:01:47 -0500
commit12908003a352a6f40e39400e469ddbac41527cb4 (patch)
treef5c67d69d876401b7579a3272eb6fe677aa9edc3
parente6ed43a2e07d5667c6126ab85d17743d82599a28 (diff)
downloadaur-12908003a352a6f40e39400e469ddbac41527cb4.tar.gz
Force Eigen 2 since Eigen >= 3.3 removes old API.
-rw-r--r--.SRCINFO10
-rw-r--r--.gitignore7
-rw-r--r--PKGBUILD39
-rw-r--r--avogadro-force-eigen2.patch20
4 files changed, 58 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index faf55a39fef..4bac4d42db6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Wed Jan 11 05:00:37 UTC 2017
pkgbase = avogadro
pkgdesc = An advanced molecular editor based on Qt
pkgver = 1.2.0
- pkgrel = 4
+ pkgrel = 5
url = http://avogadro.openmolecules.net/wiki/Main_Page
arch = i686
arch = x86_64
@@ -9,8 +11,8 @@ pkgbase = avogadro
makedepends = cmake
makedepends = boost
makedepends = doxygen
- makedepends = mesa-libgl
- makedepends = eigen
+ makedepends = libgl
+ makedepends = eigen2
depends = openbabel
depends = python2-pyqt4
depends = boost-libs
@@ -20,10 +22,12 @@ pkgbase = avogadro
source = boost153.patch
source = avogadro-glibc2.23.patch
source = avogadro-fix-linking.patch
+ source = avogadro-force-eigen2.patch
md5sums = 3206068fc27bd3b717c568ee72f1e5ec
md5sums = aa2573f78d5dbd85b3cb79e08acde8ab
md5sums = 83990ecbb4c076fddda3eaca2c2975ed
md5sums = e333f624d5649c6d3a7cfd14a778bc73
+ md5sums = b05434bbf62570f72e0b0c7335cd44c3
pkgname = avogadro
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000000..d77ee05e194
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+# makepkg files
+pkg/
+src/
+*.xz
+
+# source files
+*.gz
diff --git a/PKGBUILD b/PKGBUILD
index f732e39c085..18d37edb327 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,56 @@
-# $Id: PKGBUILD 277876 2016-10-07 17:36:47Z arojas $
-# Maintainer:
+# Maintainer: Eric Berquist <eric.berquist at gmail dot com>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Nick B <Shirakawasuna at gmail _dot_com>
pkgname=avogadro
pkgver=1.2.0
-pkgrel=4
+pkgrel=5
pkgdesc="An advanced molecular editor based on Qt"
arch=('i686' 'x86_64')
url="http://avogadro.openmolecules.net/wiki/Main_Page"
license=('GPL2')
depends=('openbabel' 'python2-pyqt4' 'boost-libs' 'glew' 'python2-numpy')
-makedepends=('cmake' 'boost' 'doxygen' 'mesa-libgl' 'eigen')
+makedepends=('cmake' 'boost' 'doxygen' 'libgl' 'eigen2')
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- 'boost153.patch' 'avogadro-glibc2.23.patch' 'avogadro-fix-linking.patch')
+ 'boost153.patch'
+ 'avogadro-glibc2.23.patch'
+ 'avogadro-fix-linking.patch'
+ 'avogadro-force-eigen2.patch')
md5sums=('3206068fc27bd3b717c568ee72f1e5ec'
'aa2573f78d5dbd85b3cb79e08acde8ab'
'83990ecbb4c076fddda3eaca2c2975ed'
- 'e333f624d5649c6d3a7cfd14a778bc73')
+ 'e333f624d5649c6d3a7cfd14a778bc73'
+ 'b05434bbf62570f72e0b0c7335cd44c3')
prepare() {
- mkdir build
+ cd "${srcdir}/${pkgname}-${pkgver}"
- cd ${pkgname}-${pkgver}
patch -p1 -i "${srcdir}"/boost153.patch
-# Fix build with glibc 2.23
- patch -p1 -i ../avogadro-glibc2.23.patch
-# Fix linking (Fedora)
- patch -p1 -i ../avogadro-fix-linking.patch
+ # Fix build with glibc 2.23
+ patch -p1 -i "${srcdir}"/avogadro-glibc2.23.patch
+ # Fix linking (Fedora)
+ patch -p1 -i "${srcdir}"/avogadro-fix-linking.patch
+ # Force Eigen 2, newer versions of Eigen 3 remove backward
+ # compatibility
+ patch -p1 -i "${srcdir}"/avogadro-force-eigen2.patch
+
+ mkdir -p build
}
build() {
- cd build
+ cd "${srcdir}/${pkgname}-${pkgver}/build"
- cmake ../${pkgname}-${pkgver} \
+ cmake "${srcdir}/${pkgname}-${pkgver}" \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DPYTHON_EXECUTABLE=/usr/bin/python2 \
-DQT_MKSPECS_RELATIVE=share/qt4/mkspecs
+
make
}
package() {
- cd build
+ cd "${srcdir}/${pkgname}-${pkgver}/build"
+
make DESTDIR="${pkgdir}" install
}
diff --git a/avogadro-force-eigen2.patch b/avogadro-force-eigen2.patch
new file mode 100644
index 00000000000..dc689187d8a
--- /dev/null
+++ b/avogadro-force-eigen2.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1cbeb8f..e1e40d6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -231,14 +231,7 @@ if(NOT Linguist_FOUND)
+ message(WARNING " Qt4 Linguist not found, please install it if you want Avogadro translations")
+ endif()
+
+-find_package(Eigen3) # find and setup Eigen3 if available
+-if(NOT EIGEN3_FOUND)
+- message(STATUS "Cannot find Eigen3, trying Eigen2")
+- find_package(Eigen2 REQUIRED) # Some version is required
+-else()
+-# Use Stage10 Eigen3 support
+- set (EIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API TRUE)
+-endif()
++find_package(Eigen2 REQUIRED)
+
+ find_package(ZLIB REQUIRED)
+ find_package(OpenBabel2 REQUIRED) # find and setup OpenBabel