Update to version 1.37.1

3 files changed, 78 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b38dec3a3ca2..d48873f7010e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Jul 28 19:55:42 UTC 2017
+# Wed Sep 27 17:19:05 UTC 2017
 pkgbase = slic3r-prusa3d
 	pkgdesc = Updated Slic3r by Prusa3D with many bugfixes and new features
-	pkgver = 1.36.2
+	pkgver = 1.37.1
 	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.36.2
+	source = git+https://github.com/prusa3d/Slic3r.git#tag=version_1.37.1
 	source = Move-Slic3r-data-to-usr-share-slic3r.patch
 	source = slic3r.desktop
 	md5sums = SKIP
-	md5sums = 1c7b1af4df70c6a2f2bdb9c6a2c02b3f
+	md5sums = b10622cb1abb008679c19988f3ed2e59
 	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 57569ff57408..7114ede3e4c8 100644
--- a/Move-Slic3r-data-to-usr-share-slic3r.patch
+++ b/Move-Slic3r-data-to-usr-share-slic3r.patch
@@ -1,26 +1,67 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 43d7dee7..3e4e0c82 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -45,13 +45,14 @@ 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)
++
++find_package(PerlLibs REQUIRED)
+ install(FILES ${MyVar} DESTINATION share/slic3r-prusa3d)
+-install(FILES lib/Slic3r.pm DESTINATION lib/slic3r-prusa3d)
+-install(DIRECTORY lib/Slic3r DESTINATION lib/slic3r-prusa3d)
++install(FILES lib/Slic3r.pm DESTINATION ${PERL_VENDORLIB})
++install(DIRECTORY lib/Slic3r DESTINATION ${PERL_VENDORLIB})
 diff --git a/lib/Slic3r.pm b/lib/Slic3r.pm
-index 5f4357a9..e37a5e17 100644
+index 17b78326..92f1842c 100644
 --- a/lib/Slic3r.pm
 +++ b/lib/Slic3r.pm
-@@ -49,7 +49,7 @@ warn "Running Slic3r under Perl 5.16 is neither supported nor recommended\n"
+@@ -51,7 +51,7 @@ warn "Running Slic3r under Perl 5.16 is neither supported nor recommended\n"
  
  use FindBin;
  # Path to the images.
 -our $var = sub { decode_path($FindBin::Bin) . "/var/" . $_[0] };
-+our $var = sub { '/usr/share/slic3r-prusa3d/' . $_[0] };
++our $var = sub { decode_path($FindBin::Bin) . "/../share/slic3r-prusa3d/" . $_[0] };
  
  use Moo 1.003001;
  
 diff --git a/slic3r.pl b/slic3r.pl
-index c1371472..6cd50804 100755
+index 4b6e43e4..96cd91ec 100755
 --- a/slic3r.pl
 +++ b/slic3r.pl
-@@ -5,7 +5,7 @@ use warnings;
+@@ -3,12 +3,6 @@
+ use strict;
+ use warnings;
  
- BEGIN {
-     use FindBin;
+-BEGIN {
+-    use FindBin;
 -    use lib "$FindBin::Bin/lib";
-+    use lib "$FindBin::Bin/lib", "/usr/lib/slic3r-prusa3d/";
- }
- 
+-    use local::lib '--no-create', "$FindBin::Bin/local-lib";
+-}
+-
  use File::Basename qw(basename);
+ use Getopt::Long qw(:config no_auto_abbrev);
+ use List::Util qw(first);
+diff --git a/xs/CMakeLists.txt b/xs/CMakeLists.txt
+index 9d7c3110..59b6f335 100644
+--- a/xs/CMakeLists.txt
++++ b/xs/CMakeLists.txt
+@@ -532,5 +532,5 @@ elseif (NOT MSVC)
+ endif ()
+ 
+ # Installation
+-install(TARGETS XS DESTINATION lib/slic3r-prusa3d/auto/Slic3r/XS)
+-install(FILES lib/Slic3r/XS.pm DESTINATION lib/slic3r-prusa3d/Slic3r)
++install(TARGETS XS DESTINATION ${PERL_VENDORARCH}/auto/Slic3r/XS)
++install(FILES lib/Slic3r/XS.pm DESTINATION ${PERL_VENDORARCH}/Slic3r)
+
diff --git a/PKGBUILD b/PKGBUILD
index d53825d8d402..04e19cf11dbd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 _pkgname=slic3r-prusa3d
 pkgname=${_pkgname}
-pkgver=1.36.2
+pkgver=1.37.1
 pkgrel=1
 pkgdesc="Updated Slic3r by Prusa3D with many bugfixes and new features"
 arch=('i686' 'x86_64' 'armv6' 'armv6h' 'armv7h')
@@ -23,23 +23,29 @@ source=("git+https://github.com/prusa3d/Slic3r.git#tag=version_$pkgver"
         "Move-Slic3r-data-to-usr-share-slic3r.patch"
         'slic3r.desktop')
 md5sums=('SKIP'
-         '1c7b1af4df70c6a2f2bdb9c6a2c02b3f'
+         'b10622cb1abb008679c19988f3ed2e59'
          '1941c1ede2f03774ffb77f68a7c33572')
 
         
 prepare() {
   cd "${srcdir}/Slic3r"
   patch -p1 -i "$srcdir/Move-Slic3r-data-to-usr-share-slic3r.patch"
-  sed -i "s/#define SLIC3R_VERSION .*/#define SLIC3R_VERSION \"$pkgver\"/" xs/src/libslic3r/libslic3r.h
-  sed -i "s/#define SLIC3R_BUILD .*/#define SLIC3R_BUILD \"Arch User Repository\"/" xs/src/libslic3r/libslic3r.h
+#  sed -i 's/^use Slic3r/use Slic3r-Prusa3D/g' *.pl utils/*.pl
+#  sed -i 's/^use Slic3r/use Slic3r-Prusa3D/g' t/*.t xs/t/*.t
+#  sed -i 's/^use Slic3r/use Slic3r-Prusa3D/g' lib/*.pm lib/*/*.pm lib/*/*/*.pm lib/*/*/*/*.pm
+  mkdir -p build
 }
 
 build() {
-  cd "${srcdir}/Slic3r/xs"
-  unset PERL5LIB PERL_MM_OPT PERL_MB_OPT PERL_LOCAL_LIB_ROOT
-  export PERL_MM_USE_DEFAULT=1 MODULEBUILDRC=/dev/null
-  /usr/bin/perl Build.PL
-  ./Build
+  cd "${srcdir}/Slic3r"
+  
+  # Moved this here from prepare(). Because prepare() runs before pkgver() we always set the wrong version.
+  sed -i "s/define SLIC3R_VERSION .*/define SLIC3R_VERSION \"$pkgver\"/" xs/src/libslic3r/libslic3r.h
+  
+  cd build
+  cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+        ..
+  make
 }
 
 check () {
@@ -48,20 +54,20 @@ check () {
   prove -Ixs/blib/arch -Ixs/blib/lib/ t/
 }
 
+check() {
+  cd "${srcdir}/Slic3r/build"
+  ctest -V
+}
+
 package () {
-  cd "${srcdir}/Slic3r"
-  install -d "$pkgdir/usr/lib/${_pkgname}"
-  cp -R lib/* "$pkgdir/usr/lib/${_pkgname}"
+  cd "$srcdir/Slic3r/build"
+  make DESTDIR="$pkgdir" install
 
-  install -Dm 755 slic3r.pl "$pkgdir/usr/bin/${_pkgname}"
+  cd "${srcdir}/Slic3r"
 
   # ZSH autocompletion
   install -Dm 0644 "utils/zsh/functions/_slic3r" "$pkgdir/usr/share/zsh/site-functions/_${_pkgname}"
 
-  # Install data to /usr/share
-  mkdir -p "$pkgdir/usr/share/${_pkgname}"
-  cp -r var/* "$pkgdir/usr/share/${_pkgname}"
-
   # Desktop file
   install -d "$pkgdir/usr/share/applications"
   install -m 644 "$srcdir/slic3r.desktop" "$pkgdir/usr/share/applications/${_pkgname}.desktop"
@@ -70,10 +76,5 @@ package () {
   mkdir -p "$pkgdir/usr/share/icons/hicolor/"{128x128,192x192}/apps/
   ln -s "/usr/share/${_pkgname}/Slic3r_128px.png" "$pkgdir/usr/share/icons/hicolor/128x128/apps/${_pkgname}.png"
   ln -s "/usr/share/${_pkgname}/Slic3r_192px.png" "$pkgdir/usr/share/icons/hicolor/192x192/apps/${_pkgname}.png"
-
-  ### SLIC3R-XS MERGE
-  cd xs
-  unset PERL5LIB PERL_MM_OPT PERL_MB_OPT PERL_LOCAL_LIB_ROOT
-  ./Build install --installdirs=vendor --destdir="$pkgdir" --install_path arch=/usr/lib/"${_pkgname}"/
 }