summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Spencer <baildon.research@googlemail.com>2015-11-19 02:00:53 +0000
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-01-17 09:40:16 +0700
commit1f4d309466c8e5d05d7752e4f24dbf4e9526a8e2 (patch)
tree167373e4e4f85751cf03fc1a2bc099d177acf7ec
parent3c3c71911d1c3c6483d9b8ed33d93cc6438fd78b (diff)
downloadslackbuilds-1f4d309466c8e5d05d7752e4f24dbf4e9526a8e2.tar.gz
academic/avogadro: Patched to link X properly.
Underlinking error (cmake-3/gcc-5). Signed-off-by: David Spencer <baildon.research@googlemail.com>
-rw-r--r--academic/avogadro/avogadro-cmake-3.2.patch12
-rw-r--r--academic/avogadro/avogadro.SlackBuild3
2 files changed, 15 insertions, 0 deletions
diff --git a/academic/avogadro/avogadro-cmake-3.2.patch b/academic/avogadro/avogadro-cmake-3.2.patch
new file mode 100644
index 0000000000..1c6a38d4ca
--- /dev/null
+++ b/academic/avogadro/avogadro-cmake-3.2.patch
@@ -0,0 +1,12 @@
+Index: avogadro-1.1.1/CMakeLists.txt
+===================================================================
+--- avogadro-1.1.1.orig/CMakeLists.txt
++++ avogadro-1.1.1/CMakeLists.txt
+@@ -225,6 +225,7 @@ set(I18N_LANGUAGE "" CACHE STRING "Build
+
+ find_package(Qt4 4.6.0 REQUIRED) # find and setup Qt4 for this project
+ find_package(OpenGL REQUIRED) # find and setup OpenGL
++find_package(X11 REQUIRED) # find and setup X11
+ find_package(Linguist) # find and setup Linguist
+ if(NOT Linguist_FOUND)
+ message(WARNING " Qt4 Linguist not found, please install it if you want Avogadro translations")
diff --git a/academic/avogadro/avogadro.SlackBuild b/academic/avogadro/avogadro.SlackBuild
index cfd8d54f83..4fe366eb56 100644
--- a/academic/avogadro/avogadro.SlackBuild
+++ b/academic/avogadro/avogadro.SlackBuild
@@ -80,6 +80,9 @@ sed -i 's|share/man|man|' doc/CMakeLists.txt
# http://pkgs.fedoraproject.org/cgit/avogadro.git/plain/avogadro-1.1.1-eigen3.patch
patch -p1 < $CWD/avogadro-1.1.1-eigen3.patch
+# Fix underlinking (gcc-5.2) thanks Fedora
+patch -p1 < $CWD/avogadro-cmake-3.2.patch
+
mkdir -p build
cd build
cmake \