Updated pkgbuild, removed patch

1 files changed, 39 insertions, 42 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b26fa6408f3b..e000a5e71df6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,36 @@
-# Maintainer: Christopher Reimer <mail+aur[at]c-reimer[dot]de>
+# Maintainer: Salamandar <felix@piedallu.me>
+# Contributor: 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>
 # Contributor: olasd
 
 _pkgname=slic3r-prusa3d
 pkgname=${_pkgname}-git
-pkgver=1.37.0.r39.g247070cd
-pkgrel=2
+pkgver=1.42.0.alpha7.r95.gc77d15c98
+pkgrel=1
 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=('boost-libs' 'perl' 'perl-class-accessor' 'perl-libwww' 'perl-encode-locale'
-         'perl-moo' 'perl-opengl' 'perl-wx-glcanvas')
-makedepends=('boost' 'git' 'perl-alien-wxwidgets' 'perl-devel-checklib' 'perl-extutils-cppguess'
-             'perl-extutils-typemaps-default' 'perl-module-build-withxspp')
-checkdepends=('perl-io-stringy' 'perl-local-lib')
-optdepends=('perl-net-dbus: notifications support via any dbus-based notifier'
-            'perl-xml-sax-expatxs: make AMF parsing faster'
-            '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')
-conflicts=('slic3r-prusa3d')
-source=("git+https://github.com/prusa3d/Slic3r.git"
-        "Move-Slic3r-data-to-usr-share-slic3r.patch"
-        'slic3r.desktop')
-md5sums=('SKIP'
-         'a8f234adc154ad4c59ab03f8acc78eed'
-         '1941c1ede2f03774ffb77f68a7c33572')
+depends=(
+  'boost-libs' 'curl' 'wxgtk2' 'glew' 'intel-tbb' 'nlopt'
+)
+makedepends=(
+  'cmake' 'boost'
+)
+checkdepends=(
+  'gtest'
+)
 
-prepare() {
-  cd "${srcdir}/Slic3r"
-  patch -p1 -i "$srcdir/Move-Slic3r-data-to-usr-share-slic3r.patch"
-  mkdir -p build
-}
+conflicts=('slic3r-prusa3d' 'slic3r')
+source=(
+  "git+https://github.com/prusa3d/Slic3r.git"
+  'slic3r_prusa3d.desktop'
+)
+sha256sums=(
+  'SKIP'
+  '598e84a1a837059929477ce9d45e1e660be51e69202f788f83c6f65437055db5'
+)
 
 pkgver() {
   cd "${srcdir}/Slic3r"
@@ -42,13 +39,17 @@ pkgver() {
 
 build() {
   cd "${srcdir}/Slic3r"
-  
-  # Moved this here from prepare(). Because prepare() runs before pkgver() we always set the wrong version.
-  sed -i "s/define SLIC3R_VERSION .*/define SLIC3R_VERSION \"$pkgver\"/" xs/src/libslic3r/libslic3r.h
-  
+  mkdir -p build
+
   cd build
-  cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-        ..
+  cmake \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DSLIC3R_FHS=True \
+    -DSLIC3R_PCH=False \
+    -DSLIC3R_WX_STABLE=True \
+    ..
+
   make
 }
 
@@ -58,21 +59,17 @@ check() {
 }
 
 package () {
-  cd "$srcdir/Slic3r/build"
-  make DESTDIR="$pkgdir" install
-
-  cd "${srcdir}/Slic3r"
+  cd "${srcdir}/Slic3r/build"
+  DESTDIR="${pkgdir}" make install
 
   # ZSH autocompletion
-  install -Dm 0644 "utils/zsh/functions/_slic3r" "$pkgdir/usr/share/zsh/site-functions/_${_pkgname}"
+  # install -Dm 0644 "utils/zsh/functions/_slic3r" "$pkgdir/usr/share/zsh/site-functions/_${_pkgname}"
 
   # Desktop file
-  install -d "$pkgdir/usr/share/applications"
-  install -m 644 "$srcdir/slic3r.desktop" "$pkgdir/usr/share/applications/${_pkgname}.desktop"
+  install -Dm 644 "${srcdir}/slic3r_prusa3d.desktop" -t "${pkgdir}/usr/share/applications"
 
   # 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"
+  install -d "${pkgdir}/usr/share/icons/hicolor/"{128x128,192x192}"/apps/"
+  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"
 }
-