Unverified Commit 02032da4 authored by Emily's avatar Emily Committed by GitHub
Browse files

electron{-source,-bin,-chromedriver}: 32.3.1 -> 32.3.2, 33.4.1 -> 33.4.2,... 

electron{-source,-bin,-chromedriver}: 32.3.1 -> 32.3.2, 33.4.1 -> 33.4.2, 34.2.0 -> 34.3.0 (#385597)
parents fad26659 33aff639

pkgs/development/tools/electron/binary/info.json

+21 −21
Original line number Diff line number Diff line
@@ -67,35 +67,35 @@ 
    },

    "32": {

        "hashes": {

            "aarch64-darwin": "9d2de7531f8b4baa513c8622f37415855c889b0e99e59cbdc9570f8056f148fe",

            "aarch64-linux": "63aca27373f86044d82bb54a531288d94cb5a248438d222ee3fe4e2282667ea7",

            "armv7l-linux": "d6152c0e36ddeea3d23fd945c6c382507fdb95bf8f0a4d2f2b00966ce59aca66",

            "headers": "0j87666by9hbqkb3c0wxcjp5g8b7da807al9j4gjrspzp3r96a91",

            "x86_64-darwin": "9221ca22b8902508092581c59c9910abd9324e9234699107566e5913bccebc1b",

            "x86_64-linux": "4619dd27038abd1165c4f84caa013a0826445428c11cc29d524c5737476edaa3"

            "aarch64-darwin": "f644ac51590a5d2e16318aca9a2ad70f9b5c45cc2edf2524b33d15dd0add4193",

            "aarch64-linux": "5223d8bb21aac0a55dd09587773d93b0ca4c8c4161ac56158d93199973c8200c",

            "armv7l-linux": "153a37e43175064539c63550fee2104fc21b95279daaf8fc38dd617dbfcd2c52",

            "headers": "1sdvj3a05yrvy3b8bgzn8b2diz2ivlh4jsvhcffid0wbb17in2xj",

            "x86_64-darwin": "e85b8ca35d0710087c2915f5dab07828733b2a1aaad04ae4907f0754346a09c6",

            "x86_64-linux": "6afd83962ecbfbad19fe06d101ae00ee0662f4612c70620deb61cf6fac5b8118"

        },

        "version": "32.3.1"

        "version": "32.3.2"

    },

    "33": {

        "hashes": {

            "aarch64-darwin": "6613ca0dc9f4e0a4488113efcb9a6d81ea32b18842eaac879d2d15f6f6776b8d",

            "aarch64-linux": "194c26e79668ba176e1a641a8a0184cc7c0509b3eda9db64137a33f7b29f23a2",

            "armv7l-linux": "78ebab80ea5f9b0407179fdbf65a6a533e9e8cc67324eba1916d197a0f163c51",

            "headers": "1qlsrljlw08253hpiiccmb0kafnbihyxc7hlvakbhnbwils393xr",

            "x86_64-darwin": "723dd6e1b136fc6a4c00432769114fcae80a261a985934311ce730910d0c4df1",

            "x86_64-linux": "91950f2c5bd17f03920a20d6e2d57676f341c7ad27fb828570f4e00a1566f407"

            "aarch64-darwin": "f9958bb4fe0e2f75ae96c4a34fb77f7af3f3daa05ca0d1912ff130dd2c238198",

            "aarch64-linux": "0707c59025e9de913e155e54434afe5f9833b09da4f0f4f87653ac2194d01629",

            "armv7l-linux": "e77a264223bb1f81224e14dff3682a00f111a4610d342dfd71e4c82e4c605055",

            "headers": "1x430y2zw2qysz82jv1s3hk37qrxmv7g8q292ghp6h3cwngwpiq7",

            "x86_64-darwin": "f987547716e4d03803503ffe33aac322f70b7992d2b3d37436e182d7b3c4f48f",

            "x86_64-linux": "6f34eb4c27c2acc313f6b711ad798c840768f05eec083eccaf41579823f96add"

        },

        "version": "33.4.1"

        "version": "33.4.2"

    },

    "34": {

        "hashes": {

            "aarch64-darwin": "ee447c17b2ac545e48083113d7e39a916821c1316f60f42cbcbee4fffe7c022a",

            "aarch64-linux": "818c91309da8ff948c43df58a996c05c0d27daa690e1d659355d9db01e351919",

            "armv7l-linux": "0c75996c6bf2d37d0441d3e1021386a9348f8d21783d75571cdb10ede606424f",

            "headers": "17f06fx4yidshmkdicis6k4azph95mxs1rwpm0ll53szpcs7rdss",

            "x86_64-darwin": "8ef741819c8a5370dabc3b9df5e6ac217366477c5d5c656ed23c800bc984d887",

            "x86_64-linux": "f12a02d86cc657500978d263ec6d1841b6e2085cd3bd4d30a97cfe14685396f3"

        },

        "version": "34.2.0"

            "aarch64-darwin": "a55e2923651791d8517241f7334f336a7b3a736c35643fccbd32b7ba2e37ca1d",

            "aarch64-linux": "06895af4db0762a2c33f065bd71b92ebec5c9c557ffb2e3402aac74880687310",

            "armv7l-linux": "e7c7d9dc69f882c095d560cc20743790d15dbfd868fdfc91f81deeeae6fff90a",

            "headers": "1fgagzl5568pnk1h4sil6k8i1ghdmfdhjazg5v6prsky0q8xa325",

            "x86_64-darwin": "67a85561dee115195dc161ea512b93b7f524891eee5f271b8f93d63f8146bfc4",

            "x86_64-linux": "263ce56f37b6ab7954d1644bebd429c4c1522ddc48b55e8b3cbc4098def62588"

        },

        "version": "34.3.0"

    }

}

pkgs/development/tools/electron/chromedriver/info.json

+21 −21
Original line number Diff line number Diff line
@@ -34,35 +34,35 @@ 
    },

    "32": {

        "hashes": {

            "aarch64-darwin": "606a20ba0c4ca3ff5143d84114c76701866da9d6ca5563c4f230024a9fad107b",

            "aarch64-linux": "027d2c4bafbce2903a52bef70a8aadce6bdee8f32cf3e9aa043cef58114bf4f1",

            "armv7l-linux": "2084fe0130e0d32a94d7181b9ee0d38b67e38852efe72a44768bfd541074d631",

            "headers": "0j87666by9hbqkb3c0wxcjp5g8b7da807al9j4gjrspzp3r96a91",

            "x86_64-darwin": "8846b009c7f86dd40630fde6b914dbcd7e1acaf79bfbf6c69b5408a0c91f22f3",

            "x86_64-linux": "53f7ca0ee2bc52d7e22d75c3c3815f62f1616e82cfe030b11399549beb85f623"

            "aarch64-darwin": "50ffb73f7ac2705dc1500977dfe391f21895eefdb1eac642786ff9e3904f667e",

            "aarch64-linux": "780c79bd0f96498c8934262c56b105c53ced1fe7a6b442d1c32bcf2737bc8782",

            "armv7l-linux": "11aefc9f15b62c7102824927aa34ce07c479de9102212d00e96ff2f5ac268d89",

            "headers": "1sdvj3a05yrvy3b8bgzn8b2diz2ivlh4jsvhcffid0wbb17in2xj",

            "x86_64-darwin": "305ed9ef27305e8ee7a851e6ca169de360ee607497b5577174c67cfe4836f9ad",

            "x86_64-linux": "27d0c689b9a8564220adae3aea2a6f42411c986795f779a729fe90aed93fee61"

        },

        "version": "32.3.1"

        "version": "32.3.2"

    },

    "33": {

        "hashes": {

            "aarch64-darwin": "df7713ab2e4a7d3b059c507abcd1bb5ec8b71274407035658100529555a6ac65",

            "aarch64-linux": "e6f369ceebe049c7c119f943cc36617de3094b45eaf495259599ef65352d2eb5",

            "armv7l-linux": "41f9241f412c842027128f1260bb2f07799ddb0e6dfd22171296ccfc5c1d3ce6",

            "headers": "1qlsrljlw08253hpiiccmb0kafnbihyxc7hlvakbhnbwils393xr",

            "x86_64-darwin": "1fda63a3a64d68cb83c6619dafbf4ba4434b99b1c273c3ecdc3cc8de0ff2f422",

            "x86_64-linux": "e3d6fd631f5c1ff63850b7f0af8f3cf325200f66bdf3371c911b8f14f8a44673"

            "aarch64-darwin": "6865c4169468dbbf6e18810cfb51a3eb47bf8f2c503101cdece257d902c91b31",

            "aarch64-linux": "f4f0cfdfc02beab23df4fa30b09adee8e4d4b7c8674e75747fdbcb5aa612f62b",

            "armv7l-linux": "04ab8fa11c0d14bf948b71b1edaa2e5d4038f6e9926eba7401c6d2141af13053",

            "headers": "1x430y2zw2qysz82jv1s3hk37qrxmv7g8q292ghp6h3cwngwpiq7",

            "x86_64-darwin": "96ac3f3c34a29a5e507cd48613eea9ac281693baf3ebe9162dd92e1c4a1551f0",

            "x86_64-linux": "d7a4970c2a4fea0fcddee022d19cea6a911d3ce1695fc257de70a86d37c85d50"

        },

        "version": "33.4.1"

        "version": "33.4.2"

    },

    "34": {

        "hashes": {

            "aarch64-darwin": "c0a187acca68906c4a6387e8fabd052cb031ace6132d60a71001d9a0e891958e",

            "aarch64-linux": "61e03d4fa570976d80f740637f56192b6448a05a73d1fba9717900b29f2b1b4d",

            "armv7l-linux": "ec774d9b1a1b828a0db1502a1017fcab1dfed99b1b6b2fd2308dd600a1efa98a",

            "headers": "17f06fx4yidshmkdicis6k4azph95mxs1rwpm0ll53szpcs7rdss",

            "x86_64-darwin": "fa5a46d752267d8497d375e19079e8b6a8df70c234a79b2d6b48f5862e1a0abc",

            "x86_64-linux": "cc15a6e6206485a2d96649ceb60509b9da04fa2811c4824b2e0eb43d1f4b1417"

            "aarch64-darwin": "93a24cd159dcf9ad0015c4837cd20d6b85650b03373eff54c0e170c174d46812",

            "aarch64-linux": "c635c23d92ecea82a914717cd398a15bc5f805c9d06c83ed8d3553d5aaf35f58",

            "armv7l-linux": "c8833cdbc63f3b6df18b85ae1619e44a23d105a849d5249a2b27a0ed0b445b6b",

            "headers": "1fgagzl5568pnk1h4sil6k8i1ghdmfdhjazg5v6prsky0q8xa325",

            "x86_64-darwin": "f9156cb6ec55f364677134896391a6e98878299e6c78545876b3edce3103d88c",

            "x86_64-linux": "f7d7220f5c9941cdec532f99e4f1b2caaf43b294a054bfe284caa5b8a50120d0"

        },

        "version": "34.2.0"

        "version": "34.3.0"

    }

}

pkgs/development/tools/electron/common.nix

+5 −1
Original line number Diff line number Diff line
@@ -66,7 +66,11 @@ in 


  src = null;



  patches = base.patches;

  patches =

    base.patches

    ++ lib.optionals (lib.versions.major info.version == "32") [

      ./fix-electron-32-patch-apply-without-git-3way.patch

    ];



  unpackPhase =

    ''

pkgs/development/tools/electron/fix-electron-32-patch-apply-without-git-3way.patch

0 → 100644
+73 −0
Original line number Diff line number Diff line 
diff --git a/electron/patches/chromium/fix_osr_stutter_in_both_cpu_and_gpu_capture_when_page_has_animation.patch b/electron/patches/chromium/fix_osr_stutter_in_both_cpu_and_gpu_capture_when_page_has_animation.patch

index a8d4bc910..1d9b97e5f 100644

--- a/electron/patches/chromium/fix_osr_stutter_in_both_cpu_and_gpu_capture_when_page_has_animation.patch

+++ b/electron/patches/chromium/fix_osr_stutter_in_both_cpu_and_gpu_capture_when_page_has_animation.patch

@@ -10,10 +10,10 @@ The upstream has a fix, which will be available in Chromium M135.

 Backport this fix for Electron versions before that.

 

 diff --git a/media/capture/content/video_capture_oracle.cc b/media/capture/content/video_capture_oracle.cc

-index dad9598799a670b3cfb14965bc8a7b4ea3b4f95f..05a82788ae1e5c304ee150a2390f346d7b454630 100644

+index 43a35d394ee045f78ffecfeea582300b4083091f..ae0cdf0dcda5df71df55776f0842071eaa1b87da 100644

 --- a/media/capture/content/video_capture_oracle.cc

 +++ b/media/capture/content/video_capture_oracle.cc

-@@ -118,8 +118,9 @@ void VideoCaptureOracle::SetCaptureSizeConstraints(

+@@ -113,8 +113,9 @@ void VideoCaptureOracle::SetCaptureSizeConstraints(

  void VideoCaptureOracle::SetAutoThrottlingEnabled(bool enabled) {

    const bool was_enabled =

        (capture_size_throttling_mode_ != kThrottlingDisabled);

@@ -24,7 +24,7 @@ index dad9598799a670b3cfb14965bc8a7b4ea3b4f95f..05a82788ae1e5c304ee150a2390f346d

    capture_size_throttling_mode_ =

        enabled ? kThrottlingEnabled : kThrottlingDisabled;

    VLOG(1) << "Capture size auto-throttling is now "

-@@ -127,19 +128,22 @@ void VideoCaptureOracle::SetAutoThrottlingEnabled(bool enabled) {

+@@ -122,19 +123,22 @@ void VideoCaptureOracle::SetAutoThrottlingEnabled(bool enabled) {

  

    // When not auto-throttling, have the CaptureResolutionChooser target the max

    // resolution within constraints.

@@ -51,7 +51,7 @@ index dad9598799a670b3cfb14965bc8a7b4ea3b4f95f..05a82788ae1e5c304ee150a2390f346d

  }

  

  bool VideoCaptureOracle::ObserveEventAndDecideCapture(

-@@ -172,6 +176,15 @@ bool VideoCaptureOracle::ObserveEventAndDecideCapture(

+@@ -167,6 +171,15 @@ bool VideoCaptureOracle::ObserveEventAndDecideCapture(

          if (should_sample) {

            event_time = content_sampler_.frame_timestamp();

            duration_of_next_frame_ = content_sampler_.sampling_period();

@@ -67,8 +67,8 @@ index dad9598799a670b3cfb14965bc8a7b4ea3b4f95f..05a82788ae1e5c304ee150a2390f346d

          }

          last_time_animation_was_detected_ = event_time;

        } else {

-@@ -198,8 +211,9 @@ bool VideoCaptureOracle::ObserveEventAndDecideCapture(

-       NOTREACHED();

+@@ -194,8 +207,9 @@ bool VideoCaptureOracle::ObserveEventAndDecideCapture(

+       break;

    }

  

 -  if (!should_sample)

@@ -78,7 +78,7 @@ index dad9598799a670b3cfb14965bc8a7b4ea3b4f95f..05a82788ae1e5c304ee150a2390f346d

  

    // If the exact duration of the next frame has not been determined, estimate

    // it using the difference between the current and last frame.

-@@ -373,16 +387,18 @@ void VideoCaptureOracle::RecordConsumerFeedback(

+@@ -369,16 +383,18 @@ void VideoCaptureOracle::RecordConsumerFeedback(

  

    // resource_utilization feedback.

  

@@ -99,7 +99,7 @@ index dad9598799a670b3cfb14965bc8a7b4ea3b4f95f..05a82788ae1e5c304ee150a2390f346d

  

    if (capture_size_throttling_mode_ != kThrottlingActive) {

      VLOG(1) << "Received consumer feedback at frame #" << frame_number

-@@ -553,12 +569,14 @@ int VideoCaptureOracle::AnalyzeForIncreasedArea(base::TimeTicks analyze_time) {

+@@ -549,12 +565,14 @@ int VideoCaptureOracle::AnalyzeForIncreasedArea(base::TimeTicks analyze_time) {

    const int current_area = capture_size_.GetArea();

    const int increased_area =

        resolution_chooser_.FindLargerFrameSize(current_area, 1).GetArea();

@@ -116,7 +116,7 @@ index dad9598799a670b3cfb14965bc8a7b4ea3b4f95f..05a82788ae1e5c304ee150a2390f346d

    if (buffer_pool_utilization_.current() > 0.0) {

      const int buffer_capable_area = base::saturated_cast<int>(

          current_area / buffer_pool_utilization_.current());

-@@ -593,8 +611,9 @@ int VideoCaptureOracle::AnalyzeForIncreasedArea(base::TimeTicks analyze_time) {

+@@ -589,8 +607,9 @@ int VideoCaptureOracle::AnalyzeForIncreasedArea(base::TimeTicks analyze_time) {

  

    // At this point, the system is currently under-utilized.  Reset the start

    // time if the system was not under-utilized when the last analysis was made.

pkgs/development/tools/electron/info.json

+9 −9
Original line number Diff line number Diff line
@@ -47,10 +47,10 @@ 
            },

            "src/electron": {

                "fetcher": "fetchFromGitHub",

                "hash": "sha256-3W6F30x90mLX1BdL9zY/YLShFRUGirokadzEg5QX6TU=",

                "hash": "sha256-UpLk6Kjd50UHcUV53Gz7KnnXk8T2nd4Oc2FW7CFdL04=",

                "owner": "electron",

                "repo": "electron",

                "rev": "v32.3.1"

                "rev": "v32.3.2"

            },

            "src/media/cdm/api": {

                "fetcher": "fetchFromGitiles",
@@ -938,7 +938,7 @@ 
        "electron_yarn_hash": "122y1vnizwg0rwz8qf37mvpa0i78141y98wn4h11l6b9gyshrs65",

        "modules": "128",

        "node": "20.18.1",

        "version": "32.3.1"

        "version": "32.3.2"

    },

    "33": {

        "chrome": "130.0.6723.191",
@@ -988,10 +988,10 @@ 
            },

            "src/electron": {

                "fetcher": "fetchFromGitHub",

                "hash": "sha256-cOiflmkAzX0U7wFoGwxYDKMMrmSdjn18oXvguS6RSeY=",

                "hash": "sha256-kxRsRaLOJhKUcLNsyQ+9sC6oxGO/aDIYJnH5DUx61TM=",

                "owner": "electron",

                "repo": "electron",

                "rev": "v33.4.1"

                "rev": "v33.4.2"

            },

            "src/media/cdm/api": {

                "fetcher": "fetchFromGitiles",
@@ -1241,10 +1241,10 @@ 
            },

            "src/third_party/electron_node": {

                "fetcher": "fetchFromGitHub",

                "hash": "sha256-sUbqRJTFMuGhNHNwGZmAqNfw0t6ms8WpAeCSGjNX7Cw=",

                "hash": "sha256-ta9gw6A0aYguKYNRBW2nSPC3UTU5/7GNUPS02yyByis=",

                "owner": "nodejs",

                "repo": "node",

                "rev": "v20.18.1"

                "rev": "v20.18.3"

            },

            "src/third_party/emoji-segmenter/src": {

                "fetcher": "fetchFromGitiles",
@@ -1890,7 +1890,7 @@ 
        },

        "electron_yarn_hash": "0bzsswcg62b39xinq5vikk7qz7d15276s2vc15v1gcb5wvh05ff8",

        "modules": "130",

        "node": "20.18.1",

        "version": "33.4.1"

        "node": "20.18.3",

        "version": "33.4.2"

    }

}