Update appimage-arm.yml

Author: javiercplus

.github/workflows/appimage-arm.yml

@@ -1,4 +1,4 @@
-name: (ARM64) Compilar y Empaquetar AppImage
+name: (Debian ARM64) Compilar y Empaquetar AppImage
 
 on:
   workflow_dispatch:
@@ -126,25 +126,13 @@ jobs:
           export QT_PLUGIN_PATH="$HERE/usr/plugins:$HERE/usr/lib/plugins:$HERE/usr/lib/qt6/plugins:$QT_PLUGIN_PATH"
           export QT_QPA_PLATFORM_PLUGIN_PATH="$HERE/usr/plugins/platforms:$HERE/usr/lib/plugins/platforms:$HERE/usr/lib/qt6/plugins/platforms"
           
-          # Detectar automáticamente Wayland o X11
-          if [ -n "$WAYLAND_DISPLAY" ] || [ -S "$XDG_RUNTIME_DIR/wayland-0" ]; then
-            export QT_QPA_PLATFORM=wayland
-            echo "Usando plugin Wayland"
-          else
-            export QT_QPA_PLATFORM=xcb
-            echo "Usando plugin XCB (X11)"
-          fi
+          # Forzar el uso de XCB (X11) para garantizar el movimiento de ventanas
+          export QT_QPA_PLATFORM=xcb
+          echo "Usando plugin XCB (X11)"
           
-          export QT_DEBUG_PLUGINS=1
           export MCPELAUNCHER_DATA_DIR="$HERE/usr/share/mcpelauncher"
           export PATH="$HERE/usr/bin:$PATH"
           
-          echo "QT_PLUGIN_PATH: $QT_PLUGIN_PATH"
-          echo "Contenido de platform plugins:"
-          ls -l "$HERE"/usr/plugins/platforms/ 2>/dev/null || echo "No existe $HERE/usr/plugins/platforms"
-          ls -l "$HERE"/usr/lib/plugins/platforms/ 2>/dev/null || echo "No existe $HERE/usr/lib/plugins/platforms"
-          ls -l "$HERE"/usr/lib/qt6/plugins/platforms/ 2>/dev/null || echo "No existe $HERE/usr/lib/qt6/plugins/platforms"
-          
           exec "$HERE/usr/bin/trinity" "$@"
           EOF
           chmod +x APPIMAGE-TRINITY/AppRun
@@ -178,51 +166,25 @@ jobs:
             --icon-file APPIMAGE-TRINITY/usr/share/icons/hicolor/scalable/apps/com.trench.trinity.launcher.svg \
             --plugin qt
 
-      - name: Copiar plugins Wayland, XCB y dependencias (ARM64)
+      - name: Copiar plugins XCB y dependencias (ARM64)
         run: |
-          # Directorios de plugins
           mkdir -p APPIMAGE-TRINITY/usr/plugins/platforms
           mkdir -p APPIMAGE-TRINITY/usr/lib/plugins/platforms
           mkdir -p APPIMAGE-TRINITY/usr/lib/qt6/plugins/platforms
-          mkdir -p APPIMAGE-TRINITY/usr/plugins/wayland-shell-integration
-          mkdir -p APPIMAGE-TRINITY/usr/lib/plugins/wayland-shell-integration
-          mkdir -p APPIMAGE-TRINITY/usr/lib/qt6/plugins/wayland-shell-integration
-          mkdir -p APPIMAGE-TRINITY/usr/plugins/wayland-graphics-integration-client
-          mkdir -p APPIMAGE-TRINITY/usr/lib/plugins/wayland-graphics-integration-client
-          mkdir -p APPIMAGE-TRINITY/usr/lib/qt6/plugins/wayland-graphics-integration-client
-
-          # Buscar directorio de plataformas Qt6 (ARM64)
+
           PLATFORM_DIR=$(find /usr/lib -path "*/qt6/plugins/platforms" -type d 2>/dev/null | head -n 1)
           if [ -d "$PLATFORM_DIR" ]; then
             cp -v "$PLATFORM_DIR"/*.so APPIMAGE-TRINITY/usr/plugins/platforms/
             cp -v "$PLATFORM_DIR"/*.so APPIMAGE-TRINITY/usr/lib/plugins/platforms/
             cp -v "$PLATFORM_DIR"/*.so APPIMAGE-TRINITY/usr/lib/qt6/plugins/platforms/
           fi
 
-          # Copiar plugins de integración de Wayland (shell y graphics)
-          for subdir in wayland-shell-integration wayland-graphics-integration-client; do
-            SRC_DIR=$(find /usr/lib -path "*/qt6/plugins/$subdir" -type d 2>/dev/null | head -n 1)
-            if [ -d "$SRC_DIR" ]; then
-              cp -v "$SRC_DIR"/*.so APPIMAGE-TRINITY/usr/plugins/$subdir/
-              cp -v "$SRC_DIR"/*.so APPIMAGE-TRINITY/usr/lib/plugins/$subdir/
-              cp -v "$SRC_DIR"/*.so APPIMAGE-TRINITY/usr/lib/qt6/plugins/$subdir/
+          for lib in $(ldd /usr/lib/*/qt6/plugins/platforms/libqxcb.so 2>/dev/null | grep -E "libX|libxcb" | awk '{print $3}'); do
+            if [ -f "$lib" ]; then
+              cp -v "$lib" APPIMAGE-TRINITY/usr/lib/
             fi
           done
 
-          # Copiar dependencias de Wayland (libwayland-client, libxkbcommon, libdecor, etc.)
-          # Usamos el plugin generic como referencia
-          PLUGIN_SO=$(find /usr/lib -name "libqwayland-generic.so" -type f 2>/dev/null | head -n 1)
-          if [ -n "$PLUGIN_SO" ]; then
-            for lib in $(ldd "$PLUGIN_SO" 2>/dev/null | grep -E "libwayland|libxkbcommon|libdecor" | awk '{print $3}'); do
-              if [ -f "$lib" ]; then
-                cp -v "$lib" APPIMAGE-TRINITY/usr/lib/
-              fi
-            done
-          fi
-
-          # Copiar libQt6WaylandClient y libQt6WaylandCompositor
-          find /usr/lib -name "libQt6Wayland*.so*" -exec cp -v {} APPIMAGE-TRINITY/usr/lib/ \;
-
       - name: Generar AppImage final (ARM64)
         run: |
           export PATH=$PWD:$PATH
@@ -241,7 +203,7 @@ jobs:
         with:
           tag_name: 2.6-beta
           files: |
-            Trinity_Launcher-aarch64.AppImage
-            Trinity_Launcher-aarch64.AppImage.zsync
+            *.AppImage
+            *.zsync
         env:
           GITHUB_TOKEN: ${{ secrets.TOKEN_GIT }}