diff options
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | Move-Slic3r-data-to-usr-share-slic3r.patch | 21 | ||||
-rw-r--r-- | PKGBUILD | 6 |
3 files changed, 7 insertions, 26 deletions
@@ -1,6 +1,6 @@ pkgbase = slic3r-prusa3d pkgdesc = Updated Slic3r by Prusa3D with many bugfixes and new features - pkgver = 1.39.2 + pkgver = 1.40.0 pkgrel = 1 url = http://www.prusa3d.com/ arch = i686 @@ -32,11 +32,11 @@ pkgbase = slic3r-prusa3d optdepends = perl-net-dbus: notifications support via any dbus-based notifier optdepends = perl-net-bonjour: support for autodiscovery of printers on network (octoprint) optdepends = perl-class-xsaccessor: creating faster accessor methods - source = git+https://github.com/prusa3d/Slic3r.git#tag=version_1.39.2 + source = git+https://github.com/prusa3d/Slic3r.git#tag=version_1.40.0 source = Move-Slic3r-data-to-usr-share-slic3r.patch source = slic3r.desktop md5sums = SKIP - md5sums = 87c8e0bfdd7e132938ec0ff9edb5dc18 + md5sums = aceb830f2fbe12ef5659e73164ea733b md5sums = 1941c1ede2f03774ffb77f68a7c33572 pkgname = slic3r-prusa3d diff --git a/Move-Slic3r-data-to-usr-share-slic3r.patch b/Move-Slic3r-data-to-usr-share-slic3r.patch index 47f952cf5d4a..95c02fd52f87 100644 --- a/Move-Slic3r-data-to-usr-share-slic3r.patch +++ b/Move-Slic3r-data-to-usr-share-slic3r.patch @@ -1,24 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 43d7dee7..7939a767 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -45,13 +45,13 @@ find_package(Perl REQUIRED) - add_subdirectory(xs) - - enable_testing () --get_filename_component(PERL_BIN_PATH "${PERL_EXECUTABLE}" DIRECTORY) --add_test (NAME xs COMMAND "${PERL_EXECUTABLE}" ${PERL_BIN_PATH}/prove -I ${PROJECT_SOURCE_DIR}/local-lib/lib/perl5 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/xs) --add_test (NAME integration COMMAND "${PERL_EXECUTABLE}" ${PERL_BIN_PATH}/prove WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) -+add_test (NAME xs COMMAND prove -I ${PROJECT_SOURCE_DIR}/local-lib/lib/perl5 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/xs) -+add_test (NAME integration COMMAND prove WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) - - install(PROGRAMS slic3r.pl DESTINATION bin RENAME slic3r-prusa3d) - - file(GLOB MyVar var/*.png) -+ - install(FILES ${MyVar} DESTINATION share/slic3r-prusa3d) - install(FILES lib/Slic3r.pm DESTINATION lib/slic3r-prusa3d) - install(DIRECTORY lib/Slic3r DESTINATION lib/slic3r-prusa3d) diff --git a/lib/Slic3r.pm b/lib/Slic3r.pm index 66039ddf..bb7e1eb5 100644 --- a/lib/Slic3r.pm @@ -6,7 +6,7 @@ _pkgname=slic3r-prusa3d pkgname=${_pkgname} -pkgver=1.39.2 +pkgver=1.40.0 pkgrel=1 pkgdesc="Updated Slic3r by Prusa3D with many bugfixes and new features" arch=('i686' 'x86_64' 'armv6' 'armv6h' 'armv7h') @@ -24,7 +24,7 @@ source=("git+https://github.com/prusa3d/Slic3r.git#tag=version_${pkgver}" "Move-Slic3r-data-to-usr-share-slic3r.patch" 'slic3r.desktop') md5sums=('SKIP' - '87c8e0bfdd7e132938ec0ff9edb5dc18' + 'aceb830f2fbe12ef5659e73164ea733b' '1941c1ede2f03774ffb77f68a7c33572') prepare() { @@ -50,6 +50,8 @@ check() { #sed -i '/local::lib/d' *.t cd "${srcdir}/Slic3r/build" + sed -i 's/\/usr\/bin\/prove/prove/g' CTestTestfile.cmake + sed -i 's/"\/usr\/bin\/perl"//g' CTestTestfile.cmake ctest -V } |