[arch-commits] Commit in prusa-slicer/repos/community-x86_64 (4 files)

[Bruno Pagani]

    Date: Tuesday, May 28, 2019 @ 22:48:36
  Author: archange
Revision: 473230

archrelease: copy trunk to community-x86_64

Added:
  prusa-slicer/repos/community-x86_64/PKGBUILD
    (from rev 473229, prusa-slicer/trunk/PKGBUILD)
  prusa-slicer/repos/community-x86_64/prusa-slicer.desktop
    (from rev 473229, prusa-slicer/trunk/prusa-slicer.desktop)
Deleted:
  prusa-slicer/repos/community-x86_64/PKGBUILD
  prusa-slicer/repos/community-x86_64/prusa-slicer.desktop

----------------------+
 PKGBUILD             |  110 +++++++++++++++++++++++++------------------------
 prusa-slicer.desktop |   16 +++----
 2 files changed, 65 insertions(+), 61 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-05-28 22:48:25 UTC (rev 473229)
+++ PKGBUILD	2019-05-28 22:48:36 UTC (rev 473230)
@@ -1,53 +0,0 @@
-# Maintainer: Bruno Pagani <archange at archlinux.org>
-
-pkgname=prusa-slicer
-pkgver=2.0.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) #wxgtk3)
-makedepends=(cmake boost eigen3 expat qhull gtest libpng)
-replaces=(slic3r-prusa3d)
-source=("${url}/archive/version_${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        "${pkgname}.desktop")
-sha256sums=('5d3c7fd745f2875be55f316cd779805ce1b6ce38634f0f4b0ccd01884da731b3'
-            'fa469696bd85fef60a0f626d47d2da192902c627a9c80cc34325d47ab5d0172e')
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../PrusaSlicer-version_${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -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
-  make
-}
-
-check() {
-  cd build
-  ctest -v
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-
-  cd ..
-  # Desktop file
-  install -Dm644 ${pkgname}.desktop -t "${pkgdir}"/usr/share/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
-  done
-}

Copied: prusa-slicer/repos/community-x86_64/PKGBUILD (from rev 473229, prusa-slicer/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-05-28 22:48:36 UTC (rev 473230)
@@ -0,0 +1,57 @@
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+
+pkgname=prusa-slicer
+pkgver=2.0.0
+pkgrel=2
+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) #wxgtk3)
+makedepends=(cmake boost eigen3 expat qhull gtest libpng)
+replaces=(slic3r-prusa3d)
+source=("${url}/archive/version_${pkgver}/${pkgname}-${pkgver}.tar.gz"
+        prusa-slicer-mode-switching.patch::"https://github.com/prusa3d/PrusaSlicer/commit/5afd0b4ee28a18733dd8a0e4b4cfd612e60b452c.patch"
+        "${pkgname}.desktop")
+sha256sums=('5d3c7fd745f2875be55f316cd779805ce1b6ce38634f0f4b0ccd01884da731b3'
+            'e2f7b9865b24746a24d87d69eba72d8bf2de899466cf5731fa3cb446b8979e75'
+            'fa469696bd85fef60a0f626d47d2da192902c627a9c80cc34325d47ab5d0172e')
+
+prepare() {
+  mkdir -p build
+  cd PrusaSlicer-version_${pkgver}
+  patch -p1 -i ../prusa-slicer-mode-switching.patch
+}
+
+build() {
+  cd build
+  cmake ../PrusaSlicer-version_${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -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
+  make
+}
+
+check() {
+  cd build
+  ctest -v
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+
+  cd ..
+  # Desktop file
+  install -Dm644 ${pkgname}.desktop -t "${pkgdir}"/usr/share/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
+  done
+}

Deleted: prusa-slicer.desktop
===================================================================
--- prusa-slicer.desktop	2019-05-28 22:48:25 UTC (rev 473229)
+++ prusa-slicer.desktop	2019-05-28 22:48:36 UTC (rev 473230)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=PrusaSlicer
-Exec=/usr/bin/prusa-slicer
-Terminal=false
-Type=Application
-Icon=prusa-slicer
-StartupNotify=false
-Categories=Graphics;3DGraphics;

Copied: prusa-slicer/repos/community-x86_64/prusa-slicer.desktop (from rev 473229, prusa-slicer/trunk/prusa-slicer.desktop)
===================================================================
--- prusa-slicer.desktop	                        (rev 0)
+++ prusa-slicer.desktop	2019-05-28 22:48:36 UTC (rev 473230)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=PrusaSlicer
+Exec=/usr/bin/prusa-slicer
+Terminal=false
+Type=Application
+Icon=prusa-slicer
+StartupNotify=false
+Categories=Graphics;3DGraphics;