From 1b17c6dfc04faf545e4142a1d5efab6a93d31fcf Mon Sep 17 00:00:00 2001 From: Tomas Volf <~@wolfsden.cz> Date: Thu, 26 Jun 2025 23:01:22 +0200 Subject: nongnu: firefox-esr: Update to 140.0esr. * nongnu/packages/mozilla.scm (firefox-esr): Update to 140.0esr. [source]: Add firefox-restore-desktop-files.patch. Use >=138 version of path comparison patch. [inputs]: Use icu4c-76. [native-inputs]: Use rust-cbindgen-0.28. (firefox)[inputs]: Drop. [native-inputs]: Do not replace rust-cbindgen. * nongnu/packages/patches/firefox-esr-add-store-to-rdd-allowlist.patch: Update to new version. No functional changes. * nongnu/packages/patches/firefox-esr-use-system-wide-dir.patch: Same. * nongnu/packages/patches/firefox-esr-compare-paths.patch: Delete file. Signed-off-by: Hilton Chain --- nongnu/packages/patches/firefox-esr-use-system-wide-dir.patch | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'nongnu/packages/patches/firefox-esr-use-system-wide-dir.patch') diff --git a/nongnu/packages/patches/firefox-esr-use-system-wide-dir.patch b/nongnu/packages/patches/firefox-esr-use-system-wide-dir.patch index 67a1709..564f12f 100644 --- a/nongnu/packages/patches/firefox-esr-use-system-wide-dir.patch +++ b/nongnu/packages/patches/firefox-esr-use-system-wide-dir.patch @@ -2,10 +2,10 @@ Replace "/usr/lib/mozilla" (the system-wide directory for extensions and native manifests) with "$ICECAT_SYSTEM_DIR". diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp -index d3af49b495..4beef0aa7e 100644 +index e3be04e70c..a3501c4f44 100644 --- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp -@@ -296,24 +296,12 @@ nsresult nsXREDirProvider::GetBackgroundTasksProfilesRootDir( +@@ -280,24 +280,11 @@ nsresult nsXREDirProvider::GetBackgroundTasksProfilesRootDir( static nsresult GetSystemParentDirectory(nsIFile** aFile) { nsresult rv; nsCOMPtr localDir; @@ -25,13 +25,12 @@ index d3af49b495..4beef0aa7e 100644 - "/usr/lib/mozilla"_ns -# endif - ; -- rv = NS_NewNativeLocalFile(dirname, false, getter_AddRefs(localDir)); +- rv = NS_NewNativeLocalFile(dirname, getter_AddRefs(localDir)); -# endif -+ + const char* systemParentDir = getenv("ICECAT_SYSTEM_DIR"); + if (!systemParentDir || !*systemParentDir) return NS_ERROR_FAILURE; + -+ rv = NS_NewNativeLocalFile(nsDependentCString(systemParentDir), false, ++ rv = NS_NewNativeLocalFile(nsDependentCString(systemParentDir), + getter_AddRefs(localDir)); if (NS_SUCCEEDED(rv)) { -- cgit v1.2.3