From 0e129e765bfcb62bf217cabca6161969c950a141 Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Thu, 30 Mar 2017 08:54:59 +0200
Subject: [PATCH] Improvements to make_dmg.sh, strip more things

---
 lib/Slic3r.pm           |  6 +++++-
 package/osx/make_dmg.sh | 34 +++++++++++++++++++++++++++-------
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/lib/Slic3r.pm b/lib/Slic3r.pm
index ca09d71f90..37f242e725 100644
--- a/lib/Slic3r.pm
+++ b/lib/Slic3r.pm
@@ -42,7 +42,11 @@ 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] };
+my $varpath = decode_path($FindBin::Bin) . "/var";
+if ($^O eq 'darwin' && !-d $varpath) {
+    $varpath = decode_path($FindBin::Bin) . "/../Resources/var";
+}
+our $var = sub { "$varpath/$_[0]" };
 
 use Moo 1.003001;
 
diff --git a/package/osx/make_dmg.sh b/package/osx/make_dmg.sh
index a800f23f22..f82464daa8 100755
--- a/package/osx/make_dmg.sh
+++ b/package/osx/make_dmg.sh
@@ -77,8 +77,8 @@ mkdir -p $macosfolder
 mkdir -p $resourcefolder
 
 echo "Copying resources..." 
-cp -rf $SLIC3R_DIR/var $macosfolder/
-mv $macosfolder/var/Slic3r.icns $resourcefolder
+cp -rf $SLIC3R_DIR/var $resourcefolder/
+mv $resourcefolder/var/Slic3r.icns $resourcefolder
 
 echo "Copying Slic3r..."
 cp $SLIC3R_DIR/slic3r.pl $macosfolder/slic3r.pl
@@ -106,18 +106,38 @@ ${PP_BIN} -M attributes -M base -M bytes -M B -M POSIX \
           -M warnings -M local::lib \
           -M strict -M utf8 -M parent \
           -B -p -e "print 123" -o $WD/_tmp/test.par
-unzip $WD/_tmp/test.par -d $WD/_tmp/
+unzip -o $WD/_tmp/test.par -d $WD/_tmp/
 cp -rf $WD/_tmp/lib/* $macosfolder/local-lib/lib/perl5/
 rm -rf $WD/_tmp
 
 echo "Cleaning bundle"
 rm -rf $macosfolder/local-lib/bin
 rm -rf $macosfolder/local-lib/man
-find $macosfolder/local-lib -name .packlist -delete
-find $macosfolder/local-lib -name .meta -exec rm -rf "{}" \;
-find $macosfolder/local-lib -name '*.h' -delete
-find $macosfolder/local-lib -type d -empty -delete
+rm -f $macosfolder/local-lib/lib/perl5/Algorithm/*.pl
+rm -rf $macosfolder/local-lib/lib/perl5/unicore
+rm -rf $macosfolder/local-lib/lib/perl5/App
+rm -rf $macosfolder/local-lib/lib/perl5/Devel/CheckLib.pm
+rm -rf $macosfolder/local-lib/lib/perl5/ExtUtils
+rm -rf $macosfolder/local-lib/lib/perl5/Module/Build*
+rm -rf $macosfolder/local-lib/lib/perl5/TAP
+rm -rf $macosfolder/local-lib/lib/perl5/Test*
+find -d $macosfolder/local-lib -name '*.pod' -delete
+find -d $macosfolder/local-lib -name .packlist -delete
+find -d $macosfolder/local-lib -name .meta -exec rm -rf "{}" \;
+find -d $macosfolder/local-lib -name '*.h' -delete
+find -d $macosfolder/local-lib -name wxPerl.app -exec rm -rf "{}" \;
+find -d $macosfolder/local-lib -type d -path '*/Wx/*' \( -name WebView \
+    -or -name DocView -or -name STC -or -name IPC \
+    -or -name AUI -or -name Calendar -or -name DataView \
+    -or -name DateTime -or -name Media -or -name PerlTest \
+    -or -name Ribbon \) -exec rm -rf "{}" \;
+find -d $macosfolder/local-lib -name libwx_osx_cocoau_ribbon-3.0.0.2.0.dylib -delete
+find -d $macosfolder/local-lib -name libwx_osx_cocoau_aui-3.0.0.2.0.dylib -delete
+find -d $macosfolder/local-lib -name libwx_osx_cocoau_media-3.0.0.2.0.dylib -delete
+find -d $macosfolder/local-lib -name libwx_osx_cocoau_stc-3.0.0.2.0.dylib -delete
+find -d $macosfolder/local-lib -name libwx_osx_cocoau_webview-3.0.0.2.0.dylib -delete
 rm -rf $macosfolder/local-lib/lib/perl5/darwin-thread-multi-2level/Alien/wxWidgets/osx_cocoa_3_0_2_uni/include
+find -d $macosfolder/local-lib -type d -empty -delete
 
 make_plist