[arch-commits] Commit in curaengine/trunk (PKGBUILD do_not_copy_resource.patch)
Jelle van der Waa
jelle at archlinux.org
Sun Nov 18 11:42:04 UTC 2018
Date: Sunday, November 18, 2018 @ 11:42:04
Author: jelle
Revision: 408683
upgpkg: curaengine 3.6.0-1
Modified:
curaengine/trunk/PKGBUILD
Deleted:
curaengine/trunk/do_not_copy_resource.patch
----------------------------+
PKGBUILD | 20 ++++++++++----------
do_not_copy_resource.patch | 14 --------------
2 files changed, 10 insertions(+), 24 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-11-18 11:37:24 UTC (rev 408682)
+++ PKGBUILD 2018-11-18 11:42:04 UTC (rev 408683)
@@ -2,8 +2,8 @@
# Contributor: Grey Christoforo <first name [at] last name [dot] net>
pkgname=curaengine
-pkgver=3.4.1
-pkgrel=3
+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')
@@ -14,13 +14,13 @@
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')
+ "fix_mocksocket_tests.patch::https://github.com/Ultimaker/CuraEngine/commit/7349c981135f6460640c23527f02dea650304467.patch")
+sha512sums=('340dad4c697fb0d7b633091715a904ae7df8973626e217ae2528d0121723c07a6cf0bbc740b9ad9980f3b288fa690c9c3ee43d90914264855dace007bbb334c8'
+ '2371a984caec6b9972236f5579a4c928c6cf2c268dd994798b606ba4310333534aea52d2b465d64484081b00ab3550717d4abca3b7174f27f6e1941d43e31cff')
prepare() {
cd CuraEngine-${pkgver}
- patch -Np1 -i ${srcdir}/do_not_copy_resource.patch
+ patch -Np1 -i $srcdir/fix_mocksocket_tests.patch
}
build() {
@@ -36,14 +36,14 @@
make
}
-package() {
+check() {
cd CuraEngine-${pkgver}/build
- make DESTDIR="${pkgdir}" install
+ make test
}
-check() {
+package() {
cd CuraEngine-${pkgver}/build
- make test
+ 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:37:24 UTC (rev 408682)
+++ do_not_copy_resource.patch 2018-11-18 11:42:04 UTC (rev 408683)
@@ -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})
More information about the arch-commits
mailing list