diff options
author | Herwig Hochleitner <herwig@bendlas.net> | 2018-10-22 23:36:37 +0200 |
---|---|---|
committer | Herwig Hochleitner <herwig@bendlas.net> | 2018-10-24 19:38:51 +0200 |
commit | bb03fbc2c8b97ef5a4f4205eee51029155164b8a (patch) | |
tree | 83e33ec3e1d6a19c327bcf625e37931db2b34998 /pkgs/applications/networking/browsers/chromium/common.nix | |
parent | ddebab3575e8bd95b23b744156c7f6ab23b563f1 (diff) | |
download | nixlib-bb03fbc2c8b97ef5a4f4205eee51029155164b8a.tar nixlib-bb03fbc2c8b97ef5a4f4205eee51029155164b8a.tar.gz nixlib-bb03fbc2c8b97ef5a4f4205eee51029155164b8a.tar.bz2 nixlib-bb03fbc2c8b97ef5a4f4205eee51029155164b8a.tar.lz nixlib-bb03fbc2c8b97ef5a4f4205eee51029155164b8a.tar.xz nixlib-bb03fbc2c8b97ef5a4f4205eee51029155164b8a.tar.zst nixlib-bb03fbc2c8b97ef5a4f4205eee51029155164b8a.zip |
chromium: 69.0.3497.100 -> 70.0.3538.67
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/common.nix')
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 44 |
1 files changed, 18 insertions, 26 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index c18f77f8f996..4cbd44c100d6 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -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; |