From d30d5f3630eaba3f0b2b7c68599d7f819921d005f58de69d34e854fd497c408f Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Tue, 1 Sep 2020 12:00:03 +0000 Subject: [PATCH 1/3] - enforce GDK_BACKEND=x11 gh#prusa3d/PrusaSlicer#4691 by indroducing the same wrapper as Fedora OBS-URL: https://build.opensuse.org/package/show/science/PrusaSlicer?expand=0&rev=15 --- PrusaSlicer.changes | 6 ++++++ PrusaSlicer.spec | 13 ++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/PrusaSlicer.changes b/PrusaSlicer.changes index b81fe23..76485f5 100644 --- a/PrusaSlicer.changes +++ b/PrusaSlicer.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 1 11:46:30 UTC 2020 - Benjamin Greiner + +- enforce GDK_BACKEND=x11 gh#prusa3d/PrusaSlicer#4691 by + indroducing the same wrapper as Fedora + ------------------------------------------------------------------- Thu Aug 20 15:50:07 UTC 2020 - Benjamin Greiner diff --git a/PrusaSlicer.spec b/PrusaSlicer.spec index ef4d548..c220d9b 100644 --- a/PrusaSlicer.spec +++ b/PrusaSlicer.spec @@ -64,7 +64,7 @@ It also works with Mach3, LinuxCNC and Machinekit controllers. %prep %setup -q -n %{name}-version_%{version} -sed -i 's/UNKNOWN/OpenSUSE/' version.inc +sed -i 's/UNKNOWN/OpenSUSE-release%{release}/' version.inc %build # The build process really acquires that much memory per job. We are @@ -85,6 +85,17 @@ sed -i 's/UNKNOWN/OpenSUSE/' version.inc %install %cmake_install + +# https://github.com/prusa3d/PrusaSlicer/issues/4691 +# Since the binary segfaults under Wayland, we have to wrap it. +mv %{buildroot}%{_bindir}/prusa-slicer %{buildroot}%{_bindir}/prusa-slicer.wrapped +cat >> %{buildroot}%{_bindir}/prusa-slicer <<'END' +#!/bin/sh +export GDK_BACKEND=x11 +exec %{_bindir}/prusa-slicer.wrapped "$@" +END +chmod 755 %{buildroot}%{_bindir}/prusa-slicer + for res in 32 128 192; do mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${res}x${res}/apps/ ln -sr %{buildroot}%{_datadir}/%{name}/icons/%{name}_${res}px.png \ From f32bda865bf26af18989b5a5887ec06ce9c3fca08ccabff2f1e8264514f0a723 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Tue, 1 Sep 2020 12:24:43 +0000 Subject: [PATCH 2/3] forgot wrapper in files section OBS-URL: https://build.opensuse.org/package/show/science/PrusaSlicer?expand=0&rev=16 --- PrusaSlicer.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/PrusaSlicer.spec b/PrusaSlicer.spec index c220d9b..5748c3b 100644 --- a/PrusaSlicer.spec +++ b/PrusaSlicer.spec @@ -148,6 +148,7 @@ find %{buildroot}%{_datadir}/%{name}/localization -type d | sed ' %files -f lang-files %{_bindir}/prusa-slicer +%{_bindir}/prusa-slicer.wrapped %dir %{_datadir}/%{name}/ %{_datadir}/%{name}/{icons,models,profiles,shaders,udev}/ %{_datadir}/icons/hicolor/32x32/apps/%{name}.png From 062229dc0809b68cd645edabc7d98bbb3f7bb27fab801cee7121d07acd8ac44d Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Tue, 1 Sep 2020 13:19:26 +0000 Subject: [PATCH 3/3] - enforce GDK_BACKEND=x11 by indroducing the same wrapper as Fedora gh#prusa3d/PrusaSlicer#4691 OBS-URL: https://build.opensuse.org/package/show/science/PrusaSlicer?expand=0&rev=17 --- PrusaSlicer.changes | 4 ++-- PrusaSlicer.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PrusaSlicer.changes b/PrusaSlicer.changes index 76485f5..b7060d2 100644 --- a/PrusaSlicer.changes +++ b/PrusaSlicer.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Tue Sep 1 11:46:30 UTC 2020 - Benjamin Greiner -- enforce GDK_BACKEND=x11 gh#prusa3d/PrusaSlicer#4691 by - indroducing the same wrapper as Fedora +- enforce GDK_BACKEND=x11 by indroducing the same wrapper as Fedora + gh#prusa3d/PrusaSlicer#4691 ------------------------------------------------------------------- Thu Aug 20 15:50:07 UTC 2020 - Benjamin Greiner diff --git a/PrusaSlicer.spec b/PrusaSlicer.spec index 5748c3b..1b71880 100644 --- a/PrusaSlicer.spec +++ b/PrusaSlicer.spec @@ -64,7 +64,7 @@ It also works with Mach3, LinuxCNC and Machinekit controllers. %prep %setup -q -n %{name}-version_%{version} -sed -i 's/UNKNOWN/OpenSUSE-release%{release}/' version.inc +sed -i 's/UNKNOWN/%{release}-%{?is_opensuse:open}SUSE-%{suse_version}/' version.inc %build # The build process really acquires that much memory per job. We are