[arch-commits] Commit in kalzium/repos/extra-x86_64 (4 files)
Date: Thursday, November 5, 2020 @ 15:00:43 Author: arojas Revision: 399372 archrelease: copy trunk to extra-x86_64 Added: kalzium/repos/extra-x86_64/PKGBUILD (from rev 399371, kalzium/trunk/PKGBUILD) kalzium/repos/extra-x86_64/kalzium-openbabel3.patch (from rev 399371, kalzium/trunk/kalzium-openbabel3.patch) Deleted: kalzium/repos/extra-x86_64/PKGBUILD kalzium/repos/extra-x86_64/kalzium-openbabel3.patch --+ PKGBUILD | 68 ++--- kalzium-openbabel3.patch | 602 ++--- 2 files changed, 335 insertions(+), 335 deletions(-) Deleted: PKGBUILD === --- PKGBUILD2020-11-05 15:00:31 UTC (rev 399371) +++ PKGBUILD2020-11-05 15:00:43 UTC (rev 399372) @@ -1,34 +0,0 @@ -# Maintainer: Antonio Rojas -# Maintainer: Felix Yan - -pkgname=kalzium -pkgver=20.08.2 -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 boost) -groups=(kde-applications kde-education) -source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} -kalzium-openbabel3.patch) -sha256sums=('474f74cbb478d3f5f69b5785711ed969ac15d5e92aee5308c6118a9d12611016' -'SKIP' -'742734255681bcd57569f16d58deb3f2bb38b353352fa77d6e65772846334a9c') -validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid - F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck - -prepare() { - patch -d $pkgname-$pkgver -p1 -i ../kalzium-openbabel3.patch -} - -build() { - cmake -B build -S $pkgname-$pkgver \ --DBUILD_TESTING=OFF - cmake --build build -} - -package() { - DESTDIR="$pkgdir" cmake --install build -} Copied: kalzium/repos/extra-x86_64/PKGBUILD (from rev 399371, kalzium/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2020-11-05 15:00:43 UTC (rev 399372) @@ -0,0 +1,34 @@ +# Maintainer: Antonio Rojas +# Maintainer: Felix Yan + +pkgname=kalzium +pkgver=20.08.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 boost) +groups=(kde-applications kde-education) +source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} +kalzium-openbabel3.patch) +sha256sums=('b6dc3db2a3d14653ef132402fdd2a120ed26c663475eba186f7af9dcae5d00e5' +'SKIP' +'742734255681bcd57569f16d58deb3f2bb38b353352fa77d6e65772846334a9c') +validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid + F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck + +prepare() { + patch -d $pkgname-$pkgver -p1 -i ../kalzium-openbabel3.patch +} + +build() { + cmake -B build -S $pkgname-$pkgver \ +-DBUILD_TESTING=OFF + cmake --build build +} + +package() { + DESTDIR="$pkgdir" cmake --install build +} Deleted: kalzium-openbabel3.patch === --- kalzium-openbabel3.patch2020-11-05 15:00:31 UTC (rev 399371) +++ kalzium-openbabel3.patch2020-11-05 15:00:43 UTC (rev 399372) @@ -1,301 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index aada7a92..2a0fb61c 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -26,7 +26,12 @@ include(ECMSetupVersion) - find_package(Gettext REQUIRED) - find_package(PythonInterp REQUIRED) - find_package(PkgConfig) --find_package(OpenBabel2) -+find_package(OpenBabel3 3.1) -+if(${OpenBabel3_FOUND}) -+find_package(Threads REQUIRED) -+else() -+find_package(OpenBabel2) -+endif() - find_package(AvogadroLibs) - find_package(Eigen3) - find_package(OCaml) -@@ -37,9 +42,22 @@ check_include_files(ieeefp.h HAVE_IEEEFP_H) - - # create configuration file - set(HAVE_FACILE ${LIBFACILE_FOUND}) -+set(HAVE_OPENBABEL3 ${OpenBabel3_FOUND}) - set(HAVE_OPENBABEL2 ${OPENBABEL2_FOUND}) -+if(HAVE_OPENBABEL2 OR HAVE_OPENBABEL3) -+set(HAVE_OPENBABEL 1) -+endif() - set(HAVE_EIGEN ${EIGEN3_FOUND}) - set(HAVE_AVOGADRO ${AvogadroLibs_FOUND}) -+ -+if(HAVE_OPENBABEL3) -+set(OPENBABEL_INCLUDE_DIR ${OpenBabel3_INCLUDE_DIRS}) -+set(OPENBABEL_LIBRARIES openbabel) -+elseif(HAVE_OPENBABEL2) -+set(OPENBABEL_INCLUDE_DIR ${OPENBABEL2_INCLUDE_DIR}) -+set(OPENBABEL_LIBRARIES ${OPENBABEL2_LIBRARIES}) -+endif() -+ - configure_file( -${CMAKE_CURRENT_SOURCE_DIR}/config-kalzium.h.cmake -
[arch-commits] Commit in kalzium/repos/extra-x86_64 (4 files)
Date: Friday, October 9, 2020 @ 13:21:52 Author: arojas Revision: 397666 archrelease: copy trunk to extra-x86_64 Added: kalzium/repos/extra-x86_64/PKGBUILD (from rev 397665, kalzium/trunk/PKGBUILD) kalzium/repos/extra-x86_64/kalzium-openbabel3.patch (from rev 397665, kalzium/trunk/kalzium-openbabel3.patch) Deleted: kalzium/repos/extra-x86_64/PKGBUILD kalzium/repos/extra-x86_64/kalzium-openbabel3.patch --+ PKGBUILD | 68 ++--- kalzium-openbabel3.patch | 602 ++--- 2 files changed, 335 insertions(+), 335 deletions(-) Deleted: PKGBUILD === --- PKGBUILD2020-10-09 13:21:41 UTC (rev 397665) +++ PKGBUILD2020-10-09 13:21:52 UTC (rev 397666) @@ -1,34 +0,0 @@ -# Maintainer: Antonio Rojas -# Maintainer: Felix Yan - -pkgname=kalzium -pkgver=20.08.1 -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 boost) -groups=(kde-applications kde-education) -source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} -kalzium-openbabel3.patch) -sha256sums=('c2c4a823525ab5927c39f29e2150f34fc03947fb852aea1bdb73390c5a709188' -'SKIP' -'742734255681bcd57569f16d58deb3f2bb38b353352fa77d6e65772846334a9c') -validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid - F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck - -prepare() { - patch -d $pkgname-$pkgver -p1 -i ../kalzium-openbabel3.patch -} - -build() { - cmake -B build -S $pkgname-$pkgver \ --DBUILD_TESTING=OFF - cmake --build build -} - -package() { - DESTDIR="$pkgdir" cmake --install build -} Copied: kalzium/repos/extra-x86_64/PKGBUILD (from rev 397665, kalzium/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2020-10-09 13:21:52 UTC (rev 397666) @@ -0,0 +1,34 @@ +# Maintainer: Antonio Rojas +# Maintainer: Felix Yan + +pkgname=kalzium +pkgver=20.08.2 +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 boost) +groups=(kde-applications kde-education) +source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} +kalzium-openbabel3.patch) +sha256sums=('474f74cbb478d3f5f69b5785711ed969ac15d5e92aee5308c6118a9d12611016' +'SKIP' +'742734255681bcd57569f16d58deb3f2bb38b353352fa77d6e65772846334a9c') +validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid + F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck + +prepare() { + patch -d $pkgname-$pkgver -p1 -i ../kalzium-openbabel3.patch +} + +build() { + cmake -B build -S $pkgname-$pkgver \ +-DBUILD_TESTING=OFF + cmake --build build +} + +package() { + DESTDIR="$pkgdir" cmake --install build +} Deleted: kalzium-openbabel3.patch === --- kalzium-openbabel3.patch2020-10-09 13:21:41 UTC (rev 397665) +++ kalzium-openbabel3.patch2020-10-09 13:21:52 UTC (rev 397666) @@ -1,301 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index aada7a92..2a0fb61c 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -26,7 +26,12 @@ include(ECMSetupVersion) - find_package(Gettext REQUIRED) - find_package(PythonInterp REQUIRED) - find_package(PkgConfig) --find_package(OpenBabel2) -+find_package(OpenBabel3 3.1) -+if(${OpenBabel3_FOUND}) -+find_package(Threads REQUIRED) -+else() -+find_package(OpenBabel2) -+endif() - find_package(AvogadroLibs) - find_package(Eigen3) - find_package(OCaml) -@@ -37,9 +42,22 @@ check_include_files(ieeefp.h HAVE_IEEEFP_H) - - # create configuration file - set(HAVE_FACILE ${LIBFACILE_FOUND}) -+set(HAVE_OPENBABEL3 ${OpenBabel3_FOUND}) - set(HAVE_OPENBABEL2 ${OPENBABEL2_FOUND}) -+if(HAVE_OPENBABEL2 OR HAVE_OPENBABEL3) -+set(HAVE_OPENBABEL 1) -+endif() - set(HAVE_EIGEN ${EIGEN3_FOUND}) - set(HAVE_AVOGADRO ${AvogadroLibs_FOUND}) -+ -+if(HAVE_OPENBABEL3) -+set(OPENBABEL_INCLUDE_DIR ${OpenBabel3_INCLUDE_DIRS}) -+set(OPENBABEL_LIBRARIES openbabel) -+elseif(HAVE_OPENBABEL2) -+set(OPENBABEL_INCLUDE_DIR ${OPENBABEL2_INCLUDE_DIR}) -+set(OPENBABEL_LIBRARIES ${OPENBABEL2_LIBRARIES}) -+endif() -+ - configure_file( -${CMAKE_CURRENT_SOURCE_DIR}/config-kalzium.h.cmake -
[arch-commits] Commit in kalzium/repos/extra-x86_64 (4 files)
Date: Thursday, September 3, 2020 @ 11:27:40 Author: arojas Revision: 395235 archrelease: copy trunk to extra-x86_64 Added: kalzium/repos/extra-x86_64/PKGBUILD (from rev 395234, kalzium/trunk/PKGBUILD) kalzium/repos/extra-x86_64/kalzium-openbabel3.patch (from rev 395234, kalzium/trunk/kalzium-openbabel3.patch) Deleted: kalzium/repos/extra-x86_64/PKGBUILD kalzium/repos/extra-x86_64/kalzium-openbabel3.patch --+ PKGBUILD | 68 ++--- kalzium-openbabel3.patch | 602 ++--- 2 files changed, 335 insertions(+), 335 deletions(-) Deleted: PKGBUILD === --- PKGBUILD2020-09-03 11:27:30 UTC (rev 395234) +++ PKGBUILD2020-09-03 11:27:40 UTC (rev 395235) @@ -1,34 +0,0 @@ -# Maintainer: Antonio Rojas -# Maintainer: Felix Yan - -pkgname=kalzium -pkgver=20.08.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 vtk hicolor-icon-theme) -makedepends=(extra-cmake-modules kdoctools eigen ocaml facile python boost) -groups=(kde-applications kde-education) -source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} -kalzium-openbabel3.patch) -sha256sums=('e9b402ea91ac87a19cef6e686bfb8507f6afac0d19c5dc7de777475d5db1b06f' -'SKIP' -'742734255681bcd57569f16d58deb3f2bb38b353352fa77d6e65772846334a9c') -validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid - F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck - -prepare() { - patch -d $pkgname-$pkgver -p1 -i ../kalzium-openbabel3.patch -} - -build() { - cmake -B build -S $pkgname-$pkgver \ --DBUILD_TESTING=OFF - cmake --build build -} - -package() { - DESTDIR="$pkgdir" cmake --install build -} Copied: kalzium/repos/extra-x86_64/PKGBUILD (from rev 395234, kalzium/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2020-09-03 11:27:40 UTC (rev 395235) @@ -0,0 +1,34 @@ +# Maintainer: Antonio Rojas +# Maintainer: Felix Yan + +pkgname=kalzium +pkgver=20.08.1 +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 boost) +groups=(kde-applications kde-education) +source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} +kalzium-openbabel3.patch) +sha256sums=('c2c4a823525ab5927c39f29e2150f34fc03947fb852aea1bdb73390c5a709188' +'SKIP' +'742734255681bcd57569f16d58deb3f2bb38b353352fa77d6e65772846334a9c') +validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid + F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck + +prepare() { + patch -d $pkgname-$pkgver -p1 -i ../kalzium-openbabel3.patch +} + +build() { + cmake -B build -S $pkgname-$pkgver \ +-DBUILD_TESTING=OFF + cmake --build build +} + +package() { + DESTDIR="$pkgdir" cmake --install build +} Deleted: kalzium-openbabel3.patch === --- kalzium-openbabel3.patch2020-09-03 11:27:30 UTC (rev 395234) +++ kalzium-openbabel3.patch2020-09-03 11:27:40 UTC (rev 395235) @@ -1,301 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index aada7a92..2a0fb61c 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -26,7 +26,12 @@ include(ECMSetupVersion) - find_package(Gettext REQUIRED) - find_package(PythonInterp REQUIRED) - find_package(PkgConfig) --find_package(OpenBabel2) -+find_package(OpenBabel3 3.1) -+if(${OpenBabel3_FOUND}) -+find_package(Threads REQUIRED) -+else() -+find_package(OpenBabel2) -+endif() - find_package(AvogadroLibs) - find_package(Eigen3) - find_package(OCaml) -@@ -37,9 +42,22 @@ check_include_files(ieeefp.h HAVE_IEEEFP_H) - - # create configuration file - set(HAVE_FACILE ${LIBFACILE_FOUND}) -+set(HAVE_OPENBABEL3 ${OpenBabel3_FOUND}) - set(HAVE_OPENBABEL2 ${OPENBABEL2_FOUND}) -+if(HAVE_OPENBABEL2 OR HAVE_OPENBABEL3) -+set(HAVE_OPENBABEL 1) -+endif() - set(HAVE_EIGEN ${EIGEN3_FOUND}) - set(HAVE_AVOGADRO ${AvogadroLibs_FOUND}) -+ -+if(HAVE_OPENBABEL3) -+set(OPENBABEL_INCLUDE_DIR ${OpenBabel3_INCLUDE_DIRS}) -+set(OPENBABEL_LIBRARIES openbabel) -+elseif(HAVE_OPENBABEL2) -+set(OPENBABEL_INCLUDE_DIR ${OPENBABEL2_INCLUDE_DIR}) -+set(OPENBABEL_LIBRARIES ${OPENBABEL2_LIBRARIES}) -+endif() -+ - configure_file( -${CMAKE_CURRENT_SOURCE_DIR}/config-kalzium.h.cmake -
[arch-commits] Commit in kalzium/repos/extra-x86_64 (4 files)
Date: Thursday, June 11, 2020 @ 18:33:34 Author: arojas Revision: 33 archrelease: copy trunk to extra-x86_64 Added: kalzium/repos/extra-x86_64/PKGBUILD (from rev 32, kalzium/trunk/PKGBUILD) kalzium/repos/extra-x86_64/kalzium-openbabel3.patch (from rev 32, kalzium/trunk/kalzium-openbabel3.patch) Deleted: kalzium/repos/extra-x86_64/PKGBUILD kalzium/repos/extra-x86_64/kalzium-openbabel3.patch --+ PKGBUILD | 73 ++--- kalzium-openbabel3.patch | 602 ++--- 2 files changed, 335 insertions(+), 340 deletions(-) Deleted: PKGBUILD === --- PKGBUILD2020-06-11 18:33:18 UTC (rev 32) +++ PKGBUILD2020-06-11 18:33:34 UTC (rev 33) @@ -1,39 +0,0 @@ -# Maintainer: Antonio Rojas -# Maintainer: Felix Yan - -pkgname=kalzium -pkgver=20.04.1 -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 boost) -groups=(kde-applications kdeedu) -source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} -kalzium-openbabel3.patch) -sha256sums=('fdb066519cc4839ce59a5325729414dd5e6082ce23eff004afee60968744c577' -'SKIP' -'742734255681bcd57569f16d58deb3f2bb38b353352fa77d6e65772846334a9c') -validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid - F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck - -prepare() { - mkdir -p build - - cd $pkgname-$pkgver - patch -p1 -i ../kalzium-openbabel3.patch -} - -build() { - cd build - cmake ../$pkgname-$pkgver \ --DBUILD_TESTING=OFF - make -} - -package() { - cd build - make DESTDIR="$pkgdir" install -} Copied: kalzium/repos/extra-x86_64/PKGBUILD (from rev 32, kalzium/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2020-06-11 18:33:34 UTC (rev 33) @@ -0,0 +1,34 @@ +# Maintainer: Antonio Rojas +# Maintainer: Felix Yan + +pkgname=kalzium +pkgver=20.04.2 +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 boost) +groups=(kde-applications kde-education) +source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} +kalzium-openbabel3.patch) +sha256sums=('c0d276f2f37f4c8e83d26b4e6e3dd8dfe0e420ecdeed055b4fb62bdb2433b4b4' +'SKIP' +'742734255681bcd57569f16d58deb3f2bb38b353352fa77d6e65772846334a9c') +validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid + F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck + +prepare() { + patch -d $pkgname-$pkgver -p1 -i ../kalzium-openbabel3.patch +} + +build() { + cmake -B build -S $pkgname-$pkgver \ +-DBUILD_TESTING=OFF + cmake --build build +} + +package() { + DESTDIR="$pkgdir" cmake --install build +} Deleted: kalzium-openbabel3.patch === --- kalzium-openbabel3.patch2020-06-11 18:33:18 UTC (rev 32) +++ kalzium-openbabel3.patch2020-06-11 18:33:34 UTC (rev 33) @@ -1,301 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index aada7a92..2a0fb61c 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -26,7 +26,12 @@ include(ECMSetupVersion) - find_package(Gettext REQUIRED) - find_package(PythonInterp REQUIRED) - find_package(PkgConfig) --find_package(OpenBabel2) -+find_package(OpenBabel3 3.1) -+if(${OpenBabel3_FOUND}) -+find_package(Threads REQUIRED) -+else() -+find_package(OpenBabel2) -+endif() - find_package(AvogadroLibs) - find_package(Eigen3) - find_package(OCaml) -@@ -37,9 +42,22 @@ check_include_files(ieeefp.h HAVE_IEEEFP_H) - - # create configuration file - set(HAVE_FACILE ${LIBFACILE_FOUND}) -+set(HAVE_OPENBABEL3 ${OpenBabel3_FOUND}) - set(HAVE_OPENBABEL2 ${OPENBABEL2_FOUND}) -+if(HAVE_OPENBABEL2 OR HAVE_OPENBABEL3) -+set(HAVE_OPENBABEL 1) -+endif() - set(HAVE_EIGEN ${EIGEN3_FOUND}) - set(HAVE_AVOGADRO ${AvogadroLibs_FOUND}) -+ -+if(HAVE_OPENBABEL3) -+set(OPENBABEL_INCLUDE_DIR ${OpenBabel3_INCLUDE_DIRS}) -+set(OPENBABEL_LIBRARIES openbabel) -+elseif(HAVE_OPENBABEL2) -+set(OPENBABEL_INCLUDE_DIR ${OPENBABEL2_INCLUDE_DIR}) -+set(OPENBABEL_LIBRARIES ${OPENBABEL2_LIBRARIES}) -+endif() -+ - configure_file( -${CMAKE_CURRENT_SOURCE_DIR}/config-kalzium.h.cmake -
[arch-commits] Commit in kalzium/repos/extra-x86_64 (4 files)
Date: Friday, May 15, 2020 @ 12:18:18 Author: arojas Revision: 383547 archrelease: copy trunk to extra-x86_64 Added: kalzium/repos/extra-x86_64/PKGBUILD (from rev 383546, kalzium/trunk/PKGBUILD) kalzium/repos/extra-x86_64/kalzium-openbabel3.patch (from rev 383546, kalzium/trunk/kalzium-openbabel3.patch) Deleted: kalzium/repos/extra-x86_64/PKGBUILD kalzium/repos/extra-x86_64/kalzium-openbabel3.patch --+ PKGBUILD | 78 ++--- kalzium-openbabel3.patch | 605 ++--- 2 files changed, 340 insertions(+), 343 deletions(-) Deleted: PKGBUILD === --- PKGBUILD2020-05-15 12:18:06 UTC (rev 383546) +++ PKGBUILD2020-05-15 12:18:18 UTC (rev 383547) @@ -1,39 +0,0 @@ -# Maintainer: Antonio Rojas -# Maintainer: Felix Yan - -pkgname=kalzium -pkgver=20.04.0 -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 boost) -groups=(kde-applications kdeedu) -source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} -kalzium-openbabel3.patch) -sha256sums=('abb77b3d1f4298f47c5e8ed0d4ea23f1251d95d29cac3b53a3ed56500934b858' -'SKIP' -'1e818cbb4d7ecd8b1ba36c0280ea8431a8b9863d1bf0b1173bca2d9d4272843e') -validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid - F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck - -prepare() { - mkdir -p build - - cd $pkgname-$pkgver - patch -p1 -i ../kalzium-openbabel3.patch -} - -build() { - cd build - cmake ../$pkgname-$pkgver \ --DBUILD_TESTING=OFF - make -} - -package() { - cd build - make DESTDIR="$pkgdir" install -} Copied: kalzium/repos/extra-x86_64/PKGBUILD (from rev 383546, kalzium/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2020-05-15 12:18:18 UTC (rev 383547) @@ -0,0 +1,39 @@ +# Maintainer: Antonio Rojas +# Maintainer: Felix Yan + +pkgname=kalzium +pkgver=20.04.1 +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 boost) +groups=(kde-applications kdeedu) +source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} +kalzium-openbabel3.patch) +sha256sums=('fdb066519cc4839ce59a5325729414dd5e6082ce23eff004afee60968744c577' +'SKIP' +'742734255681bcd57569f16d58deb3f2bb38b353352fa77d6e65772846334a9c') +validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid + F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck + +prepare() { + mkdir -p build + + cd $pkgname-$pkgver + patch -p1 -i ../kalzium-openbabel3.patch +} + +build() { + cd build + cmake ../$pkgname-$pkgver \ +-DBUILD_TESTING=OFF + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install +} Deleted: kalzium-openbabel3.patch === --- kalzium-openbabel3.patch2020-05-15 12:18:06 UTC (rev 383546) +++ kalzium-openbabel3.patch2020-05-15 12:18:18 UTC (rev 383547) @@ -1,304 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index aada7a92..cfe04cfd 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -26,7 +26,13 @@ include(ECMSetupVersion) - find_package(Gettext REQUIRED) - find_package(PythonInterp REQUIRED) - find_package(PkgConfig) --find_package(OpenBabel2) -+find_package(OpenBabel3 3.1) -+if(OpenBabel3_FOUND) -+find_package(Boost COMPONENTS system) # dependency of OpenBabel3 -+endif() -+if(NOT ${OpenBabel3_FOUND} OR NOT ${Boost_FOUND}) -+find_package(OpenBabel2) -+endif() - find_package(AvogadroLibs) - find_package(Eigen3) - find_package(OCaml) -@@ -37,9 +43,24 @@ check_include_files(ieeefp.h HAVE_IEEEFP_H) - - # create configuration file - set(HAVE_FACILE ${LIBFACILE_FOUND}) -+if(OpenBabel3_FOUND AND Boost_FOUND) -+set(HAVE_OPENBABEL3 1) -+endif() - set(HAVE_OPENBABEL2 ${OPENBABEL2_FOUND}) -+if(HAVE_OPENBABEL2 OR HAVE_OPENBABEL3) -+set(HAVE_OPENBABEL 1) -+endif() - set(HAVE_EIGEN ${EIGEN3_FOUND}) - set(HAVE_AVOGADRO ${AvogadroLibs_FOUND}) -+ -+if(HAVE_OPENBABEL3) -+set(OPENBABEL_INCLUDE_DIR ${OpenBabel3_INCLUDE_DIRS}) -+set(OPENBABEL_LIBRARIES openbabel) -+elseif(HAVE_OPENBABEL2) -+set(OPENBABEL_INCLUDE_DIR ${OPENBABEL2_INCLUDE_DIR}) -+set(OPENBABEL_LIBRARIES
[arch-commits] Commit in kalzium/repos/extra-x86_64 (4 files)
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 === --- PKGBUILD2020-03-05 13:46:43 UTC (rev 376646) +++ PKGBUILD2020-03-05 13:46:52 UTC (rev 376647) @@ -1,42 +0,0 @@ -# Maintainer: Antonio Rojas -# Maintainer: Felix Yan - -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 - F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck - -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) +++ PKGBUILD2020-03-05 13:46:52 UTC (rev 376647) @@ -0,0 +1,42 @@ +# Maintainer: Antonio Rojas +# Maintainer: Felix Yan + +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 + F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck + +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.patch2020-03-05 13:46:43 UTC (rev 376646) +++ kalzium-openbabel3.patch2020-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 -+#include - #endif - - #include -@@ -406,8 +407,9 @@ QBrush KalziumColorSchemeType::elementBrush(int el) const - { - QColor c; - --std::vector color = OpenBabel::etab.GetRGB(el); --c.setRgbF(color[0], color[1], color[2]); -+double red, green, blue; -+OpenBabel::OBElements::GetRGB(el, , , ); -+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.patch2020-03-05 13:46:52 UTC (rev
[arch-commits] Commit in kalzium/repos/extra-x86_64 (4 files)
Date: Monday, February 24, 2020 @ 14:56:02 Author: arojas Revision: 376147 archrelease: copy trunk to extra-x86_64 Added: kalzium/repos/extra-x86_64/PKGBUILD (from rev 376146, kalzium/trunk/PKGBUILD) kalzium/repos/extra-x86_64/kalzium-openbabel3.patch (from rev 376146, 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 === --- PKGBUILD2020-02-24 14:55:40 UTC (rev 376146) +++ PKGBUILD2020-02-24 14:56:02 UTC (rev 376147) @@ -1,42 +0,0 @@ -# Maintainer: Antonio Rojas -# Maintainer: Felix Yan - -pkgname=kalzium -pkgver=19.12.2 -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=('ce40143bdf33a7896b9e17fd3172287b33f6f2486bb0ecce2392d16bf88f9590' -'SKIP' -'820550c6443cec572b28338899d2be871acc42fc02654a0df48a306b7cce09d5') -validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid - F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck - -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 376146, kalzium/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2020-02-24 14:56:02 UTC (rev 376147) @@ -0,0 +1,42 @@ +# Maintainer: Antonio Rojas +# Maintainer: Felix Yan + +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 + F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck + +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.patch2020-02-24 14:55:40 UTC (rev 376146) +++ kalzium-openbabel3.patch2020-02-24 14:56:02 UTC (rev 376147) @@ -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 -+#include - #endif - - #include -@@ -406,8 +407,9 @@ QBrush KalziumColorSchemeType::elementBrush(int el) const - { - QColor c; - --std::vector color = OpenBabel::etab.GetRGB(el); --c.setRgbF(color[0], color[1], color[2]); -+double red, green, blue; -+OpenBabel::OBElements::GetRGB(el, , , ); -+c.setRgbF(red, green, blue); - - return QBrush(c); - } Copied: kalzium/repos/extra-x86_64/kalzium-openbabel3.patch (from rev 376146, kalzium/trunk/kalzium-openbabel3.patch) === --- kalzium-openbabel3.patch(rev 0) +++ kalzium-openbabel3.patch2020-02-24 14:56:02 UTC (rev
[arch-commits] Commit in kalzium/repos/extra-x86_64 (4 files)
Date: Thursday, February 6, 2020 @ 12:22:39 Author: arojas Revision: 374816 archrelease: copy trunk to extra-x86_64 Added: kalzium/repos/extra-x86_64/PKGBUILD (from rev 374815, kalzium/trunk/PKGBUILD) kalzium/repos/extra-x86_64/kalzium-openbabel3.patch (from rev 374815, 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 === --- PKGBUILD2020-02-06 12:22:28 UTC (rev 374815) +++ PKGBUILD2020-02-06 12:22:39 UTC (rev 374816) @@ -1,42 +0,0 @@ -# Maintainer: Antonio Rojas -# Maintainer: Felix Yan - -pkgname=kalzium -pkgver=19.12.1 -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=('f50cc18d94ce9a1aaedcbee3a5dccc2cc6723ac8ec151a0ae0ff60009a7c6943' -'SKIP' -'820550c6443cec572b28338899d2be871acc42fc02654a0df48a306b7cce09d5') -validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid - F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck - -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 374815, kalzium/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2020-02-06 12:22:39 UTC (rev 374816) @@ -0,0 +1,42 @@ +# Maintainer: Antonio Rojas +# Maintainer: Felix Yan + +pkgname=kalzium +pkgver=19.12.2 +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=('ce40143bdf33a7896b9e17fd3172287b33f6f2486bb0ecce2392d16bf88f9590' +'SKIP' +'820550c6443cec572b28338899d2be871acc42fc02654a0df48a306b7cce09d5') +validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid + F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck + +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.patch2020-02-06 12:22:28 UTC (rev 374815) +++ kalzium-openbabel3.patch2020-02-06 12:22:39 UTC (rev 374816) @@ -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 -+#include - #endif - - #include -@@ -406,8 +407,9 @@ QBrush KalziumColorSchemeType::elementBrush(int el) const - { - QColor c; - --std::vector color = OpenBabel::etab.GetRGB(el); --c.setRgbF(color[0], color[1], color[2]); -+double red, green, blue; -+OpenBabel::OBElements::GetRGB(el, , , ); -+c.setRgbF(red, green, blue); - - return QBrush(c); - } Copied: kalzium/repos/extra-x86_64/kalzium-openbabel3.patch (from rev 374815, kalzium/trunk/kalzium-openbabel3.patch) === --- kalzium-openbabel3.patch(rev 0) +++ kalzium-openbabel3.patch2020-02-06 12:22:39 UTC (rev
[arch-commits] Commit in kalzium/repos/extra-x86_64 (4 files)
Date: Thursday, January 9, 2020 @ 12:36:21 Author: arojas Revision: 372928 archrelease: copy trunk to extra-x86_64 Added: kalzium/repos/extra-x86_64/PKGBUILD (from rev 372927, kalzium/trunk/PKGBUILD) kalzium/repos/extra-x86_64/kalzium-openbabel3.patch (from rev 372927, 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 === --- PKGBUILD2020-01-09 12:36:09 UTC (rev 372927) +++ PKGBUILD2020-01-09 12:36:21 UTC (rev 372928) @@ -1,42 +0,0 @@ -# Maintainer: Antonio Rojas -# Maintainer: Felix Yan - -pkgname=kalzium -pkgver=19.12.0 -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 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' -'820550c6443cec572b28338899d2be871acc42fc02654a0df48a306b7cce09d5') -validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid - F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck - -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 372927, kalzium/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2020-01-09 12:36:21 UTC (rev 372928) @@ -0,0 +1,42 @@ +# Maintainer: Antonio Rojas +# Maintainer: Felix Yan + +pkgname=kalzium +pkgver=19.12.1 +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=('f50cc18d94ce9a1aaedcbee3a5dccc2cc6723ac8ec151a0ae0ff60009a7c6943' +'SKIP' +'820550c6443cec572b28338899d2be871acc42fc02654a0df48a306b7cce09d5') +validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid + F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck + +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.patch2020-01-09 12:36:09 UTC (rev 372927) +++ kalzium-openbabel3.patch2020-01-09 12:36:21 UTC (rev 372928) @@ -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 -+#include - #endif - - #include -@@ -406,8 +407,9 @@ QBrush KalziumColorSchemeType::elementBrush(int el) const - { - QColor c; - --std::vector color = OpenBabel::etab.GetRGB(el); --c.setRgbF(color[0], color[1], color[2]); -+double red, green, blue; -+OpenBabel::OBElements::GetRGB(el, , , ); -+c.setRgbF(red, green, blue); - - return QBrush(c); - } Copied: kalzium/repos/extra-x86_64/kalzium-openbabel3.patch (from rev 372927, kalzium/trunk/kalzium-openbabel3.patch) === --- kalzium-openbabel3.patch(rev 0) +++ kalzium-openbabel3.patch2020-01-09 12:36:21 UTC (rev
[arch-commits] Commit in kalzium/repos/extra-x86_64 (4 files)
Date: Thursday, December 12, 2019 @ 17:14:58 Author: arojas Revision: 371304 archrelease: copy trunk to extra-x86_64 Added: kalzium/repos/extra-x86_64/PKGBUILD (from rev 371303, kalzium/trunk/PKGBUILD) kalzium/repos/extra-x86_64/kalzium-openbabel3.patch (from rev 371303, 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 === --- PKGBUILD2019-12-12 17:14:13 UTC (rev 371303) +++ PKGBUILD2019-12-12 17:14:58 UTC (rev 371304) @@ -1,42 +0,0 @@ -# Maintainer: Antonio Rojas -# Maintainer: Felix Yan - -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 - F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck - -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 371303, kalzium/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2019-12-12 17:14:58 UTC (rev 371304) @@ -0,0 +1,42 @@ +# Maintainer: Antonio Rojas +# Maintainer: Felix Yan + +pkgname=kalzium +pkgver=19.12.0 +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 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' +'820550c6443cec572b28338899d2be871acc42fc02654a0df48a306b7cce09d5') +validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid + F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck + +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.patch2019-12-12 17:14:13 UTC (rev 371303) +++ kalzium-openbabel3.patch2019-12-12 17:14:58 UTC (rev 371304) @@ -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 -+#include - #endif - - #include -@@ -406,8 +407,9 @@ QBrush KalziumColorSchemeType::elementBrush(int el) const - { - QColor c; - --std::vector 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 371303, kalzium/trunk/kalzium-openbabel3.patch) === --- kalzium-openbabel3.patch(rev 0) +++ kalzium-openbabel3.patch2019-12-12
[arch-commits] Commit in kalzium/repos/extra-x86_64 (4 files)
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 === --- PKGBUILD2019-12-12 13:25:37 UTC (rev 370937) +++ PKGBUILD2019-12-12 13:25:49 UTC (rev 370938) @@ -1,42 +0,0 @@ -# Maintainer: Antonio Rojas -# Maintainer: Felix Yan - -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 - F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck - -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) +++ PKGBUILD2019-12-12 13:25:49 UTC (rev 370938) @@ -0,0 +1,42 @@ +# Maintainer: Antonio Rojas +# Maintainer: Felix Yan + +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 + F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck + +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.patch2019-12-12 13:25:37 UTC (rev 370937) +++ kalzium-openbabel3.patch2019-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 -+#include - #endif - - #include -@@ -406,8 +407,9 @@ QBrush KalziumColorSchemeType::elementBrush(int el) const - { - QColor c; - --std::vector 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.patch2019-12-12 13:25:49
[arch-commits] Commit in kalzium/repos/extra-x86_64 (4 files)
Date: Thursday, November 7, 2019 @ 13:06:22 Author: arojas Revision: 366988 archrelease: copy trunk to extra-x86_64 Added: kalzium/repos/extra-x86_64/PKGBUILD (from rev 366987, kalzium/trunk/PKGBUILD) kalzium/repos/extra-x86_64/kalzium-openbabel3.patch (from rev 366987, 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 === --- PKGBUILD2019-11-07 13:06:13 UTC (rev 366987) +++ PKGBUILD2019-11-07 13:06:22 UTC (rev 366988) @@ -1,42 +0,0 @@ -# Maintainer: Antonio Rojas -# Maintainer: Felix Yan - -pkgname=kalzium -pkgver=19.08.2 -pkgrel=3 -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=('e63d88526c86dd67ab133694dc23b6a35fd5514643bd7a7f1790db8c2a8490d9' -'SKIP' -'010f10640fb80834f13556e6cf03f594118081d610701a82aeec043b7a44f1e8') -validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid - F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck - -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 366987, kalzium/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2019-11-07 13:06:22 UTC (rev 366988) @@ -0,0 +1,42 @@ +# Maintainer: Antonio Rojas +# Maintainer: Felix Yan + +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 + F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck + +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.patch2019-11-07 13:06:13 UTC (rev 366987) +++ kalzium-openbabel3.patch2019-11-07 13:06:22 UTC (rev 366988) @@ -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 -+#include - #endif - - #include -@@ -406,8 +407,9 @@ QBrush KalziumColorSchemeType::elementBrush(int el) const - { - QColor c; - --std::vector 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 366987, kalzium/trunk/kalzium-openbabel3.patch) === --- kalzium-openbabel3.patch(rev 0) +++ kalzium-openbabel3.patch2019-11-07 13:06:22 UTC
[arch-commits] Commit in kalzium/repos/extra-x86_64 (4 files)
Date: Sunday, October 13, 2019 @ 09:37:26 Author: arojas Revision: 364781 archrelease: copy trunk to extra-x86_64 Added: kalzium/repos/extra-x86_64/PKGBUILD (from rev 364780, kalzium/trunk/PKGBUILD) kalzium/repos/extra-x86_64/kalzium-openbabel3.patch (from rev 364780, 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 === --- PKGBUILD2019-10-13 09:36:50 UTC (rev 364780) +++ PKGBUILD2019-10-13 09:37:26 UTC (rev 364781) @@ -1,42 +0,0 @@ -# Maintainer: Antonio Rojas -# Maintainer: Felix Yan - -pkgname=kalzium -pkgver=19.08.2 -pkgrel=2 -pkgdesc="Periodic Table of Elements" -url="https://kde.org/applications/education/kalzium/; -arch=(x86_64) -license=(GPL LGPL FDL) -depends=(khtml knewstuff kplotting kunitconversion 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=('e63d88526c86dd67ab133694dc23b6a35fd5514643bd7a7f1790db8c2a8490d9' -'SKIP' -'010f10640fb80834f13556e6cf03f594118081d610701a82aeec043b7a44f1e8') -validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid - F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck - -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 364780, kalzium/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2019-10-13 09:37:26 UTC (rev 364781) @@ -0,0 +1,42 @@ +# Maintainer: Antonio Rojas +# Maintainer: Felix Yan + +pkgname=kalzium +pkgver=19.08.2 +pkgrel=3 +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=('e63d88526c86dd67ab133694dc23b6a35fd5514643bd7a7f1790db8c2a8490d9' +'SKIP' +'010f10640fb80834f13556e6cf03f594118081d610701a82aeec043b7a44f1e8') +validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid + F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck + +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.patch2019-10-13 09:36:50 UTC (rev 364780) +++ kalzium-openbabel3.patch2019-10-13 09:37:26 UTC (rev 364781) @@ -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 -+#include - #endif - - #include -@@ -406,8 +407,9 @@ QBrush KalziumColorSchemeType::elementBrush(int el) const - { - QColor c; - --std::vector 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 364780, kalzium/trunk/kalzium-openbabel3.patch) === --- kalzium-openbabel3.patch(rev 0) +++ kalzium-openbabel3.patch2019-10-13 09:37:26 UTC (rev 364781)