diff options
| author | Christopher Reimer | 2018-01-24 20:28:14 +0100 |
|---|---|---|
| committer | Christopher Reimer | 2018-01-24 20:29:10 +0100 |
| commit | 7809bc1fb60f240750249b05d17e52f700f2dc22 (patch) | |
| tree | c7c7399822edbdef1de557170646440babdccdcd | |
| parent | 079f3c7480c4f46df88182aa571f5344bbf387dd (diff) | |
| download | aur-7809bc1fb60f240750249b05d17e52f700f2dc22.tar.gz | |
Update to version 1.38.6 (Thanks to Roman Tataurov)
| -rw-r--r-- | Move-Slic3r-data-to-usr-share-slic3r.patch | 14 | ||||
| -rw-r--r-- | PKGBUILD | 16 |
2 files changed, 17 insertions, 13 deletions
diff --git a/Move-Slic3r-data-to-usr-share-slic3r.patch b/Move-Slic3r-data-to-usr-share-slic3r.patch index 6c3668cc213f..47f952cf5d4a 100644 --- a/Move-Slic3r-data-to-usr-share-slic3r.patch +++ b/Move-Slic3r-data-to-usr-share-slic3r.patch @@ -20,18 +20,18 @@ index 43d7dee7..7939a767 100644 install(FILES lib/Slic3r.pm DESTINATION lib/slic3r-prusa3d) install(DIRECTORY lib/Slic3r DESTINATION lib/slic3r-prusa3d) diff --git a/lib/Slic3r.pm b/lib/Slic3r.pm -index 17b78326..92f1842c 100644 +index 66039ddf..bb7e1eb5 100644 --- a/lib/Slic3r.pm +++ b/lib/Slic3r.pm -@@ -51,7 +51,7 @@ warn "Running Slic3r under Perl 5.16 is neither supported nor recommended\n" - +@@ -41,7 +41,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 { decode_path($FindBin::Bin) . "/../share/slic3r-prusa3d/" . $_[0] }; - use Moo 1.003001; + # Let the XS module know where the GUI resources reside. +-set_resources_dir(decode_path($FindBin::Bin) . (($^O eq 'darwin') ? '/../Resources' : '/resources')); ++set_resources_dir("/usr/share/slic3r-prusa3d"); + set_var_dir(resources_dir() . "/icons"); + use Moo 1.003001; diff --git a/slic3r.pl b/slic3r.pl index 4b6e43e4..d833ed1b 100755 --- a/slic3r.pl @@ -1,3 +1,4 @@ + # Maintainer: Christopher Reimer <mail+aur[at]c-reimer[dot]de> # Contributor: Swift Geek <swifgeek ɐ google m č0m> # Contributor: Nick Østergaard <oe.nick at gmail dot com> @@ -5,7 +6,7 @@ _pkgname=slic3r-prusa3d pkgname=${_pkgname} -pkgver=1.37.2 +pkgver=1.38.6 pkgrel=1 pkgdesc="Updated Slic3r by Prusa3D with many bugfixes and new features" arch=('i686' 'x86_64' 'armv6' 'armv6h' 'armv7h') @@ -23,10 +24,9 @@ source=("git+https://github.com/prusa3d/Slic3r.git#tag=version_$pkgver" "Move-Slic3r-data-to-usr-share-slic3r.patch" 'slic3r.desktop') md5sums=('SKIP' - '7ae5572aa5f23f073dd696f7446d6529' + '87c8e0bfdd7e132938ec0ff9edb5dc18' '1941c1ede2f03774ffb77f68a7c33572') - prepare() { cd "${srcdir}/Slic3r" patch -p1 -i "$srcdir/Move-Slic3r-data-to-usr-share-slic3r.patch" @@ -62,13 +62,17 @@ package () { # ZSH autocompletion install -Dm 0644 "utils/zsh/functions/_slic3r" "$pkgdir/usr/share/zsh/site-functions/_${_pkgname}" + # Resources + mkdir -p "$pkgdir/usr/share/${_pkgname}" + cp -R resources/icons "$pkgdir/usr/share/${_pkgname}/" + cp -R resources/profiles "$pkgdir/usr/share/${_pkgname}/" + # Desktop file install -d "$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/${_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" + ln -s "/usr/share/${_pkgname}/icons/Slic3r_128px.png" "$pkgdir/usr/share/icons/hicolor/128x128/apps/${_pkgname}.png" + ln -s "/usr/share/${_pkgname}/icons/Slic3r_192px.png" "$pkgdir/usr/share/icons/hicolor/192x192/apps/${_pkgname}.png" } - |