Date: Sunday, November 18, 2018 @ 11:42:21 Author: jelle Revision: 408684
archrelease: copy trunk to community-x86_64 Added: curaengine/repos/community-x86_64/PKGBUILD (from rev 408683, curaengine/trunk/PKGBUILD) Deleted: curaengine/repos/community-x86_64/PKGBUILD curaengine/repos/community-x86_64/do_not_copy_resource.patch ----------------------------+ PKGBUILD | 98 +++++++++++++++++++++---------------------- do_not_copy_resource.patch | 14 ------ 2 files changed, 49 insertions(+), 63 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-11-18 11:42:04 UTC (rev 408683) +++ PKGBUILD 2018-11-18 11:42:21 UTC (rev 408684) @@ -1,49 +0,0 @@ -# Maintainer: Jelle van der Waa <je...@archlinux.org> -# Contributor: Grey Christoforo <first name [at] last name [dot] net> - -pkgname=curaengine -pkgver=3.4.1 -pkgrel=3 -pkgdesc="Engine for processing 3D models into 3D printing instruction for Ultimaker and other GCode based 3D printers." -url="https://github.com/Ultimaker/CuraEngine" -arch=('x86_64') -license=('AGPL') -depends=('arcus') -# TODO: https://github.com/Ultimaker/CuraEngine/blob/master/CMakeLists.txt#L26 -# Package polyclipping in the repos -checkdepends=('cppunit') -makedepends=('cmake' 'git') -source=("$pkgname-$pkgver.tar.gz::https://github.com/Ultimaker/${pkgname}/archive/${pkgver}.tar.gz" - do_not_copy_resource.patch) -md5sums=('825f80f42da70efe6c889d8acb8f6afe' - '07b0f2240737f99830c1a87c1f1f378e') - -prepare() { - cd CuraEngine-${pkgver} - patch -Np1 -i ${srcdir}/do_not_copy_resource.patch -} - -build() { - cd CuraEngine-${pkgver} - mkdir -p build - cd build - - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_TESTS=ON \ - -DCMAKE_BUILD_TYPE=Release - - make -} - -package() { - cd CuraEngine-${pkgver}/build - make DESTDIR="${pkgdir}" install -} - -check() { - cd CuraEngine-${pkgver}/build - make test -} - -# vim:set ts=2 sw=2 et: Copied: curaengine/repos/community-x86_64/PKGBUILD (from rev 408683, curaengine/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-11-18 11:42:21 UTC (rev 408684) @@ -0,0 +1,49 @@ +# Maintainer: Jelle van der Waa <je...@archlinux.org> +# Contributor: Grey Christoforo <first name [at] last name [dot] net> + +pkgname=curaengine +pkgver=3.6.0 +pkgrel=1 +pkgdesc="Engine for processing 3D models into 3D printing instruction for Ultimaker and other GCode based 3D printers." +url="https://github.com/Ultimaker/CuraEngine" +arch=('x86_64') +license=('AGPL') +depends=('arcus') +# TODO: https://github.com/Ultimaker/CuraEngine/blob/master/CMakeLists.txt#L26 +# Package polyclipping in the repos +checkdepends=('cppunit') +makedepends=('cmake' 'git') +source=("$pkgname-$pkgver.tar.gz::https://github.com/Ultimaker/${pkgname}/archive/${pkgver}.tar.gz" + "fix_mocksocket_tests.patch::https://github.com/Ultimaker/CuraEngine/commit/7349c981135f6460640c23527f02dea650304467.patch") +sha512sums=('340dad4c697fb0d7b633091715a904ae7df8973626e217ae2528d0121723c07a6cf0bbc740b9ad9980f3b288fa690c9c3ee43d90914264855dace007bbb334c8' + '2371a984caec6b9972236f5579a4c928c6cf2c268dd994798b606ba4310333534aea52d2b465d64484081b00ab3550717d4abca3b7174f27f6e1941d43e31cff') + +prepare() { + cd CuraEngine-${pkgver} + patch -Np1 -i $srcdir/fix_mocksocket_tests.patch +} + +build() { + cd CuraEngine-${pkgver} + mkdir -p build + cd build + + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_TESTS=ON \ + -DCMAKE_BUILD_TYPE=Release + + make +} + +check() { + cd CuraEngine-${pkgver}/build + make test +} + +package() { + cd CuraEngine-${pkgver}/build + make DESTDIR="${pkgdir}" install +} + +# vim:set ts=2 sw=2 et: Deleted: do_not_copy_resource.patch =================================================================== --- do_not_copy_resource.patch 2018-11-18 11:42:04 UTC (rev 408683) +++ do_not_copy_resource.patch 2018-11-18 11:42:21 UTC (rev 408684) @@ -1,14 +0,0 @@ -diff -aur CuraEngine-3.4.1/CMakeLists.txt CuraEngine-3.4.1.old/CMakeLists.txt ---- CuraEngine-3.4.1/CMakeLists.txt 2018-07-09 10:55:15.000000000 +0200 -+++ CuraEngine-3.4.1.old/CMakeLists.txt 2018-09-07 20:16:42.621995976 +0200 -@@ -252,10 +252,6 @@ - endif() - - --add_custom_command(TARGET CuraEngine POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy_directory -- ${CMAKE_SOURCE_DIR}/resources $<TARGET_FILE_DIR:CuraEngine>) -- - # Installing CuraEngine. - include(GNUInstallDirs) - install(TARGETS CuraEngine DESTINATION ${CMAKE_INSTALL_BINDIR})