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

[Antonio Rojas]

    Date: Thursday, November 9, 2017 @ 13:43:49
  Author: arojas
Revision: 309171

archrelease: copy trunk to extra-x86_64

Added:
  kalzium/repos/extra-x86_64/PKGBUILD
    (from rev 309170, kalzium/trunk/PKGBUILD)
Deleted:
  kalzium/repos/extra-x86_64/PKGBUILD
  kalzium/repos/extra-x86_64/kalzium-ocaml-4.04.patch

--------------------------+
 PKGBUILD                 |   80 ++++++++++++++++++++++-----------------------
 kalzium-ocaml-4.04.patch |   13 -------
 2 files changed, 40 insertions(+), 53 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-09 13:43:31 UTC (rev 309170)
+++ PKGBUILD	2017-11-09 13:43:49 UTC (rev 309171)
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 281258 2016-11-18 20:36:27Z arojas $
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=kalzium
-pkgver=17.08.2
-pkgrel=1
-pkgdesc="Periodic Table of Elements"
-url="https://kde.org/applications/education/kalzium/"
-arch=(i686 x86_64)
-license=(GPL LGPL FDL)
-depends=(khtml kdelibs4support knewstuff kplotting avogadrolibs openbabel chemical-mime-data)
-makedepends=(extra-cmake-modules kdoctools kdesignerplugin python eigen ocaml facile)
-conflicts=(kdeedu-kalzium)
-replaces=(kdeedu-kalzium)
-groups=(kde-applications kdeedu)
-source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('8cc761c8aa47fcf6b73e55505b6c644f73ec2a6928b797149e7119cd41cf47ac'
-            'SKIP')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
-              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DBUILD_TESTING=OFF
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}

Copied: kalzium/repos/extra-x86_64/PKGBUILD (from rev 309170, kalzium/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-11-09 13:43:49 UTC (rev 309171)
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 281258 2016-11-18 20:36:27Z arojas $
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=kalzium
+pkgver=17.08.3
+pkgrel=1
+pkgdesc="Periodic Table of Elements"
+url="https://kde.org/applications/education/kalzium/"
+arch=(i686 x86_64)
+license=(GPL LGPL FDL)
+depends=(khtml kdelibs4support knewstuff kplotting avogadrolibs openbabel chemical-mime-data)
+makedepends=(extra-cmake-modules kdoctools kdesignerplugin python eigen ocaml facile)
+conflicts=(kdeedu-kalzium)
+replaces=(kdeedu-kalzium)
+groups=(kde-applications kdeedu)
+source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
+sha256sums=('cdc6d34769ce4dcf878c972e9e98c9cdab387e7b0c8087ab9d1dedd342655490'
+            'SKIP')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
+              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
+
+prepare() {
+  mkdir -p build
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Deleted: kalzium-ocaml-4.04.patch
===================================================================
--- kalzium-ocaml-4.04.patch	2017-11-09 13:43:31 UTC (rev 309170)
+++ kalzium-ocaml-4.04.patch	2017-11-09 13:43:49 UTC (rev 309171)
@@ -1,13 +0,0 @@
-diff --git a/kalzium-17.04.3.orig/src/CMakeOCamlInstructions.cmake b/kalzium-17.04.3/src/CMakeOCamlInstructions.cmake
---- a/kalzium-17.04.3.orig/src/CMakeOCamlInstructions.cmake
-+++ b/kalzium-17.04.3/src/CMakeOCamlInstructions.cmake
-@@ -58,7 +58,7 @@
- # object files
- 
- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o
--                   COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} -I ${LIBFACILE_INCLUDE_DIR} -c ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c -o ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o
-+                   COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} -I ${LIBFACILE_INCLUDE_DIR} -c ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c
-                    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c ${CMAKE_CURRENT_BINARY_DIR}/solver.o
-                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o)
-