From 69d35bb3172a619bd6951802899adaa5cfd279f4 Mon Sep 17 00:00:00 2001
From: Tomas Groth <second@tgc.dk>
Date: Tue, 27 Feb 2024 20:57:48 +0100
Subject: [PATCH] Use the release tarball, add an AppData xml and minor
 adjustments.

---
 flatpak/build.sh                      | 12 +++++++--
 flatpak/org.openlp.OpenLP.appdata.xml | 39 +++++++++++++++++++++++++++
 flatpak/org.openlp.OpenLP.yml         |  4 +--
 3 files changed, 51 insertions(+), 4 deletions(-)
 create mode 100644 flatpak/org.openlp.OpenLP.appdata.xml

diff --git a/flatpak/build.sh b/flatpak/build.sh
index db1da44..0294ca1 100755
--- a/flatpak/build.sh
+++ b/flatpak/build.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+OPENLP_VERSION=3.1.0
+OPENLP_PACK_REVISION=1
+BUNDLE_VERSION=${OPENLP_VERSION}-${OPENLP_PACK_REVISION}
+
 # checkout the flathub shared-modules, needed for the VLC build
 git submodule update --init --recursive
 
@@ -19,5 +23,9 @@ if [ ! -f "flatpak-pip-generator" ]; then
 fi
 python flatpak-pip-generator  --requirements-file  requirements.txt
 
-# Finally do the build
-flatpak-builder --user --install --force-clean openlp-flatpak-builddir org.openlp.OpenLP.yml
+# Finally do the build, install for the user and into a repo in the repo-folder
+flatpak-builder --user --install --force-clean --repo=repo openlp-flatpak-builddir org.openlp.OpenLP.yml
+
+# create flatpak bundle file
+echo "Bundle into a flatpak file, this can take a while..."
+flatpak build-bundle repo openlp-${BUNDLE_VERSION}.flatpak org.openlp.OpenLP
diff --git a/flatpak/org.openlp.OpenLP.appdata.xml b/flatpak/org.openlp.OpenLP.appdata.xml
new file mode 100644
index 0000000..a6823bf
--- /dev/null
+++ b/flatpak/org.openlp.OpenLP.appdata.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<component type="desktop-application">
+    <id>org.openlp.OpenLP</id>
+    <launchable type="desktop-id">org.openlp.OpenLP.desktop</launchable>
+    <metadata_license>CC0-1.0</metadata_license>
+    <name>OpenLP</name>
+    <summary>OpenLP - Church presentation software</summary>
+    <description>
+        <p>
+            OpenLP is a free and open source cross-platform presentation tool
+            useful for churches. It provides presentation features for songs,
+            scriptures, media and more.
+            NOTE: This distribution does not provide LibreOffice integration.
+        </p>
+    </description>
+    <categories>
+        <category>Presentation</category>
+        <category>Video</category>
+        <category>AudioVideo</category>
+        <category>Player</category>
+        <category>Spirituality</category>
+        <category>Music</category>
+    </categories>
+    <content_rating type="oars-1.1" />
+    <url type="homepage">https://www.openlp.org/</url>
+    <url type="bugtracker">https://gitlab.com/openlp/openlp/-/issues</url>
+    <url type="donation">https://openlp.org/contribute</url>
+    <releases>
+        <release version="3.1.0-1" date="2024-02-29"/>
+    </releases>
+    <project_group>OpenLP</project_group>
+    <project_license>GPL-3.0+</project_license>
+    <developer_name>OpenLP et al.</developer_name>
+    <update_contact></update_contact>
+    <screenshots>
+        <screenshot type="default"><image type="source">https://openlp.org/screenshots/mainwindow.png</image></screenshot>
+    </screenshots>
+</component>
diff --git a/flatpak/org.openlp.OpenLP.yml b/flatpak/org.openlp.OpenLP.yml
index 3edee73..08a0d1d 100644
--- a/flatpak/org.openlp.OpenLP.yml
+++ b/flatpak/org.openlp.OpenLP.yml
@@ -37,5 +37,5 @@ modules:
       - 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/e5e8bc4164513ff4858b125c5efc2c157d758ea5/openlp-e5e8bc4164513ff4858b125c5efc2c157d758ea5.tar.gz
-        sha256: 5de48fb834cd831216ceb97f43846517cf427a85254236057ba20127288c2284
+        url: https://gitlab.com/openlp/openlp/-/archive/3.1.0/openlp-3.1.0.tar.gz
+        sha256: d40baf9698d84fbcaf1cc3624aca3c157de6e25dbf8b09f54037cd98632ec939