From 887d1d38cb747ab6d52790fc0f4edf06ff09cf8f Mon Sep 17 00:00:00 2001
From: Nicholas Shiell <nicholas@nshiell.com>
Date: Mon, 5 Jun 2023 20:47:26 +0100
Subject: [PATCH] AppImage creation tweaks

---
 tools/app-image-create.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/app-image-create.sh b/tools/app-image-create.sh
index 3b8c3c2..e632f65 100755
--- a/tools/app-image-create.sh
+++ b/tools/app-image-create.sh
@@ -29,12 +29,14 @@ APP_RUN='#! /bin/bash
 APPDIR=`dirname $0`
 export PATH="$PATH":"${APPDIR}"/usr/bin
 
-if [ "$(tools/can-run-host.py)" == "ALL_OK" ]; then
+if [ "$($APPDIR/can-run-host.py)" == "ALL_OK" ]; then
     ${APPDIR}/opt/database-dossier/database-dossier.py $@
 else
     ${APPDIR}/usr/bin/python3 ${APPDIR}/opt/database-dossier/database-dossier.py $@
 fi'
 
+export CONDA_PYTHON_VERSION="3.9"
+
 export CONDA_CHANNELS='conda-forge'
 
 # I think PyWebkit looks nicer than the new QtWebEngine
@@ -42,7 +44,7 @@ export CONDA_CHANNELS='conda-forge'
 export CONDA_PACKAGES='PyQtWebKit';# pyqt5 5.15.7'
 
 # Install PyQt5 at this point - will install the correct version
-export PIP_REQUIREMENTS='appdirs mysql_connector_python Pygments'
+export PIP_REQUIREMENTS='appdirs mysql_connector_python Pygments pyqt5'
 
 # [Pour everything into a large bowl]
 mkdir -p ./AppDir/opt/database-dossier/artwork
@@ -67,7 +69,8 @@ echo "$APP_RUN" > ./AppDir/AppRun.sh
 
 # The version of PyQt that is compatibile with PyQtWebKit has a nasty bug
 # this change makes things work
-sed -i 's/QtCore.QMetaObject.connectSlotsByName(self.toplevelWidget)/#QtCore.QMetaObject.connectSlotsByName(self.toplevelWidget)/g' AppDir/usr/conda/lib/*/site-packages/PyQt5/uic/uiparser.py
+#sed -i 's/QtCore.QMetaObject.connectSlotsByName(self.toplevelWidget)/#QtCore.QMetaObject.connectSlotsByName(self.toplevelWidget)/g' AppDir/usr/conda/lib/*/site-packages/PyQt5/uic/uiparser.py
+sed -i 's/QtCore.QMetaObject.connectSlotsByName(self.toplevelWidget)/#QtCore.QMetaObject.connectSlotsByName(self.toplevelWidget)/g' AppDir/usr/conda/lib/python3.9/site-packages/PyQt5/uic/uiparser.py
 
 mkdir -p AppDir/usr/share/metainfo/
 echo '<?xml version="1.0" encoding="UTF-8"?>