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

[Bruno Pagani]

    Date: Wednesday, July 21, 2021 @ 00:47:06
  Author: archange
Revision: 980598

upgpkg: prusa-slicer 2.3.3-1

Modified:
  prusa-slicer/trunk/PKGBUILD
Deleted:
  prusa-slicer/trunk/prusa-slicer-gcc11.patch

--------------------------+
 PKGBUILD                 |    9 +++------
 prusa-slicer-gcc11.patch |   21 ---------------------
 2 files changed, 3 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-21 00:46:04 UTC (rev 980597)
+++ PKGBUILD	2021-07-21 00:47:06 UTC (rev 980598)
@@ -1,8 +1,8 @@
 # Maintainer: Bruno Pagani <archange at archlinux.org>
 
 pkgname=prusa-slicer
-pkgver=2.3.1
-pkgrel=4
+pkgver=2.3.3
+pkgrel=1
 pkgdesc="G-code generator for 3D printers (Prusa fork of Slic3r)"
 arch=(x86_64)
 url="https://github.com/prusa3d/PrusaSlicer"
@@ -11,15 +11,12 @@
 makedepends=(cmake boost cereal eigen expat gtest libpng systemd)
 replaces=(slic3r-prusa3d)
 source=(${url}/archive/version_${pkgver}/${pkgname}-${pkgver}.tar.gz
-        prusa-slicer-gcc11.patch
         prusa-slicer-openexr3.patch)
-sha256sums=('c1315826d07f428dfe4b9aa6325727beb1257aa6f711d1659a2760f8e213cd51'
-            '1d394b12e0b8f597e5c19c3531621a7ccfd70216d997a77de24891c92a524170'
+sha256sums=('deda209505f740ac3d6f59cb2a960f4df908269ee09bd30cd4edb9fc472d29ac'
             '1ef7c22f641b7c18de212202c21f14f6533834a36d7fe0c2b322bc9a13804c6b')
 
 prepare() {
   cd PrusaSlicer-version_${pkgver}
-  patch -p1 < ../prusa-slicer-gcc11.patch # Add missing include for GCC 11
   patch -p1 < ../prusa-slicer-openexr3.patch # Fix build with openEXR 3
 }
 

Deleted: prusa-slicer-gcc11.patch
===================================================================
--- prusa-slicer-gcc11.patch	2021-07-21 00:46:04 UTC (rev 980597)
+++ prusa-slicer-gcc11.patch	2021-07-21 00:47:06 UTC (rev 980598)
@@ -1,21 +0,0 @@
-From 62592cab48cfb6a20d84041b1992aecc6a2b659c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hejl?= <hejl.lukas at gmail.com>
-Date: Sat, 1 May 2021 22:33:59 +0200
-Subject: [PATCH] Added missing include (GCC 11.1)
-
----
- src/libslic3r/Optimize/Optimizer.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/libslic3r/Optimize/Optimizer.hpp b/src/libslic3r/Optimize/Optimizer.hpp
-index 05191eba26..8ae55c61c5 100644
---- a/src/libslic3r/Optimize/Optimizer.hpp
-+++ b/src/libslic3r/Optimize/Optimizer.hpp
-@@ -8,6 +8,7 @@
- #include <functional>
- #include <limits>
- #include <cassert>
-+#include <optional>
- 
- namespace Slic3r { namespace opt {
-