Uranium: update to 4.2.0.
This commit is contained in:
parent
157a43d1ad
commit
46dc96f4a3
@ -1,25 +0,0 @@
|
||||
From 675b0ec27be2cd2789edd56d991b17fcb467a4cb Mon Sep 17 00:00:00 2001
|
||||
From: Jasper Chan <jasperchan515@gmail.com>
|
||||
Date: Sat, 17 Nov 2018 01:27:37 -0800
|
||||
Subject: [PATCH] Remove crashing line
|
||||
|
||||
---
|
||||
UM/Qt/Bindings/MainWindow.py | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git UM/Qt/Bindings/MainWindow.py UM/Qt/Bindings/MainWindow.py
|
||||
index 72d76d8e..ab48cbc5 100644
|
||||
--- UM/Qt/Bindings/MainWindow.py
|
||||
+++ UM/Qt/Bindings/MainWindow.py
|
||||
@@ -73,8 +73,6 @@ class MainWindow(QQuickWindow):
|
||||
|
||||
self._viewport_rect = QRectF(0, 0, 1.0, 1.0)
|
||||
|
||||
- self.closing.connect(self.preClosing)
|
||||
-
|
||||
Application.getInstance().setMainWindow(self)
|
||||
self._fullscreen = False
|
||||
|
||||
--
|
||||
2.19.1
|
||||
|
@ -1,30 +0,0 @@
|
||||
From 237dc959ca536ae4a45d1ba59d4ad6cf86a36946 Mon Sep 17 00:00:00 2001
|
||||
From: Ghostkeeper <rubend@tutanota.com>
|
||||
Date: Mon, 25 Feb 2019 11:58:02 +0100
|
||||
Subject: [PATCH] Fix install prefix when installing in symlinked directory
|
||||
|
||||
If /bin is a symlink to /usr/bin and /bin appears before /usr/bin on the user's PATH, it would get sys.argv[0]='/bin/python3'. This then messes up the install location ('/') which consequently messes up the data and config storage directories.
|
||||
This solution is provided by CapnKernel and should resolve the symlink so that sys.argv[0]='/usr/bin/python3' again and the storage data and config storage directories become something like /usr/share/... again.
|
||||
---
|
||||
UM/Application.py | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git UM/Application.py UM/Application.py
|
||||
index 05adb8f3..f709438a 100644
|
||||
--- UM/Application.py
|
||||
+++ UM/Application.py
|
||||
@@ -398,9 +398,10 @@ class Application:
|
||||
@staticmethod
|
||||
def getInstallPrefix() -> str:
|
||||
if "python" in os.path.basename(sys.executable):
|
||||
- return os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), ".."))
|
||||
+ executable = sys.argv[0]
|
||||
else:
|
||||
- return os.path.abspath(os.path.join(os.path.dirname(sys.executable), ".."))
|
||||
+ executable = sys.executable
|
||||
+ return os.path.abspath(os.path.join(os.path.dirname(os.path.realpath(executable)), ".."))
|
||||
|
||||
__instance = None # type: Application
|
||||
|
||||
--
|
||||
2.21.0
|
@ -1,6 +1,6 @@
|
||||
# Template file for 'Uranium'
|
||||
pkgname=Uranium
|
||||
version=4.0.0
|
||||
version=4.2.0
|
||||
revision=1
|
||||
archs=noarch
|
||||
build_style=cmake
|
||||
@ -15,4 +15,4 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
|
||||
license="LGPL-3.0-or-later"
|
||||
homepage="https://github.com/Ultimaker/Uranium"
|
||||
distfiles="https://github.com/Ultimaker/Uranium/archive/${version}.tar.gz"
|
||||
checksum=d405183b98b2e8db8c8c11ebe6f8838865cb4ac7f6a55ab0ac654b060edf9dd8
|
||||
checksum=af394fb133e6a3ce92c245428bcf458956b2ca26c33122a35c464b9f5aaddd2e
|
||||
|
Loading…
x
Reference in New Issue
Block a user