[arch-commits] Commit in kalzium/repos (7 files)

Antonio Rojas arojas at archlinux.org
Sat Aug 19 04:58:08 UTC 2017


    Date: Saturday, August 19, 2017 @ 04:58:07
  Author: arojas
Revision: 302471

archrelease: copy trunk to kde-unstable-i686, kde-unstable-x86_64

Added:
  kalzium/repos/kde-unstable-i686/
  kalzium/repos/kde-unstable-i686/PKGBUILD
    (from rev 302470, kalzium/trunk/PKGBUILD)
  kalzium/repos/kde-unstable-i686/kalzium-ocaml-4.04.patch
    (from rev 302470, kalzium/trunk/kalzium-ocaml-4.04.patch)
  kalzium/repos/kde-unstable-x86_64/PKGBUILD
    (from rev 302470, kalzium/trunk/PKGBUILD)
  kalzium/repos/kde-unstable-x86_64/kalzium-ocaml-4.04.patch
    (from rev 302470, kalzium/trunk/kalzium-ocaml-4.04.patch)
Deleted:
  kalzium/repos/kde-unstable-x86_64/PKGBUILD
  kalzium/repos/kde-unstable-x86_64/kalzium-ocaml-4.04.patch

----------------------------------------------+
 /PKGBUILD                                    |   40 +++++++++++++++++++++
 /kalzium-ocaml-4.04.patch                    |   13 +++++++
 kde-unstable-i686/PKGBUILD                   |   40 +++++++++++++++++++++
 kde-unstable-i686/kalzium-ocaml-4.04.patch   |   13 +++++++
 kde-unstable-x86_64/PKGBUILD                 |   46 -------------------------
 kde-unstable-x86_64/kalzium-ocaml-4.04.patch |   13 -------
 6 files changed, 106 insertions(+), 59 deletions(-)

Copied: kalzium/repos/kde-unstable-i686/PKGBUILD (from rev 302470, kalzium/trunk/PKGBUILD)
===================================================================
--- kde-unstable-i686/PKGBUILD	                        (rev 0)
+++ kde-unstable-i686/PKGBUILD	2017-08-19 04:58:07 UTC (rev 302471)
@@ -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.0
+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=('8e3a7630fbdbbe16c0ac208e5b8473abb01f068d2d44e1cee81236233fb3bb07'
+            '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 \
+    -DKDE_INSTALL_LIBDIR=lib \
+    -DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Copied: kalzium/repos/kde-unstable-i686/kalzium-ocaml-4.04.patch (from rev 302470, kalzium/trunk/kalzium-ocaml-4.04.patch)
===================================================================
--- kde-unstable-i686/kalzium-ocaml-4.04.patch	                        (rev 0)
+++ kde-unstable-i686/kalzium-ocaml-4.04.patch	2017-08-19 04:58:07 UTC (rev 302471)
@@ -0,0 +1,13 @@
+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)
+

Deleted: kde-unstable-x86_64/PKGBUILD
===================================================================
--- kde-unstable-x86_64/PKGBUILD	2017-08-19 04:57:46 UTC (rev 302470)
+++ kde-unstable-x86_64/PKGBUILD	2017-08-19 04:58:07 UTC (rev 302471)
@@ -1,46 +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.07.80
-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/unstable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
-        kalzium-ocaml-4.04.patch)
-sha256sums=('701f25a3ce2488310871f75354896a56a267682c8f9a2acd6ee2819fce0e7a98'
-            'SKIP'
-            '1bb03588d074331fb78d4647aa038353cc202b9eff20f6bfec95c9e8340dc83b')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
-              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
-
-prepare() {
-  mkdir -p build
-
-# Fix solver build with ocaml 4.04
-  cd $pkgname-$pkgver
-  patch -p2 -i ../kalzium-ocaml-4.04.patch
-}
-
-build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DKDE_INSTALL_LIBDIR=lib \
-    -DBUILD_TESTING=OFF
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}

Copied: kalzium/repos/kde-unstable-x86_64/PKGBUILD (from rev 302470, kalzium/trunk/PKGBUILD)
===================================================================
--- kde-unstable-x86_64/PKGBUILD	                        (rev 0)
+++ kde-unstable-x86_64/PKGBUILD	2017-08-19 04:58:07 UTC (rev 302471)
@@ -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.0
+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=('8e3a7630fbdbbe16c0ac208e5b8473abb01f068d2d44e1cee81236233fb3bb07'
+            '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 \
+    -DKDE_INSTALL_LIBDIR=lib \
+    -DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Deleted: kde-unstable-x86_64/kalzium-ocaml-4.04.patch
===================================================================
--- kde-unstable-x86_64/kalzium-ocaml-4.04.patch	2017-08-19 04:57:46 UTC (rev 302470)
+++ kde-unstable-x86_64/kalzium-ocaml-4.04.patch	2017-08-19 04:58:07 UTC (rev 302471)
@@ -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)
-

Copied: kalzium/repos/kde-unstable-x86_64/kalzium-ocaml-4.04.patch (from rev 302470, kalzium/trunk/kalzium-ocaml-4.04.patch)
===================================================================
--- kde-unstable-x86_64/kalzium-ocaml-4.04.patch	                        (rev 0)
+++ kde-unstable-x86_64/kalzium-ocaml-4.04.patch	2017-08-19 04:58:07 UTC (rev 302471)
@@ -0,0 +1,13 @@
+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)
+



More information about the arch-commits mailing list