diff options
author | M. Scholz | 2018-10-19 10:14:06 +0200 |
---|---|---|
committer | M. Scholz | 2018-10-19 10:14:06 +0200 |
commit | 2b73809aee800472550d564ca8f665c9541e0786 (patch) | |
tree | 38f29176ab02deb6207901deba0b2996d9ca32bc /PKGBUILD | |
parent | de8441606845d1373090143f2be57cabb4361dc1 (diff) | |
download | aur-2b73809aee800472550d564ca8f665c9541e0786.tar.gz |
updated to current HEAD on github that fixes many C++0x issues
Diffstat (limited to 'PKGBUILD')
-rw-r--r-- | PKGBUILD | 56 |
1 files changed, 23 insertions, 33 deletions
@@ -1,6 +1,6 @@ # Maintainer: Mirko Scholz <srtlg> pkgname=objcryst-fox -pkgver=2017.2 +pkgver=2017.2.27 pkgrel=1 pkgdesc='A program for the ab initio structure determination from powder diffraction' arch=('i686' 'x86_64') @@ -8,58 +8,48 @@ url='http://fox.vincefn.net/FoxWiki' depends=('glu' 'freeglut' 'wxgtk2' 'fftw') makedepends=('libmariadbclient' 'newmat') license=('GPL2') +#_objcryst_ver=v${pkgver} +_objcryst_ver=5d39b64a641e2707d35ff3d0977b00f5ecf57831 +_boost_ver=1.68.0 source=( "Fox.desktop" -"boost_C++0x.patch" -"FoxServerThread.patch" -"https://github.com/vincefn/objcryst/archive/v${pkgver}.tar.gz" +"objcryst-${pkgver}.tar.gz::https://github.com/vincefn/objcryst/archive/${_objcryst_ver}.tar.gz" +"https://dl.bintray.com/boostorg/release/${_boost_ver}/source/boost_${_boost_ver//./_}.tar.bz2" "http://downloads.sourceforge.net/project/objcryst/3rdPartyLibraries/cctbx.tar.bz2") -noextract=("cctbx.tar.bz2") +noextract=("cctbx.tar.bz2" "boost_${_boost_ver//./_}.tar.bz2") sha1sums=('6d8bb12fe1add4481ac1733e9cf6aea57aedee61' - 'bb4543680a8fb9a7752811ffe12df15f0704903b' - '8347e418458816e7b5875433690ed58dd198d6b7' - '767480573e16cc75d0f81db29e6acc380fe81643' + 'a542bdd57433bf143b751c0fca2c383cd71833af' + '18863a7cae4d58ae85eb63d400f774f60a383411' '1aa2d033d45a86e928ee58196fe5916da9376c18') prepare() { - cd "${srcdir}/objcryst-${pkgver}" - # from Debian package - sed -i -e 's?install -m 755 src/Fox /usr/local/bin?install -Dm 755 src/Fox $(DESTDIR)/usr/bin/Fox?' Fox/gnu.mak - cd "${srcdir}/objcryst-${pkgver}" + cd "${srcdir}/" + _objcryst_dir=`tar tf objcryst-${pkgver}.tar.gz | head -1` - cd "${srcdir}/objcryst-${pkgver}" + cd "${srcdir}/${_objcryst_dir}" + [ -e cctbx.tar.bz2 ] || ln -s ../cctbx.tar.bz2 + [ -e boost_${_boost_ver//./_}.tar.bz2 ] || ln -s ../boost_${_boost_ver//./_}.tar.bz2 + + cd "${srcdir}/${_objcryst_dir}" # http://fox.vincefn.net/Compile/Linux cd ObjCryst ln -sf rules-gnu.mak rules.mak cd ../Fox ln -sf gnu.mak Makefile - - cd "${srcdir}/objcryst-${pkgver}" - # patch the faulty boost - # prevent it from beeing overwritten - sed -i -e 's/cd $(BUILD_DIR) && tar -xjf cctbx.tar.bz2/#/g' ObjCryst/rules-gnu.mak - # https://stackoverflow.com/questions/18900730/boostshared-ptrshared-ptrconst-boostshared-ptr-is-implicitly-declared - if [ ! -e cctbx.tar.bz2 ]; then - ln -s ../cctbx.tar.bz2 - tar -xjf cctbx.tar.bz2 - fgrep 'BOOST_LIB_VERSION "1_47"' cctbx/include/boost/version.hpp || exit 1 - cd cctbx/include - patch -p2 < "${srcdir}/boost_C++0x.patch" - - cd "${srcdir}/objcryst-${pkgver}" - patch -p1 < "${srcdir}/FoxServerThread.patch" - # else assume already patched - fi } build() { - cd "${srcdir}/objcryst-${pkgver}" + cd "${srcdir}/${_objcryst_dir}" + make shared=1 "RPM_OPT_FLAGS=${CXXFLAGS}" -f gnu.mak -C Fox/src libcctbx libboost make shared=1 "RPM_OPT_FLAGS=${CXXFLAGS}" -C Fox } package() { - cd "${srcdir}/objcryst-${pkgver}" - make install -C Fox "DESTDIR=${pkgdir}" + cd "${srcdir}" + _objcryst_dir=`tar tf objcryst-${pkgver}.tar.gz | head -1` + cd "${srcdir}/${_objcryst_dir}" + mkdir -p "${pkgdir}/usr/bin" + make install -C Fox "DESTDIR=${pkgdir}/usr/bin/" install -Dm644 ${srcdir}/Fox.desktop "${pkgdir}/usr/share/applications/Fox.desktop" install -Dm644 Fox/src/Fox.xpm "${pkgdir}/usr/share/pixmaps/Fox.xpm" } |