Rename package

4 files changed, 41 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d76bb93da70a..6f0accef3296 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,33 @@
-pkgbase = prusaslicer-git
+pkgbase = prusa-slicer-git
 	pkgdesc = G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)
-	pkgver = 2.0.0
+	pkgver = 2.0.0.r336.gf617d7472
 	pkgrel = 1
-	url = http://www.prusa3d.com/
+	url = https://github.com/prusa3d/PrusaSlicer
 	arch = i686
 	arch = x86_64
 	arch = armv6
 	arch = armv6h
 	arch = armv7h
 	license = AGPL3
-	checkdepends = gtest
-	makedepends = cmake
 	makedepends = boost
+	makedepends = cmake
+	makedepends = gtest
 	depends = boost-libs
 	depends = curl
-	depends = wxgtk2
 	depends = glew
 	depends = intel-tbb
 	depends = nlopt
+	depends = wxgtk2
 	conflicts = slic3r-prusa3d-git
 	conflicts = slic3r-prusa3d
 	conflicts = slic3r
-	conflicts = prusaslicer
+	conflicts = prusa-slicer
 	replaces = slic3r-prusa3d-git
+	replaces = prusaslicer-git
 	source = git+https://github.com/prusa3d/PrusaSlicer.git
-	source = prusaslicer.desktop
+	source = prusa-slicer.desktop
 	sha256sums = SKIP
-	sha256sums = 8787e62d32e6460d92076ffe9366cd1c55e5703d220398e7f4ab1146d67f81d1
+	sha256sums = 26b66701cb2512f0d524add44689e2478c0b875f73103034e74544a9574782c5
 
-pkgname = prusaslicer-git
+pkgname = prusa-slicer-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..63ea916ef5f3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/*/
diff --git a/PKGBUILD b/PKGBUILD
index 6c624533d668..680bbfa70d37 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,27 @@
 # Maintainer: Salamandar <felix@piedallu.me>
 
-_pkgname=prusaslicer
+_pkgname=prusa-slicer
+
 pkgname=${_pkgname}-git
-pkgver=2.0.0
+pkgver=2.0.0.r336.gf617d7472
 pkgrel=1
 pkgdesc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 arch=('i686' 'x86_64' 'armv6' 'armv6h' 'armv7h')
-url="http://www.prusa3d.com/"
+url="https://github.com/prusa3d/PrusaSlicer"
 license=('AGPL3')
-depends=(
-  'boost-libs' 'curl' 'wxgtk2' 'glew' 'intel-tbb' 'nlopt'
-)
-makedepends=(
-  'cmake' 'boost'
-)
-checkdepends=(
-  'gtest'
-)
+depends=('boost-libs' 'curl' 'glew' 'intel-tbb' 'nlopt' 'wxgtk2')
+makedepends=('boost' 'cmake' 'gtest')
 source=(
   "git+https://github.com/prusa3d/PrusaSlicer.git"
-  'prusaslicer.desktop'
+  'prusa-slicer.desktop'
 )
 sha256sums=(
   'SKIP'
-  '8787e62d32e6460d92076ffe9366cd1c55e5703d220398e7f4ab1146d67f81d1'
+  '26b66701cb2512f0d524add44689e2478c0b875f73103034e74544a9574782c5'
 )
 
-conflicts=('slic3r-prusa3d-git' 'slic3r-prusa3d' 'slic3r' 'prusaslicer')
-replaces=( 'slic3r-prusa3d-git')
+conflicts=('slic3r-prusa3d-git' 'slic3r-prusa3d' 'slic3r' 'prusa-slicer')
+replaces=( 'slic3r-prusa3d-git' 'prusaslicer-git')
 
 pkgver() {
   cd "${srcdir}/PrusaSlicer"
@@ -39,13 +33,14 @@ build() {
   mkdir -p build
 
   cd build
-  cmake \
-    -DCMAKE_BUILD_TYPE=Release \
+  cmake ..\
+    -DSLIC3R_STATIC=0 \
+    -DSLIC3R_FHS=1 \
+    -DSLIC3R_WX_STABLE=1 \
+    -DSLIC3R_GTK=3 \
+    -DSLIC3R_PCH=0 \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DSLIC3R_FHS=True \
-    -DSLIC3R_PCH=False \
-    -DSLIC3R_WX_STABLE=True \
-    ..
+    -DCMAKE_INSTALL_LIBDIR=lib
 
   make
 }
@@ -57,13 +52,15 @@ check() {
 
 package () {
   cd "${srcdir}/PrusaSlicer/build"
-  DESTDIR="${pkgdir}" make install
+  make DESTDIR="${pkgdir}" install
 
   # Desktop file
-  install -Dm 644 "${srcdir}/prusaslicer.desktop" -t "${pkgdir}/usr/share/applications"
+  install -d "$pkgdir/usr/share/applications"
+  install -m 644 "${srcdir}/prusa-slicer.desktop" "${pkgdir}/usr/share/applications"
 
   # Desktop icon
-  install -d "${pkgdir}/usr/share/icons/hicolor/"{128x128,192x192}"/apps/"
+  install -d "${pkgdir}/usr/share/icons/hicolor/"{32x32,128x128,192x192}"/apps/"
+  ln -s "/usr/share/PrusaSlicer/icons/PrusaSlicer_32px.png"  "${pkgdir}/usr/share/icons/hicolor/32x32/apps/${_pkgname}.png"
   ln -s "/usr/share/PrusaSlicer/icons/PrusaSlicer_128px.png" "${pkgdir}/usr/share/icons/hicolor/128x128/apps/${_pkgname}.png"
   ln -s "/usr/share/PrusaSlicer/icons/PrusaSlicer_192px.png" "${pkgdir}/usr/share/icons/hicolor/192x192/apps/${_pkgname}.png"
 }
diff --git a/prusaslicer.desktop b/prusa-slicer.desktop
index 683d20827289..0583cc192c42 100644
--- a/prusaslicer.desktop
+++ b/prusa-slicer.desktop
@@ -1,12 +1,15 @@
 [Desktop Entry]
+Encoding=UTF-8
 Version=1.0
+Type=Application
+
 Name=PrusaSlicer (git edition)
 Exec=/usr/bin/prusa-slicer
-Icon=prusaslicer
 Terminal=false
-Type=Application
+Icon=prusa-slicer
+
 Categories=Graphics;3DGraphics;
 MimeType=model/stl;
-StartupNotify=true
+
+StartupNotify=false
 StartupWMClass=Prusa-slicer
-X-Desktop-File-Install-Version=0.24