v0.75.9

Add lwrap Fix create_shortcut() Change *.desktop's Add all LW path to Makefile uninstall Minor fixes
VHSgunzo · Feb 23, 2023 · 9f0aa54 · 9f0aa54
1 parent cb69e50
commit 9f0aa54
Show file tree

Hide file tree

Showing 40 changed files with 398 additions and 214 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,130 +8,27 @@ on:
     - '*'
 
 jobs:
-  build:
+  build_and_release:
+    name: lutris-wine
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
+
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Build archlinux package
+      - name: Build archlinux packages
         uses: countstarlight/arch-makepkg-action@master
         with:
-          #repos: >
-          #  archlinuxcn=https://geo-mirror.chaotic.cx/$repo/$arch
-          #before: "sudo pacman -S --noconfirm archlinux-keyring chaotic-keyring chaotic-mirrorlist"
-          # packages: >
-          #   aria2
-          #   qt5-tools
-          #   xterm
-          #   xorg-fonts-100dpi
-          #   xorg-fonts-75dpi
-          #   xorg-fonts-cyrillic
-          #   xorg-fonts-type1
-          #   xorg-fonts-misc
-          #   cabextract
-          #   perl
-          #   unzip
-          #   xorg-xmessage
-          #   zenity
-          #   yad
-          #   xkb-switch
-          #   imagemagick
-          #   icoutils
-          #   lib32-mangohud
-          #   lib32-vkbasalt
-          #   mangohud
-          #   mangohud-common
-          #   vkbasalt
-          #   gamemode
-          #   lib32-gamemode
-          #   giflib
-          #   lib32-giflib
-          #   libpng
-          #   lib32-libpng
-          #   libldap
-          #   lib32-libldap
-          #   gnutls
-          #   lib32-gnutls
-          #   mpg123
-          #   lib32-mpg123
-          #   openal
-          #   lib32-openal
-          #   v4l-utils
-          #   lib32-v4l-utils
-          #   libpulse
-          #   lib32-libpulse
-          #   libgpg-error
-          #   lib32-libgpg-error
-          #   alsa-plugins
-          #   lib32-alsa-plugins
-          #   alsa-lib
-          #   lib32-alsa-lib
-          #   libjpeg-turbo
-          #   lib32-libjpeg-turbo
-          #   sqlite
-          #   lib32-sqlite
-          #   libxcomposite
-          #   lib32-libxcomposite
-          #   libxinerama
-          #   lib32-libgcrypt
-          #   libgcrypt
-          #   lib32-libxinerama
-          #   ncurses
-          #   lib32-ncurses
-          #   opencl-icd-loader
-          #   lib32-opencl-icd-loader
-          #   libxslt
-          #   lib32-libxslt
-          #   libva
-          #   lib32-libva
-          #   gtk3
-          #   lib32-gtk3
-          #   lib32-vulkan-icd-loader
-          #   vulkan-headers
-          #   vulkan-icd-loader
-          #   vulkan-tools
-          #   mesa
-          #   lib32-glu
-          #   glu
-          #   lib32-libva-mesa-driver
-          #   lib32-mesa
-          #   libva-mesa-driver
-          #   mesa-demos
-          #   mesa-utils
-          #   mesa-vdpau
-          #   vulkan-mesa-layers
-          #   lib32-vulkan-mesa-layers
-          #   libstrangle-git
-          #   openssl
-          #   libnotify
-          #   coreutils
-          #   libxrandr
-          #   lib32-libxrandr
-          #   xorg-xrandr
-          #   bc
-          #   xorg-xgamma
-          #   lsb-release
-          #   iputils
-          #   curl
-          #   xdelta3
-          #   latencyflex-git
-          #   latencyflex-wine-git
-          #   xdg-utils
-          #   desktop-file-utils
-          #   squashfs-tools
-          #   squashfuse
-          #   fuse2
-          #   reshade-shaders-git
-          #   winetricks
-          #   innoextract
-          #   p7zip
-          #   gnu-netcat
-          scripts: "makepkg --nodeps"
+          scripts: "makepkg --nodeps && cd lwrap && makepkg --nodeps"
+
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
         with:
-          files: lutris-wine-git-*.pkg*
+          files: |
+            lutris-wine-git-*.pkg*
+            lwrap/lwrap-*.pkg*
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/LutrisWineService.desktop b/LutrisWineService.desktop
@@ -1,191 +1,191 @@
 [Desktop Action explorer]
-Exec=lutris-wine -explorer %f
+Exec="/usr/bin/lutris-wine" -explorer %f
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Explorer
 Name[ru_RU]=Рабочий стол
 
 [Desktop Action cmd]
-Exec=lutris-wine -cmd %f
+Exec="/usr/bin/lutris-wine" -cmd %f
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Open in CMD
 Name[ru_RU]=Открыть в CMD
 
 [Desktop Action shell]
-Exec=lutris-wine -shell %f
+Exec="/usr/bin/lutris-wine" -shell %f
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Open in SHELL
 Name[ru_RU]=Открыть в SHELL
 
 [Desktop Action regedit]
-Exec=lutris-wine -regedit %f
+Exec="/usr/bin/lutris-wine" -regedit %f
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Registry editor
 Name[ru_RU]=Редактор реестра
 
 [Desktop Action control]
-Exec=lutris-wine -control %f
+Exec="/usr/bin/lutris-wine" -control %f
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Control panel
 Name[ru_RU]=Панель управления
 
 [Desktop Action winecfg]
-Exec=lutris-wine -winecfg %f
+Exec="/usr/bin/lutris-wine" -winecfg %f
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Wine settings
 Name[ru_RU]=Настройки Wine
 
 [Desktop Action taskmgr]
-Exec=lutris-wine -taskmgr %f
+Exec="/usr/bin/lutris-wine" -taskmgr %f
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Task manager
 Name[ru_RU]=Диспетчер задач
 
 [Desktop Action winemgr]
-Exec=lutris-wine -winemgr
+Exec="/usr/bin/lutris-wine" -winemgr
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Wine manager
 Name[ru_RU]=Wine менеджер
 
 [Desktop Action uninstaller]
-Exec=lutris-wine -uninstaller %f
+Exec="/usr/bin/lutris-wine" -uninstaller %f
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Wine uninstaller
 Name[ru_RU]=Устан/удал программ
 
 [Desktop Action winetricks]
-Exec=lutris-wine -winetricks %f
+Exec="/usr/bin/lutris-wine" -winetricks %f
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Winetricks
 Name[ru_RU]=Winetricks
 
 [Desktop Action openpfx]
-Exec=lutris-wine -openpfx %f
+Exec="/usr/bin/lutris-wine" -openpfx %f
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Open drive C:\\
 Name[ru_RU]=Открыть диск C:\\
 
 [Desktop Action killwine]
-Exec=lutris-wine -killwine %f
+Exec="/usr/bin/lutris-wine" -killwine %f
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Kill Wine processes
 Name[ru_RU]=Убить процессы Wine
 
 [Desktop Action killtray]
-Exec=lutris-wine -killtray
+Exec="/usr/bin/lutris-wine" -killtray
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Kill tray
 Name[ru_RU]=Убить трей
 
 [Desktop Action killexe]
-Exec=lutris-wine -killexe %f
+Exec="/usr/bin/lutris-wine" -killexe %f
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Kill running EXE
 Name[ru_RU]=Убить запущенные EXE
 
 [Desktop Action killshell]
-Exec=lutris-wine -killshell
+Exec="/usr/bin/lutris-wine" -killshell
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Kill SHELL
 Name[ru_RU]=Убить SHELL
 
 [Desktop Action clearpfx]
-Exec=lutris-wine -clearpfx %f
+Exec="/usr/bin/lutris-wine" -clearpfx %f
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Clear prefix
 Name[ru_RU]=Очистить префикс
 
 [Desktop Action debug]
-Exec=lutris-wine -debug %f
+Exec="/usr/bin/lutris-wine" -debug %f
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=DEBUG
 Name[ru_RU]=ДЕБАГ
 
 [Desktop Action shortcut]
-Exec=lutris-wine -shortcut %f
+Exec="/usr/bin/lutris-wine" -shortcut %f
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Create shortcut
 Name[ru_RU]=Cоздать ярлык
 
 [Desktop Action addtolu]
-Exec=lutris-wine -addtolu %f
+Exec="/usr/bin/lutris-wine" -addtolu %f
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Add to Lutris
 Name[ru_RU]=Добавить в Lutris
 
 [Desktop Action rmapp]
-Exec=lutris-wine -rmapp %f
+Exec="/usr/bin/lutris-wine" -rmapp %f
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Remove menu app
 Name[ru_RU]=Удалить приложение из меню
 
 [Desktop Action tray]
-Exec=lutris-wine -tray noclose
+Exec="/usr/bin/lutris-wine" -tray noclose
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Tray
 Name[ru_RU]=Трей
 
 [Desktop Action exit]
-Exec=lutris-wine -exit %f
+Exec="/usr/bin/lutris-wine" -exit %f
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Force exit
 Name[ru_RU]=Закрыть всё
 
 [Desktop Action update]
-Exec=lutris-wine -update openupdtr
+Exec="/usr/bin/lutris-wine" -update openupdtr
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Update runtime
 Name[ru_RU]=Обновление рантайм
 
 [Desktop Action help]
-Exec=lutris-wine -help
+Exec="/usr/bin/lutris-wine" -help
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Usage info
 Name[ru_RU]=Использование
 
 [Desktop Action version]
-Exec=lutris-wine -version %f
+Exec="/usr/bin/lutris-wine" -version %f
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Version info
 Name[ru_RU]=Версия
 
 [Desktop Action config]
-Exec=lutris-wine -config %f
+Exec="/usr/bin/lutris-wine" -config %f
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Settings
 Name[ru_RU]=Настройки
 
 [Desktop Action appcfg]
-Exec=lutris-wine -appcfg
+Exec="/usr/bin/lutris-wine" -appcfg
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Apps settings
 Name[ru_RU]=Настройки приложений
 
 [Desktop Action init]
-Exec=lutris-wine -init %f
+Exec="/usr/bin/lutris-wine" -init %f
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Forced initialization
 Name[ru_RU]=Принудительная инициализация
 
 [Desktop Action pfxbackup]
-Exec=lutris-wine -pfxbackup %f
+Exec="/usr/bin/lutris-wine" -pfxbackup %f
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Create prefix backup
 Name[ru_RU]=Создать бекап префикса
 
 [Desktop Action pfxrestore]
-Exec=lutris-wine -pfxrestore %f
+Exec="/usr/bin/lutris-wine" -pfxrestore %f
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Restore prefix from backup
 Name[ru_RU]=Восстановить префикс
 
 [Desktop Action backupmnt]
-Exec=lutris-wine -backupmnt %f
+Exec="/usr/bin/lutris-wine" -backupmnt %f
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Mount prefix backup
 Name[ru_RU]=Монтировать бекап префикса
 
 [Desktop Action backupunmnt]
-Exec=lutris-wine -backupunmnt %f
+Exec="/usr/bin/lutris-wine" -backupunmnt %f
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 Name=Unmount prefix backup
 Name[ru_RU]=Отмонтировать бекап префикса

diff --git a/Makefile b/Makefile
@@ -36,5 +36,12 @@ uninstall:
 	$(RM) -rfv "$(DESTDIR)/usr/share/kservices5/ServiceMenus/LutrisWine"*
 	$(RM) -rfv "$(DESTDIR)/usr/share/lutris-wine"
 	$(RM) -rfv "$(DESTDIR)/usr/share/licenses/lutris-wine"
+	$(RM) -rfv "$(HOME)/.local/bin/lutris-wine"
+	$(RM) -rfv "$(HOME)/.config/menus/applications-merged/LutrisWine.menu"
+	$(RM) -rfv "$(HOME)/.local/share/applications/LutrisWine"
+	$(RM) -rfv "$(HOME)/.local/share/desktop-directories/LutrisWine"*
+	$(RM) -rfv "$(HOME)/.local/share/kservices5/ServiceMenus/LutrisWine"*
+	$(RM) -rfv "$(HOME)/.local/share/LutrisWine"
+	$(RM) -rfv "$(HOME)/LutrisWine"
 
 .PHONY: install uninstall
diff --git a/PKGBUILD b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: VHSgunzo <vhsgunzo.github.io>
 pkgname='lutris-wine-git'
-pkgver='0.75.8'
+pkgver='0.75.9'
 pkgrel='1'
 pkgdesc='Easy launch of your Windows applications and games with Wine/Proton'
 arch=('x86_64')

diff --git a/applications/LutrisWine.desktop b/applications/LutrisWine.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Categories=Lutris Wine
-Exec=lutris-wine %f
+Exec="/usr/bin/lutris-wine" %f
 Icon=/usr/share/lutris-wine/icons/default_icon.png
 MimeType=application/x-ms-dos-executable;application/x-wine-extension-msp;application/x-msi;application/x-msdos-program;text/win-bat;application/x-ms-shortcut;text/x-ms-regedit
 Name=Lutris Wine