Merge branch 'main' into update

.github/workflows/main.yml

@@ -1,9 +1,7 @@
 name: CreateFlatpak
 
 on:
-  push:
-    branches:
-      - 'main'
+  pull_request:
     paths:
       - 'org.gramps_project.Gramps.yml'
   workflow_dispatch:

ChangeLog

@@ -1,3 +1,6 @@
+Gramps flatpak 5.2.0-1
+  - restore home directory access due to user data loss, since flathub blocks adequate access to xdg-data, xdg-config, xdg-cache, and ~/.gramps
+
 Gramps flatpak 5.2.0-0
   - update Gramps source to 5.2.0 and update sha256
   - remove flatpak's home directory access in favor of xdg access for Docs, Downloads, and Pictures

README.md

@@ -10,12 +10,6 @@ https://github.com/gramps-project/flatpak
 
 https://github.com/flathub/org.gramps_project.Gramps
 
-***Please Note***
-For security reasons, the flatpak for Gramps 5.2 will lose access to the entire home directory in exchange for xdg access to only Documents, Downloads, and Pictures. If your media directory for Gramps is not in Documents, Downloads, or Pictures, then you can either:
-1. Move your media directory to either Documents, Downloads, or Pictures, and then use the Media Tool in Gramps to change the path so that Gramps can see the media again
-2. Use flatseal (a flatpak permissions app available at flathub) to allow Gramps access to whereever your media directory is located.
-3. If the 5.2 version of Gramps does not show your tree, then close Gramps, open your file browser to the directory that the .gramps file (or .gpkg file if a backup), right click on the file, and select "Open with Gramps". It will take a couple minutes to convert to the 5.2 version, but it should work as long as you make sure the file and all related pictures are in Documents, Pictures, or Downloads.
-
 Also, the old version of Berkeley Database (BSDDB) that was included with the Gramps 5.0 and 5.1 flatpaks will be dropped for 5.2.
 
 Please make regular full backups of your important genealogy files, and include any attached media files for your genealogy in your backups for your convenience.

org.gramps_project.Gramps.metainfo.xml

@@ -203,6 +203,7 @@
 
   <content_rating type="oars-1.1"/>
   <releases>
+    <release date="2024-03-11" version="5.2.0-1"/>
     <release date="2024-02-24" version="5.2.0-0"/>
     <release date="2023-06-30" version="5.1.6-1"/>
     <release date="2023-03-25" version="5.1.5-5"/>

org.gramps_project.Gramps.yml

@@ -7,10 +7,21 @@ command: gramps
 # to force an archive flatpak to use system locale instead of English. Not needed for flathub packages.
 separate-locales: false
 finish-args:
-  - --filesystem=xdg-documents
-  - --filesystem=xdg-download
-  - --filesystem=xdg-pictures
+  - --filesystem=home
+# for now, flathub rules blocking the data directories prevent users from choosing to go between a flatpak
+# installation and a system installation. This can cause user data loss, even using persist instead of filesystem
+# can cause data loss for users moving from the flatpak to a system install. When flathub changes thier rules, 
+# home access can be removed and the below filesystems permissions can be used
+#  - --filesystem=xdg-documents:create
+#  - --filesystem=xdg-download
+#  - --filesystem=xdg-pictures
+# for data directories and compatibility with system installs, flathub currently blocks these directories
+ # for databases started with 5.1 and earlier
 #  - --filesystem=~/.gramps:create
+ # for databases started with 5.2 system installations
+#  - --filesystem=xdg-data:create
+#  - --filesystem=xdg-config:create
+#  - --filesystem=xdg-cache:create
 # for gui
   - --socket=wayland
   - --socket=fallback-x11