Updated pkgbuild, removed patch

5 files changed, 63 insertions, 123 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 804e99cedfe3..800f591dd437 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Sun Sep  3 11:56:47 UTC 2017
 pkgbase = slic3r-prusa3d-git
 	pkgdesc = Updated Slic3r by Prusa3D with many bugfixes and new features
-	pkgver = 1.37.0.r39.g247070cd
-	pkgrel = 2
+	pkgver = 1.42.0.alpha7.r95.gc77d15c98
+	pkgrel = 1
 	url = http://www.prusa3d.com/
 	arch = i686
 	arch = x86_64
@@ -11,35 +9,21 @@ pkgbase = slic3r-prusa3d-git
 	arch = armv6h
 	arch = armv7h
 	license = AGPL3
-	checkdepends = perl-io-stringy
-	checkdepends = perl-local-lib
+	checkdepends = gtest
+	makedepends = cmake
 	makedepends = boost
-	makedepends = git
-	makedepends = perl-alien-wxwidgets
-	makedepends = perl-devel-checklib
-	makedepends = perl-extutils-cppguess
-	makedepends = perl-extutils-typemaps-default
-	makedepends = perl-module-build-withxspp
 	depends = boost-libs
-	depends = perl
-	depends = perl-class-accessor
-	depends = perl-libwww
-	depends = perl-encode-locale
-	depends = perl-moo
-	depends = perl-opengl
-	depends = perl-wx-glcanvas
-	optdepends = perl-net-dbus: notifications support via any dbus-based notifier
-	optdepends = perl-xml-sax-expatxs: make AMF parsing faster
-	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
+	depends = curl
+	depends = wxgtk2
+	depends = glew
+	depends = intel-tbb
+	depends = nlopt
 	conflicts = slic3r-prusa3d
+	conflicts = slic3r
 	source = git+https://github.com/prusa3d/Slic3r.git
-	source = Move-Slic3r-data-to-usr-share-slic3r.patch
-	source = slic3r.desktop
-	md5sums = SKIP
-	md5sums = a8f234adc154ad4c59ab03f8acc78eed
-	md5sums = 1941c1ede2f03774ffb77f68a7c33572
+	source = slic3r_prusa3d.desktop
+	sha256sums = SKIP
+	sha256sums = 598e84a1a837059929477ce9d45e1e660be51e69202f788f83c6f65437055db5
 
 pkgname = slic3r-prusa3d-git
 
diff --git a/Move-Slic3r-data-to-usr-share-slic3r.patch b/Move-Slic3r-data-to-usr-share-slic3r.patch
deleted file mode 100644
index 580e3ced1006..000000000000
--- a/Move-Slic3r-data-to-usr-share-slic3r.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 43d7dee7..40c7a815 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -45,9 +45,8 @@ find_package(Perl REQUIRED)
- add_subdirectory(xs)
- 
- enable_testing ()
--get_filename_component(PERL_BIN_PATH "${PERL_EXECUTABLE}" DIRECTORY)
--add_test (NAME xs COMMAND "${PERL_EXECUTABLE}" ${PERL_BIN_PATH}/prove -I ${PROJECT_SOURCE_DIR}/local-lib/lib/perl5 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/xs)
--add_test (NAME integration COMMAND "${PERL_EXECUTABLE}" ${PERL_BIN_PATH}/prove WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
-+add_test (NAME xs COMMAND prove -I ${PROJECT_SOURCE_DIR}/local-lib/lib/perl5 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/xs)
-+add_test (NAME integration COMMAND prove WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
- 
- install(PROGRAMS slic3r.pl DESTINATION bin RENAME slic3r-prusa3d)
- 
-diff --git a/lib/Slic3r.pm b/lib/Slic3r.pm
-index 17b78326..8411fad7 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"
- 
- use FindBin;
- # Path to the images.
--our $var = sub { decode_path($FindBin::Bin) . "/var/" . $_[0] };
-+our $var = sub { '/usr/share/slic3r-prusa3d/' . $_[0] };
- 
- use Moo 1.003001;
- 
-diff --git a/slic3r.pl b/slic3r.pl
-index 4b6e43e4..d833ed1b 100755
---- a/slic3r.pl
-+++ b/slic3r.pl
-@@ -5,8 +5,7 @@ use warnings;
- 
- BEGIN {
-     use FindBin;
--    use lib "$FindBin::Bin/lib";
--    use local::lib '--no-create', "$FindBin::Bin/local-lib";
-+    use lib "$FindBin::Bin/lib", "/usr/lib/slic3r-prusa3d/";
- }
- 
- use File::Basename qw(basename);
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"
 }
-
diff --git a/slic3r.desktop b/slic3r.desktop
deleted file mode 100644
index 339c267834c6..000000000000
--- a/slic3r.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Name=Slic3r Prusa Edition
-Icon=slic3r-prusa3d
-Exec=/usr/bin/slic3r-prusa3d
-StartupNotify=false
-StartupWMClass=Slic3r-prusa3d.pl
diff --git a/slic3r_prusa3d.desktop b/slic3r_prusa3d.desktop
new file mode 100644
index 000000000000..c92e0e71982b
--- /dev/null
+++ b/slic3r_prusa3d.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Name=Slic3r Prusa Edition (Git version)
+Exec=/usr/bin/slic3r-gui
+Icon=slic3r-prusa3d
+Terminal=false
+Type=Application
+Categories=Graphics;3DGraphics;
+MimeType=model/stl;
+StartupNotify=true
+StartupWMClass=Slic3r-gui