[arch-commits] Commit in kdeedu-kalzium/trunk (PKGBUILD fix-linking.patch)

[Andrea Scarpino]

    Date: Sunday, December 2, 2012 @ 02:44:49
  Author: andrea
Revision: 172241

KDE 4.9.4

Modified:
  kdeedu-kalzium/trunk/PKGBUILD
Deleted:
  kdeedu-kalzium/trunk/fix-linking.patch

-------------------+
 PKGBUILD          |   14 +++-----------
 fix-linking.patch |   24 ------------------------
 2 files changed, 3 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-12-02 07:44:45 UTC (rev 172240)
+++ PKGBUILD	2012-12-02 07:44:49 UTC (rev 172241)
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=kdeedu-kalzium
-pkgver=4.9.3
+pkgver=4.9.4
 pkgrel=1
 pkgdesc="Periodic Table of Elements"
 url="http://kde.org/applications/education/kalzium/"
@@ -12,18 +12,10 @@
 depends=('kdelibs' 'avogadro' 'ocaml' 'facile')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz"
-        'fix-linking.patch')
-sha1sums=('7b4a50aabd960752d6b746740cc6b4bf6cae3b30'
-          '478697adc8ae191355ee64b824f30e11bd7af682')
+source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz")
+sha1sums=('7fb581e74cd2d561a9db7c2de754339f2e345e2a')
 
 build() {
-  # KDEBUG#308939 (Fixed upstream)
-  cd kalzium-${pkgver}
-  patch -p1 -i "${srcdir}"/fix-linking.patch
-  cd ../
-
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../kalzium-${pkgver} \

Deleted: fix-linking.patch
===================================================================
--- fix-linking.patch	2012-12-02 07:44:45 UTC (rev 172240)
+++ fix-linking.patch	2012-12-02 07:44:49 UTC (rev 172241)
@@ -1,24 +0,0 @@
-commit ffac09556f6f3d5d758bac9ba2b91117e6014ea7
-Author: Christoph Feck <christoph at 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 at 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)
-