From e5aec154e47410abb5251e31c6d51813065d4f8d 2019-04-18 14:57:58
From: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Date: 2019-04-18 14:57:58
Subject: [PATCH] AppImage should build and run now

Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>

---

diff --git a/build_cfg/linux/AppRun b/build_cfg/linux/AppRun
index d252436..c914287 100644
--- a/build_cfg/linux/AppRun
+++ b/build_cfg/linux/AppRun
@@ -9,5 +9,5 @@ export QT_QPA_PLATFORM_PLUGIN_PATH=$HERE/usr/plugins
 export QT_XKB_CONFIG_ROOT=$HERE/usr/lib
 export FONTCONFIG_FILE=/etc/fonts/fonts.conf
 export FONTCONFIG_PATH=/etc/fonts
-${HERE}/usr/bin/sciqlop "$@"
+LD_PRELOAD=${HERE}/usr/lib/libpython3.7m.so  ${HERE}/usr/bin/sciqlop "$@"
 
diff --git a/build_cfg/linux/appImage.sh b/build_cfg/linux/appImage.sh
index 00a317f..334eed4 100644
--- a/build_cfg/linux/appImage.sh
+++ b/build_cfg/linux/appImage.sh
@@ -1,16 +1,28 @@
 #!/bin/bash
+# guess using centos 7 as build host
+yum install -y gtk3 openssl-devel.x86_64 ncurses-devel.x86_64 sqlite-devel.x86_64 tkinter.x86_64 readline-devel.x86_64 xz-devel.x86_64 gdbm-devel.x86_64 bzip2-devel.x86_64 tk-devel.x86_64 libffi-devel.x86_64 make
 HERE="$(dirname "$(readlink -f "${0}")")"
 mkdir build
 cd build
-mkdir -p $(pwd)/AppDir/usr
+# need to build python to easily install/relocate in AppImage
+wget https://www.python.org/ftp/python/3.7.3/Python-3.7.3.tgz
+tar -xf Python-3.7.3.tgz
+cd Python-3.7.3
+# Optimisation is damn slow maybe enabled later
+./configure --enable-shared --prefix=/usr
+make -j
+DESTDIR=$(pwd)/../AppDir make install
+cd ..
 cp $HERE/AppRun $(pwd)/AppDir/
 chmod +x $(pwd)/AppDir/AppRun
-virtualenv --always-copy  --relocatable  -p python3 $(pwd)/AppDir/usr
-$(pwd)/AppDir/usr/bin/pip3 install git+https://github.com/jeandet/spwc
-meson --prefix=/usr ..
+# Tweak to find custom python from build dir
+sed s/\\/usr/\\/SciQLop\\/build\\/AppDir\\/usr/ -i AppDir/usr/lib/pkgconfig/python3.pc
+LD_PRELOAD=$(pwd)/AppDir/usr/lib/libpython3.7m.so.1.0 PATH=$(pwd)/AppDir/usr/bin/:/usr/bin/ LD_LIBRARY_PATH=AppDir/usr/lib/:AppDir/usr/lib/python3.7/ $(pwd)/AppDir/usr/bin/python3 $(pwd)/AppDir/usr/bin/pip3 install git+https://github.com/jeandet/spwc
+LD_LIBRARY_PATH=AppDir/usr/lib/ PKG_CONFIG_PATH=./AppDir/usr/lib/pkgconfig/:$PKG_CONFIG_PATH PATH=./AppDir/usr/bin/:$PATH meson --prefix=/usr ..
 ninja
 DESTDIR=$(pwd)/AppDir ninja install
-mv AppDir/usr/lib64 AppDir/usr/lib
+cp -r -t AppDir/usr/lib64/* AppDir/usr/lib/
+rm -rf AppDir/usr/lib64/
 wget https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
 chmod +x  linuxdeployqt-continuous-x86_64.AppImage && ./linuxdeployqt-continuous-x86_64.AppImage --appimage-extract
-LD_LIBRARY_PATH=AppDir/usr/lib/:AppDir/usr/lib/SciQLop/:$(python3-config --prefix)/lib64 ./squashfs-root/AppRun AppDir/usr/share/applications/*.desktop -appimage -extra-plugins=iconengines,platformthemes/libqgtk3.so -ignore-glob=$(pwd)/AppDir/usr/lib/python3.6/site-packages/*
+LD_LIBRARY_PATH=AppDir/usr/lib:AppDir/usr/lib/SciQLop/:AppDir/usr/lib/python3.7/site-packages/numpy/.libs/ ./squashfs-root/AppRun AppDir/usr/share/applications/*.desktop -appimage -extra-plugins=iconengines,platformthemes/libqgtk3.so