From 34c462770a7b7aeb47ee1cc2f2d5a1b04e42003b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E9=80=B8=E8=B1=AA?= Date: Wed, 15 Feb 2023 13:00:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=94=B9=E5=96=84wine=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E7=9A=84=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lutris/gui/dialogs/runner_install.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lutris/gui/dialogs/runner_install.py b/lutris/gui/dialogs/runner_install.py index fa578d6b..39502fba 100644 --- a/lutris/gui/dialogs/runner_install.py +++ b/lutris/gui/dialogs/runner_install.py @@ -255,7 +255,11 @@ class RunnerInstallDialog(ModelessDialog): # Extract version numbers from the end of the version string. # We look for things like xx-7.2 or xxx-4.3-2. A leading period # will be part of the version, but a leading hyphen will not. - match = re.search(r"^(.*?)\-?(\d[.\-\d]*)$", raw_version) + # 老虎会游泳：第一个正则表达式匹配 overwatch2-caffe-7.18 中的 7.18，以及 lutris-7.2-2 中的 7.2-2。 + # 第二个正则表达式匹配 lutris-GE-Proton7-32 中的 7-32。 + # 表达式不能合并或交换顺序，否则 lutris-mk11-4.18 的匹配结果可能是 11，而不是我们想要的 4.18。 + # 表达式也不能以 $ 结束，否则匹配不到 winehq-staging-7.19-ubuntu20.04 里的 7.19。 + match = re.search(r"^(.*?)\-(\d+(\.\d+){1,}(-\d+)?)", raw_version) or re.search(r"^(.*?)(\d[.\-\d]*)", raw_version) if match: version_parts = [int(p) for p in match.group(2).replace("-", ".").split(".") if p] return version_parts, raw_version, version["architecture"] -- Gitee From fc63329e726cbac2fc3f8b2ba7ed4088a26613f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E9=80=B8=E8=B1=AA?= Date: Wed, 15 Feb 2023 13:03:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=8F=90=E5=8D=87?= =?UTF-8?q?=E5=88=B00.5.12.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 11374230..2c9d55ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +net.winegame.client (0.5.12.2) jammy; urgency=medium + + * 改善wine版本的排序。 + + -- SwimmingTiger Wed, 15 Feb 2023 13:02:20 +0800 + net.winegame.client (0.5.12.1) jammy; urgency=medium * Vulkan ICD加载器里添加一个“不指定（使用系统默认值）”的选项 -- Gitee