From ff2bd846bb5a177b0f1a0c139155ff532691e72a Mon Sep 17 00:00:00 2001
From: Eonfge <33983090+Eonfge@users.noreply.github.com>
Date: Wed, 18 Sep 2019 11:08:47 +0200
Subject: [PATCH] Changed logic concerning file access

This is more future proof. I discovered with the Zandronum project how much fiddling will be required in keeping shared resources reliable.
---
 description.patch        | 18 ++++++++++++++++++
 org.zdoom.GZDoom.desktop |  2 +-
 org.zdoom.GZDoom.yaml    |  4 +++-
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 description.patch

diff --git a/description.patch b/description.patch
new file mode 100644
index 0000000..5f760cc
--- /dev/null
+++ b/description.patch
@@ -0,0 +1,18 @@
+diff --git a/src/d_iwad.cpp b/src/d_iwad.cpp
+index b421b1b35..9f0b16948 100644
+--- a/src/d_iwad.cpp
++++ b/src/d_iwad.cpp
+@@ -683,9 +683,10 @@ int FIWadManager::IdentifyVersion (TArray<FString> &wadfiles, const char *iwad,
+ 					  "2. Edit your ~/Library/Preferences/" GAMENAMELOWERCASE ".ini and add the directories\n"
+ 					  "of your iwads to the list beneath [IWADSearch.Directories]");
+ #else
+-					  "1. Place one or more of these wads in ~/.config/" GAMENAMELOWERCASE "/.\n"
+-					  "2. Edit your ~/.config/" GAMENAMELOWERCASE "/" GAMENAMELOWERCASE ".ini and add the directories of your\n"
+-					  "iwads to the list beneath [IWADSearch.Directories]");
++					  "1. Place one or more of these wads in ~/.var/app/org.zdoom.GZDoom/.config/" GAMENAMELOWERCASE "/\n"
++					  "2. Edit your ~/.var/app/org.zdoom.GZDoom/.config/" GAMENAMELOWERCASE "/" GAMENAMELOWERCASE ".ini and\n"
++					  "     add the directories of your iwads to the list beneath [IWADSearch.Directories]\n"
++					  "3. Validate your Flatpak permissions, so that Flatpak has access to your directories with wads");
+ #endif
+ 	}
+ 	int pick = 0;
diff --git a/org.zdoom.GZDoom.desktop b/org.zdoom.GZDoom.desktop
index ef6894e..0a83cea 100644
--- a/org.zdoom.GZDoom.desktop
+++ b/org.zdoom.GZDoom.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Categories=Games;
 Comment=Multi-game launcher for Doom era games
+Categories=Game;Shooter;
 Exec=gzdoom.sh
 Icon=org.zdoom.GZDoom
 Name=GZDoom
diff --git a/org.zdoom.GZDoom.yaml b/org.zdoom.GZDoom.yaml
index 8484054..0ea5b91 100644
--- a/org.zdoom.GZDoom.yaml
+++ b/org.zdoom.GZDoom.yaml
@@ -16,7 +16,7 @@ finish-args:
 # We access the original ~/.config/gzdoom because
 # that is where users will most likely have their iwads
 - --env=DOOMWADDIR=/app/share/games/doom
-- --filesystem=~/.config/gzdoom
+- --persist=.config/gzdoom
 
 cleanup:
 - /app/include
@@ -72,6 +72,8 @@ modules:
   - type: file
     url: https://github.com/coelckers/gzdoom/raw/g4.2.1/soundfont/gzdoom.sf2
     sha256: fca3e514b635a21789d4224e84865d2954a2a914d46b64aa8219ddb565c44869
+  - type: patch
+    path: description.patch
   - type: shell
     commands:
     - install -Dm 644 gzdoom.sf2 /app/share/sounds/sf2/gzdoom.sf2