From 6baee00f28c036c369f8cf6258f42aa8b6f7619d Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 19 Jun 2022 14:38:27 -0700
Subject: [PATCH] Use org.gnu.pspp instead of org.fsf.pspp.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Plus other changes to the flatpak manifest suggested by Hubert Figuière
at https://github.com/flathub/flathub/pull/3275.
---
 ...pspp.flatpakref => org.gnu.pspp.flatpakref |  2 +-
 org.fsf.pspp.yml => org.gnu.pspp.yml          | 22 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)
 rename org.fsf.pspp.flatpakref => org.gnu.pspp.flatpakref (98%)
 rename org.fsf.pspp.yml => org.gnu.pspp.yml (93%)

diff --git a/org.fsf.pspp.flatpakref b/org.gnu.pspp.flatpakref
similarity index 98%
rename from org.fsf.pspp.flatpakref
rename to org.gnu.pspp.flatpakref
index 3e8ac16d66..7c63544157 100644
--- a/org.fsf.pspp.flatpakref
+++ b/org.gnu.pspp.flatpakref
@@ -1,6 +1,6 @@
 [Flatpak Ref]
 Title=GNU PSPP
-Name=org.fsf.pspp
+Name=org.gnu.pspp
 Branch=master
 Url=REPO_URL
 IsRuntime=false
diff --git a/org.fsf.pspp.yml b/org.gnu.pspp.yml
similarity index 93%
rename from org.fsf.pspp.yml
rename to org.gnu.pspp.yml
index ad4087e619..a7b470d8cc 100644
--- a/org.fsf.pspp.yml
+++ b/org.gnu.pspp.yml
@@ -1,8 +1,17 @@
-app-id: org.fsf.pspp
+app-id: org.gnu.pspp
 runtime: org.gnome.Platform
-runtime-version: '41'
+runtime-version: '42'
 sdk: org.gnome.Sdk
 command: psppire
+finish-args:
+  # X11 + XShm access
+  - --share=ipc
+  - --socket=fallback-x11
+  # Wayland access
+  - --socket=wayland
+  - --own-name=gnu.pspp
+  - --talk-name=org.gtk.vfs.*
+  - --filesystem=xdg-run/gvfsd
 modules:
   - name: spread-sheet-widget
     buildsystem: autotools
@@ -24,12 +33,3 @@ modules:
         dest: pspp
     build-commands:
       - cd pspp && ./configure --prefix=/app --libdir=/app/lib && make -j$(nproc) && make -j$(nproc) install
-finish-args:
-  # X11 + XShm access
-  - --share=ipc
-  - --socket=x11
-  # Wayland access
-  - --socket=wayland
-  - --own-name=gnu.pspp
-  - --talk-name=org.gtk.vfs.*
-  - --filesystem=xdg-run/gvfsd
-- 
2.30.2