fix

wyzdwdz · May 5, 2024 · 52a4082 · 52a4082
1 parent d02c6df
commit 52a4082
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 45 deletions.
diff --git a/.github/linux/AppImageBuilder_arm64.yml b/.github/linux/AppImageBuilder_arm64.yml
@@ -13,9 +13,9 @@ AppDir:
     - arm64
     allow_unauthenticated: true
     sources:
-      - sourceline: 'deb http://deb.debian.org/debian bookworm main non-free-firmware'
-      - sourceline: 'deb http://deb.debian.org/debian-security/ bookworm-security main non-free-firmware'
-      - sourceline: 'deb http://deb.debian.org/debian bookworm-updates main non-free-firmware'
+    - sourceline: 'deb http://deb.debian.org/debian bookworm main non-free-firmware'
+    - sourceline: 'deb http://deb.debian.org/debian-security/ bookworm-security main non-free-firmware'
+    - sourceline: 'deb http://deb.debian.org/debian bookworm-updates main non-free-firmware'
     include:
     - libc-bin
     - libgcc-s1:arm64

diff --git a/.github/linux/AppImageBuilder_armv7l.yml b/.github/linux/AppImageBuilder_armv7l.yml
@@ -13,50 +13,46 @@ AppDir:
     - armhf
     allow_unauthenticated: true
     sources:
-      - sourceline: 'deb http://deb.debian.org/debian bookworm main non-free-firmware'
-      - sourceline: 'deb http://deb.debian.org/debian-security/ bookworm-security main non-free-firmware'
-      - sourceline: 'deb http://deb.debian.org/debian bookworm-updates main non-free-firmware'
+    - sourceline: 'deb http://deb.debian.org/debian bookworm main non-free-firmware'
+    - sourceline: 'deb http://deb.debian.org/debian-security/ bookworm-security main non-free-firmware'
+    - sourceline: 'deb http://deb.debian.org/debian bookworm-updates main non-free-firmware'
     include:
-    - libc6:armhf
+    - libc-bin
     - libgcc-s1:armhf
   files:
     include: 
     - /lib/arm-linux-gnueabihf/libGLX.so.0
-    - /lib/arm-linux-gnueabihf/libOpenGL.so.0 
-    - /lib/arm-linux-gnueabihf/libxcb-glx.so.0 
-    - /lib/arm-linux-gnueabihf/libEGL.so.1 
-    - /lib/arm-linux-gnueabihf/libX11.so.6 
-    - /lib/arm-linux-gnueabihf/libxkbcommon.so.0 
-    - /lib/arm-linux-gnueabihf/libX11-xcb.so.1 
-    - /lib/arm-linux-gnueabihf/libxcb-cursor.so.0 
-    - /lib/arm-linux-gnueabihf/libxcb-icccm.so.4 
-    - /lib/arm-linux-gnueabihf/libxcb-image.so.0 
-    - /lib/arm-linux-gnueabihf/libxcb-keysyms.so.1 
-    - /lib/arm-linux-gnueabihf/libxcb-randr.so.0 
-    - /lib/arm-linux-gnueabihf/libxcb-render-util.so.0 
-    - /lib/arm-linux-gnueabihf/libxcb-shm.so.0 
+    - /lib/arm-linux-gnueabihf/libOpenGL.so.0
+    - /lib/arm-linux-gnueabihf/libxcb-glx.so.0
+    - /lib/arm-linux-gnueabihf/libEGL.so.1
+    - /lib/arm-linux-gnueabihf/libX11.so.6
+    - /lib/arm-linux-gnueabihf/libxkbcommon.so.0
+    - /lib/arm-linux-gnueabihf/libX11-xcb.so.1
+    - /lib/arm-linux-gnueabihf/libxcb-cursor.so.0
+    - /lib/arm-linux-gnueabihf/libxcb-icccm.so.4
+    - /lib/arm-linux-gnueabihf/libxcb-image.so.0
+    - /lib/arm-linux-gnueabihf/libxcb-keysyms.so.1
+    - /lib/arm-linux-gnueabihf/libxcb-randr.so.0
+    - /lib/arm-linux-gnueabihf/libxcb-render-util.so.0
+    - /lib/arm-linux-gnueabihf/libxcb-shm.so.0
     - /lib/arm-linux-gnueabihf/libxcb-sync.so.1
-    - /lib/arm-linux-gnueabihf/libxcb-xfixes.so.0 
-    - /lib/arm-linux-gnueabihf/libxcb-render.so.0 
-    - /lib/arm-linux-gnueabihf/libxcb-shape.so.0 
-    - /lib/arm-linux-gnueabihf/libxcb-xkb.so.1 
-    - /lib/arm-linux-gnueabihf/libxcb-xinput.so.0 
-    - /lib/arm-linux-gnueabihf/libxcb.so.1 
+    - /lib/arm-linux-gnueabihf/libxcb-xfixes.so.0
+    - /lib/arm-linux-gnueabihf/libxcb-render.so.0
+    - /lib/arm-linux-gnueabihf/libxcb-shape.so.0
+    - /lib/arm-linux-gnueabihf/libxcb-xkb.so.1
+    - /lib/arm-linux-gnueabihf/libxcb-xinput.so.0
+    - /lib/arm-linux-gnueabihf/libxcb.so.1
     - /lib/arm-linux-gnueabihf/libxkbcommon-x11.so.0
-    - /lib/arm-linux-gnueabihf/libXrender.so.1 
-    - /lib/arm-linux-gnueabihf/libstdc++.so.6 
-    - /lib/arm-linux-gnueabihf/libGLdispatch.so.0 
-    - /lib/arm-linux-gnueabihf/libxcb-util.so.1 
-    - /lib/arm-linux-gnueabihf/libXau.so.6 
-    - /lib/arm-linux-gnueabihf/libXdmcp.so.6 
-    - /lib/arm-linux-gnueabihf/libbsd.so.0 
-    - /lib/arm-linux-gnueabihf/libmd.so.0
+    - /lib/arm-linux-gnueabihf/libXrender.so.1
+    - /lib/arm-linux-gnueabihf/libstdc++.so.6
+    - /lib/arm-linux-gnueabihf/libGLdispatch.so.0
+    - /lib/arm-linux-gnueabihf/libxcb-util.so.1
+    - /lib/arm-linux-gnueabihf/libXau.so.6
+    - /lib/arm-linux-gnueabihf/libXdmcp.so.6
+    - /lib/arm-linux-gnueabihf/libbsd.so.0
+    - /lib/arm-linux-gnueabihf/libmd.so.
     exclude:
     - usr/share/man
-    - usr/share/doc/*/README.*
-    - usr/share/doc/*/changelog.*
-    - usr/share/doc/*/NEWS.*
-    - usr/share/doc/*/TODO.*
   runtime:
     env:
       QT_AUTO_SCREEN_SCALE_FACTOR: '1'

diff --git a/.github/linux/AppImageBuilder_x64.yml b/.github/linux/AppImageBuilder_x64.yml
@@ -13,9 +13,9 @@ AppDir:
     - amd64
     allow_unauthenticated: true
     sources: 
-      - sourceline: 'deb http://deb.debian.org/debian bookworm main non-free-firmware'
-      - sourceline: 'deb http://deb.debian.org/debian-security/ bookworm-security main non-free-firmware'
-      - sourceline: 'deb http://deb.debian.org/debian bookworm-updates main non-free-firmware'
+    - sourceline: 'deb http://deb.debian.org/debian bookworm main non-free-firmware'
+    - sourceline: 'deb http://deb.debian.org/debian-security/ bookworm-security main non-free-firmware'
+    - sourceline: 'deb http://deb.debian.org/debian bookworm-updates main non-free-firmware'
     include:
     - libc-bin
     - libgcc-s1:amd64
@@ -34,10 +34,6 @@ AppDir:
     - /lib/x86_64-linux-gnu/libxkbcommon-x11.so.0
     exclude:
     - usr/share/man
-    - usr/share/doc/*/README.*
-    - usr/share/doc/*/changelog.*
-    - usr/share/doc/*/NEWS.*
-    - usr/share/doc/*/TODO.*
   runtime:
     env:
       QT_AUTO_SCREEN_SCALE_FACTOR: '1'