Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
winetricks
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
winetricks
Commits
bb2877dc
Commit
bb2877dc
authored
May 27, 2022
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix detection for --gui without args
parent
ef8fe105
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
44 additions
and
2 deletions
+44
-2
0001-fix-detection-for-gui-without-args.patch
patches/0001-fix-detection-for-gui-without-args.patch
+42
-0
winetricks.spec
winetricks.spec
+2
-2
No files found.
patches/0001-fix-detection-for-gui-without-args.patch
0 → 100644
View file @
bb2877dc
From e86950243c9de949269102aed1aa42d215fd2308 Mon Sep 17 00:00:00 2001
From: Vitaly Lipatov <lav@etersoft.ru>
Date: Mon, 23 May 2022 21:37:20 +0300
Subject: [PATCH] fix detection for --gui without args
---
src/winetricks | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/winetricks b/src/winetricks
index cd2a344..1058a50 100755
--- a/src/winetricks
+++ b/src/winetricks
@@ -3271,11 +3271,13 @@ winetricks_early_wine_arch()
winetricks_detect_gui()
{
- if [ -n "$1" ]; then
- if [ "$1" = "kdialog" ] && test -x "$(command -v kdialog 2>/dev/null)"; then
+ if [ "$1" != "--gui" ] ; then
+ if [ "$1" = "kdialog" ] ; then
+ test -x "$(command -v kdialog 2>/dev/null)" || w_die "--gui kdialog is forced, but kdialog command is missed."
WINETRICKS_GUI=kdialog
WINETRICKS_GUI_VERSION="$(kdialog --version)"
- elif [ "$1" = "zenity" ] || [ "$1" = "--gui" ] && test -x "$(command -v zenity 2>/dev/null)"; then
+ elif [ "$1" = "zenity" ] ; then
+ test -x "$(command -v zenity 2>/dev/null)" || w_die "--gui zenity is forced, but zenity command is missed."
WINETRICKS_GUI=zenity
WINETRICKS_GUI_VERSION="$(zenity --version)"
WINETRICKS_MENU_HEIGHT=500
@@ -23097,7 +23099,7 @@ if ! test "${WINETRICKS_LIB}"; then
# GUI case
# No non-option arguments given, so read them from GUI, and loop until user quits
if [ ${WINETRICKS_GUI} = "none" ]; then
- winetricks_detect_gui
+ winetricks_detect_gui --gui
fi
winetricks_detect_sudo
test -z "${WINETRICKS_ISO_MOUNT}" && winetricks_detect_iso_mount
--
2.33.3
winetricks.spec
View file @
bb2877dc
Name: winetricks
Version: 20220411
Release: alt
2
Release: alt
3
Summary: Work around common problems in Wine
...
...
@@ -14,7 +14,7 @@ Packager: Vitaly Lipatov <lav@altlinux.ru>
# Source-url: %url/archive/%version/%name-%version.tar.gz
Source: %name-%version.tar
Patch: 0
66a2334ebc6fb608825949d7c642b1441bc403a
.patch
Patch: 0
001-fix-detection-for-gui-without-args
.patch
BuildArch: noarch
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment