Revert "Update to 1.3.0"

This reverts commit 91996da57548075b5b2933922f3c908407d840d5.

2 files changed, 108 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9c80fcd9ba67..2955e51efbdb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Wed Mar  1 18:57:48 UTC 2017
 pkgbase = slic3r
 	pkgdesc = Slic3r is an STL-to-GCODE translator for RepRap 3D printers, aiming to be a modern and fast alternative to Skeinforge.
-	pkgver = 1.3.0
+	pkgver = 1.2.9
 	pkgrel = 8
 	url = http://slic3r.org/
 	arch = i686
@@ -32,12 +34,20 @@ pkgbase = slic3r
 	optdepends = perl-class-xsaccessor: creating faster accessor methods
 	provides = slic3r
 	conflicts = slic3r-git
-	source = https://github.com/slic3r/Slic3r/releases/download/1.3.0/slic3r-1.3.0-linux-x64.tar.bz2
+	source = https://github.com/alexrj/Slic3r/archive/1.2.9.tar.gz
 	source = slic3r.desktop
 	source = slic3r
-	md5sums = 23761e32aca057de12e940fca097bcfef5a1efea9ff4998f8aa9fd58241db6dd
-	md5sums = 332ef39aab3893622df7027b98d7deef424cb9563b458e13a129ef687a899cdd
-	md5sums = 6e5012b1960a191e808ce29dbc9d6d1b180e4f383ef8bc0807efd77824425f55
+	source = 6e5938c8330b5bdb6b85c3ca8dc188605ee56b98.patch
+	source = 0001-hamfisted-fix-for-opengl-0.70-problems-making-and-us.patch
+	source = 0002-Significant-code-cleanup-remember-to-turn-off-VBOs-a.patch
+	source = 0003-Added-comments-and-VBO-implementation-for-drawing-of.patch
+	md5sums = 05ac7b137cbb7b12f442776e4c12dcc2
+	md5sums = cf0130330574a13b4372beb8f241d71e
+	md5sums = a30a96504f11c95956dd8ce645b77504
+	md5sums = 182ca1abc80a6c2f48541c5ffbdb98ab
+	md5sums = 78f3754e0d3df172a9d48d31ea9afb15
+	md5sums = 316ca184f98c7dca37660f63db16fb6c
+	md5sums = 8853bb4e7e8a5d3debd59a65c4fbbd1c
 
 pkgname = slic3r
 
diff --git a/PKGBUILD b/PKGBUILD
index 1cb545617af7..0902081fc64d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Nick Østergaard <oe.nick at gmail dot com>
 
 pkgname=slic3r
-pkgver=1.3.0
+pkgver=1.2.9
 pkgrel=8
 pkgdesc="Slic3r is an STL-to-GCODE translator for RepRap 3D printers, aiming to be a modern and fast alternative to Skeinforge."
 arch=('i686' 'x86_64' 'armv7h')
@@ -30,26 +30,98 @@ provides=('slic3r')
 conflicts=('slic3r-git')
 #Consider uncommenting line below in case of false negative test results ;)
 BUILDENV+=('!check')
-source=("https://github.com/slic3r/Slic3r/releases/download/${pkgver}/slic3r-${pkgver}-linux-x64.tar.bz2"
+source=("https://github.com/alexrj/Slic3r/archive/$pkgver.tar.gz"
 				'slic3r.desktop'
-				'slic3r')
-md5sums=('23761e32aca057de12e940fca097bcfef5a1efea9ff4998f8aa9fd58241db6dd'
-         '332ef39aab3893622df7027b98d7deef424cb9563b458e13a129ef687a899cdd'
-         '6e5012b1960a191e808ce29dbc9d6d1b180e4f383ef8bc0807efd77824425f55')
+				'slic3r'
+        '6e5938c8330b5bdb6b85c3ca8dc188605ee56b98.patch'
+        '0001-hamfisted-fix-for-opengl-0.70-problems-making-and-us.patch'
+        '0002-Significant-code-cleanup-remember-to-turn-off-VBOs-a.patch'
+        '0003-Added-comments-and-VBO-implementation-for-drawing-of.patch')
+md5sums=('05ac7b137cbb7b12f442776e4c12dcc2'
+         'cf0130330574a13b4372beb8f241d71e'
+         'a30a96504f11c95956dd8ce645b77504'
+         '182ca1abc80a6c2f48541c5ffbdb98ab'
+         '78f3754e0d3df172a9d48d31ea9afb15'
+         '316ca184f98c7dca37660f63db16fb6c'
+         '8853bb4e7e8a5d3debd59a65c4fbbd1c')
 _src_dir='$srcdir/Slic3r-$pkgver'
 
-package()
-{
-	cd $srcdir
-	
-	install -d "$pkgdir/opt"
-	tar xfj slic3r-${pkgver}-linux-x64.tar.bz2 -C "$pkgdir/opt/"
-	sed -i "$pkgdir/opt/Slic3r/Slic3r" -e 's/DIR=.*$/DIR=\/opt\/Slic3r/'
-	sed -i "$pkgdir/opt/Slic3r/Slic3r" -e 's/LD_LIBRARY_PATH=.*$/LD_LIBRARY_PATH=\/opt\/Slic3r\/bin/'
-	
-	install -d "$pkgdir/usr/bin"
-	ln -s "/opt/Slic3r/Slic3r" "$pkgdir/usr/bin/slic3r"
-	
-	install -d "$pkgdir/usr/share/applications"
-	install -m 644 $srcdir/slic3r.desktop "$pkgdir/usr/share/applications/"
-}
\ No newline at end of file
+prepare() {
+	eval cd "$_src_dir"
+  # Nasty fix for useless Growl dependency ... please post in comment real fix, if u know one ;)
+#  sed -i "s/        'Growl/\#&/" Build.PL
+  sed -i '/Growl/d' Build.PL
+
+  # Nasty fix for useless warning
+  sed -i '/^warn \"Running Slic3r under Perl/,+1 s/^/\#/' ./lib/Slic3r.pm
+
+  msg2 "Patching..."
+  patch -p1 -i $srcdir/6e5938c8330b5bdb6b85c3ca8dc188605ee56b98.patch
+  patch -p1 -i $srcdir/0001-hamfisted-fix-for-opengl-0.70-problems-making-and-us.patch
+  patch -p1 -i $srcdir/0002-Significant-code-cleanup-remember-to-turn-off-VBOs-a.patch
+  patch -p1 -i $srcdir/0003-Added-comments-and-VBO-implementation-for-drawing-of.patch
+}
+
+build() {
+  # Setting these env variables overwrites any command-line-options we don't want...
+  export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps \
+    PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \
+    PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
+    MODULEBUILDRC=/dev/null
+  export SLIC3R_NO_AUTO="true"
+
+  eval cd "$_src_dir/xs"
+  warning " ⚠  DO NOT respond to any question with 'yes'. Report a bug in comment instead.\n"
+  warning "Running Slic3r under Perl >= 5.16 is not supported nor recommended\nIn case of related to this issues please use ARM repository to get older perl package\n"
+  # Cuz cpan will install fixes to $HOME ... which is not the point of this package
+
+  # slic3r-xs Build stage
+  msg2 "Building Slic3r::XS (1/3)"
+  /usr/bin/perl Build.PL
+  ./Build
+
+}
+
+check () {
+  eval cd "$_src_dir"
+
+  msg2 "Testing Slic3r::XS - (2/3)"
+  prove -Ixs/blib/arch -Ixs/blib/lib/ xs/t/
+
+  msg2 "Testing Slic3r (3/3)"
+  prove -Ixs/blib/arch -Ixs/blib/lib/ t/
+}
+
+package () {
+  eval cd "$_src_dir"
+  install -d $pkgdir/usr/share/perl5/vendor_perl/
+  cp -R $srcdir/Slic3r-$pkgver/lib/* $pkgdir/usr/share/perl5/vendor_perl/
+
+  install -d $pkgdir/usr/bin/vendor_perl/
+  install -m 755 $srcdir/Slic3r-$pkgver/slic3r.pl $pkgdir/usr/bin/vendor_perl/
+
+  #TODO : Do something about utils ! (we let swiftgeek fix this)
+  #install -m 755 $srcdir/Slic3r-$pkgver/utils/*.pl $pkgdir/usr/bin/
+  #install -m 755 $srcdir/Slic3r-$pkgver/utils/post-processing/*.pl $pkgdir/usr/bin/
+
+  # ZSH autocompletion
+  install -d "${pkgdir}/usr/share/zsh/site-functions"
+  install -m 0644 "$srcdir/Slic3r-$pkgver/utils/zsh/functions/_slic3r" "$pkgdir/usr/share/zsh/site-functions/_slic3r.zsh"
+
+  # Icons " current Build.PL is not really geared for installation "
+  install -d $pkgdir/usr/bin/vendor_perl/var
+  install -m 644 $srcdir/Slic3r-$pkgver/var/*  $pkgdir/usr/bin/vendor_perl/var/
+
+  # Desktop icon
+  install -d $pkgdir/usr/share/applications
+  install -m 644 $srcdir/slic3r.desktop $pkgdir/usr/share/applications/
+
+  ### SLIC3R-XS MERGE
+  eval cd "$_src_dir/xs"
+  ./Build install
+
+  # Just to have a more sane bin name also, and automagically fix perl LANG
+  # problems. Might be fixed now https://github.com/alexrj/Slic3r/pull/1510
+  install -m 755 $srcdir/slic3r $pkgdir/usr/bin/
+}
+