Date: Sunday, August 14, 2022 @ 19:16:19 Author: alucryd Revision: 1266082
upgpkg: superslicer 1:2.4.58.4-1 Added: superslicer/trunk/superslicer-wxgtk3-wayland.patch Modified: superslicer/trunk/PKGBUILD ----------------------------------+ PKGBUILD | 21 ++++++++++++--------- superslicer-wxgtk3-wayland.patch | 21 +++++++++++++++++++++ 2 files changed, 33 insertions(+), 9 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-08-14 19:09:40 UTC (rev 1266081) +++ PKGBUILD 2022-08-14 19:16:19 UTC (rev 1266082) @@ -1,8 +1,9 @@ -# Maintainer: Lukas1818 aur at lukas1818 dot de +# Maintainer: Maxime Gauduin <[email protected]> +# Contributor: Lukas1818 <[email protected]> pkgname=superslicer -pkgver=2.4.58.3 -pkgrel=2 +pkgver=2.4.58.4 +pkgrel=1 epoch=1 pkgdesc='G-code generator for 3D printers' arch=(x86_64) @@ -36,8 +37,7 @@ systemd webkit2gtk ) -optdepends=('superslicer-profiles: Predefined printer profiles') -_tag=1b9766613cd7785586391b85025e46b4850d2c33 +_tag=eab5d801234a595fdcc28019e2afb3b4c5fc86fa _wxcommit=489f6118256853cf5b299d595868641938566cdb source=( git+https://github.com/supermerill/SuperSlicer.git#tag=${_tag} @@ -46,6 +46,7 @@ superslicer-cereal.patch superslicer-openexr3.patch superslicer-boost1.79.patch + superslicer-wxgtk3-wayland.patch ) b2sums=('SKIP' 'SKIP' @@ -52,7 +53,8 @@ '05c1d81b8dd005b4a5db935e32facc4aefd27696458ff41caef50b93bf2ac12da441e534b1f9d99383bfba6db23c0e4a8b53cf567c245f11478379cf769a5a1b' 'a652af374ca4cdd2b1db87bac9a1a6263a3c0df954c8afa4fddea3041659b159412fe3ab850d804a27dcb4b3ca8d64de511ef11769d353d7d2a0f7021dc38e99' 'd351d05190977e55047504d13ab4172c7eaf7fb2077a61a448dd29a8a27084ee4b13284143102b7ea3dff0edc8b20675dff0014e9f26cd5f448e50c04a1d6779' - '45ff3ab349a92b072eed57a511aead233e4356fcc9ab9382902af9702aee22f73c9a9f07a58420ca20c7c2cd41e81637f1d0114033c2fdb7f597cbcb484fa8ff') + '45ff3ab349a92b072eed57a511aead233e4356fcc9ab9382902af9702aee22f73c9a9f07a58420ca20c7c2cd41e81637f1d0114033c2fdb7f597cbcb484fa8ff' + '6b8abda2bfee9294bd5cd97380403680d6b2c6187af178e5eb4be2665280d1ff0d66036525b485e64d38d1d464756388fd4b53c6277d691079f51e6ee0c12372') prepare() { cd SuperSlicer @@ -61,9 +63,10 @@ git config submodule.resources/profiles.url ../slic3r-profiles git submodule update resources/profiles - patch -Np1 -i "$srcdir/superslicer-cereal.patch" - patch -Np1 -i "$srcdir/superslicer-openexr3.patch" - patch -Np1 -i "$srcdir/superslicer-boost1.79.patch" + patch -Np1 -i ../superslicer-cereal.patch + patch -Np1 -i ../superslicer-openexr3.patch + patch -Np1 -i ../superslicer-boost1.79.patch + patch -Np1 -i ../superslicer-wxgtk3-wayland.patch } pkgver() { Added: superslicer-wxgtk3-wayland.patch =================================================================== --- superslicer-wxgtk3-wayland.patch (rev 0) +++ superslicer-wxgtk3-wayland.patch 2022-08-14 19:16:19 UTC (rev 1266082) @@ -0,0 +1,21 @@ +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
