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

Firefox: 133.0.3 -> 134.0; 128.5.2esr -> 128.6.0esr (#371577)

parents e7bd1e2e fee3a7e8
Loading
Loading
Loading
Loading
+620 −414

File changed.

Preview size limit exceeded, changes collapsed.

+8 −8
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ in
, glib
, gnum4
, gtk3
, icu72
, icu73
, icu74
, libGL
, libGLU
, libevent
@@ -268,6 +268,12 @@ buildStdenv.mkDerivation {
      hash = "sha256-2IpdSyye3VT4VB95WurnyRFtdN1lfVtYpgEiUVhfNjw=";
    })
  ]
  ++ lib.optionals ((lib.versionAtLeast version "129" && lib.versionOlder version "134") || lib.versionOlder version "128.6.0") [
    # Python 3.12.8 compat
    # https://bugzilla.mozilla.org/show_bug.cgi?id=1935621
    # https://phabricator.services.mozilla.com/D231480
    ./mozbz-1935621-attachment-9442305.patch
  ]
  ++ [
    # LLVM 19 turned on WASM reference types by default, exposing a bug
    # that broke the Mozilla WASI build. Supposedly, it has been fixed
@@ -286,10 +292,6 @@ buildStdenv.mkDerivation {
      url = "https://hg.mozilla.org/integration/autoland/raw-rev/23a9f6555c7c";
      hash = "sha256-CRywalJlRMFVLITEYXxpSq3jLPbUlWKNRHuKLwXqQfU=";
    })
    # Python 3.12.8 compat
    # https://bugzilla.mozilla.org/show_bug.cgi?id=1935621
    # https://phabricator.services.mozilla.com/D231480
    ./mozbz-1935621-attachment-9442305.patch
    # Fix for missing vector header on macOS
    # https://bugzilla.mozilla.org/show_bug.cgi?id=1939405
    ./firefox-mac-missing-vector-header.patch
@@ -526,11 +528,9 @@ buildStdenv.mkDerivation {
    ++ lib.optional  sndioSupport sndio
    ++ lib.optionals waylandSupport [ libxkbcommon libdrm ]
  ))
  # icu73 changed how it follows symlinks which breaks in the firefox sandbox
  # https://bugzilla.mozilla.org/show_bug.cgi?id=1839287
  # icu74 fails to build on 127 and older
  # https://bugzilla.mozilla.org/show_bug.cgi?id=1862601
  ++ [ (if (lib.versionAtLeast version "115") then icu73 else icu72) ]
  ++ [ (if (lib.versionAtLeast version "134") then icu74 else icu73) ]
  ++ lib.optional  gssSupport libkrb5
  ++ lib.optional  jemallocSupport jemalloc
  ++ extraBuildInputs;
+2 −2
Original line number Diff line number Diff line
@@ -9,10 +9,10 @@

buildMozillaMach rec {
  pname = "firefox";
  version = "128.5.2esr";
  version = "128.6.0esr";
  src = fetchurl {
    url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
    sha512 = "1e5b6bfe63279acc8b7350c08f2767620f01b979057f50ab1952331b6efc05124f7c9530a7cc793b0f3616344334a2903fe5712bbb45418e936684d294c5530a";
    sha512 = "49bce966e062766861712bd65cca46a438b339fe31598f69e4fe64da78ef6f8b4581c1d502341ef1c032aafaab2f4f88e69cb93a0b845ba7173fec277ae695b5";
  };

  meta = {
+2 −2
Original line number Diff line number Diff line
@@ -9,10 +9,10 @@

buildMozillaMach rec {
  pname = "firefox";
  version = "133.0.3";
  version = "134.0";
  src = fetchurl {
    url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
    sha512 = "ce48beaa5bb1717d9b6dbfff035b1bb5de1456df14b6a91adfaf3ccfb7ac550ab7ee854546231424a920e01d981825253609fce2ec326c4aa1ca316bbbdb31f8";
    sha512 = "1275a686dc0a27b48df4ae05616511512f676e03474e3095b2521eac25a385d345aa3e8786716dbe812af49e07d72b32772479089d648968e2004ca0c9c35344";
  };

  meta = {