From 5920fb377cf81a6b4ea7f023d09cf4866f86e715 Mon Sep 17 00:00:00 2001
From: Taqi Raza <mttalpur@gmail.com>
Date: Wed, 25 Dec 2024 22:07:51 +0500
Subject: [PATCH] test

---
 .github/workflows/main.yml | 22 ++++++++++++----------
 wine-devel.yml             |  3 +--
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index de55e0f..ff7ad25 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -32,11 +32,13 @@ jobs:
 
       - name: Prerequisites
         run: |
-          sudo apt update && sudo apt install libfuse2 tree -y
-          wget -q "https://github.com/AppImageCrafters/appimage-builder/releases/download/Continuous/appimage-builder-1.1.1.dev32+g2709a3b-x86_64.AppImage" -O appimage-builder ; chmod +x appimage-builder ; ./appimage-builder --appimage-extract &>/dev/null
+          sudo apt update && sudo apt install libfuse2 patchelf tree -y
+          wget -q "https://github.com/AppImageCrafters/appimage-builder/releases/download/v1.1.0/appimage-builder-1.1.0-x86_64.AppImage" -O appimage-builder ; chmod +x appimage-builder 
           mkdir -p /usr/share/icons/hicolor/scalable/ ; cp wine.svg /usr/share/icons/hicolor/scalable/
+          wget -q "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage" -O appimagetool ; chmod a+x appimagetool
           # devel
           echo "WINE_VER=devel_9.22" >> $GITHUB_ENV
+          echo "UPINFO=$(grep -Eo update-info.* wine-devel.yml | awk '{print $2}')"  >> $GITHUB_ENV
 
           # wineasio
           git clone --recursive https://github.com/mmtrt/wineasio.git --depth=1 -b main
@@ -49,17 +51,17 @@ jobs:
       # Runs a set of commands using the runners shell
       - name: Build appimage
         run: |
-          # add custom mksquashfs
-          cp runtime/mksquashfs squashfs-root/usr/bin/mksquashfs
-
-          # force zstd format in appimagebuilder for appimages
-          rm appimage-builder ; sed -i 's|xz|zstd|' squashfs-root/usr/lib/python3.8/site-packages/appimagebuilder/modules/prime/appimage_primer.py
-
           # pull glibc version from archlinux packages web
           sed -i "s|x.xx|$(wget -qO- https://archlinux.org/packages/core/x86_64/glibc/ | grep glibc | awk '{print $5}' | cut -d'+' -f1 | head -1)|" wine-devel.yml
 
-          squashfs-root/AppRun --recipe wine-devel.yml
-
+          ./appimage-builder --skip-appimage --recipe wine-devel.yml
+          find ${GITHUB_WORKSPACE}/AppDir/runtime/compat/lib/i386-linux-gnu/ -iname 'libz**' | xargs -i -t -exec cp {} ${GITHUB_WORKSPACE}/AppDir/usr/lib/i386-linux-gnu/
+          find ${GITHUB_WORKSPACE}/AppDir/runtime/compat/lib/x86_64-linux-gnu/ -iname 'libz**' | xargs -i -t -exec cp {} ${GITHUB_WORKSPACE}/AppDir/usr/lib/x86_64-linux-gnu/
+          find ${GITHUB_WORKSPACE}/AppDir/runtime/compat/usr/lib/i386-linux-gnu/ -iname 'libstdc**' | xargs -i -t -exec cp {} ${GITHUB_WORKSPACE}/AppDir/usr/lib/i386-linux-gnu/
+          cd ./AppDir/runtime/compat/lib/i386-linux-gnu/
+          ln -rsf ld-linux.so.2 ${GITHUB_WORKSPACE}/AppDir/runtime/default/lib/
+          cd ${GITHUB_WORKSPACE}
+          ARCH=x86_64 ./appimagetool --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 22 -n -u ${UPINFO} AppDir/ wine-${WINE_VER}-x86_64.AppImage
       - name: release
         uses: marvinpinto/action-automatic-releases@6273874b61ebc8c71f1a61b2d98e234cf389b303
         with:
diff --git a/wine-devel.yml b/wine-devel.yml
index 5bed83e..52c3184 100644
--- a/wine-devel.yml
+++ b/wine-devel.yml
@@ -9,7 +9,7 @@ script:
   # Copy App icon to AppDir/usr/share/icons needed prior to appimage-builder ver 1.x.x
   - mkdir -p AppDir/usr/share/icons ; cp wine.svg AppDir/usr/share/icons
   # Add static appimage runtime
-  - cp runtime/runtime-x86_64 appimage-build/prime/runtime-x86_64
+  # - cp runtime/runtime-x86_64 appimage-build/prime/runtime-x86_64
   # Add config
   - cp -R config AppDir/winedata
   # Add wineaiso
@@ -264,7 +264,6 @@ AppDir:
      cp wineasio/docker/wineasio64.dll.so AppDir/opt/wine-devel/lib64/wine/x86_64-unix/wineasio64.so
 
   runtime:
-    version: v3.0.0-devel-2
     env:
       LIBGL_DRIVERS_PATH: '${APPDIR}/usr/lib/i386-linux-gnu/dri:${APPDIR}/usr/lib/x86_64-linux-gnu/dri:${LIBGL_DRIVERS_PATH}'
       APPDIR_LIBC_VERSION: 'x.xx'