[arch-commits] Commit in electron/trunk (19 files)
Nicola Squartini
tensor5 at archlinux.org
Thu Feb 22 16:27:06 UTC 2018
Date: Thursday, February 22, 2018 @ 16:27:05
Author: tensor5
Revision: 297083
upgpkg: electron 1.8.2-1
Added:
electron/trunk/chromium-dmabuf.patch
Modified:
electron/trunk/PKGBUILD
electron/trunk/breakpad-glibc2.26.patch
electron/trunk/chromium-include-functional.patch
electron/trunk/chromium-use-system-ffmpeg.patch
electron/trunk/dont-bootstrap-libchromiumcontent.patch
electron/trunk/dont-use-sysroot.patch
electron/trunk/libchromiumcontent-no-depot_tools.patch
electron/trunk/libchromiumcontent-settings.patch
electron/trunk/libchromiumcontent-sort-filenames.patch
electron/trunk/libchromiumcontent-static-library-only.patch
electron/trunk/libchromiumcontent-use-system-tools.patch
electron/trunk/no-whole-archive.patch
electron/trunk/use-system-ffmpeg.patch
electron/trunk/use-system-libraries-in-node.patch
electron/trunk/use-system-ninja.patch
Deleted:
electron/trunk/chromium-gn-bootstrap-r2.patch
electron/trunk/chromium-gtk3.patch
electron/trunk/libchromiumcontent-chdir.patch
----------------------------------------------+
PKGBUILD | 81 +++++++++++------------
breakpad-glibc2.26.patch | 4 -
chromium-dmabuf.patch | 86 +++++++++++++++++++++++++
chromium-gn-bootstrap-r2.patch | 13 ---
chromium-gtk3.patch | 13 ---
chromium-include-functional.patch | 2
chromium-use-system-ffmpeg.patch | 47 ++++++-------
dont-bootstrap-libchromiumcontent.patch | 14 ++--
dont-use-sysroot.patch | 14 ++--
libchromiumcontent-chdir.patch | 11 ---
libchromiumcontent-no-depot_tools.patch | 30 +++++---
libchromiumcontent-settings.patch | 67 +++++++++++--------
libchromiumcontent-sort-filenames.patch | 23 ++++--
libchromiumcontent-static-library-only.patch | 14 ++--
libchromiumcontent-use-system-tools.patch | 27 +++----
no-whole-archive.patch | 2
use-system-ffmpeg.patch | 2
use-system-libraries-in-node.patch | 21 ------
use-system-ninja.patch | 2
19 files changed, 260 insertions(+), 213 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-02-22 12:23:12 UTC (rev 297082)
+++ PKGBUILD 2018-02-22 16:27:05 UTC (rev 297083)
@@ -1,19 +1,20 @@
# $Id$
# Maintainer: Nicola Squartini <tensor5 at gmail.com>
-_chromiumver=58.0.3029.110
+_chromiumver=59.0.3071.115
+_freetype_rev=5a3490e054bda8a318ebde482
pkgname=electron
-pkgver=1.7.12
-pkgrel=3
+pkgver=1.8.2
+pkgrel=1
pkgdesc='Build cross platform desktop apps with web technologies'
arch=('x86_64')
url='http://electron.atom.io/'
license=('MIT' 'custom')
-depends=('c-ares' 'ffmpeg' 'gtk3' 'http-parser' 'libevent' 'libxslt'
- 'libxss' 'minizip' 'nss' 're2' 'snappy')
+depends=('c-ares' 'ffmpeg' 'gtk3' 'http-parser' 'libevent' 'libxss' 'minizip'
+ 'nss' 're2' 'snappy')
makedepends=('clang' 'gconf' 'git' 'gperf' 'gtk2' 'harfbuzz-icu' 'jsoncpp'
- 'libexif' 'libgnome-keyring' 'libnotify' 'ninja' 'npm' 'pciutils'
- 'python2' 'wget' 'yasm')
+ 'libexif' 'libgnome-keyring' 'libnotify' 'llvm' 'ninja' 'npm'
+ 'pciutils' 'python2' 'wget' 'yasm')
optdepends=('gvfs: file deletion support (gvfs-trash)'
'kde-cli-tools: file deletion support (kioclient5)'
'kdebase-runtime: file deletion support (kioclient)'
@@ -30,7 +31,8 @@
'pdf_viewer::git+https://github.com/electron/pdf-viewer.git'
'git+https://github.com/kennethreitz/requests.git'
'google-breakpad::git+https://chromium.googlesource.com/breakpad/breakpad/src'
- "electron-chromium-${_chromiumver}.tar.xz::https://github.com/zcbenz/chromium-source-tarball/releases/download/${_chromiumver}/chromium-${_chromiumver}.tar.xz"
+ "chromium-freetype2::git+https://chromium.googlesource.com/chromium/src/third_party/freetype2#commit=${_freetype_rev}"
+ "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${_chromiumver}.tar.xz"
'electron.desktop'
'default_app-icon.patch'
'dont-bootstrap-libchromiumcontent.patch'
@@ -45,20 +47,18 @@
'use-system-ffmpeg.patch'
'breakpad-glibc2.26.patch'
'gyp-no-rpath.patch'
- 'libchromiumcontent-chdir.patch'
'libchromiumcontent-no-depot_tools.patch'
'libchromiumcontent-settings.patch'
'libchromiumcontent-sort-filenames.patch'
'libchromiumcontent-static-library-only.patch'
'libchromiumcontent-use-system-tools.patch'
- 'chromium-gn-bootstrap-r2.patch'
- 'chromium-gtk3.patch'
+ 'chromium-dmabuf.patch'
'chromium-include-functional.patch'
'chromium-use-system-ffmpeg.patch'
'chromium-use-system-minizip.patch'
'chromium-use-system-re2.patch'
)
-noextract=("electron-chromium-${_chromiumver}.tar.xz")
+noextract=("chromium-${_chromiumver}.tar.xz")
sha512sums=('SKIP'
'SKIP'
'SKIP'
@@ -70,31 +70,30 @@
'SKIP'
'SKIP'
'SKIP'
- 'efe0c61a8888ead17d4ae2494623b65b4a201e6c8487b8af850c17b4cc7cccadd10b85a2ba4a913622bacbff5bb3bfbe192e361fc1a0e3c00c4a5cd2195666c6'
+ 'SKIP'
+ 'f30d54dedd43ba11321db1bcd443bb44a550ffca24ebb579727b98a15b6a3f6f598f20f0ef0889eab6820e6faacba0aa567927fd36d5ed0e61d7bd4f760e9993'
'613317b8c63efb0ddfe9112b56aa9714b536082144c0903d5b97351c3396b3c9eedeb44b6da72b85cbfd1bdd16cba30c512ac93c8ca6ffb04cad283ef29958b2'
'a9b4d25987171c170ad2c6467c45d1f27c6dfba71c4d981564f6d0a683acd54c17e415314c35a44560ab6428a2ff98321caec0d2a07a9c69bddd580c42f6eb48'
- 'c2ae7549e6372609fbebaf552af2ebda9e313eec4c3a8636ba9dfe7d34bbc5fdc7c73a88881a3a7a80b04b929b8251fe24cd3bfed828a812cdcfb0efc29312f5'
+ 'b002bb96d38875876d09ad5ceb76843b306031c470ba24aace6cbc5b8a22774f44b5c0e4a99bf807737e25f57254d14865934694114a9f4551453cc6c560063a'
'22d2d3605a49a72cf7e12e4f1cdadb6e327a7487eed47eeb04a4213cf6dcc73c47d93cdea85a767a11181debc37e952f5e4685f9fae1debd4a1a1a10ac188e8c'
- '145c9b96c867bbaff76639554e63315186103e16bde366629a56cf06d19015141d84711923e57bfaeffb3f2ab91c986c75c41767f4bf05c179e07b68e2cb554c'
+ '8661ceff63a7b0140e811d699bb5e37ac9ceeb2def9dc47166c54ab6c225157efdac7226d9a305d2bf50e38c53f2a51a15dcdc25e9e2be86002693ada9d32c9d'
'62963c4dbf86624f370aad1ee42d43b7e4f6a0f719d906959ed642b1c0ca9ba397a8ea3923e6c6a4acc38bfb2187642791148dd528bb3b4ddc79f039fa6d8fa5'
'4eeb3a757bcf268b9bc7d16ca1efa9fa96d1aa55827766e1ec88d967946412688f4ab88a0ee3fb0870f32fa6ce4dd5cfe92c27a55c86d489e04c5c297d30e6bc'
'd6dfadb1c30e0a2f234dedd09a79c4af96aaef976146fdb95989edc6bd019d6e52e127fc9fc119c17e4d3321052f49877c728c52cd2e8d3ca41165c5155b40d3'
- '42fce1906cc78f3b853ec1bad2ef9f6ec3465c92d941113d3f084406c0dfcbe0a4eddf9fbe7d0decb63d1cfbb4bbf681bbb75510df1c874afb1d9b1805c228a4'
- '606b44f4c259cb1acc7f825aefc072a951004d0f5307ddf95d87634b83e25bfe1202d3aef0c1cef47b51a6afa58c2a365a405c524adf1af5e799e69b97bb368b'
- '473db4f20714e12bf402b61b67f1fff886be4505cdec77120c143c453e0529028703c8b3b3cb8a69d68debd35dfce528db4b3a3028162ea43ba600c9364cbaa5'
- '49da48a340bc165a7677bb324b091240e1f8f6acf868b67df05f1cd9d3d15a3948a186981ed45e7388ecff4fe5099d3a0ed1ef405af79292505c8e2a301fcc27'
- '61d60c46cfd0b59d4188452f73868363bb051804c8927a75680e150818c7bee7823c3ae6788d1eb4c4d6f672dd92ec684f9f8115d9cf80603e714bf97b08e874'
+ '5c29c2a1c8128e85619fb84f1b5db12ff7446d72d14a25367f32d9370706a7b9ad9a53dc1d2e36df3f0d155d555cfa8586026508e83e6be7968a44d7144994df'
+ 'bee177ebb768d14d65de9172b9eecd2d738b312932c33ef45422cd8fec3448916236ecedd15a733c544144c2f0a3887c084bea9c5d61e176de4839ea28148277'
+ 'b4a42f274b88f9f97fa409a6c95b0f9896bc86aa342ee24cfc029e4f640c5badf258932eabd1d451571339cc8733796f5770e0b979b7deda5b5ae09deb2e85c8'
+ 'c921239b239ff5d7f79da4d3a12bae136cca36f95cd44e9278dc3e7647a8c153e1a70100d6e5e9d815a94b9da7a4131414bed98fb6db4b0c964a5fdca2279e0c'
+ '2dd594a07f8ce62a7706a0365d764ab3ee3cc2d050d6ae4460db3152269e84f43516438a4f48f47fc54fe758a70c462baed6b7defa8b2bd277e67cb1bae8da12'
'fef435fcae0fcfc5ed7fe66bcdad24565a87493ff133422fa54756ee1c1335d4bfdae7e782d3f72fcd5c0e6c337b7a30fe7fb36a02a3fea1a1d509244d01d636'
- 'c8d0711818d790a4db06163b6f22badbad405aa719f7ffe0f2574f2a49074085949902cd060ff47609fc930cc88d60a25a9ca2cc569702fab4ab4a8a57611a4b'
- '607681ea5a5d62201f37e72b039a370c8b260a4eff14697713124b91383315fdde14ebb028e13ca06da26259f322680f2749fc67b99f1bc6196fa3c1c63f5d65'
- '93a85e826f019b0d3af7d8e9276404d2cbaabd9674c6a36a31518e893ac2759cadd410c9c27af1186ad90fe6bd888546df9567987a04375993c6f776bd508b32'
- '54ded98c95de5c6f6bdc3352b4f34f8b6ea0f527355ccff12b8f88a8dfb8b308301a95d5f4c4f1cdd7333a5c3372045e63e63e524329913d3e339d757721ef01'
- 'dd7f6fc0023e867835fe7cabd4b54750ebec0ea91102ca11d73a9c3e7caa92f2c8118795d2f67b3269381a3366b3ff9cf692924bcbb379a5ed7ce36b86b4d8b6'
- '6bc66e6d3df8ef3d616a01fa5ac9270eeed1f705cbb3557dc3d670f9cbd50cf47d4773a334e11494cbb78f850ce2c3f364d8889e7bcfcadec299b354a37cfd6a'
- '8ae7a0c049429191a5092b73ba7e6681ac17b0fe4ac77715e67c9e7c1db63e66731912fb144955108ee1d37848d3bb03d1f5defec2b7b2324784dec1eda898ef'
- 'c94a8dcb69e2a1d7e2e24a34e89cece2c2329df5a99f214a511bea0e837d44c690de26b72095153d2284c0617b5d89ea782cf54fa3151da9d5c9261ac9469bcd'
- '6a995c3fa315692525db59abbd9e4297551448cb111ba93efc2d6443546cf0961a84fb3762cf9c9be6e56cde13c885504c0dad0968f92bb32e471adfc5cbbf4a'
- 'cb903a6dd635fe70afc7c6961700d2aaa1da6ec2996c4f352e253876b8b831cdfe3cc5d32d90aec468302e4b5cabae0efbc269acd4fa3c7ffc26825e8617fa40'
+ '03676f682cd2db47aaf53c7e8221c3d19e20d7768e9b6a7cdb2da80674f220c293164ee1ca094b0c494d82cf1ba0e178ed66f41a6af28d266a50a758f95d6185'
+ '755714719d1acff42240465d64be0cbad987a0edddf5e57e21d8ff373550ebf779de7c3207a309269317f30b929c318828cc9d5da59b9757a4beb449c3c7e688'
+ '8da75b16f3fc39e828b94fe9bf013a2fd180a81a9a34a8511a99e62e8d2a714ced24d94ef643561e0c88c27868d8eaa643e19003cbfa293451fc15dd75f5801f'
+ '9bd56c6dba41ae08cad2435f229bcab7218f82be4a33dbf8dbf7204d839fbf0ba505b8444d3d17083d3260b597e694ead720c5aef9060a21917c3c844ba4ef28'
+ '901b07a90b1576f0aa4f2438ed08a0e85c7a64b3a4c95645f9e3cbd3cf265e395feb43e7969540c39e7dea3b24e78c59a9d88c9b4e5262816cd89e9543068c98'
+ 'acf6a43e89a49fb5d21fa165fe3a6b6a73b766fec05f952d11f48840ccb7c6640c1f946d87fb9b700f330a4eeffbd05346cc97def3de892b700439cad2a8e7bd'
+ '09a910f14c4466a74638af0505dbdbbf586813b0a20506ac15ae375037a1f06f82fea4045350f1e54357dd41fb721061c7cc2f0eea2e3a0439a79466db3875ea'
+ '39309580c96220ae503ecd811e1f4c593fea028804d3ba4026a83c0928b941a0ca851b6d76ee289ee48671eb0bd2187c81f26495c6ca92ce6a96baf3c9464274'
'eace29bd99f7167ac2e5b7499560ec7e6c205eeee8fd0adef8cc7de3cef5058f9852dd2cc20946d637ed479d25b270c35d52de6f104f41000faa36dc018f63aa'
'5552e8918462f6c3a4e1baef3c22b57d70c732766945ea0b39f63df7d7b8fca9646f1f9b28b0528fa586799842c949298fc97e1041875da0ca1aacff046f6c9b')
@@ -107,8 +106,8 @@
'libpng'
# 'libvpx'
'libwebp'
- 'libxml'
- 'libxslt'
+# 'libxml'
+# 'libxslt'
're2'
'snappy'
'yasm'
@@ -131,7 +130,7 @@
patch -Np1 -i "${srcdir}"/no-whole-archive.patch
# Add extra libraries for unbundling
- sed -e "s/'-lexpat',/'-lexpat', '<\!@(pkg-config --libs-only-l libavcodec libavformat libavutil libevent flac harfbuzz-icu jsoncpp minizip libpng libpulse libwebpdemux libxml-2.0 libxslt)', '-ljpeg', '-lre2', '-lsnappy', '-latomic',/" \
+ sed -e "s/'-lexpat',/'-lexpat', '<\!@(pkg-config --libs-only-l libavcodec libavformat libavutil libevent flac harfbuzz-icu jsoncpp minizip libpng libpulse libwebpdemux)', '-ljpeg', '-lre2', '-lsnappy', '-latomic',/" \
-e 's/gtk+-2\.0/gtk+-3.0/' \
-i brightray/brightray.gyp
@@ -160,19 +159,17 @@
patch -Np1 -i "${srcdir}"/gyp-no-rpath.patch
cd "${srcdir}"/electron/vendor/libchromiumcontent
- patch -Np1 -i "${srcdir}"/libchromiumcontent-chdir.patch
patch -Np1 -i "${srcdir}"/libchromiumcontent-no-depot_tools.patch
patch -Np1 -i "${srcdir}"/libchromiumcontent-settings.patch
patch -Np1 -i "${srcdir}"/libchromiumcontent-sort-filenames.patch # deterministic build
patch -Np1 -i "${srcdir}"/libchromiumcontent-use-system-tools.patch
patch -Np1 -i "${srcdir}"/libchromiumcontent-static-library-only.patch
- rm patches/third_party/ffmpeg/build_gn.patch # Use system ffmpeg
+ rm patches/third_party/ffmpeg/001-build_gn.patch # Use system ffmpeg
echo 'Extracting chromium source...'
- tar -xJf "${srcdir}"/electron-chromium-${_chromiumver}.tar.xz
+ tar -xJf "${srcdir}"/chromium-${_chromiumver}.tar.xz
mv chromium-${_chromiumver} src
cd src
- patch -Np1 -i "${srcdir}"/chromium-gn-bootstrap-r2.patch
- patch -Np1 -i "${srcdir}"/chromium-gtk3.patch
+ patch -Np1 -i "${srcdir}"/chromium-dmabuf.patch
patch -Np1 -i "${srcdir}"/chromium-include-functional.patch
patch -Np1 -i "${srcdir}"/chromium-use-system-ffmpeg.patch
patch -Np1 -i "${srcdir}"/chromium-use-system-minizip.patch
@@ -192,9 +189,9 @@
# Create sysmlink to system Node.js
mkdir -p third_party/node/linux/node-linux-x64/bin
ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin
- cd third_party/node
- npm install
- patch -d node_modules/vulcanize -p1 < patch_vulcanize.diff
+
+ # Fixes from the chromium package
+ mv "${srcdir}/chromium-freetype2" third_party/freetype/src
}
build() {
@@ -218,7 +215,7 @@
LDFLAGS="${LDFLAGS} -Wl,-z,noexecstack"
script/bootstrap.py --verbose \
--clang_dir=/usr \
- --build_libchromiumcontent
+ --build_release_libcc
script/build.py -c Release
}
Modified: breakpad-glibc2.26.patch
===================================================================
--- breakpad-glibc2.26.patch 2018-02-22 12:23:12 UTC (rev 297082)
+++ breakpad-glibc2.26.patch 2018-02-22 16:27:05 UTC (rev 297083)
@@ -186,7 +186,7 @@
};
--- a/src/client/linux/microdump_writer/microdump_writer.cc
+++ b/src/client/linux/microdump_writer/microdump_writer.cc
-@@ -416,7 +416,7 @@ class MicrodumpWriter {
+@@ -560,7 +560,7 @@ class MicrodumpWriter {
void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
@@ -197,7 +197,7 @@
#endif
--- a/src/client/linux/minidump_writer/minidump_writer.cc
+++ b/src/client/linux/minidump_writer/minidump_writer.cc
-@@ -1240,7 +1240,7 @@ class MinidumpWriter {
+@@ -1248,7 +1248,7 @@ class MinidumpWriter {
const int fd_; // File descriptor where the minidum should be written.
const char* path_; // Path to the file where the minidum should be written.
Added: chromium-dmabuf.patch
===================================================================
--- chromium-dmabuf.patch (rev 0)
+++ chromium-dmabuf.patch 2018-02-22 16:27:05 UTC (rev 297083)
@@ -0,0 +1,86 @@
+--- a/ui/gfx/linux/client_native_pixmap_dmabuf.cc
++++ b/ui/gfx/linux/client_native_pixmap_dmabuf.cc
+@@ -7,36 +7,35 @@
+ #include <fcntl.h>
+ #include <linux/version.h>
+ #include <stddef.h>
++#include <sys/ioctl.h>
+ #include <sys/mman.h>
+ #include <xf86drm.h>
+
+ #include "base/debug/crash_logging.h"
+ #include "base/memory/ptr_util.h"
++#include "base/posix/eintr_wrapper.h"
+ #include "base/process/memory.h"
+ #include "base/process/process_metrics.h"
+ #include "base/strings/stringprintf.h"
+ #include "base/trace_event/trace_event.h"
+
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
++#include <linux/dma-buf.h>
++#else
+ #include <linux/types.h>
+
+-struct local_dma_buf_sync {
++struct dma_buf_sync {
+ __u64 flags;
+ };
+
+-#define LOCAL_DMA_BUF_SYNC_READ (1 << 0)
+-#define LOCAL_DMA_BUF_SYNC_WRITE (2 << 0)
+-#define LOCAL_DMA_BUF_SYNC_RW \
+- (LOCAL_DMA_BUF_SYNC_READ | LOCAL_DMA_BUF_SYNC_WRITE)
+-#define LOCAL_DMA_BUF_SYNC_START (0 << 2)
+-#define LOCAL_DMA_BUF_SYNC_END (1 << 2)
++#define DMA_BUF_SYNC_READ (1 << 0)
++#define DMA_BUF_SYNC_WRITE (2 << 0)
++#define DMA_BUF_SYNC_RW (DMA_BUF_SYNC_READ | DMA_BUF_SYNC_WRITE)
++#define DMA_BUF_SYNC_START (0 << 2)
++#define DMA_BUF_SYNC_END (1 << 2)
+
+-#define LOCAL_DMA_BUF_BASE 'b'
+-#define LOCAL_DMA_BUF_IOCTL_SYNC \
+- _IOW(LOCAL_DMA_BUF_BASE, 0, struct local_dma_buf_sync)
+-
+-#else
+-#include <linux/dma-buf.h>
++#define DMA_BUF_BASE 'b'
++#define DMA_BUF_IOCTL_SYNC _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync)
+ #endif
+
+ namespace gfx {
+@@ -44,25 +43,19 @@ namespace gfx {
+ namespace {
+
+ void PrimeSyncStart(int dmabuf_fd) {
+- struct local_dma_buf_sync sync_start = {0};
++ struct dma_buf_sync sync_start = {0};
+
+- sync_start.flags = LOCAL_DMA_BUF_SYNC_START | LOCAL_DMA_BUF_SYNC_RW;
+-#if DCHECK_IS_ON()
+- int rv =
+-#endif
+- drmIoctl(dmabuf_fd, LOCAL_DMA_BUF_IOCTL_SYNC, &sync_start);
+- DPLOG_IF(ERROR, rv) << "Failed DMA_BUF_SYNC_START";
++ sync_start.flags = DMA_BUF_SYNC_START | DMA_BUF_SYNC_RW;
++ int rv = HANDLE_EINTR(ioctl(dmabuf_fd, DMA_BUF_IOCTL_SYNC, &sync_start));
++ PLOG_IF(ERROR, rv) << "Failed DMA_BUF_SYNC_START";
+ }
+
+ void PrimeSyncEnd(int dmabuf_fd) {
+- struct local_dma_buf_sync sync_end = {0};
++ struct dma_buf_sync sync_end = {0};
+
+- sync_end.flags = LOCAL_DMA_BUF_SYNC_END | LOCAL_DMA_BUF_SYNC_RW;
+-#if DCHECK_IS_ON()
+- int rv =
+-#endif
+- drmIoctl(dmabuf_fd, LOCAL_DMA_BUF_IOCTL_SYNC, &sync_end);
+- DPLOG_IF(ERROR, rv) << "Failed DMA_BUF_SYNC_END";
++ sync_end.flags = DMA_BUF_SYNC_END | DMA_BUF_SYNC_RW;
++ int rv = HANDLE_EINTR(ioctl(dmabuf_fd, DMA_BUF_IOCTL_SYNC, &sync_end));
++ PLOG_IF(ERROR, rv) << "Failed DMA_BUF_SYNC_END";
+ }
+
+ } // namespace
Deleted: chromium-gn-bootstrap-r2.patch
===================================================================
--- chromium-gn-bootstrap-r2.patch 2018-02-22 12:23:12 UTC (rev 297082)
+++ chromium-gn-bootstrap-r2.patch 2018-02-22 16:27:05 UTC (rev 297083)
@@ -1,13 +0,0 @@
-Index: tools/gn/bootstrap/bootstrap.py
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index 38cfb117d29c3895291379f00d8dc8c8b0727474..679170e610f8292bcbeb76508fd247d322a69c79 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -385,6 +385,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/base_switches.cc',
- 'base/build_time.cc',
- 'base/callback_internal.cc',
-+ 'base/callback_helpers.cc',
- 'base/command_line.cc',
- 'base/debug/activity_tracker.cc',
- 'base/debug/alias.cc',
Deleted: chromium-gtk3.patch
===================================================================
--- chromium-gtk3.patch 2018-02-22 12:23:12 UTC (rev 297082)
+++ chromium-gtk3.patch 2018-02-22 16:27:05 UTC (rev 297083)
@@ -1,13 +0,0 @@
---- a/chrome/browser/ui/libgtkui/gtk_ui.cc
-+++ b/chrome/browser/ui/libgtkui/gtk_ui.cc
-@@ -376,6 +376,10 @@
- } // namespace
-
- GtkUi::GtkUi() : middle_click_action_(GetDefaultMiddleClickAction()) {
-+#if GTK_MAJOR_VERSION > 2
-+ g_setenv("GDK_SCALE", "1", FALSE);
-+ gdk_set_allowed_backends("x11");
-+#endif
- GtkInitFromCommandLine(*base::CommandLine::ForCurrentProcess());
- #if GTK_MAJOR_VERSION == 2
- native_theme_ = NativeThemeGtk2::instance();
Modified: chromium-include-functional.patch
===================================================================
--- chromium-include-functional.patch 2018-02-22 12:23:12 UTC (rev 297082)
+++ chromium-include-functional.patch 2018-02-22 16:27:05 UTC (rev 297083)
@@ -2,7 +2,7 @@
+++ b/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h
@@ -5,6 +5,7 @@
#include "platform/PlatformExport.h"
- #include "wtf/ThreadSpecific.h"
+ #include "platform/wtf/ThreadSpecific.h"
+#include <functional>
#include <memory>
Modified: chromium-use-system-ffmpeg.patch
===================================================================
--- chromium-use-system-ffmpeg.patch 2018-02-22 12:23:12 UTC (rev 297082)
+++ chromium-use-system-ffmpeg.patch 2018-02-22 16:27:05 UTC (rev 297083)
@@ -1,48 +1,43 @@
--- a/media/ffmpeg/ffmpeg_common.h
+++ b/media/ffmpeg/ffmpeg_common.h
-@@ -22,10 +22,6 @@
+@@ -23,10 +23,12 @@
// 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
++#if !defined(USE_SYSTEM_FFMPEG)
+ // 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
++#endif // !defined(USE_SYSTEM_FFMPEG)
// 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,
-@@ -39,7 +35,6 @@
+@@ -40,7 +42,9 @@
MSVC_PUSH_DISABLE_WARNING(4244);
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
--#include <libavformat/internal.h>
++#if !defined(USE_SYSTEM_FFMPEG)
+ #include <libavformat/internal.h>
++#endif // !defined(USE_SYSTEM_FFMPEG)
#include <libavformat/avio.h>
#include <libavutil/avutil.h>
#include <libavutil/imgutils.h>
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -1221,24 +1221,6 @@
+@@ -1223,6 +1223,7 @@
// 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);
-- if (packet_pts < start_time_estimates[stream->index])
-- start_time_estimates[stream->index] = packet_pts;
-- }
-- packet_buffer = packet_buffer->next;
-- }
-- }
++#if !defined(USE_SYSTEM_FFMPEG)
+ const AVFormatInternal* internal = format_context->internal;
+ if (internal && internal->packet_buffer &&
+ format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
+@@ -1246,6 +1247,7 @@
+ packet_buffer = packet_buffer->next;
+ }
+ }
++#endif // !defined(USE_SYSTEM_FFMPEG)
std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());
Modified: dont-bootstrap-libchromiumcontent.patch
===================================================================
--- dont-bootstrap-libchromiumcontent.patch 2018-02-22 12:23:12 UTC (rev 297082)
+++ dont-bootstrap-libchromiumcontent.patch 2018-02-22 16:27:05 UTC (rev 297083)
@@ -2,12 +2,12 @@
index e0a95f6..1383e70 100755
--- a/script/build-libchromiumcontent.py
+++ b/script/build-libchromiumcontent.py
-@@ -28,7 +28,7 @@ def main():
- update = os.path.join(script_dir, 'update')
+@@ -44,7 +44,7 @@ def main():
build = os.path.join(script_dir, 'build')
create_dist = os.path.join(script_dir, 'create-dist')
-- execute_stdout([sys.executable, bootstrap])
-+ # execute_stdout([sys.executable, bootstrap])
- execute_stdout([sys.executable, update, '-t', args.target_arch,
- '--defines', args.defines])
- execute_stdout([sys.executable, build, '-R', '-t', args.target_arch])
+ if args.force_update or libchromiumcontent_outdated():
+- execute_stdout([sys.executable, bootstrap])
++ # execute_stdout([sys.executable, bootstrap])
+ execute_stdout([sys.executable, update, '-t', args.target_arch,
+ '--defines', args.defines])
+ update_gclient_done_marker()
Modified: dont-use-sysroot.patch
===================================================================
--- dont-use-sysroot.patch 2018-02-22 12:23:12 UTC (rev 297082)
+++ dont-use-sysroot.patch 2018-02-22 16:27:05 UTC (rev 297083)
@@ -1,10 +1,10 @@
--- a/script/bootstrap.py
+++ b/script/bootstrap.py
-@@ -56,9 +56,6 @@ def main():
+@@ -60,9 +60,6 @@ def main():
libcc_source_path, libcc_shared_library_path,
libcc_static_library_path)
-- if PLATFORM == 'linux':
+- if PLATFORM == 'linux' and args.target_arch != 'mips64el':
- download_sysroot(args.target_arch)
-
create_chrome_version_h()
@@ -12,16 +12,16 @@
run_update(defines, args.msvs)
--- a/toolchain.gypi
+++ b/toolchain.gypi
-@@ -56,10 +56,10 @@
+@@ -59,10 +59,10 @@
'sysroot%': '<(source_root)/vendor/debian_jessie_arm64-sysroot',
}],
['target_arch=="ia32"', {
-- 'sysroot%': '<(source_root)/vendor/debian_wheezy_i386-sysroot',
+- 'sysroot%': '<(source_root)/vendor/debian_jessie_i386-sysroot',
+ 'sysroot%': '/',
}],
['target_arch=="x64"', {
-- 'sysroot%': '<(source_root)/vendor/debian_wheezy_amd64-sysroot',
+- 'sysroot%': '<(source_root)/vendor/debian_jessie_amd64-sysroot',
+ 'sysroot%': '/',
}],
- ],
- },
+ ['target_arch=="mips64el"', {
+ 'sysroot%': '<(source_root)/vendor/debian_jessie_mips64-sysroot',
Deleted: libchromiumcontent-chdir.patch
===================================================================
--- libchromiumcontent-chdir.patch 2018-02-22 12:23:12 UTC (rev 297082)
+++ libchromiumcontent-chdir.patch 2018-02-22 16:27:05 UTC (rev 297083)
@@ -1,11 +0,0 @@
---- a/script/update
-+++ b/script/update
-@@ -41,6 +41,8 @@ solutions = [
- '''
-
- def main():
-+ os.chdir(SOURCE_ROOT)
-+
- args = parse_args()
-
- if sys.platform in ['win32', 'cygwin']:
Modified: libchromiumcontent-no-depot_tools.patch
===================================================================
--- libchromiumcontent-no-depot_tools.patch 2018-02-22 12:23:12 UTC (rev 297082)
+++ libchromiumcontent-no-depot_tools.patch 2018-02-22 16:27:05 UTC (rev 297083)
@@ -1,7 +1,7 @@
--- a/script/update
+++ b/script/update
-@@ -46,8 +46,8 @@
- if sys.platform in ['win32', 'cygwin']:
+@@ -48,8 +48,8 @@
+ if sys.platform == 'win32' and not args.skip_depot_tools_update:
update_depot_tools()
- if args.clean and os.path.isdir(SRC_DIR):
@@ -11,14 +11,20 @@
# Warning about using a network share as git cache from Windows 7+: The
# gclient script may experience errors unless you disable SMBv2 cache by
-@@ -55,8 +55,8 @@
- # HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\Lanmanworkstation\Parameters\DirectoryCacheLifetime
- # to 0.
- # More information: https://stackoverflow.com/a/9935126
-- git_cache = args.git_cache or os.getenv('LIBCHROMIUMCONTENT_GIT_CACHE', '')
-- gclient_sync(chromium_version(), args.clean, git_cache)
-+ # git_cache = args.git_cache or os.getenv('LIBCHROMIUMCONTENT_GIT_CACHE', '')
-+ # gclient_sync(chromium_version(), args.clean, git_cache)
+@@ -60,11 +60,11 @@
+ git_cache = args.git_cache or os.getenv('LIBCHROMIUMCONTENT_GIT_CACHE', '')
+ target_arch = args.target_arch
+ nohooks = target_arch == 'mips64el' and IS_MIPS64EL_HOST
+- if not args.skip_gclient:
+- if (args.source_only):
+- return gclient_sync(chromium_version(), args.clean, git_cache, nohooks)
+- else:
+- gclient_sync(chromium_version(), args.clean, git_cache, nohooks)
++ # if not args.skip_gclient:
++ # if (args.source_only):
++ # return gclient_sync(chromium_version(), args.clean, git_cache, nohooks)
++ # else:
++ # gclient_sync(chromium_version(), args.clean, git_cache, nohooks)
- if sys.platform == 'linux2':
- install_sysroot()
+ if target_arch == 'mips64el' and IS_MIPS64EL_HOST:
+ os.system('sh script/mips64el/runhooks-mips64el')
Modified: libchromiumcontent-settings.patch
===================================================================
--- libchromiumcontent-settings.patch 2018-02-22 12:23:12 UTC (rev 297082)
+++ libchromiumcontent-settings.patch 2018-02-22 16:27:05 UTC (rev 297083)
@@ -1,32 +1,6 @@
---- a/chromiumcontent/args/static_library.gn
-+++ b/chromiumcontent/args/static_library.gn
-@@ -2,10 +2,22 @@
- is_electron_build = true
- is_component_build = false
- is_debug = false
--symbol_level = 2
-+symbol_level = 0
- enable_nacl = false
- enable_widevine = true
- proprietary_codecs = true
- is_component_ffmpeg = true
- ffmpeg_branding = "Chrome"
- use_gold = false
-+clang_base_path = "/usr"
-+clang_use_chrome_plugins = false
-+fatal_linker_warnings = false
-+treat_warnings_as_errors = false
-+fieldtrial_testing_like_official_build = true
-+remove_webcore_debug_symbols = true
-+link_pulseaudio = true
-+linux_use_bundled_binutils = false
-+use_cups = true
-+use_gconf = false
-+use_gtk3 = true
-+use_sysroot = false
--- a/chromiumcontent/BUILD.gn
+++ b/chromiumcontent/BUILD.gn
-@@ -33,7 +33,7 @@
+@@ -34,7 +34,7 @@ group("targets") {
]
if (is_linux) {
@@ -35,7 +9,7 @@
}
if (is_component_build) {
-@@ -155,13 +155,13 @@
+@@ -156,13 +156,13 @@ if (is_electron_build && is_component_build) {
static_library("libgtkui") {
complete_static_lib = true
sources = [
@@ -56,3 +30,40 @@
]
}
}
+--- a/chromiumcontent/args/static_library.gn
++++ b/chromiumcontent/args/static_library.gn
+@@ -2,10 +2,22 @@ root_extra_deps = [ "//chromiumcontent:chromiumcontent" ]
+ is_electron_build = true
+ is_component_build = false
+ is_debug = false
+-symbol_level = 2
++symbol_level = 0
+ enable_nacl = false
+ enable_widevine = true
+ proprietary_codecs = true
+ is_component_ffmpeg = true
+ ffmpeg_branding = "Chrome"
+ v8_promise_internal_field_count = 1 # https://github.com/nodejs/node/pull/13242
++clang_base_path = "/usr"
++clang_use_chrome_plugins = false
++fatal_linker_warnings = false
++treat_warnings_as_errors = false
++fieldtrial_testing_like_official_build = true
++remove_webcore_debug_symbols = true
++link_pulseaudio = true
++linux_use_bundled_binutils = false
++use_cups = true
++use_gconf = false
++use_gtk3 = true
++use_sysroot = false
+--- a/script/update
++++ b/script/update
+@@ -295,7 +295,7 @@ def run_gn(target_arch, defines):
+ if sys.platform in ['win32', 'cygwin']:
+ args += ' use_experimental_allocator_shim=false'
+ if sys.platform == 'linux2':
+- args += ' use_gtk3=false'
++ args += ' use_gtk3=true'
+ if target_arch == 'mips64el':
+ args += ' clang_use_chrome_plugins=false'
+ args += ' enable_hangout_services_extension=true'
Modified: libchromiumcontent-sort-filenames.patch
===================================================================
--- libchromiumcontent-sort-filenames.patch 2018-02-22 12:23:12 UTC (rev 297082)
+++ libchromiumcontent-sort-filenames.patch 2018-02-22 16:27:05 UTC (rev 297083)
@@ -12,12 +12,21 @@
out.write("]\n")
--- a/tools/generate_filenames_gypi.py
+++ b/tools/generate_filenames_gypi.py
-@@ -98,7 +98,7 @@ def main(target_file, code_dir, shared_dir, static_dir):
+@@ -99,7 +99,7 @@ def main(target_file, code_dir, shared_dir, static_dir):
- def searh_files(src, suffix, exclude):
-- files = glob.glob(os.path.join(src, '*.' + suffix))
-+ files = sorted(glob.glob(os.path.join(src, '*.' + suffix)))
- files = [f for f in files if os.path.basename(f) not in exclude]
- return ([os.path.abspath(f) for f in files if not is_v8_library(f)],
- [os.path.abspath(f) for f in files if is_v8_library(f)])
+ def find_libraries(dirpath, library_suffix, list_of_excludes):
+- libraries = glob.glob(os.path.join(dirpath, '*.' + library_suffix))
++ libraries = sorted(glob.glob(os.path.join(dirpath, '*.' + library_suffix)))
+ if (library_suffix == 'so'):
+ # Handle "libname.so.123"
+ libraries += find_files_by_regex(dirpath, re.compile('.*\.so\.[0-9]+'))
+@@ -132,7 +132,7 @@ def find_files_by_regex(dirpath, regex):
+ if regex.match(file):
+ files_found.append(os.path.join(root, file))
+
+- return files_found
++ return sorted(files_found)
+
+
+ def is_v8_library(p):
Modified: libchromiumcontent-static-library-only.patch
===================================================================
--- libchromiumcontent-static-library-only.patch 2018-02-22 12:23:12 UTC (rev 297082)
+++ libchromiumcontent-static-library-only.patch 2018-02-22 16:27:05 UTC (rev 297083)
@@ -1,6 +1,6 @@
--- a/script/build
+++ b/script/build
-@@ -11,7 +11,7 @@ from lib.util import get_configuration, get_output_dir
+@@ -13,7 +13,7 @@ from lib.config import MIPS64EL_GCC, IS_MIPS64EL_HOST, set_mips64el_env, \
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
VENDOR_DIR = os.path.join(SOURCE_ROOT, 'vendor')
TARGETS = ['chromiumcontent_all']
@@ -11,7 +11,7 @@
if sys.platform == 'win32':
--- a/script/create-dist
+++ b/script/create-dist
-@@ -72,7 +72,7 @@ BINARIES = {
+@@ -76,7 +76,7 @@ BINARIES = {
'libffmpeg.dylib',
],
'linux': [
@@ -20,7 +20,7 @@
],
'win32': [
'd3dcompiler_47.dll',
-@@ -381,7 +381,7 @@ def generate_ninja(args, ninja):
+@@ -390,7 +390,7 @@ def generate_ninja(args, ninja):
copy_generated_sources(target_arch, component, ninja)
copy_locales(target_arch, component, ninja)
@@ -29,9 +29,9 @@
copy_sources(ninja)
generate_licenses(ninja)
-@@ -490,9 +490,9 @@ def copy_binaries(target_arch, component, create_debug_archive,
- elif target_arch == 'arm64':
- binaries = [ 'chromedriver', 'clang_x64_v8_arm64/mksnapshot' ]
+@@ -513,9 +513,9 @@ def copy_binaries(target_arch, component, create_debug_archive,
+ else:
+ binaries = [ 'chromedriver', 'clang_x64_v8_mips64el/mksnapshot' ]
else:
- binaries = [ 'chromedriver', 'mksnapshot' ]
+ binaries = [ 'mksnapshot' ]
@@ -43,7 +43,7 @@
--- a/script/update
+++ b/script/update
-@@ -17,7 +17,7 @@ VENDOR_DIR = os.path.join(SOURCE_ROOT, 'vendor')
+@@ -19,7 +19,7 @@ VENDOR_DIR = os.path.join(SOURCE_ROOT, 'vendor')
SRC_DIR = os.path.join(SOURCE_ROOT, 'src')
CHROMIUMCONTENT_SOURCE_DIR = os.path.join(SOURCE_ROOT, 'chromiumcontent')
CHROMIUMCONTENT_DESTINATION_DIR = os.path.join(SRC_DIR, 'chromiumcontent')
Modified: libchromiumcontent-use-system-tools.patch
===================================================================
--- libchromiumcontent-use-system-tools.patch 2018-02-22 12:23:12 UTC (rev 297082)
+++ libchromiumcontent-use-system-tools.patch 2018-02-22 16:27:05 UTC (rev 297083)
@@ -1,6 +1,6 @@
--- a/script/build
+++ b/script/build
-@@ -13,7 +13,7 @@ VENDOR_DIR = os.path.join(SOURCE_ROOT, 'vendor')
+@@ -15,7 +15,7 @@ VENDOR_DIR = os.path.join(SOURCE_ROOT, 'vendor')
TARGETS = ['chromiumcontent_all']
COMPONENTS = ['static_library', 'shared_library', 'ffmpeg']
@@ -8,10 +8,10 @@
+NINJA = 'ninja'
if sys.platform == 'win32':
NINJA = '{0}.exe'.format(NINJA)
-
+ elif IS_MIPS64EL_HOST:
--- a/script/create-dist
+++ b/script/create-dist
-@@ -29,7 +29,7 @@
+@@ -31,7 +31,7 @@ import ninja_syntax
MAIN_DIR = os.path.join(DIST_DIR, 'main')
DIST_SRC_DIR = os.path.join(MAIN_DIR, 'src')
@@ -19,33 +19,32 @@
+NINJA = 'ninja'
if sys.platform == 'win32':
NINJA = '{0}.exe'.format(NINJA)
-
+ elif IS_MIPS64EL_HOST:
--- a/script/update
+++ b/script/update
-@@ -58,10 +58,10 @@ def main():
- git_cache = args.git_cache or os.getenv('LIBCHROMIUMCONTENT_GIT_CACHE', '')
- gclient_sync(chromium_version(), args.clean, git_cache)
+@@ -69,17 +69,16 @@ def main():
+ if target_arch == 'mips64el' and IS_MIPS64EL_HOST:
+ os.system('sh script/mips64el/runhooks-mips64el')
- if sys.platform == 'linux2':
-- install_sysroot()
+- install_sysroot(target_arch)
- elif sys.platform in ['win32', 'cygwin']:
- update_toolchain_json()
+ # if sys.platform == 'linux2':
-+ # install_sysroot()
++ # install_sysroot(target_arch)
+ # elif sys.platform in ['win32', 'cygwin']:
+ # update_toolchain_json()
- target_arch = args.target_arch
if target_arch == 'arm64':
-@@ -69,7 +69,6 @@ def main():
+ install_aarch64_bintools()
- return (apply_patches() or
+ return (apply_patches(args.skip_patches, target_arch) or
copy_chromiumcontent_files() or
- update_clang() or
+ setup_mips64el_toolchain(target_arch) or
run_gn(target_arch, args.defines))
-
-@@ -205,7 +204,7 @@ def run_gn(target_arch, defines):
+@@ -277,7 +276,7 @@ def run_gn(target_arch, defines):
if sys.platform in ['win32', 'cygwin']:
gn = os.path.join(SRC_DIR, 'buildtools', 'win', 'gn.exe')
elif sys.platform == 'linux2':
Modified: no-whole-archive.patch
===================================================================
--- no-whole-archive.patch 2018-02-22 12:23:12 UTC (rev 297082)
+++ no-whole-archive.patch 2018-02-22 16:27:05 UTC (rev 297083)
@@ -1,6 +1,6 @@
--- a/brightray/brightray.gyp
+++ b/brightray/brightray.gyp
-@@ -41,14 +41,13 @@
+@@ -48,14 +48,13 @@
'conditions': [
# Link with libraries of libchromiumcontent.
['OS=="linux" and libchromiumcontent_component==0', {
Modified: use-system-ffmpeg.patch
===================================================================
--- use-system-ffmpeg.patch 2018-02-22 12:23:12 UTC (rev 297082)
+++ use-system-ffmpeg.patch 2018-02-22 16:27:05 UTC (rev 297083)
@@ -1,6 +1,6 @@
--- a/brightray/brightray.gyp
+++ b/brightray/brightray.gyp
-@@ -130,8 +130,6 @@
+@@ -145,8 +145,6 @@
}, {
'link_settings': {
'libraries': [
Modified: use-system-libraries-in-node.patch
===================================================================
--- use-system-libraries-in-node.patch 2018-02-22 12:23:12 UTC (rev 297082)
+++ use-system-libraries-in-node.patch 2018-02-22 16:27:05 UTC (rev 297083)
@@ -16,27 +16,8 @@
'node_tag': '',
'node_use_dtrace': 'false',
'node_use_etw': 'false',
-@@ -109,18 +109,6 @@
- 'conditions': [
- ['OS=="linux"', {
- 'cflags': [
-- '-Wno-parentheses-equality',
-- '-Wno-unused-function',
-- '-Wno-sometimes-uninitialized',
-- '-Wno-pointer-sign',
-- '-Wno-string-plus-int',
-- '-Wno-unused-variable',
-- '-Wno-unused-value',
-- '-Wno-deprecated-declarations',
-- '-Wno-return-type',
-- '-Wno-shift-negative-value',
-- '-Wno-format',
-- '-Wno-varargs', # https://git.io/v6Olj
- # Required when building as shared library.
- '-fPIC',
+@@ -165,6 +165,12 @@
],
-@@ -160,6 +148,12 @@
- ],
}],
['OS=="linux" and libchromiumcontent_component==0', {
+ 'libraries': [
Modified: use-system-ninja.patch
===================================================================
--- use-system-ninja.patch 2018-02-22 12:23:12 UTC (rev 297082)
+++ use-system-ninja.patch 2018-02-22 16:27:05 UTC (rev 297083)
@@ -1,6 +1,6 @@
--- a/script/build.py
+++ b/script/build.py
-@@ -19,7 +19,7 @@
+@@ -23,7 +23,7 @@
# Update the VS build env.
import_vs_env(get_target_arch())
More information about the arch-commits
mailing list