diff options
| author | root <root@rshg054.dnsready.net> | 2012-11-10 01:23:31 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-11-10 01:23:31 -0800 |
| commit | 6eea0bd1e92ed5aa53cb5f59102529c88e9e1786 (patch) | |
| tree | b069468f4084f5af5ad3ba2ecab7e6b4deb90267 /extra/kdeedu-kalzium | |
| parent | 3f7cb62ef558ea147661abe007a4293c0069fc62 (diff) | |
Sat Nov 10 01:23:30 PST 2012
Diffstat (limited to 'extra/kdeedu-kalzium')
| -rw-r--r-- | extra/kdeedu-kalzium/PKGBUILD | 15 | ||||
| -rw-r--r-- | extra/kdeedu-kalzium/fix-linking.patch | 24 |
2 files changed, 35 insertions, 4 deletions
diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD index 6ae05f4b1..a85fc3058 100644 --- a/extra/kdeedu-kalzium/PKGBUILD +++ b/extra/kdeedu-kalzium/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 167805 2012-10-03 14:42:37Z andrea $ +# $Id: PKGBUILD 170622 2012-11-09 08:27:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalzium -pkgver=4.9.2 +pkgver=4.9.3 pkgrel=1 pkgdesc="Periodic Table of Elements" url="http://kde.org/applications/education/kalzium/" @@ -12,10 +12,17 @@ groups=('kde' 'kdeedu') depends=('kdelibs' 'avogadro' 'ocaml' 'facile') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz") -sha1sums=('d328ad31f50a33aefeb009411a1adb51c29850a2') +source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz" + 'fix-linking.patch') +sha1sums=('7b4a50aabd960752d6b746740cc6b4bf6cae3b30' + '478697adc8ae191355ee64b824f30e11bd7af682') build() { + # KDEBUG#308939 (Fixed upstream) + cd kalzium-${pkgver} + patch -p1 -i "${srcdir}"/fix-linking.patch + cd ../ + cd "${srcdir}" mkdir build cd build diff --git a/extra/kdeedu-kalzium/fix-linking.patch b/extra/kdeedu-kalzium/fix-linking.patch new file mode 100644 index 000000000..6b0c1df7c --- /dev/null +++ b/extra/kdeedu-kalzium/fix-linking.patch @@ -0,0 +1,24 @@ +commit ffac09556f6f3d5d758bac9ba2b91117e6014ea7 +Author: Christoph Feck <christoph@maxiom.de> +Date: Fri Nov 2 17:31:48 2012 +0100 + + SVN_SILENT link + + If possible, please include this build fix in 4.9.3 tag. + + BUG: 308939 + CCMAIL: kde-release-team@kde.org + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 03eabf3..c8f425a 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -138,7 +138,7 @@ target_link_libraries(kalzium ${KDE4_KHTML_LIBRARY} ${KDE4_KNEWSTUFF3_LIBS} ${KD + if (OPENBABEL2_FOUND) + target_link_libraries(kalzium ${OPENBABEL2_LIBRARIES}) + if (EIGEN2_FOUND AND Avogadro_FOUND) +- target_link_libraries(kalzium compoundviewer avogadro) ++ target_link_libraries(kalzium ${QT_QTOPENGL_LIBRARY} compoundviewer avogadro) + endif (EIGEN2_FOUND AND Avogadro_FOUND) + endif (OPENBABEL2_FOUND) + |