From 0615c08e2c3769b669cd22ad754bbc0610d95f7f Mon Sep 17 00:00:00 2001
From: Tomas Groth <second@tgc.dk>
Date: Sun, 10 Mar 2024 13:54:55 +0100
Subject: [PATCH] updated to 3.1.1 and include translations

---
 flatpak/build.sh                      | 3 ++-
 flatpak/org.openlp.OpenLP.appdata.xml | 2 +-
 flatpak/org.openlp.OpenLP.yml         | 6 ++++--
 flatpak/requirements.txt              | 1 +
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/flatpak/build.sh b/flatpak/build.sh
index 0294ca1..b420c4f 100755
--- a/flatpak/build.sh
+++ b/flatpak/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-OPENLP_VERSION=3.1.0
+OPENLP_VERSION=3.1.1
 OPENLP_PACK_REVISION=1
 BUNDLE_VERSION=${OPENLP_VERSION}-${OPENLP_PACK_REVISION}
 
@@ -24,6 +24,7 @@ fi
 python flatpak-pip-generator  --requirements-file  requirements.txt
 
 # Finally do the build, install for the user and into a repo in the repo-folder
+mkdir repo
 flatpak-builder --user --install --force-clean --repo=repo openlp-flatpak-builddir org.openlp.OpenLP.yml
 
 # create flatpak bundle file
diff --git a/flatpak/org.openlp.OpenLP.appdata.xml b/flatpak/org.openlp.OpenLP.appdata.xml
index a6823bf..0391ab7 100644
--- a/flatpak/org.openlp.OpenLP.appdata.xml
+++ b/flatpak/org.openlp.OpenLP.appdata.xml
@@ -27,7 +27,7 @@
     <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"/>
+        <release version="3.1.1-1" date="2024-03-10"/>
     </releases>
     <project_group>OpenLP</project_group>
     <project_license>GPL-3.0+</project_license>
diff --git a/flatpak/org.openlp.OpenLP.yml b/flatpak/org.openlp.OpenLP.yml
index ae19596..3c40270 100644
--- a/flatpak/org.openlp.OpenLP.yml
+++ b/flatpak/org.openlp.OpenLP.yml
@@ -31,6 +31,8 @@ modules:
   - name: OpenLP
     buildsystem: simple
     build-commands:
+      - mkdir -p /app/share/openlp/i18n
+      - cd resources/i18n; for file in *.ts; do lconvert -i $file -o /app/share/openlp/i18n/${file%%ts}qm ; done; cd ../..
       - 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
@@ -38,7 +40,7 @@ modules:
       - install -Dm 644 -t /app/share/appdata/ org.openlp.OpenLP.appdata.xml
     sources:
       - type: archive
-        url: https://gitlab.com/openlp/openlp/-/archive/3.1.0/openlp-3.1.0.tar.gz
-        sha256: d40baf9698d84fbcaf1cc3624aca3c157de6e25dbf8b09f54037cd98632ec939
+        url: https://gitlab.com/openlp/openlp/-/archive/3.1.1/openlp-3.1.1.tar.gz
+        sha256: c464669a3661b3b23e917cb1508c1bfc8e8c8308ee24c86e7dde94789ea1797c
       - type: file
         path: org.openlp.OpenLP.appdata.xml
diff --git a/flatpak/requirements.txt b/flatpak/requirements.txt
index 17b195a..44e41ec 100644
--- a/flatpak/requirements.txt
+++ b/flatpak/requirements.txt
@@ -25,6 +25,7 @@ waitress
 websockets
 #PyMuPDF
 QDarkStyle
+packaging
 PyMySQL
 python-vlc
 #psycopg2