Unverified Commit 8e037d02 authored by Michael Weiss's avatar Michael Weiss Committed by GitHub
Browse files

Merge pull request #235170 from primeos/chromium-backport 

[release-23.05] Prepare for backporting Chromium M114
parents afc48694 495a318f

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

+8 −0
Original line number Diff line number Diff line
@@ -170,6 +170,14 @@ let 
      # (we currently package 1.26 in Nixpkgs while Chromium bundles 1.21):

      # Source: https://bugs.chromium.org/p/angleproject/issues/detail?id=7582#c1

      ./patches/angle-wayland-include-protocol.patch

    ] ++ lib.optionals (chromiumVersionAtLeast "114") [

      # We need to revert this patch to build M114+ with LLVM 16:

      (githubPatch {

        # Reland [clang] Disable autoupgrading debug info in ThinLTO builds

        commit = "54969766fd2029c506befc46e9ce14d67c7ed02a";

        sha256 = "sha256-Vryjg8kyn3cxWg3PmSwYRG6zrHOqYWBMSdEMGiaPg6M=";

        revert = true;

      })

    ];



    postPatch = ''

pkgs/applications/networking/browsers/chromium/upstream-info.json

+9 −9
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 
    }

  },

  "beta": {

    "version": "114.0.5735.35",

    "sha256": "1ik3d886pcpqs7fnqf7ck0y8x8dbi1d4aqm227qwv0jw2p4a0qyb",

    "sha256bin64": "0xx53x6c7r8cji7d2663zn4p4yklzyc124abqlhyr14w8p2lfldq",

    "version": "114.0.5735.45",

    "sha256": "1z7z4mq3yw9i17xprza3v33wx28zpk7s3g8xcgapdydw0rgxz30v",

    "sha256bin64": "1387x7mab2sh3wg39z48gl8fjhq39jllbcgzic8rdzpbhlcgs7br",

    "deps": {

      "gn": {

        "version": "2023-04-19",
@@ -32,15 +32,15 @@ 
    }

  },

  "dev": {

    "version": "115.0.5773.4",

    "sha256": "18as1yqp7jyv92mn6lq4fl6mzq3w5qx4aqsw5nyixmgys4hfx6a6",

    "sha256bin64": "0d0anrc2bdh9c8rs06jng45xd7sxw0raky3wrngbda2g4aqh817k",

    "version": "115.0.5790.3",

    "sha256": "1haai0jabghwl37k929138s4l6izmifssdvn2wgsig9jhiihxz29",

    "sha256bin64": "12avl8ilvhmlvbag045yhnx0bbbsyx5d3jqh5af07pmbcxksgf96",

    "deps": {

      "gn": {

        "version": "2023-05-09",

        "version": "2023-05-19",

        "url": "https://gn.googlesource.com/gn",

        "rev": "26aa46c283e40199b6f847ecca088dcea7099ded",

        "sha256": "1z5w4fiypv4aq12qlc8in832n7k6wi4k64k4axardrsy24316r9d"

        "rev": "e9e83d9095d3234adf68f3e2866f25daf766d5c7",

        "sha256": "0y07c18xskq4mclqiz3a63fz8jicz2kqridnvdhqdf75lhp61f8a"

      }

    }

  },