From 4af48fa20359dfbe9ffd8ac57619bd234923eb0e Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Fri, 30 Dec 2022 16:03:32 +0100
Subject: [PATCH] revert new autoconf lookup directory handling when running as
 flatpak

---
 patches/flatpak_autoconf.patch | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 patches/flatpak_autoconf.patch

diff --git a/patches/flatpak_autoconf.patch b/patches/flatpak_autoconf.patch
new file mode 100644
index 0000000..44d943a
--- /dev/null
+++ b/patches/flatpak_autoconf.patch
@@ -0,0 +1,23 @@
+diff --git a/extensions/pref/autoconfig/src/nsReadConfig.cpp b/extensions/pref/autoconfig/src/nsReadConfig.cpp
+index 06f54dd0ab77..54f08ac90104 100644
+--- a/extensions/pref/autoconfig/src/nsReadConfig.cpp
++++ b/extensions/pref/autoconfig/src/nsReadConfig.cpp
+@@ -247,16 +247,8 @@ nsresult nsReadConfig::openAndEvaluateJSFile(const char* aFileName,
+   nsCOMPtr<nsIInputStream> inStr;
+   if (isBinDir) {
+     nsCOMPtr<nsIFile> jsFile;
+-#if defined(MOZ_WIDGET_GTK)
+-    if (!mozilla::widget::IsRunningUnderFlatpakOrSnap()) {
+-#endif  // defined(MOZ_WIDGET_GTK)
+-      rv = NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(jsFile));
+-#if defined(MOZ_WIDGET_GTK)
+-    } else {
+-      rv = NS_GetSpecialDirectory(NS_OS_SYSTEM_CONFIG_DIR,
+-                                  getter_AddRefs(jsFile));
+-    }
+-#endif  // defined(MOZ_WIDGET_GTK)
++    rv = NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(jsFile));
++
+     if (NS_FAILED(rv)) return rv;
+ 
+     rv = jsFile->AppendNative(nsDependentCString(aFileName));