From 895a277d8d97119694325c3edc3c047809025d41 Mon Sep 17 00:00:00 2001
From: Tomas Groth <second@tgc.dk>
Date: Mon, 19 Feb 2024 17:17:21 +0100
Subject: [PATCH] Make openlp actually start and add desktop file and icon

---
 flatpak/build.sh              | 10 +++++++++-
 flatpak/org.openlp.OpenLP.yml |  8 ++++++--
 flatpak/requirements.txt      |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 flatpak/build.sh

diff --git a/flatpak/build.sh b/flatpak/build.sh
old mode 100644
new mode 100755
index 2f8c6f9..0dfac50
--- a/flatpak/build.sh
+++ b/flatpak/build.sh
@@ -3,9 +3,17 @@
 # build PyMuPdf dependency file
 PYMUPDF_VER=1.23.22
 PY_TARGET=311
-req2flatpak --requirements pymupdf==${PYMUPDF_VER} pymupdfb==${PYMUPDF_VER} --target-platforms ${PY_TARGET}-x86_64 ${PY_TARGET}-aarch64 --outfile python3-pymupdf.yaml
+# first get the req2flatpak tool if not already present. Alternatively get req2flatpak from https://pypi.org/project/req2flatpak/
+if [ ! -f "req2flatpak.py" ]; then
+  curl -O https://raw.githubusercontent.com/johannesjh/req2flatpak/main/req2flatpak.py
+fi
+python3 req2flatpak.py --requirements pymupdf==${PYMUPDF_VER} pymupdfb==${PYMUPDF_VER} --target-platforms ${PY_TARGET}-x86_64 ${PY_TARGET}-aarch64 --outfile python3-pymupdf.yaml
 
 # build the openlp dependency file - remember to update requirements.txt if needed. Certain devel packages might be needed.
+# first get the flatpak-pip-generator tool if not already present
+if [ ! -f "flatpak-pip-generator" ]; then
+  curl -O https://raw.githubusercontent.com/flatpak/flatpak-builder-tools/master/pip/flatpak-pip-generator
+fi
 python flatpak-pip-generator  --requirements-file  requirements.txt
 
 # Finally do the build
diff --git a/flatpak/org.openlp.OpenLP.yml b/flatpak/org.openlp.OpenLP.yml
index a2df2de..fad0040 100644
--- a/flatpak/org.openlp.OpenLP.yml
+++ b/flatpak/org.openlp.OpenLP.yml
@@ -4,6 +4,7 @@ runtime-version: '5.15-23.08'
 sdk: org.kde.Sdk
 base: com.riverbankcomputing.PyQt.BaseApp
 base-version: '5.15-23.08'
+command: 'openlp'
 cleanup-commands:
   - /app/cleanup-BaseApp.sh
 modules:
@@ -23,7 +24,10 @@ modules:
     buildsystem: simple
     build-commands:
       - pip install --no-deps --no-build-isolation --prefix=$FLATPAK_DEST .
+      - mkdir -p /app/share/applications && cp resources/openlp.desktop /app/share/applications/org.openlp.OpenLP.desktop && sed -ie s/Icon=openlp/Icon=org.openlp.OpenLP/ /app/share/applications/org.openlp.OpenLP.desktop
+      - mkdir -p /app/share/icons/hicolor/256x256/apps/ && cp resources/images/openlp-logo-256x256.png /app/share/icons/hicolor/256x256/apps/org.openlp.OpenLP.png
+      - mkdir -p /app/share/icons/hicolor/scalable/apps/ && cp resources/images/openlp-logo.svg /app/share/icons/hicolor/scalable/apps/org.openlp.OpenLP.svg
     sources:
       - type: archive
-        url: https://gitlab.com/openlp/openlp/-/archive/3.1.0rc4/openlp-3.1.0rc4.tar.gz
-        sha256: 63cc3f49944b8e5d5e0576105813938dee87355cb672318acb6c78df2e33522d
+        url: https://gitlab.com/openlp/openlp/-/archive/e5e8bc4164513ff4858b125c5efc2c157d758ea5/openlp-e5e8bc4164513ff4858b125c5efc2c157d758ea5.tar.gz
+        sha256: 5de48fb834cd831216ceb97f43846517cf427a85254236057ba20127288c2284
diff --git a/flatpak/requirements.txt b/flatpak/requirements.txt
index ea8c4d2..14f77ab 100644
--- a/flatpak/requirements.txt
+++ b/flatpak/requirements.txt
@@ -20,7 +20,7 @@ requests
 SQLAlchemy
 waitress
 websockets
-PyMuPDF
+#PyMuPDF
 QDarkStyle
 #PyMySQL
 python-vlc