diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm index 9d08a43ebd8..5ea454431c9 100644 --- a/gnu/packages/librewolf.scm +++ b/gnu/packages/librewolf.scm @@ -212,17 +212,17 @@ ;; It's used for cache validation and therefore can lead to strange bugs. ;; ex: date '+%Y%m%d%H%M%S' ;; or: (format-time-string "%Y%m%d%H%M%S") -(define %librewolf-build-id "20250613072513") +(define %librewolf-build-id "20250628094930") (define-public librewolf (package (name "librewolf") - (version "139.0.4-1") + (version "140.0.2-1") (source (make-librewolf-source #:version version - #:firefox-hash "1xc7481g9adrn98ivqgigvdjcpkyk6sa183qvpbwcjgrqczhapjk" - #:librewolf-hash "1izrhzzzdighcjm4mmdkalqzxzypn30fyxnbi8y0a489kdsn4j5c" + #:firefox-hash "00swi8y46r7yibi2klc0z23j33blydx60972fim6bmgm82l5bbkh" + #:librewolf-hash "06v57209s38sqzr77bk2jq3nzd3qjbxd736rwir8x8f0ff19j8n4" #:l10n firefox-l10n)) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/patches/librewolf-use-system-wide-dir.patch b/gnu/packages/patches/librewolf-use-system-wide-dir.patch index c8a4d8cb123..c1b36af58dd 100644 --- a/gnu/packages/patches/librewolf-use-system-wide-dir.patch +++ b/gnu/packages/patches/librewolf-use-system-wide-dir.patch @@ -5,33 +5,33 @@ diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp index 0cbc825738..5c0bf6ae7f 100644 --- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp -@@ -280,25 +280,11 @@ nsresult nsXREDirProvider::GetBackgroundTasksProfilesRootDir( - static nsresult GetSystemParentDirectory(nsIFile** aFile) { +@@ -282,25 +282,10 @@ + nsCString aName = "LibreWolf"_ns) { nsresult rv; nsCOMPtr localDir; -# if defined(XP_MACOSX) - rv = GetOSXFolderType(kOnSystemDisk, kApplicationSupportFolderType, - getter_AddRefs(localDir)); - if (NS_SUCCEEDED(rv)) { -- rv = localDir->AppendNative("LibreWolf"_ns); +- rv = localDir->AppendNative(aName); - } -# else -- constexpr auto dirname = +- ToLowerCase(aName); +- nsCString dirname = -# ifdef HAVE_USR_LIB64_DIR -- "/usr/lib64/librewolf"_ns +- "/usr/lib64/"_ns + aName -# elif defined(__OpenBSD__) || defined(__FreeBSD__) -- "/usr/local/lib/librewolf"_ns +- "/usr/local/lib/"_ns + aName -# else -- "/usr/lib/librewolf"_ns +- "/usr/lib/"_ns + aName -# endif - ; - 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), + getter_AddRefs(localDir)); + if (NS_SUCCEEDED(rv)) { - localDir.forget(aFile); - } + localDir.forget(aFile); \ No newline at end of file