[arch-commits] Commit in kalzium/repos/extra-x86_64 (4 files)

[Antonio Rojas]

    Date: Thursday, March 5, 2020 @ 13:46:52
  Author: arojas
Revision: 376647

archrelease: copy trunk to extra-x86_64

Added:
  kalzium/repos/extra-x86_64/PKGBUILD
    (from rev 376646, kalzium/trunk/PKGBUILD)
  kalzium/repos/extra-x86_64/kalzium-openbabel3.patch
    (from rev 376646, 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	2020-03-05 13:46:43 UTC (rev 376646)
+++ PKGBUILD	2020-03-05 13:46:52 UTC (rev 376647)
@@ -1,42 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=kalzium
-pkgver=19.12.2
-pkgrel=2
-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 vtk 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=('ce40143bdf33a7896b9e17fd3172287b33f6f2486bb0ecce2392d16bf88f9590'
-            'SKIP'
-            '820550c6443cec572b28338899d2be871acc42fc02654a0df48a306b7cce09d5')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
-              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at 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 376646, kalzium/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-03-05 13:46:52 UTC (rev 376647)
@@ -0,0 +1,42 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=kalzium
+pkgver=19.12.3
+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 vtk 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=('e44f359d1343c30cf1993a3970a3e610d0d5782f92a6b331b035cf4fef104195'
+            'SKIP'
+            '820550c6443cec572b28338899d2be871acc42fc02654a0df48a306b7cce09d5')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
+              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at 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	2020-03-05 13:46:43 UTC (rev 376646)
+++ kalzium-openbabel3.patch	2020-03-05 13:46:52 UTC (rev 376647)
@@ -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 376646, kalzium/trunk/kalzium-openbabel3.patch)
===================================================================
--- kalzium-openbabel3.patch	                        (rev 0)
+++ kalzium-openbabel3.patch	2020-03-05 13:46:52 UTC (rev 376647)
@@ -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);
+ }