Fix various problems with perl-local-lib and missing Slic3r.pm file

3 files changed, 19 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d48873f7010e..4be48641be1b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Sep 27 17:19:05 UTC 2017
+# Mon Oct  2 18:23:20 UTC 2017
 pkgbase = slic3r-prusa3d
 	pkgdesc = Updated Slic3r by Prusa3D with many bugfixes and new features
 	pkgver = 1.37.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.prusa3d.com/
 	arch = i686
 	arch = x86_64
@@ -12,6 +12,7 @@ pkgbase = slic3r-prusa3d
 	arch = armv7h
 	license = AGPL3
 	checkdepends = perl-io-stringy
+	checkdepends = perl-local-lib
 	makedepends = boost
 	makedepends = git
 	makedepends = perl-alien-wxwidgets
@@ -36,7 +37,7 @@ pkgbase = slic3r-prusa3d
 	source = Move-Slic3r-data-to-usr-share-slic3r.patch
 	source = slic3r.desktop
 	md5sums = SKIP
-	md5sums = b10622cb1abb008679c19988f3ed2e59
+	md5sums = 7ae5572aa5f23f073dd696f7446d6529
 	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 7114ede3e4c8..6c3668cc213f 100644
--- a/Move-Slic3r-data-to-usr-share-slic3r.patch
+++ b/Move-Slic3r-data-to-usr-share-slic3r.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 43d7dee7..3e4e0c82 100644
+index 43d7dee7..7939a767 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -45,13 +45,14 @@ find_package(Perl REQUIRED)
+@@ -45,13 +45,13 @@ find_package(Perl REQUIRED)
  add_subdirectory(xs)
  
  enable_testing ()
@@ -16,12 +16,9 @@ index 43d7dee7..3e4e0c82 100644
  
  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})
+ 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 17b78326..92f1842c 100644
 --- a/lib/Slic3r.pm
@@ -36,32 +33,16 @@ index 17b78326..92f1842c 100644
  use Moo 1.003001;
  
 diff --git a/slic3r.pl b/slic3r.pl
-index 4b6e43e4..96cd91ec 100755
+index 4b6e43e4..d833ed1b 100755
 --- a/slic3r.pl
 +++ b/slic3r.pl
-@@ -3,12 +3,6 @@
- use strict;
- use warnings;
+@@ -5,8 +5,7 @@ use warnings;
  
--BEGIN {
--    use FindBin;
+ BEGIN {
+     use FindBin;
 -    use lib "$FindBin::Bin/lib";
 -    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 ()
++    use lib "$FindBin::Bin/lib", "/usr/lib/slic3r-prusa3d/";
+ }
  
- # 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)
-
+ use File::Basename qw(basename);
diff --git a/PKGBUILD b/PKGBUILD
index 1c5dd2a307d8..f461fd06f47b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgname=slic3r-prusa3d
 pkgname=${_pkgname}
 pkgver=1.37.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Updated Slic3r by Prusa3D with many bugfixes and new features"
 arch=('i686' 'x86_64' 'armv6' 'armv6h' 'armv7h')
 url="http://www.prusa3d.com/"
@@ -15,7 +15,7 @@ depends=('boost-libs' 'intel-tbb' 'perl' 'perl-class-accessor' 'perl-libwww' 'pe
          'perl-moo' 'perl-opengl' 'perl-sub-quote' 'perl-wx-glcanvas')
 makedepends=('boost' 'git' 'perl-alien-wxwidgets' 'perl-devel-checklib' 'perl-extutils-cppguess'
              'perl-extutils-typemaps-default' 'perl-module-build-withxspp')
-checkdepends=('perl-io-stringy')
+checkdepends=('perl-io-stringy' 'perl-local-lib')
 optdepends=('perl-net-dbus: notifications support via any dbus-based notifier'
             'perl-net-bonjour: support for autodiscovery of printers on network (octoprint)'
             'perl-class-xsaccessor: creating faster accessor methods')
@@ -23,7 +23,7 @@ source=("git+https://github.com/prusa3d/Slic3r.git#tag=version_$pkgver"
         "Move-Slic3r-data-to-usr-share-slic3r.patch"
         'slic3r.desktop')
 md5sums=('SKIP'
-         'b10622cb1abb008679c19988f3ed2e59'
+         '7ae5572aa5f23f073dd696f7446d6529'
          '1941c1ede2f03774ffb77f68a7c33572')
 
         
@@ -47,7 +47,7 @@ build() {
 
 check() {
   cd "${srcdir}/Slic3r/t" # We're on linux. We don't want to user local::lib
-  sed -i '/local::lib/d' *.t
+  #sed -i '/local::lib/d' *.t
 
   cd "${srcdir}/Slic3r/build"
   ctest -V