Update to 1.33.6 and adopted some ideas from debian to make it possible for slic3r-prusa3d to coexist with slic3r on the same system

4 files changed, 40 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 450d480bdcf3..ecefed083439 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = slic3r-prusa3d
 	pkgdesc = Updated Slic3r by Prusa3D with many bugfixes and new features
-	pkgver = 1.33.4
+	pkgver = 1.33.6
 	pkgrel = 1
 	url = http://www.prusa3d.com/
 	arch = i686
@@ -30,17 +30,12 @@ pkgbase = slic3r-prusa3d
 	optdepends = perl-xml-sax: Additive Manufacturing File Format (AMF) support
 	optdepends = perl-net-bonjour: support for autodiscovery of printers on network (octoprint)
 	optdepends = perl-class-xsaccessor: creating faster accessor methods
-	provides = slic3r
-	conflicts = slic3r
-	conflicts = slic3r-git
-	conflicts = slic3r-xs
-	conflicts = slic3r-xs-git
-	source = git+https://github.com/prusa3d/Slic3r.git#tag=version_1.33.4
+	source = git+https://github.com/prusa3d/Slic3r.git#tag=version_1.33.6
 	source = Move-Slic3r-data-to-usr-share-slic3r.patch
 	source = slic3r.desktop
 	md5sums = SKIP
-	md5sums = 03863b8db5dff40e194290ae07d6366f
-	md5sums = 7de264a96d4bcc1143b148ad8d854979
+	md5sums = 1c7b1af4df70c6a2f2bdb9c6a2c02b3f
+	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 9a46fbe5bfe7..57569ff57408 100644
--- a/Move-Slic3r-data-to-usr-share-slic3r.patch
+++ b/Move-Slic3r-data-to-usr-share-slic3r.patch
@@ -1,13 +1,26 @@
 diff --git a/lib/Slic3r.pm b/lib/Slic3r.pm
-index b7c265c..ba3f68d 100644
+index 5f4357a9..e37a5e17 100644
 --- a/lib/Slic3r.pm
 +++ b/lib/Slic3r.pm
-@@ -47,7 +47,7 @@ warn "Running Slic3r under Perl 5.16 is neither supported nor recommended\n"
+@@ -49,7 +49,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/' . $_[0] };
++our $var = sub { '/usr/share/slic3r-prusa3d/' . $_[0] };
  
  use Moo 1.003001;
  
+diff --git a/slic3r.pl b/slic3r.pl
+index c1371472..6cd50804 100755
+--- a/slic3r.pl
++++ b/slic3r.pl
+@@ -5,7 +5,7 @@ use warnings;
+ 
+ BEGIN {
+     use FindBin;
+-    use lib "$FindBin::Bin/lib";
++    use lib "$FindBin::Bin/lib", "/usr/lib/slic3r-prusa3d/";
+ }
+ 
+ use File::Basename qw(basename);
diff --git a/PKGBUILD b/PKGBUILD
index d8a28ff948f4..b0d3888228d4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
 # Contributor: Nick Østergaard <oe.nick at gmail dot com>
 # Contributor: olasd
 
-_pkgname=slic3r
-pkgname=${_pkgname}-prusa3d
-pkgver=1.33.4
+_pkgname=slic3r-prusa3d
+pkgname=${_pkgname}
+pkgver=1.33.6
 pkgrel=1
 pkgdesc="Updated Slic3r by Prusa3D with many bugfixes and new features"
 arch=('i686' 'x86_64' 'armv6' 'armv6h' 'armv7h')
@@ -21,20 +21,19 @@ optdepends=('perl-net-dbus: notifications support via any dbus-based notifier'
             'perl-xml-sax: Additive Manufacturing File Format (AMF) support'
             'perl-net-bonjour: support for autodiscovery of printers on network (octoprint)'
             'perl-class-xsaccessor: creating faster accessor methods')
-provides=('slic3r')
-conflicts=('slic3r' 'slic3r-git' 'slic3r-xs' 'slic3r-xs-git')
 source=("git+https://github.com/prusa3d/Slic3r.git#tag=version_$pkgver"
         "Move-Slic3r-data-to-usr-share-slic3r.patch"
         'slic3r.desktop')
 md5sums=('SKIP'
-         '03863b8db5dff40e194290ae07d6366f'
-         '7de264a96d4bcc1143b148ad8d854979')
+         '1c7b1af4df70c6a2f2bdb9c6a2c02b3f'
+         '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
 }
 
 build() {
@@ -53,30 +52,30 @@ check () {
 
 package () {
   cd "${srcdir}/Slic3r"
-  install -d "$pkgdir/usr/share/perl5/vendor_perl/"
-  cp -R lib/* "$pkgdir/usr/share/perl5/vendor_perl/"
+  install -d "$pkgdir/usr/lib/${_pkgname}"
+  cp -R lib/* "$pkgdir/usr/lib/${_pkgname}"
 
-  install -Dm 755 slic3r.pl "$pkgdir/usr/bin/vendor_perl/slic3r"
+  install -Dm 755 slic3r.pl "$pkgdir/usr/bin/${_pkgname}"
 
   # ZSH autocompletion
-  install -Dm 0644 "utils/zsh/functions/_slic3r" "$pkgdir/usr/share/zsh/site-functions/_slic3r"
+  install -Dm 0644 "utils/zsh/functions/_slic3r" "$pkgdir/usr/share/zsh/site-functions/_${_pkgname}"
 
   # Install data to /usr/share
-  mkdir -p "$pkgdir/usr/share/slic3r"
-  cp -r var/* "$pkgdir/usr/share/slic3r"
+  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/"
+  install -m 644 "$srcdir/slic3r.desktop" "$pkgdir/usr/share/applications/${_pkgname}.desktop"
 
   # Desktop icon
   mkdir -p "$pkgdir/usr/share/icons/hicolor/"{128x128,192x192}/apps/
-  ln -s /usr/share/slic3r/Slic3r_128px.png "$pkgdir/usr/share/icons/hicolor/128x128/apps/slic3r.png"
-  ln -s /usr/share/slic3r/Slic3r_192px.png "$pkgdir/usr/share/icons/hicolor/192x192/apps/slic3r.png"
+  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"
+  ./Build install --installdirs=vendor --destdir="$pkgdir" --install_path arch=/usr/lib/"${_pkgname}"/
 }
 
diff --git a/slic3r.desktop b/slic3r.desktop
index 95d9d45a8d03..339c267834c6 100644
--- a/slic3r.desktop
+++ b/slic3r.desktop
@@ -2,8 +2,8 @@
 Encoding=UTF-8
 Version=1.0
 Type=Application
-Name=Slic3r
-Icon=slic3r
-Exec=/usr/bin/vendor_perl/slic3r
+Name=Slic3r Prusa Edition
+Icon=slic3r-prusa3d
+Exec=/usr/bin/slic3r-prusa3d
 StartupNotify=false
-StartupWMClass=Slic3r.pl
+StartupWMClass=Slic3r-prusa3d.pl