[arch-commits] Commit in electron/trunk (19 files)
Nicola Squartini
tensor5 at archlinux.org
Thu Aug 31 08:42:29 UTC 2017
Date: Thursday, August 31, 2017 @ 08:42:29
Author: tensor5
Revision: 255160
upgpkg: electron 1.6.11-1
Added:
electron/trunk/chromium-include-functional.patch
electron/trunk/gtk3-message-box.patch
electron/trunk/libchromiumcontent-settings.patch
Modified:
electron/trunk/PKGBUILD
electron/trunk/brightray-no-whole-archive.patch
electron/trunk/brightray-use-system-ffmpeg.patch
electron/trunk/chromium-gtk3.patch
electron/trunk/chromium-use-system-ffmpeg.patch
electron/trunk/chromium-use-system-minizip.patch
electron/trunk/chromium-use-system-re2.patch
electron/trunk/default_app-icon.patch
electron/trunk/gtk3-menu-bar.patch
electron/trunk/gtk3-warnings.patch
electron/trunk/libchromiumcontent-static-library-only.patch
electron/trunk/libchromiumcontent-use-system-tools.patch
electron/trunk/use-system-ffmpeg.patch
electron/trunk/use-system-libraries-in-node.patch
Deleted:
electron/trunk/chromium-cups.patch
electron/trunk/libchromiumcontent-use-system-ffmpeg.patch
----------------------------------------------+
PKGBUILD | 142 +++++++++++++------------
brightray-no-whole-archive.patch | 2
brightray-use-system-ffmpeg.patch | 2
chromium-cups.patch | 10 -
chromium-gtk3.patch | 12 +-
chromium-include-functional.patch | 10 +
chromium-use-system-ffmpeg.patch | 12 +-
chromium-use-system-minizip.patch | 2
chromium-use-system-re2.patch | 27 +---
default_app-icon.patch | 6 -
gtk3-menu-bar.patch | 12 +-
gtk3-message-box.patch | 11 +
gtk3-warnings.patch | 16 +-
libchromiumcontent-settings.patch | 58 ++++++++++
libchromiumcontent-static-library-only.patch | 42 ++++++-
libchromiumcontent-use-system-ffmpeg.patch | 18 ---
libchromiumcontent-use-system-tools.patch | 21 ++-
use-system-ffmpeg.patch | 2
use-system-libraries-in-node.patch | 5
19 files changed, 251 insertions(+), 159 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-08-31 08:24:47 UTC (rev 255159)
+++ PKGBUILD 2017-08-31 08:42:29 UTC (rev 255160)
@@ -1,10 +1,10 @@
# $Id$
# Maintainer: Nicola Squartini <tensor5 at gmail.com>
-_chromiumver=53.0.2785.143
+_chromiumver=56.0.2924.87
pkgname=electron
-pkgver=1.4.16
-pkgrel=3
+pkgver=1.6.11
+pkgrel=1
pkgdesc='Build cross platform desktop apps with web technologies'
arch=('i686' 'x86_64')
url='http://electron.atom.io/'
@@ -13,7 +13,7 @@
'libxss' 'minizip' 'nss' 're2' 'snappy')
makedepends=('clang' 'gconf' 'git' 'gperf' 'gtk2' 'harfbuzz-icu' 'jsoncpp'
'libexif' 'libgnome-keyring' 'libnotify' 'ninja' 'npm' 'pciutils'
- 'python2' 'yasm')
+ 'python2' 'wget' 'yasm')
optdepends=('gvfs: file deletion support (gvfs-trash)'
'kde-cli-tools: file deletion support (kioclient5)'
'kdebase-runtime: file deletion support (kioclient)'
@@ -22,13 +22,15 @@
'git+https://github.com/boto/boto.git'
'git+https://github.com/electron/brightray.git'
'breakpad::git+https://github.com/electron/chromium-breakpad.git'
+ 'git+https://chromium.googlesource.com/chromium/src/tools/grit.git'
'git+https://github.com/electron/gyp.git'
"git+https://github.com/electron/libchromiumcontent.git"
'native_mate::git+https://github.com/zcbenz/native-mate.git'
'git+https://github.com/electron/node.git'
+ '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'
- "https://github.com/zcbenz/chromium-source-tarball/releases/download/${_chromiumver}/chromium-${_chromiumver}.tar.xz"
+ "electron-chromium-${_chromiumver}.tar.xz::https://github.com/zcbenz/chromium-source-tarball/releases/download/${_chromiumver}/chromium-${_chromiumver}.tar.xz"
'electron.desktop'
'default_app-icon.patch'
'dont-bootstrap-libchromiumcontent.patch'
@@ -36,6 +38,7 @@
'dont-use-sysroot.patch'
'allow-i686.patch'
'gtk3-menu-bar.patch'
+ 'gtk3-message-box.patch'
'gtk3-warnings.patch'
'use-system-clang.patch'
'use-system-libraries-in-node.patch'
@@ -45,12 +48,12 @@
'brightray-no-whole-archive.patch'
'brightray-use-system-ffmpeg.patch'
'gyp-no-rpath.patch'
+ 'libchromiumcontent-settings.patch'
'libchromiumcontent-sort-filenames.patch'
'libchromiumcontent-static-library-only.patch'
- 'libchromiumcontent-use-system-ffmpeg.patch'
'libchromiumcontent-use-system-tools.patch'
- 'chromium-cups.patch'
'chromium-gtk3.patch'
+ 'chromium-include-functional.patch'
'chromium-unset-madv_free.patch'
'chromium-use-system-ffmpeg.patch'
'chromium-use-system-minizip.patch'
@@ -67,61 +70,54 @@
'SKIP'
'SKIP'
'SKIP'
- '2929d23425e35b4d91199dfa05ed642c5567863d1982c72055f339c794027c98'
+ 'SKIP'
+ 'SKIP'
+ '70876d8b1e91801af0af133f6de2992c1c8868e34b6354bb060e040958c604d7'
'5270db01f3f8aaa5137dec275a02caa832b7f2e37942e068cba8d28b3a29df39'
- 'a86c9855efc321d6ba0c6ea38c5c4feadfc6fdeb6eaef2bb100d97face20db13'
+ '84b4c5d9a27727b18e500db4fcc5c44dd52eaeb440eeec02cd8321d1f6bfcadf'
'14dbd1eecb7034d9e19e1f0c61b0a36ed3b9c610db008ff2a6da2a540ade1221'
'2a2bc09a40415fd0d57cc8815a158bf32eb4cc2add3b655dddf568c7dc795ff3'
'182a2eeb784630e6aa3378a54c5709629658eac8e146764008cb2f2214cd5427'
'c209475c16b506d8d888a54c8564718cf9775f450d1867e19e86a03d99a119be'
- '3f9bc0e3ee316f172b390584287fb93778ad8923f99f8e80ead8cfd5fa23127a'
- 'f7c61f61cfbb9b1605f4d43d8d1166c1bcc4a292b8445ee6cf1f816a0cd90f78'
+ 'e18b81d584684657bf0a1af000d22f3c0963250c77ec9d72a4c877eabf032cd2'
+ '473f740b2b73cad131a38bd56bfa84e7905378187ef4586ea5eff18342b2ba8a'
+ 'ea2942e980328ffb989abb32e5aa0991363178b9c455b931ab726e1c3039ec96'
'ce78850a2d2fe343febee597f0fce361ff99be63f6f720fa844d64efc7abb84e'
- '730f48c52e9a2bf71c46f4594ec0ccdb3382fe35301000e6e16389f36df348e3'
+ '541d3c11ff4b540f37e066e695cdcc053d069ee09b64dfe170b0fa236b7a1eee'
'dc3286a1947240ab6ec562263af0b3c9971da2a4ab45970e3e664563e877280f'
- '8191483a1f51ee4a5dd1e7e6bb699ad52321291ef79ffed11bbf8f2b6fb89034'
+ 'c697b9bafaa26014fb829001ec783dd74ef35cf1d188cb7729ebf42d73548488'
'3bf045dc4ac1cb32491c4a20de313c3056824e75308f97b9e869fd5a2a166480'
- '47371fb1061cfd8fd4b4f9f4477eb3ea119be1c84554fb2e590e73eda38aa2c2'
- 'ebb8ecae1544997d39525c57eca644edc57f567e4ddac8b69e5c0ea85c428998'
+ 'cd8e21529ac47c42827c5c619309098c3046fe24106946313e0d0e89d39876fd'
+ 'e627cbdfa3175d1cdf1bfe17de42bbce5c8086ea7cebf99e1aec251fb5bf8456'
'68977a78fb41a549eb449dd35f94e0168d647245516397f0ecdfa7a03a147045'
+ '6fd3ed318f76c37a0d31ea07c892354718a8c2300f81f1901690f90f8016a04b'
'4de540ec76736ef3e14475090916a42c03692c542822b430f1ab3f6d36655511'
- '7bc4cc154643712556f2cfbcba72bc08d032a52a39bccc61c91a7b230fe9a80e'
- '56522aeb26fc5d6d70ed2b476e292b0ac24740f64e9e0384b501ba648bb8d9fa'
- '2fb2157c854dab173a2ef9b4aa0ab5bb3c0dd077447c4719c7554eee6e0546b6'
- 'f0db776be86c01020c6d28c9b4d2f53391692698231655003dcde43dea4eacb6'
- '5573da0c0f1120ecbc0b20798c7342a06a978bb39d4e4362ea465244a8683c5f'
+ '88c924e39de283f698323c9ea5e2e9ce277f2d75b190500a5ad9d3bf81bafdae'
+ '91d805ecbf4fdc7fb644c8029adcfb6651777fbeaff0c581550405ded3c9ba1c'
+ '8fbaa725f7e8ba3851d84d7b03f7837049f8ce2e976fa1ebc76231236678183b'
+ '43116692892bb85646ebf34ce91d47233203e9c9fa887d6993ecbbb5033dcd27'
'ccba3002243fb1f9a67c8a60af310706caa591d12aef45f1d0f4bda47626f3ab'
- '7cda59fe372b37beca079adf55b951b4f3a6c7a5490813b729fa145562d2ba12'
- 'bc78d7af8e514ea28caa6c6ccaf78cc3e80044ef862e2ca7978439f183e36179'
- 'bdbc9107800caf6040f5acdc4982c2a3a5cf61d00e4141b590cb9bcb87353429')
+ 'ed9fdb6a66a6ff7e4726d273d9da68fa68117d8f6668781005ec1d621759a5be'
+ '76fb05484a4e9faaad0763b65b6ad84224a9f74aff9227c7a3dc1c15eea324c4'
+ 'b9fcfa7f25f0b49dd44e13b86e5f160e1e73cef0af5227840a4c2d2329e092c9'
+ )
-_chromium_flags=('fastbuild=2'
- 'host_clang=0'
- 'linux_use_bundled_binutils=0'
- 'linux_use_bundled_gold=0'
- 'release_extra_cflags="-O3"'
- 'remove_webcore_debug_symbols=1'
- 'use_gconf=0'
- 'use_gtk3=1'
- 'use_sysroot=0'
- 'use_system_expat=1'
- 'use_system_ffmpeg=1'
- 'use_system_flac=1'
- 'use_system_harfbuzz=1'
- 'use_system_jsoncpp=1'
- 'use_system_libevent=1'
- 'use_system_libjpeg=1'
- 'use_system_libpng=1'
- 'use_system_libvpx=1'
- 'use_system_libwebp=1'
- 'use_system_libxml=1'
- 'use_system_libxslt=1'
- 'use_system_re2=1'
- 'use_system_snappy=1'
- 'use_system_yasm=1'
- 'use_system_zlib=1'
- 'werror=""' # required by bundled ICU and i686 build
- )
+_system_libs=('ffmpeg'
+ 'flac'
+ 'harfbuzz-ng'
+# 'icu'
+ 'libevent'
+ 'libjpeg'
+ 'libpng'
+ 'libvpx'
+ 'libwebp'
+ 'libxml'
+ 'libxslt'
+ 're2'
+ 'snappy'
+ 'yasm'
+ 'zlib'
+ )
prepare() {
cd "${srcdir}"/electron
@@ -128,6 +124,7 @@
patch -Np1 -i "${srcdir}"/default_app-icon.patch # Icon from .desktop file
patch -Np1 -i "${srcdir}"/gtk3-menu-bar.patch
+ patch -Np1 -i "${srcdir}"/gtk3-message-box.patch
patch -Np1 -i "${srcdir}"/gtk3-warnings.patch
patch -Np1 -i "${srcdir}"/use-system-clang.patch
patch -Np1 -i "${srcdir}"/use-system-libraries-in-node.patch
@@ -141,12 +138,17 @@
mkdir -p "${srcdir}"/python2-path
ln -sf /usr/bin/python2 "${srcdir}/python2-path/python"
- for m in boto breakpad brightray native_mate node requests; do
+ for m in boto breakpad brightray native_mate node pdf_viewer requests; do
git submodule init vendor/${m}
git config submodule.vendor/${m}.url "${srcdir}/${m}"
done
git submodule update
+ cd "${srcdir}"/electron/vendor/pdf_viewer
+ git submodule init vendor/grit
+ git config submodule.vendor/grit.url "${srcdir}/grit"
+ git submodule update
+
cd "${srcdir}"/electron/vendor/breakpad
git submodule init src
git config submodule.src.url "${srcdir}"/google-breakpad
@@ -162,7 +164,7 @@
done
git submodule update
# 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 vpx 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 vpx libwebpdemux libxml-2.0 libxslt)', '-ljpeg', '-lre2', '-lsnappy', '-latomic',/" \
-e 's/gtk+-2\.0/gtk+-3.0/' \
-i brightray.gyp
@@ -171,27 +173,39 @@
patch -Np1 -i "${srcdir}"/gyp-no-rpath.patch
cd "${srcdir}"/electron/vendor/brightray/vendor/libchromiumcontent
- git checkout 97e32dafa4a1112f14eef61a663cf39a03ed4c97
+ git checkout e2ec6935fbf034207d5ad00fa905a4b2cdd60bb7
git submodule update --init vendor/python-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-use-system-ffmpeg.patch
patch -Np1 -i "${srcdir}"/libchromiumcontent-static-library-only.patch
- rm patches/third_party/ffmpeg/ffmpeg.patch # Use system ffmpeg
- echo 'Extracting chromium source...'
- tar -xJf "${srcdir}"/chromium-${_chromiumver}.tar.xz
- mv chromium-${_chromiumver} src
+ rm patches/third_party/ffmpeg/build_gn.patch # Use system ffmpeg
+ ln -s "${srcdir}"/chromium-${_chromiumver} src
if [ ! -e src/.version ]; then
echo "${_chromiumver}" > src/.version
fi
cd src
- patch -Np1 -i "${srcdir}"/chromium-cups.patch # fixes build with CUPS 2.2
patch -Np1 -i "${srcdir}"/chromium-gtk3.patch
+ patch -Np1 -i "${srcdir}"/chromium-include-functional.patch
patch -Np1 -i "${srcdir}"/chromium-unset-madv_free.patch # fixes crash with kernels < 4.5
patch -Np1 -i "${srcdir}"/chromium-use-system-ffmpeg.patch
patch -Np1 -i "${srcdir}"/chromium-use-system-minizip.patch
patch -Np1 -i "${srcdir}"/chromium-use-system-re2.patch
- python2 build/linux/unbundle/replace_gyp_files.py "${_chromium_flags[@]/#/-D}"
+
+ for lib in "${_system_libs[@]}" libjpeg_turbo; do
+ find -type f -path "*/third_party/${lib}/*" \
+ \! -path "*third_party/${lib}/chromium/*" \
+ \! -path "*third_party/${lib}/google/*" \
+ \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
+ -delete
+ done
+ python2 build/linux/unbundle/replace_gn_files.py --system-libraries "${_system_libs[@]}"
+
+ # Download GN
+ echo "Downloading GN..."
+ cd buildtools/linux64
+ wget -O gn https://storage.googleapis.com/chromium-gn/$(<gn.sha1)
+ chmod u+x gn
}
build() {
@@ -208,8 +222,7 @@
script/bootstrap.py --verbose \
--target_arch=${_target} \
--clang_dir=/usr \
- --build_libchromiumcontent \
- --defines="${_chromium_flags[*]}"
+ --build_libchromiumcontent
script/build.py -c Release
}
@@ -232,7 +245,10 @@
install -d -m755 "${pkgdir}"/usr/lib/electron
install -m644 blink_image_resources_200_percent.pak \
content_resources_200_percent.pak content_shell.pak icudtl.dat \
- natives_blob.bin snapshot_blob.bin ui_resources_200_percent.pak \
+ natives_blob.bin \
+ pdf_viewer_resources.pak \
+ snapshot_blob.bin \
+ ui_resources_200_percent.pak \
views_resources_200_percent.pak \
"${pkgdir}"/usr/lib/electron
install -m755 electron "${pkgdir}"/usr/lib/electron
Modified: brightray-no-whole-archive.patch
===================================================================
--- brightray-no-whole-archive.patch 2017-08-31 08:24:47 UTC (rev 255159)
+++ brightray-no-whole-archive.patch 2017-08-31 08:42:29 UTC (rev 255160)
@@ -1,6 +1,6 @@
--- a/brightray.gyp
+++ b/brightray.gyp
-@@ -39,14 +39,13 @@
+@@ -41,14 +41,13 @@
'conditions': [
# Link with libraries of libchromiumcontent.
['OS=="linux" and libchromiumcontent_component==0', {
Modified: brightray-use-system-ffmpeg.patch
===================================================================
--- brightray-use-system-ffmpeg.patch 2017-08-31 08:24:47 UTC (rev 255159)
+++ brightray-use-system-ffmpeg.patch 2017-08-31 08:42:29 UTC (rev 255160)
@@ -1,6 +1,6 @@
--- a/brightray.gyp
+++ b/brightray.gyp
-@@ -105,8 +105,6 @@
+@@ -130,8 +130,6 @@
}, {
'link_settings': {
'libraries': [
Deleted: chromium-cups.patch
===================================================================
--- chromium-cups.patch 2017-08-31 08:24:47 UTC (rev 255159)
+++ chromium-cups.patch 2017-08-31 08:42:29 UTC (rev 255160)
@@ -1,10 +0,0 @@
---- a/printing/backend/print_backend_cups.cc
-+++ b/printing/backend/print_backend_cups.cc
-@@ -4,6 +4,7 @@
-
- #include "printing/backend/print_backend_cups.h"
-
-+#include <cups/ppd.h>
- #include <dlfcn.h>
- #include <errno.h>
- #include <pthread.h>
Modified: chromium-gtk3.patch
===================================================================
--- chromium-gtk3.patch 2017-08-31 08:24:47 UTC (rev 255159)
+++ chromium-gtk3.patch 2017-08-31 08:42:29 UTC (rev 255160)
@@ -1,9 +1,9 @@
---- a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
-+++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
-@@ -488,6 +488,10 @@
- default_font_weight_(gfx::Font::Weight::NORMAL),
- middle_click_action_(GetDefaultMiddleClickAction()),
- device_scale_factor_(1.0) {
+--- a/chrome/browser/ui/libgtkui/gtk_ui.cc
++++ b/chrome/browser/ui/libgtkui/gtk_ui.cc
+@@ -411,6 +411,10 @@
+ } // namespace
+
+ Gtk2UI::Gtk2UI() : middle_click_action_(GetDefaultMiddleClickAction()) {
+#if GTK_MAJOR_VERSION > 2
+ g_setenv("GDK_SCALE", "1", FALSE);
+ gdk_set_allowed_backends("x11");
Added: chromium-include-functional.patch
===================================================================
--- chromium-include-functional.patch (rev 0)
+++ chromium-include-functional.patch 2017-08-31 08:42:29 UTC (rev 255160)
@@ -0,0 +1,10 @@
+--- a/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h
++++ b/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h
+@@ -5,6 +5,7 @@
+ #include "platform/PlatformExport.h"
+ #include "wtf/ThreadSpecific.h"
+
++#include <functional>
+ #include <memory>
+
+ namespace gpu {
Modified: chromium-use-system-ffmpeg.patch
===================================================================
--- chromium-use-system-ffmpeg.patch 2017-08-31 08:24:47 UTC (rev 255159)
+++ chromium-use-system-ffmpeg.patch 2017-08-31 08:42:29 UTC (rev 255160)
@@ -5,8 +5,8 @@
// 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 BUILD.gn file &
--// ffmpeg.gyp file or the headers below will generate different structures!
+-// 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.
@@ -21,10 +21,10 @@
#include <libavutil/imgutils.h>
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -1106,24 +1106,6 @@
- // If no estimate is found, the stream entry will be kInfiniteDuration().
+@@ -1198,24 +1198,6 @@
+ // If no estimate is found, the stream entry will be kInfiniteDuration.
std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
- kInfiniteDuration());
+ kInfiniteDuration);
- const AVFormatInternal* internal = format_context->internal;
- if (internal && internal->packet_buffer &&
- format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
@@ -45,4 +45,4 @@
- }
std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());
- AVStream* audio_stream = NULL;
+
Modified: chromium-use-system-minizip.patch
===================================================================
--- chromium-use-system-minizip.patch 2017-08-31 08:24:47 UTC (rev 255159)
+++ chromium-use-system-minizip.patch 2017-08-31 08:42:29 UTC (rev 255160)
@@ -1,6 +1,6 @@
--- a/third_party/zlib/google/zip_reader.cc
+++ b/third_party/zlib/google/zip_reader.cc
-@@ -279,10 +279,9 @@
+@@ -278,10 +278,9 @@
current_entry_info_.reset();
reached_end_ = false;
Modified: chromium-use-system-re2.patch
===================================================================
--- chromium-use-system-re2.patch 2017-08-31 08:24:47 UTC (rev 255159)
+++ chromium-use-system-re2.patch 2017-08-31 08:42:29 UTC (rev 255160)
@@ -1,17 +1,10 @@
---- a/build/linux/unbundle/re2.gyp
-+++ b/build/linux/unbundle/re2.gyp
-@@ -8,13 +8,12 @@
- 'target_name': 're2',
- 'type': 'none',
- 'variables': {
-- 'headers_root_path': '.',
-+ 'headers_root_path': 'src',
- 'header_filenames': [
- 're2/filtered_re2.h',
- 're2/re2.h',
- 're2/set.h',
- 're2/stringpiece.h',
-- 're2/variadic_function.h',
- ],
- 'shim_generator_additional_args': [
- # Chromium copy of re2 is patched to rename POSIX to POSIX_SYNTAX
+--- a/build/linux/unbundle/re2.gn
++++ b/build/linux/unbundle/re2.gn
+@@ -11,7 +11,6 @@
+ "re2/re2.h",
+ "re2/set.h",
+ "re2/stringpiece.h",
+- "re2/variadic_function.h",
+ ]
+ }
+
Modified: default_app-icon.patch
===================================================================
--- default_app-icon.patch 2017-08-31 08:24:47 UTC (rev 255159)
+++ default_app-icon.patch 2017-08-31 08:42:29 UTC (rev 255160)
@@ -1,7 +1,7 @@
--- a/default_app/default_app.js
+++ b/default_app/default_app.js
-@@ -17,9 +17,6 @@ exports.load = (appUrl) => {
- backgroundColor: '#FFFFFF',
+@@ -20,9 +20,6 @@ exports.load = (appUrl) => {
+ },
useContentSize: true
}
- if (process.platform === 'linux') {
@@ -12,7 +12,7 @@
mainWindow.loadURL(appUrl)
--- a/filenames.gypi
+++ b/filenames.gypi
-@@ -87,7 +87,6 @@
+@@ -85,7 +85,6 @@
],
'default_app_sources': [
'default_app/default_app.js',
Modified: gtk3-menu-bar.patch
===================================================================
--- gtk3-menu-bar.patch 2017-08-31 08:24:47 UTC (rev 255159)
+++ gtk3-menu-bar.patch 2017-08-31 08:42:29 UTC (rev 255160)
@@ -5,7 +5,7 @@
#if defined(OS_WIN)
#include "ui/gfx/color_utils.h"
-#elif defined(USE_X11)
--#include "chrome/browser/ui/libgtk2ui/skia_utils_gtk2.h"
+-#include "chrome/browser/ui/libgtkui/skia_utils_gtk.h"
#endif
namespace atom {
@@ -26,11 +26,11 @@
GtkWidget* menu_bar = gtk_menu_bar_new();
-
- GtkStyle* style = gtk_rc_get_style(menu_bar);
-- *enabled = libgtk2ui::GdkColorToSkColor(style->fg[GTK_STATE_NORMAL]);
-- *disabled = libgtk2ui::GdkColorToSkColor(style->fg[GTK_STATE_INSENSITIVE]);
-- *highlight = libgtk2ui::GdkColorToSkColor(style->fg[GTK_STATE_SELECTED]);
-- *hover = libgtk2ui::GdkColorToSkColor(style->fg[GTK_STATE_PRELIGHT]);
-- *background = libgtk2ui::GdkColorToSkColor(style->bg[GTK_STATE_NORMAL]);
+- *enabled = libgtkui::GdkColorToSkColor(style->fg[GTK_STATE_NORMAL]);
+- *disabled = libgtkui::GdkColorToSkColor(style->fg[GTK_STATE_INSENSITIVE]);
+- *highlight = libgtkui::GdkColorToSkColor(style->fg[GTK_STATE_SELECTED]);
+- *hover = libgtkui::GdkColorToSkColor(style->fg[GTK_STATE_PRELIGHT]);
+- *background = libgtkui::GdkColorToSkColor(style->bg[GTK_STATE_NORMAL]);
-
+ GtkWidget* menu_item = gtk_menu_item_new_with_label("");
+ GtkWidget* label = gtk_bin_get_child(GTK_BIN(menu_item));
Added: gtk3-message-box.patch
===================================================================
--- gtk3-message-box.patch (rev 0)
+++ gtk3-message-box.patch 2017-08-31 08:42:29 UTC (rev 255160)
@@ -0,0 +1,11 @@
+--- a/atom/browser/ui/message_box_gtk.cc
++++ b/atom/browser/ui/message_box_gtk.cc
+@@ -197,7 +197,7 @@
+ }
+
+ void GtkMessageBox::OnCheckboxToggled(GtkWidget* widget) {
+- checkbox_checked_ = GTK_TOGGLE_BUTTON(widget)->active;
++ checkbox_checked_ = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+ }
+
+ } // namespace
Modified: gtk3-warnings.patch
===================================================================
--- gtk3-warnings.patch 2017-08-31 08:24:47 UTC (rev 255159)
+++ gtk3-warnings.patch 2017-08-31 08:42:29 UTC (rev 255160)
@@ -9,15 +9,15 @@
#include "atom/browser/ui/file_dialog.h"
#include "atom/browser/native_window_views.h"
-@@ -43,20 +45,20 @@ class FileChooserDialog {
- const Filters& filters)
- : parent_(static_cast<atom::NativeWindowViews*>(parent_window)),
- filters_(filters) {
+@@ -39,20 +41,20 @@ class FileChooserDialog {
+ const DialogSettings& settings)
+ : parent_(static_cast<atom::NativeWindowViews*>(settings.parent_window)),
+ filters_(settings.filters) {
- const char* confirm_text = GTK_STOCK_OK;
+ const char* confirm_text = _("_OK");
- if (!button_label.empty())
- confirm_text = button_label.c_str();
+ if (!settings.button_label.empty())
+ confirm_text = settings.button_label.c_str();
else if (action == GTK_FILE_CHOOSER_ACTION_SAVE)
- confirm_text = GTK_STOCK_SAVE;
+ confirm_text = _("_Save");
@@ -26,7 +26,7 @@
+ confirm_text = _("_Open");
dialog_ = gtk_file_chooser_dialog_new(
- title.c_str(),
+ settings.title.c_str(),
NULL,
action,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -45,7 +45,7 @@
#include "atom/browser/ui/message_box.h"
#include "atom/browser/browser.h"
-@@ -111,13 +113,13 @@ class GtkMessageBox {
+@@ -126,13 +128,13 @@ class GtkMessageBox {
const char* TranslateToStock(int id, const std::string& text) {
std::string lower = base::ToLowerASCII(text);
if (lower == "cancel")
Added: libchromiumcontent-settings.patch
===================================================================
--- libchromiumcontent-settings.patch (rev 0)
+++ libchromiumcontent-settings.patch 2017-08-31 08:42:29 UTC (rev 255160)
@@ -0,0 +1,58 @@
+--- 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
+@@ -32,7 +32,7 @@
+ ]
+
+ if (is_linux) {
+- deps += [ "//chrome/browser/ui/libgtkui:libgtk2ui" ]
++ deps += [ "//chrome/browser/ui/libgtkui:libgtk3ui" ]
+ }
+
+ if (is_component_build) {
+@@ -154,13 +154,13 @@
+ static_library("libgtkui") {
+ complete_static_lib = true
+ sources = [
+- "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk2ui/app_indicator_icon.o",
+- "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk2ui/app_indicator_icon_menu.o",
+- "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk2ui/gtk_util.o",
+- "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk2ui/gtk_status_icon.o",
+- "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk2ui/menu_util.o",
+- "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk2ui/skia_utils_gtk.o",
+- "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk2ui/unity_service.o",
++ "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk3ui/app_indicator_icon.o",
++ "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk3ui/app_indicator_icon_menu.o",
++ "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk3ui/gtk_util.o",
++ "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk3ui/gtk_status_icon.o",
++ "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk3ui/menu_util.o",
++ "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk3ui/skia_utils_gtk.o",
++ "$root_out_dir/obj/chrome/browser/ui/libgtkui/libgtk3ui/unity_service.o",
+ ]
+ }
+ }
Modified: libchromiumcontent-static-library-only.patch
===================================================================
--- libchromiumcontent-static-library-only.patch 2017-08-31 08:24:47 UTC (rev 255159)
+++ libchromiumcontent-static-library-only.patch 2017-08-31 08:42:29 UTC (rev 255160)
@@ -1,5 +1,3 @@
-diff --git a/script/build b/script/build
-index 5e06fd1..fdf8b95 100755
--- a/script/build
+++ b/script/build
@@ -11,7 +11,7 @@ from lib.util import get_configuration, get_output_dir
@@ -11,16 +9,46 @@
NINJA = 'ninja'
if sys.platform == 'win32':
-diff --git a/script/update b/script/update
-index 62828ce..e757fc6 100755
+--- a/script/create-dist
++++ b/script/create-dist
+@@ -59,7 +59,7 @@
+ 'libffmpeg.dylib',
+ ],
+ 'linux': [
+- 'libffmpeg.so',
++ # 'libffmpeg.so',
+ ],
+ 'win32': [
+ 'd3dcompiler_47.dll',
+@@ -312,7 +312,7 @@
+ copy_generated_sources(target_arch, component)
+ copy_locales(target_arch, component)
+
+- copy_ffmpeg(target_arch)
++ # copy_ffmpeg(target_arch)
+ copy_sources()
+ generate_licenses()
+ if not args.no_zip:
+@@ -429,9 +429,9 @@
+ elif target_arch == 'arm':
+ binaries = [ 'chromedriver', 'clang_x86_v8_arm/mksnapshot' ]
+ else:
+- binaries = [ 'chromedriver', 'mksnapshot' ]
++ binaries = [ 'mksnapshot' ]
+
+- ffmpeg_output_dir = get_output_dir(SOURCE_ROOT, target_arch, 'ffmpeg')
++ ffmpeg_output_dir = get_output_dir(SOURCE_ROOT, target_arch, 'static_library')
+ for binary in binaries:
+ shutil.copy2(os.path.join(ffmpeg_output_dir, binary), target_dir)
+
--- a/script/update
+++ b/script/update
-@@ -18,7 +18,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')
-COMPONENTS = ['static_library', 'shared_library', 'ffmpeg']
+COMPONENTS = ['static_library']
+ DEPOT_TOOLS = os.path.join(VENDOR_DIR, 'depot_tools')
- TARBALL_REPO = 'zcbenz/chromium-source-tarball'
- TARBALL_URL = 'https://github.com/{0}/releases/download/{1}/chromium-{1}.tar.xz'
+ NINJA = os.path.join(DEPOT_TOOLS, 'ninja')
Deleted: libchromiumcontent-use-system-ffmpeg.patch
===================================================================
--- libchromiumcontent-use-system-ffmpeg.patch 2017-08-31 08:24:47 UTC (rev 255159)
+++ libchromiumcontent-use-system-ffmpeg.patch 2017-08-31 08:42:29 UTC (rev 255160)
@@ -1,18 +0,0 @@
---- a/script/create-dist
-+++ b/script/create-dist
-@@ -95,7 +95,6 @@
- 'libcookie_config.a',
- 'libos_crypt.a',
- 'libdom_keycode_converter.a',
-- os.path.join('lib', 'libffmpeg.so'),
- ],
- 'win32': [
- 'chromedriver.exe',
-@@ -318,7 +317,6 @@
- copy_generated_sources(target_arch, component, output_dir)
- copy_locales(target_arch, component, output_dir)
-
-- copy_ffmpeg(target_arch)
- copy_sources()
- generate_licenses()
- if not args.no_zip:
Modified: libchromiumcontent-use-system-tools.patch
===================================================================
--- libchromiumcontent-use-system-tools.patch 2017-08-31 08:24:47 UTC (rev 255159)
+++ libchromiumcontent-use-system-tools.patch 2017-08-31 08:42:29 UTC (rev 255160)
@@ -1,5 +1,3 @@
-diff --git a/script/build b/script/build
-index 8259f49..c4ffd5d 100755
--- a/script/build
+++ b/script/build
@@ -13,7 +13,7 @@ VENDOR_DIR = os.path.join(SOURCE_ROOT, 'vendor')
@@ -11,21 +9,26 @@
if sys.platform == 'win32':
NINJA = '{0}.exe'.format(NINJA)
-diff --git a/script/update b/script/update
-index b9f5127..499cebb 100755
--- a/script/update
+++ b/script/update
-@@ -31,13 +31,9 @@ def main():
- if not is_source_tarball_updated(version):
- download_source_tarball(version)
+@@ -39,16 +39,14 @@ def main():
+ else:
+ print "Skipping Chromium Source Tarball Download"
- if sys.platform == 'linux2':
- install_sysroot()
--
+- elif sys.platform in ['win32', 'cygwin']:
+- update_toolchain_json()
++ # if sys.platform == 'linux2':
++ # install_sysroot()
++ # elif sys.platform in ['win32', 'cygwin']:
++ # update_toolchain_json()
+
target_arch = args.target_arch
return (apply_patches() or
copy_chromiumcontent_files() or
- update_clang() or
- run_gyp(target_arch, args.defines))
+- update_gn() or
+ run_gn(target_arch, args.defines))
Modified: use-system-ffmpeg.patch
===================================================================
--- use-system-ffmpeg.patch 2017-08-31 08:24:47 UTC (rev 255159)
+++ use-system-ffmpeg.patch 2017-08-31 08:42:29 UTC (rev 255160)
@@ -1,6 +1,6 @@
--- a/electron.gyp
+++ b/electron.gyp
-@@ -182,7 +182,6 @@
+@@ -191,7 +191,6 @@
}, {
'copied_libraries': [
'<(PRODUCT_DIR)/lib/libnode.so',
Modified: use-system-libraries-in-node.patch
===================================================================
--- use-system-libraries-in-node.patch 2017-08-31 08:24:47 UTC (rev 255159)
+++ use-system-libraries-in-node.patch 2017-08-31 08:42:29 UTC (rev 255160)
@@ -16,7 +16,7 @@
'node_tag': '',
'node_use_dtrace': 'false',
'node_use_etw': 'false',
-@@ -109,17 +109,6 @@
+@@ -109,18 +109,6 @@
'conditions': [
['OS=="linux"', {
'cflags': [
@@ -30,11 +30,12 @@
- '-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',
],
-@@ -198,6 +187,12 @@
+@@ -160,6 +148,12 @@
],
}],
['OS=="linux" and libchromiumcontent_component==0', {
More information about the arch-commits
mailing list