Merge pull request #1950 from grumpycoders/revert-1947-appimage-bullshit

Revert "Sorting out yet another AppImage breakage."

Author: nicolasnoble

.github/workflows/linux-build.yml

@@ -11,7 +11,6 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/grumpycoders/pcsx-redux-build:latest
-      options: --device /dev/fuse --cap-add SYS_ADMIN --security-opt apparmor:unconfined
       env:
         TEST_RESULTS: /tmp/test-results
     steps:

tools/build/Dockerfile

@@ -36,22 +36,17 @@ RUN apt install -y xvfb
 RUN apt install -y python3-pip python3-setuptools patchelf desktop-file-utils libgdk-pixbuf2.0-dev fakeroot strace
 RUN apt install -y glibc-tools lcov
 RUN apt install -y file
-
-# AppImage dependencies
-RUN apt install -y libfuse2t64
-RUN apt install -y fuse
-
 WORKDIR /tmp
-RUN wget https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage && \
+RUN wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage && \
     chmod +x /tmp/appimagetool-x86_64.AppImage && \
     cd /opt && /tmp/appimagetool-x86_64.AppImage --appimage-extract && \
     mv squashfs-root appimage-tool.AppDir && \
     ln -s /opt/appimage-tool.AppDir/AppRun /usr/bin/appimagetool && \
     rm /tmp/appimagetool-x86_64.AppImage
 WORKDIR /
-RUN wget -O appimage-builder-x86_64.AppImage https://github.com/AppImageCrafters/appimage-builder/releases/download/v1.1.0/appimage-builder-1.1.0-x86_64.AppImage
-RUN chmod +x appimage-builder-x86_64.AppImage
-RUN mv appimage-builder-x86_64.AppImage /usr/local/bin/appimage-builder
+RUN pip3 install --break-system-packages appimage-builder pydpkg
+COPY appimage-dpkg.patch /appimage-dpkg.patch
+RUN patch -p 1 < appimage-dpkg.patch
 RUN apt install -y imagemagick-6.q16 gtk-update-icon-cache appstream
 RUN apt install -y squashfs-tools zip zsync
 

tools/build/appimage-dpkg.patch

@@ -0,0 +1,22 @@
+diff --git a/appimagebuilder/modules/deploy/apt/package.py b/appimagebuilder/modules/deploy/apt/package.py
+index 792a724d..6b59d3a3 100644
+--- a/usr/local/lib/python3.12/dist-packages/appimagebuilder/modules/deploy/apt/package.py
++++ b/usr/local/lib/python3.12/dist-packages/appimagebuilder/modules/deploy/apt/package.py
+@@ -13,7 +13,7 @@
+ import urllib
+ from pathlib import Path
+ 
+-from packaging import version
++from pydpkg import Dpkg
+ 
+ 
+ class Package:
+@@ -76,7 +76,7 @@ def __str__(self):
+ 
+     def __gt__(self, other):
+         if isinstance(other, Package):
+-            return version.parse(self.version) > version.parse(other.version)
++            return Dpkg.compare_versions(self.version, other.version) > 0
+ 
+     def __hash__(self):
+         return self.__str__().__hash__()