mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 15:11:25 +00:00
chromium: 69.0.3497.100 -> 70.0.3538.67
This commit is contained in:
Herwig Hochleitner
parent
ddebab3575
commit
bb03fbc2c8
@ -92,11 +92,6 @@ let
|
||||
buildPath = "out/${buildType}";
|
||||
libExecPath = "$out/libexec/${packageName}";
|
||||
|
||||
freetype_source = fetchurl {
|
||||
url = http://anduin.linuxfromscratch.org/BLFS/other/chromium-freetype.tar.xz;
|
||||
sha256 = "1vhslc4xg0d6wzlsi99zpah2xzjziglccrxn55k7qna634wyxg77";
|
||||
};
|
||||
|
||||
versionRange = min-version: upto-version:
|
||||
let inherit (upstream-info) version;
|
||||
result = versionAtLeast version min-version && versionOlder version upto-version;
|
||||
@ -132,22 +127,26 @@ let
|
||||
++ optional pulseSupport libpulseaudio
|
||||
++ optional (versionAtLeast version "71") at-spi2-core;
|
||||
|
||||
patches = [
|
||||
# As major versions are added, you can trawl the gentoo and arch repos at
|
||||
# https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/
|
||||
# https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium
|
||||
# for updated patches and hints about build flags
|
||||
# (gentooPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000")
|
||||
./patches/fix-freetype.patch
|
||||
patches = optional enableWideVine ./patches/widevine.patch ++ [
|
||||
./patches/nix_plugin_paths_68.patch
|
||||
./patches/remove-webp-include-69.patch
|
||||
] ++ optional enableWideVine ./patches/widevine.patch
|
||||
++ optional ((versionRange "69" "70") && stdenv.isAarch64)
|
||||
(fetchpatch {
|
||||
url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/0001-vpx_sum_squares_2d_i16_neon-Make-s2-a-uint64x1_t.patch;
|
||||
sha256 = "0f37rsjx7jcvdngkj8y6600091nwgn4jci0ny7bxlapq0zx2a4x7";
|
||||
})
|
||||
++ optional stdenv.isAarch64
|
||||
# Unfortunately, chromium regularly breaks on major updates and
|
||||
# then needs various patches backported. Good sources for such patches and other hints:
|
||||
# - https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/
|
||||
# - https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium
|
||||
# - https://github.com/chromium/chromium/search?q=GCC&s=committer-date&type=Commits
|
||||
#
|
||||
# ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" )
|
||||
] ++ optionals (versionOlder version "71") [
|
||||
( githubPatch "cbdb8bd6567c8143dc8c1e5e86a21a8ea064eea4" "0258qlffp6f6izswczb11p8zdpn550z5yqa9z7gdg2rg5171n5i8" )
|
||||
( githubPatch "e98f8ef8b2f236ecbb01df8c39e6ee1c8fbe8d7d" "1ky5xrzch6aya87kn0bgb31lksl3g8kh2v8k676ks7pdl2v132p9" )
|
||||
( githubPatch "a4de8da116585357c123d71e5f54d1103824c6df" "1y7afnjrsz6j2l3vy1ms8mrkbb51xhcafw9r371algi48il7rajm" )
|
||||
( githubPatch "b033d2ba32da5ea237656568c25908d4f12b7bac" "008dg8vk822wyrinirx4nh92yq9bki4mwfwvcwnxdjmvz3y0jfcc" )
|
||||
( githubPatch "2f9563e49f6c28dfe52940901417a4031b95a49b" "1q8qhpzx611yzrxa8lgpw0bad9bxx84rsrvczl4xvk5qh93zna7i" )
|
||||
( githubPatch "a66e0a3f3f57eb045639e2752a99ade348dc17e9" "1c5x9856b167z270357wr8l6m1wrznxcx89ykj6kfz5djqmv251g" )
|
||||
( githubPatch "4d9714247f617bf9e1cf95f735148f5e598a9529" "1423jf3lzbljzgbcwvfrrfyhyl3fab988hsyjvk95zyclxff7iij" )
|
||||
( githubPatch "87902b3202f81d689dd314c17006ffc907fe12a1" "15q37cd26s73girq1imcs52fb1irh0qlfvhksh6g0l0jjrdyzk6r" )
|
||||
] ++ optional stdenv.isAarch64
|
||||
(if (versionOlder version "71") then
|
||||
fetchpatch {
|
||||
url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch;
|
||||
@ -193,11 +192,6 @@ let
|
||||
mkdir -p third_party/node/linux/node-linux-x64/bin
|
||||
ln -s $(which node) third_party/node/linux/node-linux-x64/bin/node
|
||||
|
||||
# use patched freetype
|
||||
# FIXME https://bugs.chromium.org/p/pdfium/issues/detail?id=733
|
||||
# FIXME http://savannah.nongnu.org/bugs/?51156
|
||||
tar -xJf ${freetype_source}
|
||||
|
||||
# remove unused third-party
|
||||
# in third_party/crashpad third_party/zlib contains just a header-adapter
|
||||
for lib in ${toString gnSystemLibraries}; do
|
||||
@ -243,8 +237,6 @@ let
|
||||
google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI";
|
||||
google_default_client_id = "404761575300.apps.googleusercontent.com";
|
||||
google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D";
|
||||
} // optionalAttrs (versionRange "60" "70") {
|
||||
use_gtk3 = true;
|
||||
} // optionalAttrs proprietaryCodecs {
|
||||
# enable support for the H.264 codec
|
||||
proprietary_codecs = true;
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
--- a/third_party/freetype/BUILD.gn
|
||||
+++ b/third_party/freetype/BUILD.gn
|
||||
@@ -63,10 +63,12 @@ source_set("freetype_source") {
|
||||
"src/src/base/ftbase.c",
|
||||
"src/src/base/ftbbox.c",
|
||||
"src/src/base/ftbitmap.c",
|
||||
+ "src/src/base/ftfntfmt.c",
|
||||
"src/src/base/ftfstype.c",
|
||||
"src/src/base/ftgasp.c",
|
||||
"src/src/base/ftglyph.c",
|
||||
"src/src/base/ftinit.c",
|
||||
+ "src/src/base/ftlcdfil.c",
|
||||
"src/src/base/ftmm.c",
|
||||
"src/src/base/ftstroke.c",
|
||||
"src/src/base/fttype1.c",
|
||||
@ -50,15 +50,6 @@ index f4e119d..d9775bd 100644
|
||||
return false;
|
||||
cur = cur.Append(kPepperFlashBaseDirectory);
|
||||
break;
|
||||
@@ -323,7 +316,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
// We currently need a path here to look up whether the plugin is disabled
|
||||
// and what its permissions are.
|
||||
case chrome::FILE_NACL_PLUGIN:
|
||||
- if (!GetInternalPluginsDirectory(&cur))
|
||||
+ if (!GetInternalPluginsDirectory(&cur, "NACL"))
|
||||
return false;
|
||||
cur = cur.Append(kInternalNaClPluginFileName);
|
||||
break;
|
||||
@@ -358,7 +351,7 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
cur = cur.DirName();
|
||||
}
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
# This file is autogenerated from update.sh in the same directory.
|
||||
{
|
||||
beta = {
|
||||
sha256 = "16biicw86mnjrmjazfbml2pf4rykhbvsz854cyfnpjhcvmlh24jp";
|
||||
sha256bin64 = "07jr1sqsxfdy3rymylkbpbgi79j9b2pax4igdzj943d0nbka84y5";
|
||||
version = "70.0.3538.35";
|
||||
sha256 = "0dqfwghl73gcmbnl9wb3i5wz8q65y1vhg7n0m2nh0hv33w1w4mp9";
|
||||
sha256bin64 = "0x7npns1ng7p4w1qswcj889v9lplvy2wv1ccxrk4ilyqiwzvwy1z";
|
||||
version = "70.0.3538.67";
|
||||
};
|
||||
dev = {
|
||||
sha256 = "0fmkhvvydinv5f543n7rrmsv99rf0skwwhlpmszvspx6y4wz9smv";
|
||||
sha256bin64 = "0plr8ph78kfg2dpyacjy3aw3msfif95fqpb8xx0n8whkkpbl9968";
|
||||
version = "71.0.3559.6";
|
||||
sha256 = "1kw0rn58s4nd43z2qkjph7aid0s3jnmm650d7k1yxppgmfsal246";
|
||||
sha256bin64 = "0518qrghjk5jlzhmynk6nngp5i81bpxi3880gimpbd7bblj6dg7y";
|
||||
version = "71.0.3578.10";
|
||||
};
|
||||
stable = {
|
||||
sha256 = "0dcyzsb70ssx5hd2b25ab3ydpqh7crhxab9zzi5gn99ywxh1afg3";
|
||||
sha256bin64 = "0w56k7hmdi9knjaw67kdmyz0fdkjmk2ldh2n4l1c6szkr66vq30q";
|
||||
version = "69.0.3497.100";
|
||||
sha256 = "0dqfwghl73gcmbnl9wb3i5wz8q65y1vhg7n0m2nh0hv33w1w4mp9";
|
||||
sha256bin64 = "0ihs2xfb2zn8aq11kg7miw9rnjwc6l4k5jgf24dm661463xmd3ha";
|
||||
version = "70.0.3538.67";
|
||||
};
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user