Merge pull request #32 from OzarkShepherd/main

Gramps 5.1.6-1 and Gnome Runtime 44 update

.github/workflows/main.yml

@@ -2,7 +2,10 @@ name: CreateFlatpak
 
 on:
   push:
-    branches: [main]
+    branches:
+      - 'main'
+    paths:
+      - 'org.gramps_project.Gramps.yml'
   workflow_dispatch:
 
 jobs:
@@ -21,7 +24,7 @@ jobs:
     - name: SetupFlatpak
       run: |
         flatpak remote-add --if-not-exists --user flathub https://flathub.org/repo/flathub.flatpakrepo
-        flatpak install flathub org.gnome.Platform//43 org.gnome.Sdk//43 -y
+        flatpak install flathub org.gnome.Platform//44 org.gnome.Sdk//44 -y
 
     - name: BuildFlatpak
       run: |

ChangeLog

@@ -1,3 +1,9 @@
+Gramps flatpak 5.1.6-1
+  - update gramps source to 5.1.6 and update sha256sum
+  - update Gnome runtime to 44
+  - add libsoup 2.74 because as of Jun 2023 Gnome 44 does not support libsoup 2.x
+  - change python 3.9 override references to python 3.10 used by Gnome runtime 44
+
 Gramps flatpak 5.1.5-5
   - update runtime to Gnome 43
   - update hash for geocode-glib due to upstream change

README.md

@@ -2,4 +2,4 @@
 These are the manifest and data files required to make a Gramps Flatpak
 
 The flatpak is available on flathub at https://flathub.org/apps/details/org.gramps_project.Gramps
-The Gramps flatpak here is currently 5.1.5 with the runtimes and dependencies to work independently regardless of the linux distribution.  There are also dependencies for some third party add-ons like Graphview and Network Chart.
+The Gramps flatpak contains dependencies and works with flathub runtimes to work independently regardless of the linux distribution.  There are also dependencies for some third party add-ons like Graphview and Network Chart.

org.gramps_project.Gramps.metainfo.xml

@@ -203,6 +203,7 @@
 
   <content_rating type="oars-1.1"/>
   <releases>
+    <release date="2023-06-30" version="5.1.6-1"/>
     <release date="2023-03-25" version="5.1.5-5"/>
     <release date="2022-06-02" version="5.1.5-4"/>
     <release date="2022-05-05" version="5.1.5-3"/>

org.gramps_project.Gramps.yml

@@ -1,7 +1,7 @@
 app-id: org.gramps_project.Gramps
 # flatpak-builder will not take com.gramps-project.Gramps
 runtime: org.gnome.Platform
-runtime-version: '43'
+runtime-version: '44'
 sdk: org.gnome.Sdk
 command: gramps
 rename-icon: gramps
@@ -47,7 +47,7 @@ modules:
     config-opts:
       - --prefix=/app
     make-install-args:
-      - pyoverridesdir=/app/lib/python3.9/site-packages/gi/overrides
+      - pyoverridesdir=/app/lib/python3.10/site-packages/gi/overrides
       - typelibdir=/app/lib/girepository-1.0
     sources:
       - type: archive
@@ -131,7 +131,7 @@ modules:
   - name: gexiv2Dependency
     buildsystem: meson
     config-opts:
-      - -Dpython3_girdir=/app/lib/python3.9/site-packages/gi/overrides
+      - -Dpython3_girdir=/app/lib/python3.10/site-packages/gi/overrides
     sources:
       - type: archive
         url:  https://download-fallback.gnome.org/sources/gexiv2/0.12/gexiv2-0.12.2.tar.xz
@@ -148,6 +148,16 @@ modules:
         url: https://github.com/ldo/python_fontconfig/archive/v0.7.tar.gz
         sha256: 44d3f1597afae0720c02d2504105c5c2b074f2e6bc017f3c73fe33559e571e3b
 
+   # osmgpsmap dependency 1.2 as of 2023-06 requires libsoup 2.4. 
+   # Libsoup 2 is not in Gnome 44 runtime as of 2023-06, so libsoup needs a manual install until
+   # osmgpsmap gets updated to use a newer version of libsoup. Latest libsoup 2 is 2.74 from Oct 2022.
+  - name: libsoupDependency
+    buildsystem: meson
+    sources:
+      - type: archive
+        url: https://download.gnome.org/sources/libsoup/2.74/libsoup-2.74.3.tar.xz
+        sha256: e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13
+
     # osmgpsmap most recent version as of 202104 was from 202102
   - name: osmgpsmapDependency
     buildsystem: autotools
@@ -232,7 +242,7 @@ modules:
       - mv ${FLATPAK_DEST}/share/mime/packages/gramps.xml ${FLATPAK_DEST}/share/mime/packages/${FLATPAK_ID}.xml
     sources:
       - type: archive
-        url:  https://github.com/gramps-project/gramps/archive/refs/tags/v5.1.5.tar.gz
-        sha256:  4045a142a7c3cbe50a41e594bb160dce4112e37ef7dec68d65af42e9269c2df6
+        url:  https://github.com/gramps-project/gramps/archive/refs/tags/v5.1.6.tar.gz
+        sha256:  bff0b5694e77e0f7075fb76481c4523d37646cc042c8dd9897ff2e0cd401fa3b
       - type: file
         path:  org.gramps_project.Gramps.metainfo.xml