[arch-commits] Commit in prusa-slicer/trunk (PKGBUILD prusa-slicer.desktop)

[Bruno Pagani]

    Date: Monday, January 11, 2021 @ 19:05:46
  Author: archange
Revision: 818192

upgpkg: prusa-slicer 2.3.0-1

Switch to GTK3, use upstream .desktop file.

Modified:
  prusa-slicer/trunk/PKGBUILD
Deleted:
  prusa-slicer/trunk/prusa-slicer.desktop

----------------------+
 PKGBUILD             |   33 ++++++++++++---------------------
 prusa-slicer.desktop |   10 ----------
 2 files changed, 12 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-11 19:05:13 UTC (rev 818191)
+++ PKGBUILD	2021-01-11 19:05:46 UTC (rev 818192)
@@ -1,28 +1,18 @@
 # Maintainer: Bruno Pagani <archange at archlinux.org>
 
 pkgname=prusa-slicer
-pkgver=2.2.0
-pkgrel=11
+pkgver=2.3.0
+pkgrel=1
 pkgdesc="G-code generator for 3D printers (Prusa fork of Slic3r)"
 arch=(x86_64)
 url="https://github.com/prusa3d/PrusaSlicer"
 license=(AGPL3)
-depends=(boost-libs curl glew intel-tbb nlopt wxgtk2 qhull openvdb cgal) #wxgtk3)
+depends=(boost-libs curl glew intel-tbb nlopt wxgtk3 qhull openvdb cgal)
 makedepends=(cmake boost cereal eigen expat gtest libpng systemd)
 replaces=(slic3r-prusa3d)
-source=(${url}/archive/version_${pkgver}/${pkgname}-${pkgver}.tar.gz
-        ${pkgname}-boost-1.73.patch::${url}/commit/3a194f918716.patch
-        ${pkgname}.desktop)
-sha256sums=('e6e0c83bf92e448ec058fd3063b84caca69f58b8b419e48eace6e8ce534937c0'
-            '630b9db185ef3891387f3ade3eb29611eef7f7fc3fd8579b84864b936abf4b6f'
-            '9d21467c541b809f149b39c7c6b4f60b2c866823021fb6f8a076290583982d11')
+source=(${url}/archive/version_${pkgver}/${pkgname}-${pkgver}.tar.gz)
+sha256sums=('cd3bac5e29b5441fc4690f28cd7b1064e97dc00207bbdc88f7bd7832308d6ca5')
 
-prepare() {
-  cd PrusaSlicer-version_${pkgver}
-  sed -i '1i\#include <atomic>' src/slic3r/GUI/Mouse3DController.hpp
-  patch -Np1 -i ../${pkgname}-boost-1.73.patch
-}
-
 build() {
   cmake -B build -S PrusaSlicer-version_${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
@@ -29,9 +19,9 @@
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DSLIC3R_FHS=ON \
     -DSLIC3R_PCH=OFF \
-    -DSLIC3R_WX_STABLE=ON #\
-    #-DSLIC3R_GTK=3 \
-    #-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
+    -DSLIC3R_WX_STABLE=ON \
+    -DSLIC3R_GTK=3 \
+    -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
   make -C build
 }
 
@@ -43,12 +33,13 @@
 package() {
   make -C build DESTDIR="${pkgdir}" install
 
-  # Desktop file
-  install -Dm644 ${pkgname}.desktop -t "${pkgdir}"/usr/share/applications/
+  # Desktop files
+  mv "${pkgdir}"/usr/share/{PrusaSlicer/,}applications
 
   # Desktop icons
   for i in 32 128 192 ; do
     mkdir -p "${pkgdir}"/usr/share/icons/hicolor/${i}x${i}/apps/
-    ln -s /usr/share/PrusaSlicer/icons/PrusaSlicer_${i}px.png "${pkgdir}"/usr/share/icons/hicolor/${i}x${i}/apps/${pkgname}.png
+    ln -s /usr/share/PrusaSlicer/icons/PrusaSlicer_${i}px.png "${pkgdir}"/usr/share/icons/hicolor/${i}x${i}/apps/PrusaSlicer.png
+    ln -s /usr/share/PrusaSlicer/icons/PrusaSlicer-gcodeviewer_${i}px.png "${pkgdir}"/usr/share/icons/hicolor/${i}x${i}/apps/PrusaSlicer-gcodeviewer.png
   done
 }

Deleted: prusa-slicer.desktop
===================================================================
--- prusa-slicer.desktop	2021-01-11 19:05:13 UTC (rev 818191)
+++ prusa-slicer.desktop	2021-01-11 19:05:46 UTC (rev 818192)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=PrusaSlicer
-Exec=/usr/bin/prusa-slicer
-Icon=prusa-slicer
-Terminal=false
-Type=Application
-StartupNotify=false
-MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;
-Categories=Graphics;3DGraphics;
-Keywords=3D;Printing;Slicer;