[arch-commits] Commit in kdeedu-kalzium/repos (12 files)
Andrea Scarpino
andrea at archlinux.org
Fri Nov 9 08:27:43 UTC 2012
Date: Friday, November 9, 2012 @ 03:27:43
Author: andrea
Revision: 170622
db-move: moved kdeedu-kalzium from [testing] to [extra] (i686, x86_64)
Added:
kdeedu-kalzium/repos/extra-i686/PKGBUILD
(from rev 170578, kdeedu-kalzium/repos/testing-i686/PKGBUILD)
kdeedu-kalzium/repos/extra-i686/fix-linking.patch
(from rev 170578, kdeedu-kalzium/repos/testing-i686/fix-linking.patch)
kdeedu-kalzium/repos/extra-i686/kdeedu-kalzium.install
(from rev 170578, kdeedu-kalzium/repos/testing-i686/kdeedu-kalzium.install)
kdeedu-kalzium/repos/extra-x86_64/PKGBUILD
(from rev 170578, kdeedu-kalzium/repos/testing-x86_64/PKGBUILD)
kdeedu-kalzium/repos/extra-x86_64/fix-linking.patch
(from rev 170578, kdeedu-kalzium/repos/testing-x86_64/fix-linking.patch)
kdeedu-kalzium/repos/extra-x86_64/kdeedu-kalzium.install
(from rev 170578, kdeedu-kalzium/repos/testing-x86_64/kdeedu-kalzium.install)
Deleted:
kdeedu-kalzium/repos/extra-i686/PKGBUILD
kdeedu-kalzium/repos/extra-i686/kdeedu-kalzium.install
kdeedu-kalzium/repos/extra-x86_64/PKGBUILD
kdeedu-kalzium/repos/extra-x86_64/kdeedu-kalzium.install
kdeedu-kalzium/repos/testing-i686/
kdeedu-kalzium/repos/testing-x86_64/
-------------------------------------+
extra-i686/PKGBUILD | 69 ++++++++++++++++++----------------
extra-i686/fix-linking.patch | 24 +++++++++++
extra-i686/kdeedu-kalzium.install | 22 +++++-----
extra-x86_64/PKGBUILD | 69 ++++++++++++++++++----------------
extra-x86_64/fix-linking.patch | 24 +++++++++++
extra-x86_64/kdeedu-kalzium.install | 22 +++++-----
6 files changed, 146 insertions(+), 84 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-11-09 08:27:39 UTC (rev 170621)
+++ extra-i686/PKGBUILD 2012-11-09 08:27:43 UTC (rev 170622)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kdeedu-kalzium
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Periodic Table of Elements"
-url="http://kde.org/applications/education/kalzium/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-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')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kalzium-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
Copied: kdeedu-kalzium/repos/extra-i686/PKGBUILD (from rev 170578, kdeedu-kalzium/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-11-09 08:27:43 UTC (rev 170622)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kdeedu-kalzium
+pkgver=4.9.3
+pkgrel=1
+pkgdesc="Periodic Table of Elements"
+url="http://kde.org/applications/education/kalzium/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+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"
+ '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
+ cmake ../kalzium-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
Copied: kdeedu-kalzium/repos/extra-i686/fix-linking.patch (from rev 170578, kdeedu-kalzium/repos/testing-i686/fix-linking.patch)
===================================================================
--- extra-i686/fix-linking.patch (rev 0)
+++ extra-i686/fix-linking.patch 2012-11-09 08:27:43 UTC (rev 170622)
@@ -0,0 +1,24 @@
+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)
+
Deleted: extra-i686/kdeedu-kalzium.install
===================================================================
--- extra-i686/kdeedu-kalzium.install 2012-11-09 08:27:39 UTC (rev 170621)
+++ extra-i686/kdeedu-kalzium.install 2012-11-09 08:27:43 UTC (rev 170622)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: kdeedu-kalzium/repos/extra-i686/kdeedu-kalzium.install (from rev 170578, kdeedu-kalzium/repos/testing-i686/kdeedu-kalzium.install)
===================================================================
--- extra-i686/kdeedu-kalzium.install (rev 0)
+++ extra-i686/kdeedu-kalzium.install 2012-11-09 08:27:43 UTC (rev 170622)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-11-09 08:27:39 UTC (rev 170621)
+++ extra-x86_64/PKGBUILD 2012-11-09 08:27:43 UTC (rev 170622)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kdeedu-kalzium
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Periodic Table of Elements"
-url="http://kde.org/applications/education/kalzium/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-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')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kalzium-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
Copied: kdeedu-kalzium/repos/extra-x86_64/PKGBUILD (from rev 170578, kdeedu-kalzium/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-11-09 08:27:43 UTC (rev 170622)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kdeedu-kalzium
+pkgver=4.9.3
+pkgrel=1
+pkgdesc="Periodic Table of Elements"
+url="http://kde.org/applications/education/kalzium/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+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"
+ '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
+ cmake ../kalzium-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
Copied: kdeedu-kalzium/repos/extra-x86_64/fix-linking.patch (from rev 170578, kdeedu-kalzium/repos/testing-x86_64/fix-linking.patch)
===================================================================
--- extra-x86_64/fix-linking.patch (rev 0)
+++ extra-x86_64/fix-linking.patch 2012-11-09 08:27:43 UTC (rev 170622)
@@ -0,0 +1,24 @@
+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)
+
Deleted: extra-x86_64/kdeedu-kalzium.install
===================================================================
--- extra-x86_64/kdeedu-kalzium.install 2012-11-09 08:27:39 UTC (rev 170621)
+++ extra-x86_64/kdeedu-kalzium.install 2012-11-09 08:27:43 UTC (rev 170622)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: kdeedu-kalzium/repos/extra-x86_64/kdeedu-kalzium.install (from rev 170578, kdeedu-kalzium/repos/testing-x86_64/kdeedu-kalzium.install)
===================================================================
--- extra-x86_64/kdeedu-kalzium.install (rev 0)
+++ extra-x86_64/kdeedu-kalzium.install 2012-11-09 08:27:43 UTC (rev 170622)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list