maik/Arch-Hyprland
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing mesaon build errors

Browse Source
This commit is contained in:
Don Williams
2025-11-14 01:17:20 -05:00
parent 9cf06be539
commit 956fb369b5
1 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
install-scripts/ags.sh
View File

@@ -95,26 +95,15 @@ if git clone --depth=1 https://github.com/JaKooLit/ags_v1.9.0.git; then
grep -n 'moduleResolution\|ignoreDeprecations' tsconfig.json >> "$MLOG" || true grep -n 'moduleResolution\|ignoreDeprecations' tsconfig.json >> "$MLOG" || true
fi fi
# Patch pam.ts to avoid ESM gi://GUtils, which fails on some GJS builds (e.g. Arch), # Patch pam.ts to avoid ESM gi://GUtils (which breaks on some GJS builds)
# and instead use the older imports.gi API that we know works. # and instead use imports.gi.GUtils, which we know works from runtime tests.
if [ -f src/utils/pam.ts ]; then if [ -f src/utils/pam.ts ]; then
if grep -q "import GUtils from 'gi://GUtils'" src/utils/pam.ts; then if grep -q "import GUtils from 'gi://GUtils'" src/utils/pam.ts; then
printf "%s Patching src/utils/pam.ts to use imports.gi.GUtils...\n" "${NOTE}" | tee -a "$MLOG" printf "%s Patching src/utils/pam.ts to use imports.gi.GUtils...\n" "${NOTE}" | tee -a "$MLOG"
tmp_pam="$(mktemp)" # 1) Drop the upstream // @ts-expect-error line (it causes TS2578 now).
awk ' sed -i '/@ts-expect-error/d' src/utils/pam.ts
NR==1 { # 2) Replace the gi:// import with an imports.gi-based binding.
print "// Patched by install-scripts/ags.sh to avoid gi://GUtils ESM issues"; sed -i "s|import GUtils from 'gi://GUtils';|// Patched by install-scripts/ags.sh to avoid gi://GUtils ESM issues\\n// eslint-disable-next-line @typescript-eslint/ban-ts-comment\\n// @ts-ignore\\ndeclare const imports: any;\\nconst GUtils = (imports as any).gi.GUtils as any;|" src/utils/pam.ts
print "// eslint-disable-next-line @typescript-eslint/ban-ts-comment";
print "// @ts-ignore";
print "declare const imports: any;";
}
$0 ~ /^import GUtils from '\''gi:\/\/GUtils'\'';/ {
print "const GUtils = imports.gi.GUtils as any;";
next;
}
{ print }
' src/utils/pam.ts > "$tmp_pam"
mv "$tmp_pam" src/utils/pam.ts
fi fi
fi fi
@@ -124,6 +113,11 @@ if git clone --depth=1 https://github.com/JaKooLit/ags_v1.9.0.git; then
printf "\n${OK} ${YELLOW}Aylur's GTK shell $ags_tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG" printf "\n${OK} ${YELLOW}Aylur's GTK shell $ags_tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG"
else else
echo -e "\n${ERROR} ${YELLOW}Aylur's GTK shell $ags_tag${RESET} Installation failed\n " 2>&1 | tee -a "$MLOG" echo -e "\n${ERROR} ${YELLOW}Aylur's GTK shell $ags_tag${RESET} Installation failed\n " 2>&1 | tee -a "$MLOG"
# Abort here on build/install failure so we do NOT install a broken launcher
# or report success when AGS binaries are missing.
mv "$MLOG" ../Install-Logs/ || true
cd ..
exit 1
fi fi
LAUNCHER_DIR="/usr/local/share/com.github.Aylur.ags" LAUNCHER_DIR="/usr/local/share/com.github.Aylur.ags"