From 729f320627845d6163d52ff0d7da6846f8405884 Mon Sep 17 00:00:00 2001
From: Marcus Minhorst <marcus.minhorst@gmail.com>
Date: Wed, 17 Sep 2025 17:09:06 -0400
Subject: [PATCH] Fix appimage recipe

---
 .gitignore                                    |  2 -
 .../AppImageBuilder.yml                       | 30 ++++++-----
 unused/appimage.yml                           | 53 -------------------
 3 files changed, 17 insertions(+), 68 deletions(-)
 rename AppImageBuilder.yml => tools/AppImageBuilder.yml (69%)
 delete mode 100644 unused/appimage.yml

diff --git a/.gitignore b/.gitignore
index 71457ad6f..8fea570f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 # build artifacts
 /build*
 /wadsrc/*.pk3
-/appimage-build
 .flatpak-builder/
 *.AppImage
 *.flatpak
@@ -41,5 +40,4 @@ fmodapi*linux/
 /llvm
 /src/gl/unused
 /mapfiles_release/*.map
-/AppDir
 .cache/
diff --git a/AppImageBuilder.yml b/tools/AppImageBuilder.yml
similarity index 69%
rename from AppImageBuilder.yml
rename to tools/AppImageBuilder.yml
index 6f9ebcc3b..7940daf5e 100644
--- a/AppImageBuilder.yml
+++ b/tools/AppImageBuilder.yml
@@ -1,29 +1,32 @@
 # appimage-builder recipe see https://appimage-builder.readthedocs.io for details
+
 version: 1
+
 AppDir:
-  path: ./AppDir
   app_info:
-    id: com.GZDoom.app
+    id: org.zdoom.GZDoom
     name: GZDoom
-    icon: game_icon.png
-    version: latest
-    exec: ./gzdoom
+    icon: org.zdoom.GZDoom
+    version: '{{GIT_DESCRIBE}}'
+    exec: ./usr/bin/gzdoom
     exec_args: $@
-  apt:
-    arch: amd64
-    allow_unauthenticated: true
-    sources:
-    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ jammy main restricted
-    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ jammy-updates main restricted
-    include: []
+
+  runtime:
+    path_mappings:
+      - /usr/share/games/doom:$APPDIR/usr/share/games/doom
+
   files:
-    include: []
+    include:
+    - /lib64/ld-linux-x86-64.so.2
+    - /lib64/libbz2.so.1
     exclude:
     - usr/share/man
     - usr/share/doc/*/README.*
     - usr/share/doc/*/changelog.*
     - usr/share/doc/*/NEWS.*
     - usr/share/doc/*/TODO.*
+
+  # ... why are these so old ?
   test:
     fedora-30:
       image: appimagecrafters/tests-env:fedora-30
@@ -40,6 +43,7 @@ AppDir:
     ubuntu-xenial:
       image: appimagecrafters/tests-env:ubuntu-xenial
       command: ./AppRun
+
 AppImage:
   arch: x86_64
   update-information: guess
diff --git a/unused/appimage.yml b/unused/appimage.yml
deleted file mode 100644
index 885c32921..000000000
--- a/unused/appimage.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-name: Continuous Integration
-
-on: [push, pull_request]
-
-jobs:
-  build-appimage:
-    name: Linux Clang 12 | AppImage
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install GZDoom dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install clang-12 libsdl2-dev libvpx-dev libwebp-dev cmake -y
-      - name: Install appimage-builder dependencies
-        run: |
-          sudo apt-get install binutils coreutils desktop-file-utils fakeroot fuse libgdk-pixbuf2.0-dev patchelf -y 
-          sudo apt-get install python3-pip python3-setuptools squashfs-tools strace util-linux zsync -y 
-          sudo apt-get install imagemagick-6.q16hdri -y
-      - name: Install appimage-builder
-        run: |
-          python3 -m pip install --upgrade pip
-          pip install appimage-builder
-      - name: Build zmusic dependency
-        run: |
-          git clone -b 1.1.12 https://github.com/ZDoom/ZMusic.git zmusic_build
-          mkdir ./zmusic_build/build
-          cd ./zmusic_build/build
-          cmake -DCMAKE_BUILD_TYPE=Release ..
-          cmake --build .
-          cd ../../
-          mkdir -p ./AppDir/zmusic/lib
-          mkdir ./AppDir/zmusic/include
-          mv ./zmusic_build/build/source/libzmusic* ./AppDir/zmusic/lib/
-          mv ./zmusic_build/include/zmusic.h ./AppDir/zmusic/include/
-      - name: Configure
-        run: cmake -B AppDir -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_PREFIX_PATH=`pwd`/AppDir/zmusic -DPK3_QUIET_ZIPDIR=ON -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 .
-      - name: Build
-        shell: bash
-        run: |
-          export MAKEFLAGS=--keep-going
-          cmake --build AppDir --config Release --parallel `nproc`
-          cp ./AppDir/zmusic/lib/* ./AppDir/
-          mkdir -p ./AppDir/usr/share/icons
-          convert ./src/win32/icon1.ico[0] -flatten ./AppDir/usr/share/icons/game_icon.png
-      - name: Build AppImage
-        run: |
-          appimage-builder --skip-tests
-      - uses: actions/upload-artifact@v2
-        with:
-          name: AppImage
-          path: './*.AppImage*'