From c74c948d53efb9359a3312e9820adda2163ea8fd Mon Sep 17 00:00:00 2001 From: VHSgunzo Date: Mon, 5 Aug 2024 10:56:47 +0300 Subject: [PATCH] v0.78.5.3 --- CHANGELOG.md | 6 ++++++ LICENSE | 2 +- lux-wine | 11 +++++++++-- lwrap/PKGBUILD | 4 ++-- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d725da..596b7db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v0.78.5.3 + +* Update [lwrun](https://huggingface.co/lux-wine/lwrun/tree/main/releases/v0.39.1) packages +* Add [lw-tray on golang](https://github.com/VHSgunzo/lw-tray/commit/d5976a68237d9a8d26ab2e8bdb47803ea565bdd4) +* Minor fixes + # v0.78.5.2 * Update [lwrun](https://huggingface.co/lux-wine/lwrun/tree/main/releases/v0.39.1) packages diff --git a/LICENSE b/LICENSE index eb4a81a..2721e2f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2023 VHSgunzo +Copyright (c) 2024 VHSgunzo Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/lux-wine b/lux-wine index 61210e2..0c97a11 100755 --- a/lux-wine +++ b/lux-wine @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export LW_VERSION="0.78.5.2" +export LW_VERSION="0.78.5.3" export LW_DEVELOPERS="VHSgunzo" export RED='\033[1;91m' @@ -60,7 +60,12 @@ OLD_LW_DIR="$HOME/.local/share/LutrisWine" [ ! -n "$LW_DIR" ] && export LW_DIR="$HOME/.local/share/LuxWine" [ ! -n "$LW_BIN_DIR" ] && export LW_BIN_DIR="$LW_DIR/bin" [ ! -n "$LWRAP" ] && export LWRAP="$LW_BIN_DIR/lwrap" -[ ! -n "$LW_TRAY" ] && export LW_TRAY="$LWRAP_DIR/bin/lw-tray" +if [ ! -n "$LW_TRAY" ] + then + [ "$DESKTOP_SESSION" == "plasma" ] && \ + export LW_TRAY="$LWRAP_DIR/bin/lw-tray"||\ + export LW_TRAY="$LWRAP_DIR/bin/lw-tray-go/lw-tray" +fi if [ ! -n "$LW_THEMES_DIR" ] then [ -d "$LW_DIR/themes" ] && \ export LW_THEMES_DIR="$LW_DIR/themes"||\ @@ -2289,6 +2294,8 @@ lu_run() { lu_debug 2>/dev/null compositor_sw 2>/dev/null check_ld_library + WINESERVICES=(winecfg winefile explorer regedit control taskmgr uninstaller) + [[ "${WINESERVICES[@]}" =~ "$LU_EXEC" ]] && unset EXE_ARGS [[ -n "$LU_EXEC" ]] && export E_LU_EXEC="$(declare -p LU_EXEC)" [[ -n "$EXE_ARGS" ]] && export E_EXE_ARGS="$(declare -p EXE_ARGS)" [[ -n "$EXE_WRAPPER" ]] && export E_EXE_WRAPPER="$(declare -p EXE_WRAPPER)" diff --git a/lwrap/PKGBUILD b/lwrap/PKGBUILD index 7a8671c..c314f56 100644 --- a/lwrap/PKGBUILD +++ b/lwrap/PKGBUILD @@ -2,7 +2,7 @@ pkgname='lwrap' pkgver='0.78.5' -pkgrel='2' +pkgrel='3' pkgdesc='Lux Wine wrapper for RunImage container' arch=('x86_64') url='https://github.com/VHSgunzo/lux-wine' @@ -33,7 +33,7 @@ depends=( 'dos2unix' 'lw-runtime' 'wine-gecko' 'wine-mono' 'libdvdread' 'a52dec' 'wavpack' 'lib32-wavpack' 'libmpeg2' 'twolame' 'lib32-twolame' 'gst-plugin-msdk' 'lib32-libdv' 'libdv' 'GE-Proton' 'xxd-standalone' 'obs-vkcapture-lw' 'lib32-obs-vkcapture-lw' 'egl-wayland' 'gstreamer-vaapi' - 'moninfo' 'perl-image-exiftool' 'xorg-xlsfonts' 'firefox' 'controllermap' + 'moninfo' 'perl-image-exiftool' 'xorg-xlsfonts' 'firefox' 'controllermap' 'libayatana-appindicator' ) optdepends=( 'xf86-video-amdgpu' 'xf86-video-intel' 'llvm'