diff options
-rw-r--r-- | .SRCINFO | 13 | ||||
-rw-r--r-- | Move-Slic3r-data-to-usr-share-slic3r.patch | 13 | ||||
-rw-r--r-- | PKGBUILD | 54 | ||||
-rw-r--r-- | slic3r.desktop | 15 | ||||
-rwxr-xr-x | slic3r.pl | 5 |
5 files changed, 58 insertions, 42 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Tue Nov 1 16:27:46 UTC 2016 +# Wed Nov 2 13:09:18 UTC 2016 pkgbase = slic3r-prusa3d pkgdesc = Updated Slic3r by Prusa3D with many bugfixes and new features pkgver = 1.31.2 - pkgrel = 1 + pkgrel = 2 url = http://www.prusa3d.com/ arch = i686 arch = x86_64 @@ -13,6 +13,7 @@ pkgbase = slic3r-prusa3d license = AGPL3 checkdepends = perl-io-stringy makedepends = boost + makedepends = git makedepends = perl-devel-checklib makedepends = perl-extutils-cppguess makedepends = perl-extutils-typemaps-default @@ -34,10 +35,12 @@ pkgbase = slic3r-prusa3d conflicts = slic3r-git conflicts = slic3r-xs conflicts = slic3r-xs-git - source = https://github.com/prusa3d/Slic3r/archive/version_1.31.2.tar.gz + source = git+https://github.com/prusa3d/Slic3r.git#tag=version_1.31.2 + source = Move-Slic3r-data-to-usr-share-slic3r.patch source = slic3r.desktop - md5sums = ad838f6a44e1142bdd7058b6f5540698 - md5sums = 1b561afff48c79f86889664375d179ed + md5sums = SKIP + md5sums = 03863b8db5dff40e194290ae07d6366f + md5sums = 67e0f3f163eb069d20a719ca9e5468b1 pkgname = slic3r-prusa3d diff --git a/Move-Slic3r-data-to-usr-share-slic3r.patch b/Move-Slic3r-data-to-usr-share-slic3r.patch new file mode 100644 index 000000000000..9a46fbe5bfe7 --- /dev/null +++ b/Move-Slic3r-data-to-usr-share-slic3r.patch @@ -0,0 +1,13 @@ +diff --git a/lib/Slic3r.pm b/lib/Slic3r.pm +index b7c265c..ba3f68d 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" + + use FindBin; + # Path to the images. +-our $var = sub { decode_path($FindBin::Bin) . "/var/" . $_[0] }; ++our $var = sub { '/usr/share/slic3r/' . $_[0] }; + + use Moo 1.003001; + @@ -6,14 +6,14 @@ _pkgname=slic3r pkgname=${_pkgname}-prusa3d pkgver=1.31.2 -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/" license=('AGPL3') depends=('perl' 'perl-class-accessor' 'perl-encode-locale' 'perl-math-planepath' 'perl-moo' 'perl-opengl' 'perl-wx-glcanvas') -makedepends=('boost' 'perl-devel-checklib' 'perl-extutils-cppguess' +makedepends=('boost' 'git' 'perl-devel-checklib' 'perl-extutils-cppguess' 'perl-extutils-typemaps-default' 'perl-module-build-withxspp') checkdepends=('perl-io-stringy') optdepends=('perl-net-dbus: notifications support via any dbus-based notifier' @@ -23,52 +23,58 @@ optdepends=('perl-net-dbus: notifications support via any dbus-based notifier' 'perl-class-xsaccessor: creating faster accessor methods') provides=('slic3r') conflicts=('slic3r' 'slic3r-git' 'slic3r-xs' 'slic3r-xs-git') -source=("https://github.com/prusa3d/Slic3r/archive/version_${pkgver}.tar.gz" +source=("git+https://github.com/prusa3d/Slic3r.git#tag=version_$pkgver" + "Move-Slic3r-data-to-usr-share-slic3r.patch" 'slic3r.desktop') -md5sums=('ad838f6a44e1142bdd7058b6f5540698' - '1b561afff48c79f86889664375d179ed') +md5sums=('SKIP' + '03863b8db5dff40e194290ae07d6366f' + 'f9fd39cf31b8f9693585c92293ccef5e') prepare() { -cd "${srcdir}/Slic3r-version_${pkgver}/xs" - PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ - PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ - perl Build.PL + cd "${srcdir}/Slic3r" + patch -p1 -i "$srcdir/Move-Slic3r-data-to-usr-share-slic3r.patch" } build() { - cd "${srcdir}/Slic3r-version_${pkgver}/xs" + cd "${srcdir}/Slic3r/xs" + perl Build.PL --installdirs vendor + + CFLAGS+=' -std=c++11' perl Build } check () { - cd "${srcdir}/Slic3r-version_${pkgver}" + cd "${srcdir}/Slic3r" prove -Ixs/blib/arch -Ixs/blib/lib/ xs/t/ prove -Ixs/blib/arch -Ixs/blib/lib/ t/ } package () { - cd "${srcdir}/Slic3r-version_${pkgver}" - install -d $pkgdir/usr/share/perl5/vendor_perl/ - cp -R lib/* $pkgdir/usr/share/perl5/vendor_perl/ + cd "${srcdir}/Slic3r" + install -d "$pkgdir/usr/share/perl5/vendor_perl/" + cp -R lib/* "$pkgdir/usr/share/perl5/vendor_perl/" - install -d $pkgdir/usr/bin/vendor_perl/ - install -m 755 slic3r.pl $pkgdir/usr/bin/vendor_perl/ + install -Dm 755 slic3r.pl "$pkgdir/usr/bin/vendor_perl/slic3r" # ZSH autocompletion - install -d "${pkgdir}/usr/share/zsh/site-functions" - install -m 0644 "utils/zsh/functions/_slic3r" "$pkgdir/usr/share/zsh/site-functions/_slic3r.zsh" + install -Dm 0644 "utils/zsh/functions/_slic3r" "$pkgdir/usr/share/zsh/site-functions/_slic3r" + + # Install data to /usr/share + mkdir -p "$pkgdir/usr/share/slic3r" + cp -r var/* "$pkgdir/usr/share/slic3r" - # Icons " current Build.PL is not really geared for installation " - install -d $pkgdir/usr/bin/vendor_perl/var - install -m 644 var/* $pkgdir/usr/bin/vendor_perl/var/ + # Desktop file + install -d "$pkgdir/usr/share/applications" + install -m 644 "$srcdir/slic3r.desktop" "$pkgdir/usr/share/applications/" # Desktop icon - install -d $pkgdir/usr/share/applications - install -m 644 $srcdir/slic3r.desktop $pkgdir/usr/share/applications/ + 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" ### SLIC3R-XS MERGE cd xs - ./Build install + ./Build install --destdir="$pkgdir" } diff --git a/slic3r.desktop b/slic3r.desktop index 7241ad14c553..e9708fd5e936 100644 --- a/slic3r.desktop +++ b/slic3r.desktop @@ -1,10 +1,9 @@ [Desktop Entry] -Name=Slic3r -Comment=STL-to-GCODE translator for RepRap printers -Exec=env LC_ALL=C slic3r.pl --gui -Icon=/usr/bin/vendor_perl/var/Slic3r_128px.png -Terminal=0 -Type=Application Encoding=UTF-8 -Categories=Development;Application; - +Version=1.0 +Type=Application +Name=Slic3r +Icon=slic3r +Exec=/usr/share/vendor_perl/slic3r +StartupNotify=false +StartupWMClass=Slic3r.pl diff --git a/slic3r.pl b/slic3r.pl deleted file mode 100755 index e9ca79651f21..000000000000 --- a/slic3r.pl +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -# This scrips is an easy fix to perl and slic3r locale problems -# This only has to be removed after i18n support will be added (not planned) -export LC_ALL=C -exec /usr/bin/vendor_perl/slic3r.pl "$@" |