Chakra_Linux/desktop
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/desktop.git synced 2025-01-23 18:14:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

avogadro: update to 1.2.0

Browse Source
This commit is contained in:
Jeff Huang 2016-07-08 14:37:43 +01:00
parent fc25be4801
commit c236e4b540
3 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
avogadro/PKGBUILD
View File

@ -1,11 +1,6 @@
# Maintainer:
# Contributors: H W Tovetjärn (totte) <totte@tott.es>
# A Boersma (abveritas)
# A Scarpino (bash) <andrea@archlinux.org>
pkgname=avogadro
pkgver=1.1.1
pkgrel=3
pkgver=1.2.0
pkgrel=1
pkgdesc="An advanced molecular editor based on Qt"
arch=('x86_64')
url="http://avogadro.cc/wiki/Main_Page"
@ -14,19 +9,18 @@ depends=('eigen2' 'openbabel' 'python2-pyqt4' 'boost-libs' 'glew' 'python2-numpy
makedepends=('cmake' 'boost' 'doxygen' 'libgl')
categories=('education')
screenshot=('http://avogadro.openmolecules.net/w/images/7/75/Avogadro-unitcell.png')
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
"boost153.patch"
"avogadro-0001-fix-undefined-reference-to-symbol-XInitThreads.patch"
)
sha512sums=('37e2fc9400f8727b7e69d84c13989aaba6fc88287e106a6ed137e4d0fd8ea181dc4ab49b08148d2077754f014748c8ed6f46881f31a1455029f876b599754827'
'b8ebad1e70a91408be97554ac4af5872ca9ce62a387568ed32c40c50f0b29b3f6c3db38333408fda119b08f99531fd87e4dec6a5483e3492a1e8fe30b4e42d26'
'a0181f4e4d9d649f638c05cc623e52eb62a32e262b9bd4865f986c5015ba5bb8ed59672c1883d7a9521e2bbe46f739eb9346186b227eb14188c1c4f7011970c0')
"avogadro-fix-linking.patch")
sha256sums=('6453e36e8ae3e61655cbe062df6d6fa6b2409122c7b5abc0a6f1d410a181640b'
'0aaddbac2ed6e9688d7923a303b68c229f435068372f3665d731b1b9fa1d8cfb'
'3f7a236ec59684762514e81f8211cee625a44af843c8ce401e1ee002786e9d31')
prepare() {
mkdir -p build
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p1 -i "${srcdir}"/boost153.patch
patch -p1 -i "${srcdir}"/avogadro-0001-fix-undefined-reference-to-symbol-XInitThreads.patch
patch -p1 -i "${srcdir}"/avogadro-fix-linking.patch
}
build() {

13
avogadro/avogadro-0001-fix-undefined-reference-to-symbol-XInitThreads.patch
View File

@ -1,13 +0,0 @@
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")

14
avogadro/avogadro-fix-linking.patch Normal file
View File

@ -0,0 +1,14 @@
diff -up avogadro-1.1.1/libavogadro/src/python/CMakeLists.txt.openbabel avogadro-1.1.1/libavogadro/src/python/CMakeLists.txt
--- avogadro-1.1.1/libavogadro/src/python/CMakeLists.txt.openbabel 2013-12-06 09:50:04.000000000 -0600
+++ avogadro-1.1.1/libavogadro/src/python/CMakeLists.txt 2016-01-25 13:50:10.469758655 -0600
@@ -20,8 +20,8 @@ if (WIN32)
set_target_properties(python-module PROPERTIES SUFFIX ".pyd")
target_link_libraries(python-module avogadro ${PYTHON_LIBRARIES})
else()
- target_link_libraries(python-module stdc++ avogadro
- ${QT_LIBRARIES} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES})
+ target_link_libraries(python-module stdc++ avogadro
+ ${QT_LIBRARIES} ${PYTHON_LIBRARIES} ${OPENBABEL2_LIBRARIES} ${Boost_LIBRARIES})
endif()
# Let's try to use this instead: