From 015c5a2be650acf9db46c3c25012e5023319625b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 14 Oct 2020 12:17:07 +0200 Subject: [PATCH] chromium: Drop the libwebp include patch Chromium 86.0.4240.75 builds fine without this patch. And since WEBP_MAX_DIMENSION is the same in the system libwebp this patch should not be required anymore (it was introduced in 06ec2a9f196, apparently to fix the build). --- .../networking/browsers/chromium/common.nix | 1 - .../chromium/patches/remove-webp-include-69.patch | 11 ----------- 2 files changed, 12 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-69.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 7de238dae8e..f8318839b91 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -154,7 +154,6 @@ let ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ]; patches = [ - ./patches/remove-webp-include-69.patch ./patches/no-build-timestamps.patch ./patches/widevine-79.patch # Unfortunately, chromium regularly breaks on major updates and diff --git a/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-69.patch b/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-69.patch deleted file mode 100644 index 07572cf7ee9..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-69.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc -+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc -@@ -13,7 +13,7 @@ - - #include "jpeglib.h" // for JPEG_MAX_DIMENSION - --#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION -+#define WEBP_MAX_DIMENSION 16383 - - namespace blink { -