* [PR PATCH] lutris: fix crash, add missing dependency
@ 2021-01-20 21:51 paper42
2021-01-20 22:02 ` ericonr
2021-01-21 15:37 ` [PR PATCH] [Merged]: " ericonr
0 siblings, 2 replies; 3+ messages in thread
From: paper42 @ 2021-01-20 21:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1927 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages 0001-lutris-fix-crash-add-missing-dependency.patch
https://github.com/void-linux/void-packages/pull/28063
lutris: fix crash, add missing dependency
The last version could crash if file `~/.local/share/lutris/runtime/dxvk/dxvk_versions.json` didn't exist (for example on first run). The patch content is already upstream.
Lutris was also complaining about an old version of python-magic, adding it to dependencies fixed it.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28063.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-0001-lutris-fix-crash-add-missing-dependency.patch-28063.patch --]
[-- Type: text/x-diff, Size: 2227 bytes --]
From be38856ef8dac717aef0a260fb3f9da7ef5d7960 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Wed, 20 Jan 2021 22:43:56 +0100
Subject: [PATCH] lutris: fix crash, add missing dependency
---
srcpkgs/lutris/patches/fix-dxvk.patch | 22 ++++++++++++++++++++++
srcpkgs/lutris/template | 4 ++--
2 files changed, 24 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/lutris/patches/fix-dxvk.patch
diff --git a/srcpkgs/lutris/patches/fix-dxvk.patch b/srcpkgs/lutris/patches/fix-dxvk.patch
new file mode 100644
index 00000000000..1a7c135d06e
--- /dev/null
+++ b/srcpkgs/lutris/patches/fix-dxvk.patch
@@ -0,0 +1,22 @@
+upstream: yes
+--- lutris/util/wine/dxvk.py
++++ lutris/util/wine/dxvk.py
+@@ -53,7 +53,8 @@ def version(self):
+ """Return version of DXVK (latest known version if not provided)"""
+ if self._version:
+ return self._version
+- return self.versions[0]
++ if self.versions:
++ return self.versions[0]
+
+ @property
+ def dxvk_path(self):
+@@ -62,6 +62,8 @@ def dxvk_path(self):
+
+ def load_dxvk_versions(self):
+ versions_path = os.path.join(self.base_dir, "dxvk_versions.json")
++ if not system.path_exists(versions_path):
++ return []
+ with open(versions_path, "r") as dxvk_version_file:
+ dxvk_versions = [v["tag_name"] for v in json.load(dxvk_version_file)]
+ return dxvk_versions
diff --git a/srcpkgs/lutris/template b/srcpkgs/lutris/template
index 6a059013032..c8008f65f8f 100644
--- a/srcpkgs/lutris/template
+++ b/srcpkgs/lutris/template
@@ -1,12 +1,12 @@
# Template file for 'lutris'
pkgname=lutris
version=0.5.8.2
-revision=2
+revision=3
build_style=meson
hostmakedepends="gettext python3-setuptools python3-gobject gtk+3-devel"
depends="python3-dbus python3-gobject python3-yaml python3-evdev python3-Pillow
pciutils cabextract gtk+3 xrandr unzip p7zip gnome-desktop python3-requests webkit2gtk
- glxinfo python3-distro python3-lxml"
+ glxinfo python3-distro python3-lxml python3-magic"
short_desc="Open gaming platform for managing games in a unified way"
maintainer="Jan Wey. <janwey.git@gmail.com>"
license="GPL-3.0-or-later"
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: lutris: fix crash, add missing dependency
2021-01-20 21:51 [PR PATCH] lutris: fix crash, add missing dependency paper42
@ 2021-01-20 22:02 ` ericonr
2021-01-21 15:37 ` [PR PATCH] [Merged]: " ericonr
1 sibling, 0 replies; 3+ messages in thread
From: ericonr @ 2021-01-20 22:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 210 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28063#issuecomment-763978430
Comment:
@abenson if he wants to test, otherwise mergy merge when GCC is done.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: lutris: fix crash, add missing dependency
2021-01-20 21:51 [PR PATCH] lutris: fix crash, add missing dependency paper42
2021-01-20 22:02 ` ericonr
@ 2021-01-21 15:37 ` ericonr
1 sibling, 0 replies; 3+ messages in thread
From: ericonr @ 2021-01-21 15:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1733 bytes --]
There's a merged pull request on the void-packages repository
lutris: fix crash, add missing dependency
https://github.com/void-linux/void-packages/pull/28063
Description:
The last version could crash if file `~/.local/share/lutris/runtime/dxvk/dxvk_versions.json` didn't exist (for example on first run). The patch content is already upstream.
Lutris was also complaining about an old version of python-magic, adding it to dependencies fixed it.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-21 15:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-20 21:51 [PR PATCH] lutris: fix crash, add missing dependency paper42
2021-01-20 22:02 ` ericonr
2021-01-21 15:37 ` [PR PATCH] [Merged]: " ericonr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).