Date: Monday, July 17, 2017 @ 16:02:00
Author: arojas
Revision: 300702
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
kalzium/repos/extra-i686/PKGBUILD
(from rev 300701, kalzium/trunk/PKGBUILD)
kalzium/repos/extra-i686/kalzium-ocaml-4.04.patch
(from rev 300701, kalzium/trunk/kalzium-ocaml-4.04.patch)
kalzium/repos/extra-x86_64/PKGBUILD
(from rev 300701, kalzium/trunk/PKGBUILD)
kalzium/repos/extra-x86_64/kalzium-ocaml-4.04.patch
(from rev 300701, kalzium/trunk/kalzium-ocaml-4.04.patch)
Deleted:
kalzium/repos/extra-i686/PKGBUILD
kalzium/repos/extra-x86_64/PKGBUILD
---------------------------------------+
/PKGBUILD | 92 ++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 40 -------------
extra-i686/kalzium-ocaml-4.04.patch | 13 ++++
extra-x86_64/PKGBUILD | 40 -------------
extra-x86_64/kalzium-ocaml-4.04.patch | 13 ++++
5 files changed, 118 insertions(+), 80 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-07-17 16:01:30 UTC (rev 300701)
+++ extra-i686/PKGBUILD 2017-07-17 16:02:00 UTC (rev 300702)
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 281258 2016-11-18 20:36:27Z arojas $
-# Maintainer: Antonio Rojas <[email protected]>
-# Maintainer: Felix Yan <[email protected]>
-
-pkgname=kalzium
-pkgver=17.04.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=('8dfe48d336d746cfc2387d67c5bcb921f9ea4dea1c0231864f7dcd87c35a9d5f'
- 'SKIP')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid
<[email protected]>
- F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck
<[email protected]>
-
-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/extra-i686/PKGBUILD (from rev 300701,
kalzium/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-07-17 16:02:00 UTC (rev 300702)
@@ -0,0 +1,46 @@
+# $Id: PKGBUILD 281258 2016-11-18 20:36:27Z arojas $
+# Maintainer: Antonio Rojas <[email protected]>
+# Maintainer: Felix Yan <[email protected]>
+
+pkgname=kalzium
+pkgver=17.04.3
+pkgrel=2
+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}
+ kalzium-ocaml-4.04.patch)
+sha256sums=('8dfe48d336d746cfc2387d67c5bcb921f9ea4dea1c0231864f7dcd87c35a9d5f'
+ 'SKIP'
+ '1bb03588d074331fb78d4647aa038353cc202b9eff20f6bfec95c9e8340dc83b')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid
<[email protected]>
+ F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck
<[email protected]>
+
+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/extra-i686/kalzium-ocaml-4.04.patch (from rev 300701,
kalzium/trunk/kalzium-ocaml-4.04.patch)
===================================================================
--- extra-i686/kalzium-ocaml-4.04.patch (rev 0)
+++ extra-i686/kalzium-ocaml-4.04.patch 2017-07-17 16:02:00 UTC (rev 300702)
@@ -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: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-07-17 16:01:30 UTC (rev 300701)
+++ extra-x86_64/PKGBUILD 2017-07-17 16:02:00 UTC (rev 300702)
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 281258 2016-11-18 20:36:27Z arojas $
-# Maintainer: Antonio Rojas <[email protected]>
-# Maintainer: Felix Yan <[email protected]>
-
-pkgname=kalzium
-pkgver=17.04.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=('8dfe48d336d746cfc2387d67c5bcb921f9ea4dea1c0231864f7dcd87c35a9d5f'
- 'SKIP')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid
<[email protected]>
- F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck
<[email protected]>
-
-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/extra-x86_64/PKGBUILD (from rev 300701,
kalzium/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-07-17 16:02:00 UTC (rev 300702)
@@ -0,0 +1,46 @@
+# $Id: PKGBUILD 281258 2016-11-18 20:36:27Z arojas $
+# Maintainer: Antonio Rojas <[email protected]>
+# Maintainer: Felix Yan <[email protected]>
+
+pkgname=kalzium
+pkgver=17.04.3
+pkgrel=2
+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}
+ kalzium-ocaml-4.04.patch)
+sha256sums=('8dfe48d336d746cfc2387d67c5bcb921f9ea4dea1c0231864f7dcd87c35a9d5f'
+ 'SKIP'
+ '1bb03588d074331fb78d4647aa038353cc202b9eff20f6bfec95c9e8340dc83b')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid
<[email protected]>
+ F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck
<[email protected]>
+
+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/extra-x86_64/kalzium-ocaml-4.04.patch (from rev 300701,
kalzium/trunk/kalzium-ocaml-4.04.patch)
===================================================================
--- extra-x86_64/kalzium-ocaml-4.04.patch (rev 0)
+++ extra-x86_64/kalzium-ocaml-4.04.patch 2017-07-17 16:02:00 UTC (rev
300702)
@@ -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)
+
