[arch-commits] Commit in kalzium/trunk (PKGBUILD kalzium-openbabel3.patch)

[Antonio Rojas]

    Date: Wednesday, May 6, 2020 @ 14:04:44
  Author: arojas
Revision: 382386

Fix patch

Modified:
  kalzium/trunk/PKGBUILD
  kalzium/trunk/kalzium-openbabel3.patch

--------------------------+
 PKGBUILD                 |    2 +-
 kalzium-openbabel3.patch |   17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-06 13:43:58 UTC (rev 382385)
+++ PKGBUILD	2020-05-06 14:04:44 UTC (rev 382386)
@@ -15,7 +15,7 @@
         kalzium-openbabel3.patch)
 sha256sums=('abb77b3d1f4298f47c5e8ed0d4ea23f1251d95d29cac3b53a3ed56500934b858'
             'SKIP'
-            'cc1386f2c0a2664a91ecb277cc0de1e63b08140f3d7b0488d9d6aaa1dac1ed41')
+            '1e818cbb4d7ecd8b1ba36c0280ea8431a8b9863d1bf0b1173bca2d9d4272843e')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
 

Modified: kalzium-openbabel3.patch
===================================================================
--- kalzium-openbabel3.patch	2020-05-06 13:43:58 UTC (rev 382385)
+++ kalzium-openbabel3.patch	2020-05-06 14:04:44 UTC (rev 382386)
@@ -229,7 +229,7 @@
      if (d) {
          d->loadMolecule(moleculeFile);
 diff --git a/src/kalziumschemetype.cpp b/src/kalziumschemetype.cpp
-index 91a5cbf0..5032d63f 100644
+index 91a5cbf0..07f7bbfa 100644
 --- a/src/kalziumschemetype.cpp
 +++ b/src/kalziumschemetype.cpp
 @@ -25,6 +25,9 @@
@@ -242,6 +242,15 @@
  
  #include <QBrush>
  #include <QDebug>
+@@ -39,7 +42,7 @@ KalziumSchemeTypeFactory::KalziumSchemeTypeFactory()
+     m_schemes << KalziumIconicSchemeType::instance();
+     m_schemes << KalziumFamilySchemeType::instance();
+     m_schemes << KalziumGroupsSchemeType::instance();
+-    #ifdef HAVE_OPENBABEL2
++    #ifdef HAVE_OPENBABEL
+     m_schemes << KalziumColorSchemeType::instance();
+     #endif
+ }
 @@ -379,7 +382,7 @@ QList<legendPair> KalziumGroupsSchemeType::legendItems() const
      return ll;
  }
@@ -260,9 +269,9 @@
      c.setRgbF(color[0], color[1], color[2]);
 +#endif
 +#ifdef HAVE_OPENBABEL3
-+    double *red, *green, *blue;
-+    OpenBabel::OBElements::GetRGB(el, red, green, blue);
-+    c.setRgbF(*red, *green, *blue);
++    double red, green, blue;
++    OpenBabel::OBElements::GetRGB(el, &red, &green, &blue);
++    c.setRgbF(red, green, blue);
 +#endif
  
      return QBrush(c);