From 80b761b8593d5b6d3f81a084c4b70e7d4d47a256 Mon Sep 17 00:00:00 2001
From: dr460nf1r3 <root@dr460nf1r3.org>
Date: Sat, 8 Oct 2022 11:56:48 +0200
Subject: [PATCH] Fix KDE filepicker not being used

---
 .SRCINFO           | 3 +--
 PKGBUILD           | 8 ++++----
 firedragon.desktop | 7 ++++---
 3 files changed, 9 insertions(+), 9 deletions(-)
 mode change 100644 => 100755 firedragon.desktop

diff --git a/.SRCINFO b/.SRCINFO
index 2859f23..71f7637 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -45,7 +45,6 @@ pkgbase = firedragon
 	depends = ttf-font
 	depends = libpulse
 	depends = ffmpeg
-	depends = kfiredragonhelper
 	optdepends = firejail-git: Sandboxing the browser using the included profiles
 	optdepends = profile-sync-daemon: Load the browser profile into RAM
 	optdepends = whoogle: Searching the web using a locally running Whoogle instance
@@ -76,7 +75,7 @@ pkgbase = firedragon
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
 	sha256sums = fb1ed65cd9e6698122885fe38984cfd00018c7a837109f511762b2986b391e25
 	sha256sums = SKIP
-	sha256sums = 158152bdb9ef6a83bad62ae03a3d9bc8ae693b34926e53cc8c4de07df20ab22d
+	sha256sums = a6644083a30c93aae10df0007c572bcd9cb43d50ed88d3b0d0788ee5d0851323
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 7f79d02..3c58e93 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ backup=('usr/lib/firedragon/firedragon.cfg'
         'usr/lib/firedragon/distribution/policies.json')
 license=(MPL GPL LGPL)
 url=https://gitlab.com/dr460nf1r3/settings/
-depends=(gtk3 libxt mime-types dbus-glib nss ttf-font libpulse ffmpeg kfiredragonhelper)
+depends=(gtk3 libxt mime-types dbus-glib nss ttf-font libpulse ffmpeg)
 makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb
              autoconf2.13 rust clang llvm jack nodejs cbindgen nasm
              python-setuptools python-zstandard git binutils lld dump_syms
@@ -41,7 +41,7 @@ source=(https://archive.mozilla.org/pub/firefox/releases/"$pkgver"/source/firefo
 # source_aarch64=()
 sha256sums=('fb1ed65cd9e6698122885fe38984cfd00018c7a837109f511762b2986b391e25'
             'SKIP'
-            '158152bdb9ef6a83bad62ae03a3d9bc8ae693b34926e53cc8c4de07df20ab22d'
+            'a6644083a30c93aae10df0007c572bcd9cb43d50ed88d3b0d0788ee5d0851323'
             'SKIP'
             'SKIP'
             'SKIP'
@@ -168,7 +168,7 @@ fi
 
   # LibreWolf
   # Remove some pre-installed addons that might be questionable
-  # patch -Np1 -i "${_librewolf_patches_dir}"/remove_addons.patch
+  patch -Np1 -i "${_librewolf_patches_dir}"/remove_addons.patch
 
   # Debian patch to enable global menubar
   patch -Np1 -i "${_librewolf_patches_dir}"/unity-menubar.patch
@@ -183,7 +183,7 @@ fi
   patch -Np1 -i "${_librewolf_patches_dir}"/sed-patches/allow-searchengines-non-esr.patch
 
   # Remove search extensions (experimental)
-  # cp "${srcdir}/librewolf-source/assets/search-config.json" services/settings/dumps/main/search-config.json
+  cp "${srcdir}/librewolf-source/assets/search-config.json" services/settings/dumps/main/search-config.json
 
   # Stop some undesired requests (https://gitlab.com/librewolf-community/browser/common/-/issues/10)
   patch -Np1 -i "${_librewolf_patches_dir}"/sed-patches/stop-undesired-requests.patch
diff --git a/firedragon.desktop b/firedragon.desktop
old mode 100644
new mode 100755
index 0a3d959..a532a9c
--- a/firedragon.desktop
+++ b/firedragon.desktop
@@ -1,3 +1,4 @@
+#!/usr/bin/env xdg-open
 [Desktop Entry]
 Version=1.0
 Name=FireDragon
@@ -112,7 +113,7 @@ Keywords[uk]=Internet;WWW;Browser;Web;Explorer;Інтернет;мережа;п
 Keywords[vi]=Internet;WWW;Browser;Web;Explorer;Trình duyệt;Trang web
 Keywords[zh_CN]=Internet;WWW;Browser;Web;Explorer;网页;浏览;上网;火狐;FireDragon;ff;互联网;网站;
 Keywords[zh_TW]=Internet;WWW;Browser;Web;Explorer;網際網路;網路;瀏覽器;上網;網頁;火狐
-Exec=/usr/lib/firedragon/firedragon %u
+Exec=GTK_USE_PORTAL="1" /usr/lib/firedragon/firedragon %u
 Icon=firedragon
 Terminal=false
 X-MultipleArgs=false
@@ -229,7 +230,7 @@ Name[wo]=Palanteer bu bees
 Name[xh]=Ifestile entsha
 Name[zh_CN]=新建窗口
 Name[zh_TW]=開新視窗
-Exec=/usr/lib/firedragon/firedragon --new-window %u
+Exec=GTK_USE_PORTAL="1" /usr/lib/firedragon/firedragon --new-window %u
 
 [Desktop Action new-private-window]
 Name=New Private Window
@@ -337,4 +338,4 @@ Name[wo]=Panlanteeru biir bu bees
 Name[xh]=Ifestile yangasese entsha
 Name[zh_CN]=新建隐私浏览窗口
 Name[zh_TW]=新增隱私視窗
-Exec=/usr/lib/firedragon/firedragon --private-window %u
+Exec=GTK_USE_PORTAL="1" /usr/lib/firedragon/firedragon --private-window %u