[arch-commits] Commit in electron/trunk (6 files)
Nicola Squartini
tensor5 at archlinux.org
Sat Mar 17 11:05:02 UTC 2018
Date: Saturday, March 17, 2018 @ 11:05:01
Author: tensor5
Revision: 308939
upgpkg: electron 1.8.4-1
Modified:
electron/trunk/PKGBUILD
electron/trunk/libchromiumcontent-settings.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
-------------------------------------------+
PKGBUILD | 12 +++---
libchromiumcontent-settings.patch | 49 +++++++++++++++++++++++++---
libchromiumcontent-use-system-tools.patch | 14 ++++----
no-whole-archive.patch | 2 -
use-system-ffmpeg.patch | 2 -
use-system-libraries-in-node.patch | 2 -
6 files changed, 60 insertions(+), 21 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-03-17 10:37:27 UTC (rev 308938)
+++ PKGBUILD 2018-03-17 11:05:01 UTC (rev 308939)
@@ -4,7 +4,7 @@
_chromiumver=59.0.3071.115
_freetype_rev=5a3490e054bda8a318ebde482
pkgname=electron
-pkgver=1.8.2
+pkgver=1.8.4
pkgrel=1
pkgdesc='Build cross platform desktop apps with web technologies'
arch=('x86_64')
@@ -80,17 +80,17 @@
'62963c4dbf86624f370aad1ee42d43b7e4f6a0f719d906959ed642b1c0ca9ba397a8ea3923e6c6a4acc38bfb2187642791148dd528bb3b4ddc79f039fa6d8fa5'
'4eeb3a757bcf268b9bc7d16ca1efa9fa96d1aa55827766e1ec88d967946412688f4ab88a0ee3fb0870f32fa6ce4dd5cfe92c27a55c86d489e04c5c297d30e6bc'
'd6dfadb1c30e0a2f234dedd09a79c4af96aaef976146fdb95989edc6bd019d6e52e127fc9fc119c17e4d3321052f49877c728c52cd2e8d3ca41165c5155b40d3'
- '5c29c2a1c8128e85619fb84f1b5db12ff7446d72d14a25367f32d9370706a7b9ad9a53dc1d2e36df3f0d155d555cfa8586026508e83e6be7968a44d7144994df'
- 'bee177ebb768d14d65de9172b9eecd2d738b312932c33ef45422cd8fec3448916236ecedd15a733c544144c2f0a3887c084bea9c5d61e176de4839ea28148277'
+ 'e5a21eea33f24e82b250ad903ae9f6f40a71876661391b7bb2b749edb3470e1256ecb06aba0541f4da4cbaf9be2df90eb2b9e588566138fdb63d92a9aca60936'
+ 'b1cc501a1d7b2db1c7bd7543e1084a32a7b11e6f2e9c364beefd1a1f0cddb982ea105636ba19226765de44c641afd933d98a2f0ef88674453f5246568858c0cf'
'b4a42f274b88f9f97fa409a6c95b0f9896bc86aa342ee24cfc029e4f640c5badf258932eabd1d451571339cc8733796f5770e0b979b7deda5b5ae09deb2e85c8'
- 'c921239b239ff5d7f79da4d3a12bae136cca36f95cd44e9278dc3e7647a8c153e1a70100d6e5e9d815a94b9da7a4131414bed98fb6db4b0c964a5fdca2279e0c'
+ 'd7df784c7ef366dad6d016643f848490177cb77eaa62c7f895898f11310ec766d6e31a34e756670a1ab300f984dc46dfd31ac23e2cae70860dfb1269ea9fab6b'
'2dd594a07f8ce62a7706a0365d764ab3ee3cc2d050d6ae4460db3152269e84f43516438a4f48f47fc54fe758a70c462baed6b7defa8b2bd277e67cb1bae8da12'
'fef435fcae0fcfc5ed7fe66bcdad24565a87493ff133422fa54756ee1c1335d4bfdae7e782d3f72fcd5c0e6c337b7a30fe7fb36a02a3fea1a1d509244d01d636'
'03676f682cd2db47aaf53c7e8221c3d19e20d7768e9b6a7cdb2da80674f220c293164ee1ca094b0c494d82cf1ba0e178ed66f41a6af28d266a50a758f95d6185'
- '755714719d1acff42240465d64be0cbad987a0edddf5e57e21d8ff373550ebf779de7c3207a309269317f30b929c318828cc9d5da59b9757a4beb449c3c7e688'
+ 'f215ed2ddf9410bd31ada3c220de3f9a725c214532e7220ef2542d60b8a30f0cae21edc3dd7e01fdfa7b3aa877023ab446a76b47bc5fff19ec0bb0fa40df730e'
'8da75b16f3fc39e828b94fe9bf013a2fd180a81a9a34a8511a99e62e8d2a714ced24d94ef643561e0c88c27868d8eaa643e19003cbfa293451fc15dd75f5801f'
'9bd56c6dba41ae08cad2435f229bcab7218f82be4a33dbf8dbf7204d839fbf0ba505b8444d3d17083d3260b597e694ead720c5aef9060a21917c3c844ba4ef28'
- '901b07a90b1576f0aa4f2438ed08a0e85c7a64b3a4c95645f9e3cbd3cf265e395feb43e7969540c39e7dea3b24e78c59a9d88c9b4e5262816cd89e9543068c98'
+ '25e5d1051a11ef3158314b06dcb880fbed93d04a793a2c242fb8f01e867620549924b26abcac657f6edec9b9e3a78f198171a528d2567189df75e0a27f12925a'
'acf6a43e89a49fb5d21fa165fe3a6b6a73b766fec05f952d11f48840ccb7c6640c1f946d87fb9b700f330a4eeffbd05346cc97def3de892b700439cad2a8e7bd'
'09a910f14c4466a74638af0505dbdbbf586813b0a20506ac15ae375037a1f06f82fea4045350f1e54357dd41fb721061c7cc2f0eea2e3a0439a79466db3875ea'
'39309580c96220ae503ecd811e1f4c593fea028804d3ba4026a83c0928b941a0ca851b6d76ee289ee48671eb0bd2187c81f26495c6ca92ce6a96baf3c9464274'
Modified: libchromiumcontent-settings.patch
===================================================================
--- libchromiumcontent-settings.patch 2018-03-17 10:37:27 UTC (rev 308938)
+++ libchromiumcontent-settings.patch 2018-03-17 11:05:01 UTC (rev 308939)
@@ -1,6 +1,6 @@
--- a/chromiumcontent/BUILD.gn
+++ b/chromiumcontent/BUILD.gn
-@@ -34,7 +34,7 @@ group("targets") {
+@@ -36,7 +36,7 @@ group("targets") {
]
if (is_linux) {
@@ -9,7 +9,7 @@
}
if (is_component_build) {
-@@ -156,13 +156,13 @@ if (is_electron_build && is_component_build) {
+@@ -158,13 +158,13 @@ if (is_electron_build && is_component_build) {
static_library("libgtkui") {
complete_static_lib = true
sources = [
@@ -32,10 +32,10 @@
}
--- a/chromiumcontent/args/static_library.gn
+++ b/chromiumcontent/args/static_library.gn
-@@ -2,10 +2,22 @@ root_extra_deps = [ "//chromiumcontent:chromiumcontent" ]
+@@ -1,13 +1,25 @@
+ 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
@@ -56,9 +56,39 @@
+use_gconf = false
+use_gtk3 = true
+use_sysroot = false
+
+ # CFI is disabled for the time being, as Electron is not a monolithic binary
+ # with at least one shared library component (Node) and CFI is tricky in that
+--- a/patches/010-build_gn.patch
++++ b/patches/010-build_gn.patch
+@@ -31,24 +31,6 @@ index d055e705627c..a52003f1b5e1 100644
+ ]
+ if (is_win) {
+ default_compiler_configs += [
+-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+-index 3b77c055108b..10dab62c2878 100644
+---- a/build/config/compiler/BUILD.gn
+-+++ b/build/config/compiler/BUILD.gn
+-@@ -485,11 +485,11 @@ config("compiler") {
+- # For Full LTO, it provides a measurable runtime speedup of Chrome.
+- cflags += [
+- "-flto",
+-- "-fwhole-program-vtables",
+-+ # "-fwhole-program-vtables",
+- ]
+- ldflags += [
+- "-flto",
+-- "-fwhole-program-vtables",
+-+ # "-fwhole-program-vtables",
+- ]
+-
+- # Apply a lower LTO optimization level as the default is too slow.
+ diff --git a/build/config/win/BUILD.gn b/build/config/win/BUILD.gn
+ index 5e1f7fcc4d83..15723e6b7184 100644
+ --- a/build/config/win/BUILD.gn
--- a/script/update
+++ b/script/update
-@@ -295,7 +295,7 @@ def run_gn(target_arch, defines):
+@@ -294,7 +294,7 @@ def run_gn(target_arch, defines):
if sys.platform in ['win32', 'cygwin']:
args += ' use_experimental_allocator_shim=false'
if sys.platform == 'linux2':
@@ -67,3 +97,12 @@
if target_arch == 'mips64el':
args += ' clang_use_chrome_plugins=false'
args += ' enable_hangout_services_extension=true'
+@@ -321,7 +321,7 @@ def run_gn(target_arch, defines):
+ if target_arch == 'mips64el':
+ args += ' is_debug=false'
+ else:
+- args += ' is_official_build=true'
++ args += ' is_debug=false'
+
+ output_dir = get_output_dir(SOURCE_ROOT, target_arch, component)
+ subprocess.call([gn, 'gen', os.path.relpath(output_dir, SRC_DIR), '--args=' + args],
Modified: libchromiumcontent-use-system-tools.patch
===================================================================
--- libchromiumcontent-use-system-tools.patch 2018-03-17 10:37:27 UTC (rev 308938)
+++ libchromiumcontent-use-system-tools.patch 2018-03-17 11:05:01 UTC (rev 308939)
@@ -44,12 +44,12 @@
setup_mips64el_toolchain(target_arch) or
run_gn(target_arch, args.defines))
-@@ -277,7 +276,7 @@ def run_gn(target_arch, defines):
+@@ -276,7 +275,7 @@ def setup_mips64el_toolchain(target_arch):
+
+
+ def run_gn(target_arch, defines):
+- gn = os.path.join(VENDOR_DIR, 'depot_tools', 'gn')
++ gn = os.path.join(SRC_DIR, 'out', 'Release', 'gn')
if sys.platform in ['win32', 'cygwin']:
- gn = os.path.join(SRC_DIR, 'buildtools', 'win', 'gn.exe')
- elif sys.platform == 'linux2':
-- gn = os.path.join(SRC_DIR, 'buildtools', 'linux64', 'gn')
-+ gn = os.path.join(SRC_DIR, 'out', 'Release', 'gn')
- elif sys.platform == 'darwin':
- gn = os.path.join(SRC_DIR, 'buildtools', 'mac', 'gn')
+ gn += '.bat'
Modified: no-whole-archive.patch
===================================================================
--- no-whole-archive.patch 2018-03-17 10:37:27 UTC (rev 308938)
+++ no-whole-archive.patch 2018-03-17 11:05:01 UTC (rev 308939)
@@ -1,6 +1,6 @@
--- a/brightray/brightray.gyp
+++ b/brightray/brightray.gyp
-@@ -48,14 +48,13 @@
+@@ -46,14 +46,13 @@
'conditions': [
# Link with libraries of libchromiumcontent.
['OS=="linux" and libchromiumcontent_component==0', {
Modified: use-system-ffmpeg.patch
===================================================================
--- use-system-ffmpeg.patch 2018-03-17 10:37:27 UTC (rev 308938)
+++ use-system-ffmpeg.patch 2018-03-17 11:05:01 UTC (rev 308939)
@@ -1,6 +1,6 @@
--- a/brightray/brightray.gyp
+++ b/brightray/brightray.gyp
-@@ -145,8 +145,6 @@
+@@ -143,8 +143,6 @@
}, {
'link_settings': {
'libraries': [
Modified: use-system-libraries-in-node.patch
===================================================================
--- use-system-libraries-in-node.patch 2018-03-17 10:37:27 UTC (rev 308938)
+++ use-system-libraries-in-node.patch 2018-03-17 11:05:01 UTC (rev 308939)
@@ -16,7 +16,7 @@
'node_tag': '',
'node_use_dtrace': 'false',
'node_use_etw': 'false',
-@@ -165,6 +165,12 @@
+@@ -171,6 +171,12 @@
],
}],
['OS=="linux" and libchromiumcontent_component==0', {
More information about the arch-commits
mailing list