Unverified Commit 4b7192cb authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #270614 from NixOS/backport-270547-to-release-23.11 

[Backport release-23.11] buildMozillaMach: prune patches
parents febae954 81df7d0a

pkgs/applications/networking/browsers/firefox/common.nix

+1 −29
Original line number Diff line number Diff line
@@ -225,34 +225,7 @@ buildStdenv.mkDerivation { 
    "profilingPhase"

  ];



  patches = lib.optionals (lib.versionAtLeast version "112.0" && lib.versionOlder version "113.0") [

    (fetchpatch {

      # Crash when desktop scaling does not divide window scale on Wayland

      # https://bugzilla.mozilla.org/show_bug.cgi?id=1803016

      name = "mozbz1803016.patch";

      url = "https://hg.mozilla.org/mozilla-central/raw-rev/1068e0955cfb";

      hash = "sha256-iPqmofsmgvlFNm+mqVPbdgMKmP68ANuzYu+PzfCpoNA=";

    })

  ] ++ lib.optionals (lib.versionOlder version "114.0") [

    # https://bugzilla.mozilla.org/show_bug.cgi?id=1830040

    # https://hg.mozilla.org/mozilla-central/rev/cddb250a28d8

    (fetchpatch {

      url = "https://git.alpinelinux.org/aports/plain/community/firefox/avoid-redefinition.patch?id=2f620d205ed0f9072bbd7714b5ec1b7bf6911c12";

      hash = "sha256-fLUYaJwhrC/wF24HkuWn2PHqz7LlAaIZ1HYjRDB2w9A=";

    })

  ]

  ++ lib.optionals (lib.versionOlder version "102.13") [

    # cherry-pick bindgen change to fix build with clang 16

    (fetchpatch {

      url = "https://git.alpinelinux.org/aports/plain/community/firefox-esr/bindgen.patch?id=4c4b0c01c808657fffc5b796c56108c57301b28f";

      hash = "sha256-lTvgT358M4M2vedZ+A6xSKsBYhSN+McdmEeR9t75MLU=";

    })

    # cherry-pick mp4parse change fixing build with Rust 1.70+

    # original change: https://github.com/mozilla/mp4parse-rust/commit/8b5b652d38e007e736bb442ccd5aa5ed699db100

    # vendored to update checksums

    ./mp4parse-rust-170.patch

  ]

  ++ lib.optionals (lib.versionAtLeast version "120" && lib.versionOlder version "122") [

  patches = lib.optionals (lib.versionAtLeast version "120" && lib.versionOlder version "122") [

    # dbus cflags regression fix

    # https://bugzilla.mozilla.org/show_bug.cgi?id=1864083

    (fetchpatch {
@@ -260,7 +233,6 @@ buildStdenv.mkDerivation { 
      hash = "sha256-5PzVNJvPNX8irCqj1H38SFDydNJZuBHx167e1TQehaI=";

    })

  ]

  ++ lib.optional (lib.versionOlder version "111") ./env_var_for_system_dir-ff86.patch

  ++ lib.optional (lib.versionAtLeast version "111") ./env_var_for_system_dir-ff111.patch

  ++ lib.optional (lib.versionAtLeast version "96" && lib.versionOlder version "121") ./no-buildconfig-ffx96.patch

  ++ lib.optional (lib.versionAtLeast version "121") ./no-buildconfig-ffx121.patch

pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff86.patch

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
diff -r 22fc47c968f2 toolkit/xre/nsXREDirProvider.cpp

--- a/toolkit/xre/nsXREDirProvider.cpp	Mon Dec 14 15:09:17 2020 +0000

+++ b/toolkit/xre/nsXREDirProvider.cpp	Tue Feb 23 23:38:56 2021 +0100

@@ -11,6 +11,7 @@

 

 #include "jsapi.h"

 #include "xpcpublic.h"

+#include "prenv.h"

 

 #include "nsIAppStartup.h"

 #include "nsIFile.h"

@@ -305,7 +306,8 @@

       "/usr/lib/mozilla"_ns

 #    endif

       ;

-  rv = NS_NewNativeLocalFile(dirname, false, getter_AddRefs(localDir));

+  const char* pathVar = PR_GetEnv("MOZ_SYSTEM_DIR");

+  rv = NS_NewNativeLocalFile((pathVar && *pathVar) ? nsDependentCString(pathVar) : reinterpret_cast<const nsCString&>(dirname), false, getter_AddRefs(localDir));

 #  endif

 

   if (NS_SUCCEEDED(rv)) {

pkgs/applications/networking/browsers/firefox/mp4parse-rust-170.patch

deleted100644 → 0
+0 −23

File deleted.

Preview size limit exceeded, changes collapsed.