From c4c2784f4363864cc23151678080458d7b7b1d25 Mon Sep 17 00:00:00 2001 From: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com> Date: Thu, 29 Jul 2021 15:13:10 -0700 Subject: [PATCH 1/2] Add GDK wrapper --- .github/workflows/appimage.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/appimage.sh b/.github/workflows/appimage.sh index efad73115..845cd7fd4 100644 --- a/.github/workflows/appimage.sh +++ b/.github/workflows/appimage.sh @@ -41,8 +41,18 @@ mkdir -p /yuzu/artifacts/version mkdir -p squashfs-root/usr/optional/{libstdc++,libgcc_s} cp /usr/lib/x86_64-linux-gnu/libstdc++.so.6 ./squashfs-root/usr/optional/libstdc++/ cp /lib/libgcc_s.so.1 ./squashfs-root/usr/optional/libgcc_s/ - curl -sSfL https://github.com/RPCS3/AppImageKit-checkrt/releases/download/continuous2/AppRun-patched-x86_64 -o ./squashfs-root/AppRun - chmod a+x ./squashfs-root/AppRun + curl -sSfL https://github.com/RPCS3/AppImageKit-checkrt/releases/download/continuous2/AppRun-patched-x86_64 -o ./squashfs-root/AppRun.wrapped +# create AppRun +cat << 'EOF' > $HOME/squashfs-root/AppRun +#! /usr/bin/env bash +set -e +this_dir="$(readlink -f "$(dirname "$0")")" +#GDK_PIXBUF +export GDK_PIXBUF_MODULEDIR=$(pkg-config --variable=gdk_pixbuf_moduledir gdk-pixbuf-2.0) +export GDK_PIXBUF_MODULE_FILE=$(pkg-config --variable=gdk_pixbuf_cache_file gdk-pixbuf-2.0) +exec "$this_dir"/AppRun.wrapped "$@" +EOF + chmod a+x ./squashfs-root/{AppRun,AppRun.wrapped} curl -sSfL https://github.com/RPCS3/AppImageKit-checkrt/releases/download/continuous2/exec-x86_64.so -o ./squashfs-root/usr/optional/exec.so printf "#include \n#include \n#include \nint main(){auto x = std::stringbuf();x.get_allocator();std::make_exception_ptr(0);std::pmr::get_default_resource();}" \ | $CXX -x c++ -std=c++2a -o ./squashfs-root/usr/optional/checker - @@ -55,7 +65,8 @@ export PATH=$(readlink -f /tmp/squashfs-root/usr/bin/):$PATH mv ./yuzu-x86_64.AppImage /yuzu/artifacts/version/Yuzu-EA-$version.AppImage # Continuous AppImage -mv $HOME/squashfs-root/AppRun ./squashfs-root/AppRun-patched +mv $HOME/squashfs-root/AppRun.wrapped ./squashfs-root/AppRun-patched +rm $HOME/squashfs-root/AppRun curl -sL "https://raw.githubusercontent.com/$GITHUB_REPOSITORY/$BRANCH/.github/workflows/AppRun" -o $HOME/squashfs-root/AppRun chmod a+x ./squashfs-root/AppRun mv /tmp/update/AppImageUpdate $HOME/squashfs-root/usr/bin/ From ef172840c866cee09df2a1736f3896be9c057d18 Mon Sep 17 00:00:00 2001 From: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com> Date: Thu, 29 Jul 2021 15:15:03 -0700 Subject: [PATCH 2/2] add GDK wrapper --- .github/workflows/AppRun | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/AppRun b/.github/workflows/AppRun index e5505e0e3..b676afd4f 100644 --- a/.github/workflows/AppRun +++ b/.github/workflows/AppRun @@ -1,5 +1,8 @@ #!/bin/bash +export GDK_PIXBUF_MODULEDIR=$(pkg-config --variable=gdk_pixbuf_moduledir gdk-pixbuf-2.0) +export GDK_PIXBUF_MODULE_FILE=$(pkg-config --variable=gdk_pixbuf_cache_file gdk-pixbuf-2.0) + mkdir -p $HOME/.local/share/icons/hicolor/scalable/apps && cp $APPDIR/yuzu.svg $HOME/.local/share/icons/hicolor/scalable/apps GITVER=`wget -qO- https://api.github.com/repos/pineappleEA/pineapple-src/releases/latest | grep "releases/tag" | grep -o 'EA-[[:digit:]]*'`