From de42e24c4fc0a7090f8575e609458d6998459516 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Mar 2025 09:37:54 +0100 Subject: [PATCH 1/4] librewolf-unwrapped: restore patch application --- .../networking/browsers/librewolf/librewolf.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/librewolf.nix b/pkgs/applications/networking/browsers/librewolf/librewolf.nix index b7d80bfdd221..5c7facab422d 100644 --- a/pkgs/applications/networking/browsers/librewolf/librewolf.nix +++ b/pkgs/applications/networking/browsers/librewolf/librewolf.nix @@ -14,10 +14,8 @@ rec { extraPostPatch = '' while read patch_name; do - if ! sed -n '/nvidia-wayland-backported-fixes-.*-Bug-1898476/p'; then - echo "applying LibreWolf patch: $patch_name" - patch -p1 < ${source}/$patch_name - fi + echo "applying LibreWolf patch: $patch_name" + patch -p1 < ${source}/$patch_name done <${source}/assets/patches.txt cp -r ${source}/themes/browser . From a017ad7039ab5464fd81b443cbef20385d91cdc3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 8 Mar 2025 14:35:55 +0100 Subject: [PATCH 2/4] librewolf-unwrapped: sync build patching with upstream --- .../networking/browsers/librewolf/default.nix | 2 +- .../networking/browsers/librewolf/librewolf.nix | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/default.nix b/pkgs/applications/networking/browsers/librewolf/default.nix index df1ac6fa676f..0f6642b4ee32 100644 --- a/pkgs/applications/networking/browsers/librewolf/default.nix +++ b/pkgs/applications/networking/browsers/librewolf/default.nix @@ -9,7 +9,7 @@ let librewolf-src = callPackage ./librewolf.nix { }; in -(buildMozillaMach rec { +(buildMozillaMach { pname = "librewolf"; applicationName = "LibreWolf"; binaryName = "librewolf"; diff --git a/pkgs/applications/networking/browsers/librewolf/librewolf.nix b/pkgs/applications/networking/browsers/librewolf/librewolf.nix index 5c7facab422d..a87745795204 100644 --- a/pkgs/applications/networking/browsers/librewolf/librewolf.nix +++ b/pkgs/applications/networking/browsers/librewolf/librewolf.nix @@ -10,6 +10,7 @@ rec { extraConfigureFlags = [ "--with-unsigned-addon-scopes=app,system" + "--disable-default-browser-agent" ]; extraPostPatch = '' @@ -21,13 +22,24 @@ rec { cp -r ${source}/themes/browser . cp ${source}/assets/search-config.json services/settings/dumps/main/search-config.json sed -i '/MOZ_SERVICES_HEALTHREPORT/ s/True/False/' browser/moz.configure - sed -i '/MOZ_NORMANDY/ s/True/False/' browser/moz.configure cp ${source}/patches/pref-pane/category-librewolf.svg browser/themes/shared/preferences cp ${source}/patches/pref-pane/librewolf.css browser/themes/shared/preferences cp ${source}/patches/pref-pane/librewolf.inc.xhtml browser/components/preferences cp ${source}/patches/pref-pane/librewolf.js browser/components/preferences - cat ${source}/browser/preferences/preferences.ftl >> browser/locales/en-US/browser/preferences/preferences.ftl + + # override firefox version + for fn in browser/config/version.txt browser/config/version_display.txt; do + echo "${packageVersion}" > "$fn" + done + + echo "patching appstrings.properties" + find . -path '*/appstrings.properties' -exec sed -i s/Firefox/LibreWolf/ {} \; + + for fn in $(find "${source}/l10n/en-US/browser" -type f -name '*.inc.ftl'); do + target_fn=$(echo "$fn" | sed "s,${source}/l10n,browser/locales," | sed "s,\.inc\.ftl$,.ftl,") + cat "$fn" >> "$target_fn" + done ''; extraPrefsFiles = [ "${source}/settings/librewolf.cfg" ]; From 04ebc42c3551a2785af94cb54f9337726f877ead Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 8 Mar 2025 14:37:01 +0100 Subject: [PATCH 3/4] librewolf: add fpletz to maintainers --- pkgs/applications/networking/browsers/librewolf/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/librewolf/default.nix b/pkgs/applications/networking/browsers/librewolf/default.nix index 0f6642b4ee32..e8ca16d5a5c1 100644 --- a/pkgs/applications/networking/browsers/librewolf/default.nix +++ b/pkgs/applications/networking/browsers/librewolf/default.nix @@ -31,6 +31,7 @@ in maintainers = with lib.maintainers; [ squalus dwrege + fpletz ]; platforms = lib.platforms.unix; broken = stdenv.buildPlatform.is32bit; From 77d77c17c7abc914a46ccc1c87837469b82ddffc Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 8 Mar 2025 10:38:28 +0100 Subject: [PATCH 4/4] librewolf: 136.0-1 -> 136.0-2 --- pkgs/applications/networking/browsers/librewolf/src.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index a10a3b294f0e..9b43b41e95b1 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,8 +1,8 @@ { - "packageVersion": "136.0-1", + "packageVersion": "136.0-2", "source": { - "rev": "136.0-1", - "hash": "sha256-ELxcS33lYgYcBUjpfDBMGZfeWanUzcUb3gXI2kEE7O0=" + "rev": "136.0-2", + "hash": "sha256-X5DkaqqwZF4piRg/KPoV/SS1DtDG6AqR89UeWqFxZX0=" }, "firefox": { "version": "136.0",