diff --git a/cura-nvidia-fedora.patch b/cura-nvidia-fedora.patch new file mode 100644 index 0000000..7bc24df --- /dev/null +++ b/cura-nvidia-fedora.patch @@ -0,0 +1,13 @@ +diff --git a/cura_app.py b/cura_app.py +index 6869fd2..c9fae02 100755 +--- a/cura_app.py ++++ b/cura_app.py +@@ -12,7 +12,7 @@ from UM.Platform import Platform + #WORKAROUND: GITHUB-88 GITHUB-385 GITHUB-612 + if Platform.isLinux(): # Needed for platform.linux_distribution, which is not available on Windows and OSX + # For Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-qt4/+bug/941826 +- if platform.linux_distribution()[0] in ("debian", "Ubuntu", "LinuxMint"): # TODO: Needs a "if X11_GFX == 'nvidia'" here. The workaround is only needed on Ubuntu+NVidia drivers. Other drivers are not affected, but fine with this fix. ++ if platform.linux_distribution()[0] in ("debian", "Ubuntu", "LinuxMint", "Fedora"): # TODO: Needs a "if X11_GFX == 'nvidia'" here. The workaround is only needed on Ubuntu+NVidia drivers. Other drivers are not affected, but fine with this fix. + import ctypes + from ctypes.util import find_library + libGL = find_library("GL") diff --git a/cura.spec b/cura.spec index 48c3a1a..49c5d0d 100644 --- a/cura.spec +++ b/cura.spec @@ -1,7 +1,7 @@ Name: cura Epoch: 1 Version: 3.0.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: 3D printer control software License: AGPLv3+ @@ -11,6 +11,10 @@ Source0: https://github.com/Ultimaker/Cura/archive/%{version}.tar.gz#/%{n # https://github.com/Ultimaker/Cura/issues/2664 Patch0: %{name}-fix-tests.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1520138 +# https://github.com/Ultimaker/Cura/pull/2903 +Patch1: %{name}-nvidia-fedora.patch + BuildArch: noarch # There are Python plugins in /usr/lib/cura @@ -125,6 +129,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_prefix}/lib/%{name} %changelog +* Sun Dec 03 2017 Miro Hrončok - 1:3.0.3-4 +- Also apply the nvidia driver workaround on Fedora (#1520138) + * Tue Nov 21 2017 Miro Hrončok - 1:3.0.3-3 - Require libglvnd-devel as a workaround for #1494278