From c41510e86b6e86b041dbf18314c6cb03edc80def Mon Sep 17 00:00:00 2001
From: Travis CI User <travis@example.org>
Date: Tue, 4 Apr 2017 03:58:20 +0000
Subject: [PATCH] Use wxpar to pull the shared libs to ./shlib/

---
 package/common/util.sh          | 1 +
 package/linux/make_archive.sh   | 8 +++++---
 package/linux/startup_script.sh | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/package/common/util.sh b/package/common/util.sh
index 389617eb0..6292d15e4 100644
--- a/package/common/util.sh
+++ b/package/common/util.sh
@@ -88,4 +88,5 @@ function set_pr_id ()
 function install_par ()
 {
     cpanm -q PAR::Packer
+    cpanm -q Wx::Perl::Packager
 }
diff --git a/package/linux/make_archive.sh b/package/linux/make_archive.sh
index fd4fad26b..ed4d9cd70 100755
--- a/package/linux/make_archive.sh
+++ b/package/linux/make_archive.sh
@@ -43,7 +43,7 @@ echo "Appfolder: $appfolder, archivefolder: $archivefolder"
 
 # Our slic3r dir and location of perl
 PERL_BIN=$(which perl)
-PP_BIN=$(which pp)
+PP_BIN=$(which wxpar)
 SLIC3R_DIR="./"
 
 if [[ -d "${appfolder}" ]]; then
@@ -61,7 +61,6 @@ mkdir -p $appfolder
 
 echo "Copying resources..." 
 cp -rf $SLIC3R_DIR/var $resourcefolder/
-mv $resourcefolder/var/Slic3r.icns $resourcefolder
 
 echo "Copying Slic3r..."
 cp $SLIC3R_DIR/slic3r.pl $archivefolder/slic3r.pl
@@ -90,7 +89,8 @@ chmod +x $archivefolder/$appname
 
 echo "Copying perl from $PERL_BIN"
 cp -f $PERL_BIN $archivefolder/perl-local
-${PP_BIN} -M attributes -M base -M bytes -M B -M POSIX \
+${PP_BIN} wxextension .0 \
+	  -M attributes -M base -M bytes -M B -M POSIX \
           -M FindBin -M Unicode::Normalize -M Tie::Handle \
           -M Time::Local -M Math::Trig \
           -M lib -M overload \
@@ -99,6 +99,8 @@ ${PP_BIN} -M attributes -M base -M bytes -M B -M POSIX \
           -B -p -e "print 123" -o $WD/_tmp/test.par
 unzip -qq -o $WD/_tmp/test.par -d $WD/_tmp/
 cp -rf $WD/_tmp/lib/* $archivefolder/local-lib/lib/perl5/
+cp -rf $WD/_tmp/shlib $archivefolder/
+
 rm -rf $WD/_tmp
 
 echo "Cleaning local-lib"
diff --git a/package/linux/startup_script.sh b/package/linux/startup_script.sh
index 82757118b..53cea63d6 100644
--- a/package/linux/startup_script.sh
+++ b/package/linux/startup_script.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 DIR=$(dirname "$0")
-export LD_LIBRARY_PATH=./bin
+export LD_LIBRARY_PATH=./shlib/x86_64-linux-thread-multi/
 exec "$DIR/perl-local" -I"$DIR/local-lib/lib/perl5" "$DIR/slic3r.pl" $@