PR#4: Update to 4.4.0 - rpms/cura - src.fedoraproject.org

rpms / cura

#4 Update to 4.4.0

Merged 4 years ago by churchyard. Opened 4 years ago by gferon.

rpms/ gferon/cura master into master

Gabriel Féron • 4 years ago

56acf3b

.gitignore

file modified

+1 -20

		`@@ -1,20 +1,1 @@`
		`- /Cura-13.03-linux-fedora.tar.gz`
		`- /Cura-13.04-linux-fedora.tar.gz`
		`- /Cura-13.10-fedora.tar.gz`
		`- /Cura-13.11.2-fedora.tar.gz`
		`- /Cura-14.06-fedora.tar.gz`
		`- /Cura-14.09-fedora.tar.gz`
		`- /Cura-14.12.1-fedora.tar.gz`
		`- /Cura-15.02.1-fedora.tar.gz`
		`- /Cura-95c2af21db7fdda8c4324a923fa004859f6c5b9c-fedora.tar.gz`
		`- /cura-2.5.0.tar.gz`
		`- /cura-2.6.1.tar.gz`
		`- /cura-2.7.0.tar.gz`
		`- /cura-3.0.3.tar.gz`
		`- /cura-3.1.0.tar.gz`
		`- /cura-3.2.1.tar.gz`
		`- /cura-3.3.0.tar.gz`
		`- /cura-3.4.1.tar.gz`
		`- /cura-3.5.1.tar.gz`
		`- /cura-3.6.0.tar.gz`
		`- /cura-4.0.0.tar.gz`
		`+ /cura-*.tar.gz`

0001-Force-to-open-with-X11.patch

file added

+25

		`@@ -0,0 +1,25 @@`
		`+ From 56bd818610c64211b166fe1812e62d1758487a68 Mon Sep 17 00:00:00 2001`
		`+ From: Gabriel Feron <feron.gabriel@gmail.com>`
		`+ Date: Thu, 21 Nov 2019 16:13:53 +0100`
		`+ Subject: [PATCH] Force to open with X11`
		`+`
		`+ ---`
		`+ cura_app.py \| 2 ++`
		`+ 1 file changed, 2 insertions(+)`
		`+`
		`+ diff --git a/cura_app.py b/cura_app.py`
		`+ index e14b441..4ab44ef 100755`
		`+ --- a/cura_app.py`
		`+ +++ b/cura_app.py`
		`+ @@ -42,6 +42,8 @@ if not known_args["debug"]:`
		`+`
		`+ # WORKAROUND: GITHUB-88 GITHUB-385 GITHUB-612`
		`+ if Platform.isLinux(): # Needed for platform.linux_distribution, which is not available on Windows and OSX`
		`+ + # Workaround for invisible window on Wayland and (at least) Fedora 31`
		`+ + os.environ["XDG_SESSION_TYPE"] = "x11"`
		`+ # For Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-qt4/+bug/941826`
		`+ # The workaround is only needed on Ubuntu+NVidia drivers. Other drivers are not affected, but fine with this fix.`
		`+ try:`
		`+ --`
		`+ 2.23.0`
		`+`

cura.spec

file modified

+8 -5

		`@@ -1,14 +1,15 @@`
		`Name: cura`
		`Epoch: 1`
		`- Version: 4.1.0`
		`- Release: 4%{?dist}`
		`+ Version: 4.4.0`
		`+ Release: 1%{?dist}`
		`Summary: 3D printer control software`

		`# https://lists.fedoraproject.org/archives/list/legal@lists.fedoraproject.org/thread/MOUNX6I3POCDMYWBNJ7JPLLIKVYWVRBJ/`
		`License: LGPLv3+`

		`URL: https://ultimaker.com/en/products/cura-software`
		`- Source0: https://github.com/Ultimaker/Cura/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz`
		`+ Source0: https://github.com/Ultimaker/Cura/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz`
		`+ Patch0: 0001-Force-to-open-with-X11.patch`

		`BuildArch: noarch`

		`@@ -58,7 +59,6 @@`
		`needs. As it's open source, our community helps enrich it even more.`

		`# see: https://github.com/Ultimaker/Cura/issues/5142`
		`- %define cura_sdk_version 6.0.0`
		`%define cura_cloud_api_root https://api.ultimaker.com`
		`%define cura_cloud_api_version 1`
		`%define cura_cloud_account_api_root https://account.ultimaker.com`
		`@@ -76,7 +76,6 @@`
		`%{cmake} \`
		`-DCURA_VERSION:STRING=%{version} \`
		`-DCURA_BUILDTYPE=RPM \`
		`- -DCURA_SDK_VERSION:STRING=%{cura_sdk_version} \`
		`-DCURA_CLOUD_API_ROOT:STRING=%{cura_cloud_api_root} \`
		`-DCURA_CLOUD_API_VERSION:STRING=%{cura_cloud_api_version} \`
		`-DCURA_CLOUD_ACCOUNT_API_ROOT:STRING=%{cura_cloud_account_api_root} \`
		`@@ -140,6 +139,10 @@`
		`%{_prefix}/lib/%{name}`

		`%changelog`
		`+ * Thu Nov 21 2019 Gabriel Féron <feron.gabriel@gmail.com> - 4.4.0-1`
		`+ - Update to 4.4.0`
		`+ - Force X11 to workaround invisible window on Wayland`
		`+`
		`* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1:4.1.0-4`
		`- Rebuilt for Python 3.8.0rc1 (#1748018)`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (cura-4.1.0.tar.gz) = 9cb76ca1ff45916111070e5664bdb0e53002ee4539677e01c4096722066cd25de0664d33fbf3ceffda010bd460c14a3855b32b79555946c218d3373e2a6ee767`
		`+ SHA512 (cura-4.4.0.tar.gz) = 7728553d15fc843c0f2aca83e1ce3df9806835eedd0be6d7447c3edd18cda7e4a23400192f70b1c385841463126dea5bbfc7316f8f12ed26b9392047cabc69d3`

gferon commented 4 years ago

None

Metadata Update from @gferon:
- Request assigned

4 years ago

gferon commented 4 years ago

@churchyard could you give a try to Cura 4.3.0? I can't open it properly on my PC with the default QT_QPA_PLATFORM but I have a very recent setup with a AMD Navi GPU which has problems with other apps.

rebased onto 2378620

4 years ago

churchyard commented 4 years ago

I can try later this week.

(Note that a %changelog entry is missing.)

gferon commented 4 years ago

I just added the missing %changelog entry and tested at work, and cura also doesn't open - I will investigate more on the matter. I suppose setting the default Qt backend to xorg should be used as a last resort?

churchyard commented 4 years ago

possibly.

gferon commented 4 years ago

I found out that with LIBGL_ALWAYS_SOFTWARE=1 it works fine, so I think there's a bug somewhere in either Qt or Mesa. I'm still investigating.

2 new commits added

Upgrade to 4.4.0 and force to run with X11 for now
Remove CURA_SDK_VERSION CMake variable and add changelog entry

4 years ago

gferon commented 4 years ago

@churchyard I just staged an update to 4.4.0 with a patch to force Cura to run with X11 for now. I'll open an issue upstream and try to investigate, but I just sliced and printed a model with the new update, so it's good to go on my side.

Note that for some of the dependencies, I had to tie to a specific commit as there's no GitHub release for 4.4 (yet, or not anymore).

churchyard commented 4 years ago

I'll try to look at this soon.

1 new commit added