From c020bd889890c85cf433b7f345a5675517313b34 Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Mon, 4 Dec 2023 05:29:11 +0600
Subject: [PATCH] More progress on linux build job

---
 dist_assets/linux/AppImageBuilder.yml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/dist_assets/linux/AppImageBuilder.yml b/dist_assets/linux/AppImageBuilder.yml
index a53108c98..e6d4ce085 100644
--- a/dist_assets/linux/AppImageBuilder.yml
+++ b/dist_assets/linux/AppImageBuilder.yml
@@ -3,8 +3,10 @@ version: 1
 script:
   - rm -rf AppDir  | true
   - mkdir -p AppDir/usr/src
-  # Install wx (needed by crowdin script) and sqlalchemy (needed by db update script)
-  - grep -iE 'wxpython|sqlalchemy' requirements.txt | xargs python3 -B -s -m pip install -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04
+  # wxpython dependencies to host
+  - sudo apt install libnotify4 libsdl2-2.0-0
+  # Install wx (needed by crowdin script) and sqlalchemy/logbook (needed by db update script)
+  - grep -iE 'wxpython|sqlalchemy|logbook' requirements.txt | xargs python3 -B -s -m pip install --user -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04
   # Compile app data
   - find locale/ -type f -name "*.po" -exec msgen "{}" -o "{}" \;
   - python3 -B scripts/compile_lang.py
@@ -13,6 +15,7 @@ script:
   - export PYFA_VERSION="$(python3 -B scripts/dump_version.py)"
   # Copy data over to app dir
   - cp -r eos graphs gui imgs locale service utils eve.db config.py pyfa.py db_update.py README.md LICENSE version.yml AppDir/usr/src
+  - cp imgs/gui/pyfa64.png AppDir/usr/share/icons
 
 AppDir:
   path: ./AppDir
@@ -20,7 +23,7 @@ AppDir:
   app_info:
     id: pyfa
     name: pyfa
-    icon: pyfa
+    icon: pyfa64
     version: $PYFA_VERSION
     exec: usr/bin/python3.11
     exec_args: "-s $APPDIR/opt/pyfa/pyfa.py $@"
@@ -41,12 +44,15 @@ AppDir:
 
     include:
       - python3.11
+      - libnotify4
     exclude: []
 
   after_bundle:
     # Install python dependencies to bundled interpreter
-    - python3.11 -s -m pip install --prefix=/usr --root=AppDir -U pip setuptools wheel
-    - python3.11 -s -m pip install --prefix=/usr --root=AppDir -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04 -r requirements.txt
+    - export PYTHONHOME="AppDir/usr"
+    - export PYTHONPATH="AppDir/usr/lib/python3.11/site-packages"
+    - python3.11 -s -m pip install -U pip setuptools wheel
+    - python3.11 -s -m pip install -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04 -r requirements.txt
 
   runtime:
     env: