[arch-commits] Commit in superslicer/trunk (PKGBUILD superslicer-wxgtk3-wayland.patch)

[Antonio Rojas]

    Date: Monday, July 18, 2022 @ 15:04:27
  Author: arojas
Revision: 1254427

Update to 2.4.58.2, drop no longer needed patch (FS#75366)

Modified:
  superslicer/trunk/PKGBUILD
Deleted:
  superslicer/trunk/superslicer-wxgtk3-wayland.patch

----------------------------------+
 PKGBUILD                         |    9 +++------
 superslicer-wxgtk3-wayland.patch |   21 ---------------------
 2 files changed, 3 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-07-18 13:17:28 UTC (rev 1254426)
+++ PKGBUILD	2022-07-18 15:04:27 UTC (rev 1254427)
@@ -2,7 +2,7 @@
 
 pkgname=superslicer
 pkgver=2.4.58.2
-pkgrel=3
+pkgrel=1
 epoch=1
 pkgdesc='G-code generator for 3D printers'
 arch=(x86_64)
@@ -34,13 +34,11 @@
 _tag=6fcfe8fc9b70e2e5b0aefd122153c27815bb7c8f
 source=(
   git+https://github.com/supermerill/SuperSlicer.git#tag=${_tag}
-  superslicer-wxgtk3-wayland.patch
   superslicer-cereal.patch
   superslicer-openexr3.patch
   superslicer-boost1.79.patch
 )
 b2sums=('SKIP'
-        '6b8abda2bfee9294bd5cd97380403680d6b2c6187af178e5eb4be2665280d1ff0d66036525b485e64d38d1d464756388fd4b53c6277d691079f51e6ee0c12372'
         'a652af374ca4cdd2b1db87bac9a1a6263a3c0df954c8afa4fddea3041659b159412fe3ab850d804a27dcb4b3ca8d64de511ef11769d353d7d2a0f7021dc38e99'
         'd351d05190977e55047504d13ab4172c7eaf7fb2077a61a448dd29a8a27084ee4b13284143102b7ea3dff0edc8b20675dff0014e9f26cd5f448e50c04a1d6779'
         '45ff3ab349a92b072eed57a511aead233e4356fcc9ab9382902af9702aee22f73c9a9f07a58420ca20c7c2cd41e81637f1d0114033c2fdb7f597cbcb484fa8ff')
@@ -47,7 +45,6 @@
 
 prepare() {
   cd SuperSlicer
-  patch -Np1 -i "$srcdir/superslicer-wxgtk3-wayland.patch"
   patch -Np1 -i "$srcdir/superslicer-cereal.patch"
   patch -Np1 -i "$srcdir/superslicer-openexr3.patch"
   patch -Np1 -i "$srcdir/superslicer-boost1.79.patch"
@@ -62,13 +59,13 @@
   cmake -S SuperSlicer -B build -G Ninja \
     -DCMAKE_BUILD_TYPE=None \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_CXX_FLAGS="$CXXFLAGS -ffat-lto-objects" \
     -DOpenGL_GL_PREFERENCE=GLVND \
     -DSLIC3R_ALPHA=OFF \
     -DSLIC3R_BUILD_TESTS=OFF \
     -DSLIC3R_FHS=ON \
     -DSLIC3R_GTK=3 \
-    -DSLIC3R_STATIC=OFF \
-    -DSLIC3R_WX_STABLE=ON
+    -DSLIC3R_STATIC=OFF
   cmake --build build
 }
 

Deleted: superslicer-wxgtk3-wayland.patch
===================================================================
--- superslicer-wxgtk3-wayland.patch	2022-07-18 13:17:28 UTC (rev 1254426)
+++ superslicer-wxgtk3-wayland.patch	2022-07-18 15:04:27 UTC (rev 1254427)
@@ -1,21 +0,0 @@
-diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp
-index 4e85967a5..f141aabb5 100644
---- a/src/slic3r/GUI/GUI.cpp
-+++ b/src/slic3r/GUI/GUI.cpp
-@@ -35,6 +35,16 @@
- 
- namespace Slic3r { namespace GUI {
- 
-+// wxgtk3 is broken on wayland: https://trac.wxwidgets.org/ticket/17702
-+#ifdef __WXGTK3__
-+struct ForceX11 {
-+    ForceX11() {
-+        setenv("GDK_BACKEND", "x11", 1);
-+    }
-+};
-+static struct ForceX11 forcex11;
-+#endif
-+
- #if __APPLE__
- IOPMAssertionID assertionID;
- #endif