Date: Thursday, December 12, 2019 @ 13:25:49 Author: arojas Revision: 370938
archrelease: copy trunk to extra-x86_64 Added: kalzium/repos/extra-x86_64/PKGBUILD (from rev 370937, kalzium/trunk/PKGBUILD) kalzium/repos/extra-x86_64/kalzium-openbabel3.patch (from rev 370937, kalzium/trunk/kalzium-openbabel3.patch) Deleted: kalzium/repos/extra-x86_64/PKGBUILD kalzium/repos/extra-x86_64/kalzium-openbabel3.patch --------------------------+ PKGBUILD | 84 ++++++++++++++++++++++----------------------- kalzium-openbabel3.patch | 50 +++++++++++++------------- 2 files changed, 67 insertions(+), 67 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-12-12 13:25:37 UTC (rev 370937) +++ PKGBUILD 2019-12-12 13:25:49 UTC (rev 370938) @@ -1,42 +0,0 @@ -# Maintainer: Antonio Rojas <aro...@archlinux.org> -# Maintainer: Felix Yan <felixonm...@archlinux.org> - -pkgname=kalzium -pkgver=19.08.3 -pkgrel=1 -pkgdesc="Periodic Table of Elements" -url="https://kde.org/applications/education/kalzium/" -arch=(x86_64) -license=(GPL LGPL FDL) -depends=(khtml knewstuff kplotting kunitconversion qt5-script avogadrolibs openbabel hicolor-icon-theme) -makedepends=(extra-cmake-modules kdoctools eigen ocaml facile python) -groups=(kde-applications kdeedu) -source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} - kalzium-openbabel3.patch) -sha256sums=('5dc3423a0f2646b59233f92b6a6e81b4a0bcdb819aa543c83270fe4cc5592933' - 'SKIP' - '010f10640fb80834f13556e6cf03f594118081d610701a82aeec043b7a44f1e8') -validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <aa...@kde.org> - F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cf...@kde.org> - -prepare() { - mkdir -p build - - cd $pkgname-$pkgver - patch -p1 -i ../kalzium-openbabel3.patch -} - -build() { - cd build - cmake ../$pkgname-$pkgver \ - -DBUILD_TESTING=OFF \ - -DOPENBABEL2_INCLUDE_DIR=/usr/include/openbabel3 \ - -DOPENBABEL2_LIBRARIES=/usr/lib/libopenbabel.so \ - -DOPENBABEL2_VERSION_MET=TRUE - make -} - -package() { - cd build - make DESTDIR="$pkgdir" install -} Copied: kalzium/repos/extra-x86_64/PKGBUILD (from rev 370937, kalzium/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-12-12 13:25:49 UTC (rev 370938) @@ -0,0 +1,42 @@ +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Maintainer: Felix Yan <felixonm...@archlinux.org> + +pkgname=kalzium +pkgver=19.12.0 +pkgrel=1 +pkgdesc="Periodic Table of Elements" +url="https://kde.org/applications/education/kalzium/" +arch=(x86_64) +license=(GPL LGPL FDL) +depends=(kparts knewstuff kplotting kunitconversion qt5-script avogadrolibs openbabel hicolor-icon-theme) +makedepends=(extra-cmake-modules kdoctools eigen ocaml facile python) +groups=(kde-applications kdeedu) +source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} + kalzium-openbabel3.patch) +sha256sums=('0d2a2db4dac5e0ef70b296cf621b42e50322b57500fd8aa7a001a0436ad3de33' + 'SKIP' + '010f10640fb80834f13556e6cf03f594118081d610701a82aeec043b7a44f1e8') +validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <aa...@kde.org> + F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cf...@kde.org> + +prepare() { + mkdir -p build + + cd $pkgname-$pkgver + patch -p1 -i ../kalzium-openbabel3.patch +} + +build() { + cd build + cmake ../$pkgname-$pkgver \ + -DBUILD_TESTING=OFF \ + -DOPENBABEL2_INCLUDE_DIR=/usr/include/openbabel3 \ + -DOPENBABEL2_LIBRARIES=/usr/lib/libopenbabel.so \ + -DOPENBABEL2_VERSION_MET=TRUE + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install +} Deleted: kalzium-openbabel3.patch =================================================================== --- kalzium-openbabel3.patch 2019-12-12 13:25:37 UTC (rev 370937) +++ kalzium-openbabel3.patch 2019-12-12 13:25:49 UTC (rev 370938) @@ -1,25 +0,0 @@ -diff --git a/src/kalziumschemetype.cpp b/src/kalziumschemetype.cpp -index 91a5cbf0..e2935916 100644 ---- a/src/kalziumschemetype.cpp -+++ b/src/kalziumschemetype.cpp -@@ -23,7 +23,7 @@ - #include "prefs.h" - - #ifdef HAVE_OPENBABEL2 --#include <openbabel/mol.h> -+#include <openbabel/elements.h> - #endif - - #include <QBrush> -@@ -406,8 +407,9 @@ QBrush KalziumColorSchemeType::elementBrush(int el) const - { - QColor c; - -- std::vector<double> color = OpenBabel::etab.GetRGB(el); -- c.setRgbF(color[0], color[1], color[2]); -+ double *red, *green, *blue; -+ OpenBabel::OBElements::GetRGB(el, red, green, blue); -+ c.setRgbF(*red, *green, *blue); - - return QBrush(c); - } Copied: kalzium/repos/extra-x86_64/kalzium-openbabel3.patch (from rev 370937, kalzium/trunk/kalzium-openbabel3.patch) =================================================================== --- kalzium-openbabel3.patch (rev 0) +++ kalzium-openbabel3.patch 2019-12-12 13:25:49 UTC (rev 370938) @@ -0,0 +1,25 @@ +diff --git a/src/kalziumschemetype.cpp b/src/kalziumschemetype.cpp +index 91a5cbf0..e2935916 100644 +--- a/src/kalziumschemetype.cpp ++++ b/src/kalziumschemetype.cpp +@@ -23,7 +23,7 @@ + #include "prefs.h" + + #ifdef HAVE_OPENBABEL2 +-#include <openbabel/mol.h> ++#include <openbabel/elements.h> + #endif + + #include <QBrush> +@@ -406,8 +407,9 @@ QBrush KalziumColorSchemeType::elementBrush(int el) const + { + QColor c; + +- std::vector<double> color = OpenBabel::etab.GetRGB(el); +- c.setRgbF(color[0], color[1], color[2]); ++ double *red, *green, *blue; ++ OpenBabel::OBElements::GetRGB(el, red, green, blue); ++ c.setRgbF(*red, *green, *blue); + + return QBrush(c); + }