fix: isolate compat smoke dependencies

Author: Sunrisepeak

.github/workflows/validate.yml

@@ -51,7 +51,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Download mcpp
         env:
-          MCPP_VERSION: "0.0.38"
+          MCPP_VERSION: "0.0.40"
         run: |
           curl -L -fsS -o mcpp.tar.gz \
             "https://github.com/mcpp-community/mcpp/releases/download/v${MCPP_VERSION}/mcpp-${MCPP_VERSION}-linux-x86_64.tar.gz"

.gitignore

@@ -0,0 +1 @@
+.xlings-index-cache.json

pkgs/c/compat.xcb.lua

@@ -10,7 +10,7 @@ package = {
     xpm = {
         linux = {
             deps = {
-                "python@latest",
+                "xim:python@latest",
             },
             ["1.17.0"] = {
                 url    = "https://xorg.freedesktop.org/releases/individual/lib/libxcb-1.17.0.tar.xz",

tests/smoke_compat_archive.sh

@@ -27,14 +27,16 @@ link_xpkgs() {
     local src="$1"
     [[ -d "$src" ]] || return 0
     find "$src" -mindepth 1 -maxdepth 1 -type d | while read -r pkg; do
+        [[ "$(basename "$pkg")" == compat-x-* ]] && continue
         ln -s "$pkg" "$MCPP_HOME/registry/data/xpkgs/$(basename "$pkg")" 2>/dev/null || true
     done
 }
 link_xpkgs "$SMOKE_XPKGS_DIR"
 link_xpkgs "$USER_MCPP/registry/data/xpkgs"
 if [[ -d "$USER_MCPP/registry/data/xim-pkgindex" ]]; then
-    mkdir -p "$MCPP_HOME/registry/data"
-    ln -s "$USER_MCPP/registry/data/xim-pkgindex" "$MCPP_HOME/registry/data/xim-pkgindex" 2>/dev/null || true
+    mkdir -p "$MCPP_HOME/registry/data/xim-pkgindex"
+    cp -a "$USER_MCPP/registry/data/xim-pkgindex/." "$MCPP_HOME/registry/data/xim-pkgindex/" 2>/dev/null || true
+    rm -f "$MCPP_HOME/registry/data/xim-pkgindex/.xlings-index-cache.json"
 fi
 if [[ -d "$USER_MCPP/registry/bin" ]]; then
     mkdir -p "$MCPP_HOME/registry"

tests/smoke_compat_core.sh

@@ -26,14 +26,16 @@ link_xpkgs() {
     local src="$1"
     [[ -d "$src" ]] || return 0
     find "$src" -mindepth 1 -maxdepth 1 -type d | while read -r pkg; do
+        [[ "$(basename "$pkg")" == compat-x-* ]] && continue
         ln -s "$pkg" "$MCPP_HOME/registry/data/xpkgs/$(basename "$pkg")" 2>/dev/null || true
     done
 }
 link_xpkgs "$SMOKE_XPKGS_DIR"
 link_xpkgs "$USER_MCPP/registry/data/xpkgs"
 if [[ -d "$USER_MCPP/registry/data/xim-pkgindex" ]]; then
-    mkdir -p "$MCPP_HOME/registry/data"
-    ln -s "$USER_MCPP/registry/data/xim-pkgindex" "$MCPP_HOME/registry/data/xim-pkgindex" 2>/dev/null || true
+    mkdir -p "$MCPP_HOME/registry/data/xim-pkgindex"
+    cp -a "$USER_MCPP/registry/data/xim-pkgindex/." "$MCPP_HOME/registry/data/xim-pkgindex/" 2>/dev/null || true
+    rm -f "$MCPP_HOME/registry/data/xim-pkgindex/.xlings-index-cache.json"
 fi
 if [[ -d "$USER_MCPP/registry/bin" ]]; then
     mkdir -p "$MCPP_HOME/registry"

tests/smoke_compat_imgui.sh

@@ -14,7 +14,11 @@ if [[ -z "$MCPP_BIN" || ! -x "$MCPP_BIN" ]]; then
 fi
 
 TMP="$(mktemp -d)"
-trap 'rm -rf "$TMP"' EXIT
+if [[ "${MCPP_INDEX_KEEP_SMOKE_TMP:-0}" == "1" ]]; then
+    echo "KEEP: $TMP"
+else
+    trap 'rm -rf "$TMP"' EXIT
+fi
 SMOKE_CACHE_DIR="${MCPP_INDEX_SMOKE_CACHE_DIR:-}"
 SMOKE_XPKGS_DIR="${MCPP_INDEX_SMOKE_XPKGS_DIR:-}"
 
@@ -27,14 +31,16 @@ link_xpkgs() {
     local src="$1"
     [[ -d "$src" ]] || return 0
     find "$src" -mindepth 1 -maxdepth 1 -type d | while read -r pkg; do
+        [[ "$(basename "$pkg")" == compat-x-* ]] && continue
         ln -s "$pkg" "$MCPP_HOME/registry/data/xpkgs/$(basename "$pkg")" 2>/dev/null || true
     done
 }
 link_xpkgs "$SMOKE_XPKGS_DIR"
 link_xpkgs "$USER_MCPP/registry/data/xpkgs"
 if [[ -d "$USER_MCPP/registry/data/xim-pkgindex" ]]; then
-    mkdir -p "$MCPP_HOME/registry/data"
-    ln -s "$USER_MCPP/registry/data/xim-pkgindex" "$MCPP_HOME/registry/data/xim-pkgindex" 2>/dev/null || true
+    mkdir -p "$MCPP_HOME/registry/data/xim-pkgindex"
+    cp -a "$USER_MCPP/registry/data/xim-pkgindex/." "$MCPP_HOME/registry/data/xim-pkgindex/" 2>/dev/null || true
+    rm -f "$MCPP_HOME/registry/data/xim-pkgindex/.xlings-index-cache.json"
 fi
 if [[ -d "$USER_MCPP/registry/bin" ]]; then
     mkdir -p "$MCPP_HOME/registry"

tests/smoke_compat_imgui_window.sh

@@ -31,14 +31,16 @@ link_xpkgs() {
     local src="$1"
     [[ -d "$src" ]] || return 0
     find "$src" -mindepth 1 -maxdepth 1 -type d | while read -r pkg; do
+        [[ "$(basename "$pkg")" == compat-x-* ]] && continue
         ln -s "$pkg" "$MCPP_HOME/registry/data/xpkgs/$(basename "$pkg")" 2>/dev/null || true
     done
 }
 link_xpkgs "$SMOKE_XPKGS_DIR"
 link_xpkgs "$USER_MCPP/registry/data/xpkgs"
 if [[ -d "$USER_MCPP/registry/data/xim-pkgindex" ]]; then
-    mkdir -p "$MCPP_HOME/registry/data"
-    ln -s "$USER_MCPP/registry/data/xim-pkgindex" "$MCPP_HOME/registry/data/xim-pkgindex" 2>/dev/null || true
+    mkdir -p "$MCPP_HOME/registry/data/xim-pkgindex"
+    cp -a "$USER_MCPP/registry/data/xim-pkgindex/." "$MCPP_HOME/registry/data/xim-pkgindex/" 2>/dev/null || true
+    rm -f "$MCPP_HOME/registry/data/xim-pkgindex/.xlings-index-cache.json"
 fi
 if [[ -d "$USER_MCPP/registry/bin" ]]; then
     mkdir -p "$MCPP_HOME/registry"