diff options
author | Herwig Hochleitner <herwig@bendlas.net> | 2017-07-31 09:52:45 +0200 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2017-08-11 11:17:14 +0200 |
commit | 8dc869e3400cb30bd8685128c038593a0e793b54 (patch) | |
tree | 52efa7d0d36c71e950c99c645884330cc9ab77ad /pkgs/applications/networking/browsers | |
parent | 18112eea52755a72095cc53f87a1fe5f783db50b (diff) | |
download | nixpkgs-8dc869e3400cb30bd8685128c038593a0e793b54.tar nixpkgs-8dc869e3400cb30bd8685128c038593a0e793b54.tar.gz nixpkgs-8dc869e3400cb30bd8685128c038593a0e793b54.tar.bz2 nixpkgs-8dc869e3400cb30bd8685128c038593a0e793b54.tar.lz nixpkgs-8dc869e3400cb30bd8685128c038593a0e793b54.tar.xz nixpkgs-8dc869e3400cb30bd8685128c038593a0e793b54.tar.zst nixpkgs-8dc869e3400cb30bd8685128c038593a0e793b54.zip |
chromium: 59.0.3071.115 -> 60.0.3112.78
get rid of outdated version branches and patches take a patch from gentoo, to fix gn bootstrapping
Diffstat (limited to 'pkgs/applications/networking/browsers')
5 files changed, 27 insertions, 92 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 11177f3ee48..b930ab79658 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -104,23 +104,22 @@ let nspr nss systemd utillinux alsaLib bison gperf kerberos - glib gtk2 dbus_glib + glib gtk2 gtk3 dbus_glib libXScrnSaver libXcursor libXtst mesa pciutils protobuf speechd libXdamage ] ++ optional gnomeKeyringSupport libgnome_keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional pulseSupport libpulseaudio - ++ optional (versionAtLeast version "56.0.0.0") gtk3; + ++ optional pulseSupport libpulseaudio; patches = [ ./patches/nix_plugin_paths_52.patch + ./patches/chromium-gn-bootstrap-r8.patch # To enable ChromeCast, go to chrome://flags and set "Load Media Router Component Extension" to Enabled # Fixes Chromecast: https://bugs.chromium.org/p/chromium/issues/detail?id=734325 ./patches/fix_network_api_crash.patch - ./patches/chromium-59.0.3071.115-system_ffmpeg-1.patch - ] ++ optional (versionOlder version "57.0") ./patches/glibc-2.24.patch - ++ optional enableWideVine ./patches/widevine.patch; + + ] ++ optional enableWideVine ./patches/widevine.patch; postPatch = '' # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-59.0.3071.115-system_ffmpeg-1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-59.0.3071.115-system_ffmpeg-1.patch deleted file mode 100644 index 2ffdcc0ad6a..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-59.0.3071.115-system_ffmpeg-1.patch +++ /dev/null @@ -1,63 +0,0 @@ -Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org> -Date: 2017-06-25 -Initial Package Version: 57.0.2987.110 -Upstream Status: Not submitted -Origin: Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-system-ffmpeg-r4.patch -Description: Allows building with system provided ffmpeg. Rediffed - for chromium-59.0.3071.109. - -diff -Naurp chromium-59.0.3071.109-orig/media/ffmpeg/ffmpeg_common.h chromium-59.0.3071.109/media/ffmpeg/ffmpeg_common.h ---- chromium-59.0.3071.109-orig/media/ffmpeg/ffmpeg_common.h 2017-06-20 17:03:19.000000000 -0500 -+++ chromium-59.0.3071.109/media/ffmpeg/ffmpeg_common.h 2017-06-23 00:21:10.551912699 -0500 -@@ -23,10 +23,6 @@ - - // Include FFmpeg header files. - extern "C" { --// Disable deprecated features which result in spammy compile warnings. This --// list of defines must mirror those in the 'defines' section of FFmpeg's --// BUILD.gn file or the headers below will generate different structures! --#define FF_API_CONVERGENCE_DURATION 0 - // Upstream libavcodec/utils.c still uses the deprecated - // av_dup_packet(), causing deprecation warnings. - // The normal fix for such things is to disable the feature as below, -@@ -40,7 +36,6 @@ extern "C" { - MSVC_PUSH_DISABLE_WARNING(4244); - #include <libavcodec/avcodec.h> - #include <libavformat/avformat.h> --#include <libavformat/internal.h> - #include <libavformat/avio.h> - #include <libavutil/avutil.h> - #include <libavutil/imgutils.h> -diff -Naurp chromium-59.0.3071.109-orig/media/filters/ffmpeg_demuxer.cc chromium-59.0.3071.109/media/filters/ffmpeg_demuxer.cc ---- chromium-59.0.3071.109-orig/media/filters/ffmpeg_demuxer.cc 2017-06-20 17:03:19.000000000 -0500 -+++ chromium-59.0.3071.109/media/filters/ffmpeg_demuxer.cc 2017-06-23 00:22:56.289311692 -0500 -@@ -1223,29 +1223,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone - // If no estimate is found, the stream entry will be kInfiniteDuration. - std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams, - kInfiniteDuration); -- const AVFormatInternal* internal = format_context->internal; -- if (internal && internal->packet_buffer && -- format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) { -- struct AVPacketList* packet_buffer = internal->packet_buffer; -- while (packet_buffer != internal->packet_buffer_end) { -- DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index), -- start_time_estimates.size()); -- const AVStream* stream = -- format_context->streams[packet_buffer->pkt.stream_index]; -- if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) { -- const base::TimeDelta packet_pts = -- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts); -- // We ignore kNoTimestamp here since -int64_t::min() is possible; see -- // https://crbug.com/700501. Technically this is a valid value, but in -- // practice shouldn't occur, so just ignore it when estimating. -- if (packet_pts != kNoTimestamp && packet_pts != kInfiniteDuration && -- packet_pts < start_time_estimates[stream->index]) { -- start_time_estimates[stream->index] = packet_pts; -- } -- } -- packet_buffer = packet_buffer->next; -- } -- } - - std::unique_ptr<MediaTracks> media_tracks(new MediaTracks()); - diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r8.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r8.patch new file mode 100644 index 00000000000..d9f389aaf58 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r8.patch @@ -0,0 +1,13 @@ +Index: tools/gn/bootstrap/bootstrap.py +diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py +index 6f2f5b1264519ea38cc36fb0b7e2cc24c378ca7a..0b03d2626b358fb90ab39d737679ee47bd60303b 100755 +--- a/tools/gn/bootstrap/bootstrap.py ++++ b/tools/gn/bootstrap/bootstrap.py +@@ -487,6 +487,7 @@ def write_gn_ninja(path, root_gen_dir, options): + 'base/sys_info.cc', + 'base/task_runner.cc', + 'base/task_scheduler/delayed_task_manager.cc', ++ 'base/task_scheduler/environment_config.cc', + 'base/task_scheduler/post_task.cc', + 'base/task_scheduler/priority_queue.cc', + 'base/task_scheduler/scheduler_lock_impl.cc', diff --git a/pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch b/pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch deleted file mode 100644 index 10a04b7ec8d..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- old/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2016-08-03 21:02:37.000000000 +0200 -+++ new/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2016-08-14 10:59:51.395354850 +0200 -@@ -41,6 +41,11 @@ - #include <errno.h> - #include <sys/mman.h> - -+#if OS(LINUX) && defined(MADV_FREE) -+// Added in Linux 4.5, but we don't want to depend on 4.5 at runtime -+#undef MADV_FREE -+#endif -+ - #ifndef MADV_FREE - #define MADV_FREE MADV_DONTNEED - #endif diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 708320e92a2..ba3995f129a 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "086j8s8wjwk26gfb7hdqn1lsmwgr9mmw93yfi6s4wia9ra0ccwj2"; - sha256bin64 = "0z1dshxzyn5zhr4xg5mvrq70jxsfkwv50achq802322y4jz52f7n"; - version = "60.0.3112.66"; + sha256 = "1sh3rq36sh4g7blajvqfvs06fs5sbrbdp50qq0cvcj4k3fmb4bd8"; + sha256bin64 = "1w67y4z57qm5fwniayncly7a4mjmwqir7gfd54ny8lwlf247d43m"; + version = "60.0.3112.78"; }; dev = { - sha256 = "1hbf7hv4934686dp0dbqy06vbwb2kq4wz5hjfdxrgafrzqac2j7g"; - sha256bin64 = "1gg1a3k80qncr7dpw9gycndv52396cqyq9zfmzf6c4njpn2khjfv"; - version = "61.0.3153.4"; + sha256 = "0b8bzxnnzfl17vw0gwds89zjc4z4zi6fdz8f97w3x8a5ad0c2h5i"; + sha256bin64 = "1n1q6g7avw4yrzdhpzq0pfd12k1fb18hc01jqnq2ak0aisdaga72"; + version = "61.0.3163.13"; }; stable = { - sha256 = "0w1i4q7w5lcajc18jrchrhhm00x0jzm846l5x7a5rcp3baawkjrp"; - sha256bin64 = "1naq20508qjm9hlwlpj686a0lawca58rnr35ws2gh2gsyxrxnmx1"; - version = "59.0.3071.115"; + sha256 = "1sh3rq36sh4g7blajvqfvs06fs5sbrbdp50qq0cvcj4k3fmb4bd8"; + sha256bin64 = "0wbqbbq9zxizfbjxj241nhk1qgjq91db0lzzbkm5hjvjhx6war4s"; + version = "60.0.3112.78"; }; } |