[pull] main from pkgforge-dev:main

.github/workflows/Dolphin_sharun.yml

@@ -46,6 +46,10 @@ jobs:
 
           pacman-key --init && pacman-key --populate archlinux
           printf "\n[extra]\nInclude = /etc/pacman.d/mirrorlist-arch\n" | tee -a /etc/pacman.conf
+
+          cat /etc/pacman.conf
+          sudo sed -i 's/NoExtract/#NoExtract/g' /etc/pacman.conf
+
           pacman -Syu --noconfirm zsync \
             dolphin-emu \
             pulseaudio \

.github/workflows/blank.yml

@@ -4,14 +4,6 @@ name: CI
 
 # Controls when the action will run. 
 on:
-  # Triggers the workflow on push or pull request events but only for the master branch
-  push:
-    branches: [ main ]
-    paths-ignore: [ '**/README.md' ]
-  pull_request:
-    branches: [ main ]
-    paths-ignore: [ '**/README.md' ]
-
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 

dolphin-emu-appimage.sh

@@ -37,7 +37,8 @@ chmod +x ./lib4bin
 
 xvfb-run -a -- ./lib4bin -p -v -r -e -s -k /usr/bin/dolphin-*
 
-# for some reason the dir needs a capital S?
+# when compiled portable this directory needs a capital S
+# this is not needed since we are not using a binary that was compiled portable
 cp -r /usr/share/dolphin-emu/sys ./bin/Sys
 
 # Deploy Qt manually xd
@@ -79,9 +80,13 @@ git clone https://github.com/fritzw/ld-preload-open.git preload.tmp
 ( cd preload.tmp && make all && mv ./path-mapping.so ../ )
 rm -rf ./preload.tmp
 
-echo 'PATH_MAPPING="/usr/share/dolphin-emu/sys:${SHARUN_DIR}/bin/Sys"
+echo 'PATH_MAPPING="/usr/share/dolphin-emu/sys:${SHARUN_DIR}/bin/Sys:/usr/share/dolphin-emu//../locale:${SHARUN_DIR}/share/locale"
 LD_PRELOAD=${SHARUN_DIR}/path-mapping.so' > ./.env
 
+# copy locales, for some reason the dolphin binary tries to look into an invalid /usr/share/dolphin-emu//../locale path
+cp -r /usr/share/locale ./share
+find ./share/locale -type f ! -name '*dolphin*' -delete
+
 # Prepare sharun
 ln ./sharun ./AppRun
 ./sharun -g