Skip to content

Commit b781a9d

Browse files
author
Your Name
committed
ELECTRON v1.8.2, libcc v59.0.3071.115
1 parent 4012c94 commit b781a9d

11 files changed

+225
-1077
lines changed

‎electron/Readme.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
### Electron for Freebsd.
22

3-
This was built with FreeBSD 11.0-RELEASE-p1.
3+
Built with FreeBSD 11.0-RELEASE-p1.
44
```
5-
Chromium 61.0.3163.100.
6-
Electron v1.8.2.beta.2
5+
Electron v1.8.2
6+
Chromium v59.0.3071.115
77
```
88

99
**Building**

‎electron/build_electron.sh‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,39 @@ export BUILDROOT=`pwd`
66
set -x
77
ver=`uname -K`
88

9-
svnlite co -r456719 svn://svn.freebsd.org/ports/head/www/chromium chromium
9+
svnlite co -r446317 svn://svn.freebsd.org/ports/head/www/chromium chromium
1010
cd chromium
11-
patch -p1 < ../chromium_make.diff
12-
make configure DISABLE_LICENSES=1 DISABLE_VULNERABILITIES=yes
11+
rm files/patch-chrome_browser_ui_libgtkui_gtk_ui.cc
12+
make configure DISABLE_VULNERABILITIES=yes
1313
cd ..
1414
git clone https://github.com/electron/libchromiumcontent.git
1515
cd libchromiumcontent
16-
git checkout 2bdad00587
16+
git checkout dbd83b6
1717
if [ "$ver" -lt 1100508 ]
1818
then
1919
patch -p1 --ignore-whitespace < ../libchromiumcontent_110.diff
2020
else
2121
patch -p1 --ignore-whitespace < ../libchromiumcontent_111.diff
2222
fi
2323
script/bootstrap
24-
#61.0.3163.100
25-
mv ../chromium/work/chromium-61.0.3163.100 src
26-
27-
patch -p1 < ../libchromiumcontent_patches.diff
28-
rm patches/v8/025-cherry_pick_cc55747.patch*
24+
#59.0.3071.115
25+
mv ../chromium/work/chromium-59.0.3071.115 src
26+
mv src/third_party/ffmpeg/BUILD.gn.orig src/third_party/ffmpeg/BUILD.gn
2927
patch -p1 --ignore-whitespace -d src/ < ../chromiumv1.diff
30-
patch -p1 --ignore-whitespace -d src/ < ../libchromiumcontent_bsd.diff
31-
#sudo chown -R prash:wheel src/
28+
29+
rm patches/third_party/skia/003-freetype-2.patch
30+
rm patches/third_party/swiftshader/001-gold_ifc.patch
31+
3232
script/update -t x64 --skip_gclient
3333
script/build --no_shared_library -t x64
3434
script/create-dist -c static_library -t x64
35+
3536
#Building ELECTRON ...
3637
echo "Building ELECTRON ..."
3738
cd $BUILDROOT
3839
git clone https://github.com/electron/electron.git
3940
cd electron/
40-
git checkout 4dab824c6b7b833a4e3af878b1d021d60822d3e0
41+
git checkout v1.8.2
4142
if [ "$ver" -lt 1100508 ]
4243
then
4344
patch -p1 --ignore-whitespace < ../electron_110.diff
@@ -52,10 +53,10 @@ set -e
5253
patch -p1 --ignore-whitespace -d vendor/native_mate/ < ../electron_vendor_native_matev1.diff
5354
patch -p1 --ignore-whitespace -d brightray/ < ../electron_brightrayv3.diff
5455
patch -p1 --ignore-whitespace -d vendor/libchromiumcontent/ < ../electron_vendor_libchromiumcontentv1.diff
55-
5656
mkdir vendor/download/libchromiumcontent
5757
unzip ../libchromiumcontent/libchromiumcontent.zip -d vendor/download/libchromiumcontent/
5858
unzip ../libchromiumcontent/libchromiumcontent-static.zip -d vendor/download/libchromiumcontent/
59+
5960
script/bootstrap.py -v --clang_dir=/usr
6061
script/build.py -c R
6162
script/create-dist.py

‎electron/chromium_make.diff‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎electron/chromiumv1.diff‎

Lines changed: 71 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
1-
--- a/third_party/iccjpeg/BUILD.gn 2017-11-25 15:29:43.897890000 +0400
2-
+++ b/third_party/iccjpeg/BUILD.gn 2017-11-25 15:30:07.905164000 +0400
3-
@@ -3,7 +3,7 @@
4-
# found in the LICENSE file.
1+
--- a/third_party/ffmpeg/ffmpeg_generated.gni 2017-11-25 17:52:29.528877000 +0400
2+
+++ b/third_party/ffmpeg/ffmpeg_generated.gni 2017-11-25 10:19:04.663888000 +0400
3+
@@ -176,7 +176,7 @@
4+
]
5+
}
56

6-
config("iccjpeg_config") {
7-
- include_dirs = [ "." ]
8-
+ include_dirs = [ ".", "/usr/local/include", ]
7+
-if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux | is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
8+
+if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
9+
ffmpeg_c_sources += [
10+
"libavcodec/aac_ac3_parser.c",
11+
"libavcodec/aac_parser.c",
12+
--- a/third_party/angle/src/third_party/libXNVCtrl/BUILD.gn 2017-11-25 15:19:45.500682000 +0400
13+
+++ b/third_party/angle/src/third_party/libXNVCtrl/BUILD.gn 2017-11-25 15:20:25.698303000 +0400
14+
@@ -11,6 +11,7 @@
15+
cflags = [
16+
"-Wno-incompatible-pointer-types-discards-qualifiers",
17+
]
18+
+ include_dirs = [ "/usr/local/include", ]
919
}
1020

11-
static_library("iccjpeg") {
21+
source_set("libXNVCtrl") {
1222
--- a/base/BUILD.gn 2017-11-25 15:33:28.844747000 +0400
1323
+++ b/base/BUILD.gn 2017-11-25 16:01:49.441283000 +0400
1424
@@ -1507,7 +1507,8 @@
@@ -21,14 +31,25 @@
2131
}
2232

2333
defines += [ "USE_SYMBOLIZE" ]
34+
--- a/third_party/iccjpeg/BUILD.gn 2017-11-25 15:29:43.897890000 +0400
35+
+++ b/third_party/iccjpeg/BUILD.gn 2017-11-25 15:30:07.905164000 +0400
36+
@@ -3,7 +3,7 @@
37+
# found in the LICENSE file.
38+
39+
config("iccjpeg_config") {
40+
- include_dirs = [ "." ]
41+
+ include_dirs = [ ".", "/usr/local/include", ]
42+
}
43+
44+
static_library("iccjpeg") {
2445
--- a/net/BUILD.gn 2017-11-25 17:30:07.837877000 +0400
2546
+++ b/net/BUILD.gn 2017-11-25 17:18:02.786524000 +0400
2647
@@ -53,7 +53,7 @@
2748
"DLOPEN_KERBEROS",
2849
"NET_IMPLEMENTATION",
2950
]
3051
-
31-
+ include_dirs = [ "../third_party/icu/source/common", "../third_party/icu/source/i18n", ]
52+
+ include_dirs = [ "../third_party/icu/source/common", "../third_party/icu/source/i18n", "../third_party/protobuf/src", ]
3253
if (use_kerberos) {
3354
defines += [ "USE_KERBEROS" ]
3455
if (is_android) {
@@ -53,3 +74,44 @@ diff -ru a/ui/base/BUILD.gn b/ui/base/BUILD.gn
5374
sources = [
5475
"android/gfx_jni_registrar.cc",
5576
"android/gfx_jni_registrar.h",
77+
--- a/third_party/angle/BUILD.gn 2017-11-25 15:25:36.291113000 +0400
78+
+++ b/third_party/angle/BUILD.gn 2017-11-25 16:08:18.478818000 +0400
79+
@@ -421,11 +421,7 @@
80+
if (is_win) {
81+
sources += rebase_path(gles_gypi.libangle_gl_wgl_sources, ".", "src")
82+
}
83+
- if (use_x11) {
84+
- sources += rebase_path(gles_gypi.libangle_gl_glx_sources, ".", "src")
85+
- deps += [ "src/third_party/libXNVCtrl:libXNVCtrl" ]
86+
- configs += [ ":x11" ]
87+
- }
88+
+
89+
if (is_mac) {
90+
sources += rebase_path(gles_gypi.libangle_gl_cgl_sources, ".", "src")
91+
libs += [
92+
@@ -478,7 +474,13 @@
93+
]
94+
95+
public_configs = [ ":libANGLE_config" ]
96+
-
97+
+
98+
+ if (use_x11) {
99+
+ sources += rebase_path(gles_gypi.libangle_gl_glx_sources, ".", "src")
100+
+ deps += [ "src/third_party/libXNVCtrl:libXNVCtrl" ]
101+
+ configs += [ ":x11" ]
102+
+ }
103+
+
104+
if (is_win) {
105+
data_deps = [
106+
":copy_compiler_dll"
107+
--- a/content/browser/BUILD.gn 2018-03-04 11:24:27.565814000 +0400
108+
+++ b/content/browser/BUILD.gn 2018-03-04 11:19:56.545315000 +0400
109+
@@ -28,7 +28,7 @@
110+
defines = []
111+
libs = []
112+
ldflags = []
113+
-
114+
+ include_dirs = [ "../../third_party/protobuf/src", ]
115+
deps = [
116+
"//base",
117+
"//base:base_static",

‎electron/electron_110.diff‎

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -828,17 +828,23 @@ index 1c5f8a7..a733b2e 100644
828828
],
829829
'xcode_settings': {
830830
'CC': '<(make_clang_dir)/bin/clang',
831-
--- a/brightray/brightray.gypi 2018-01-17 17:52:16.139123000 +0400
832-
+++ b/brightray/brightray.gypi 2018-01-17 17:52:33.313204000 +0400
833-
@@ -121,7 +121,7 @@
834-
'USE_NSS', # deprecated after Chrome 45.
831+
--- a/brightray/brightray.gypi 2018-03-04 15:17:29.848011000 +0400
832+
+++ b/brightray/brightray.gypi 2018-03-04 16:38:25.455412000 +0400
833+
@@ -119,12 +119,13 @@
834+
'USE_OPENSSL',
835835
],
836836
}],
837-
- ['OS in ["linux", "mac"]', {
838-
+ ['OS in ["linux", "mac", "freebsd"]', {
837+
- ['OS=="linux"', {
838+
+ ['OS=="linux" or OS=="freebsd"', {
839839
'defines': [
840-
'WEBRTC_POSIX',
841-
'UCHAR_TYPE=uint16_t',
840+
'USE_X11',
841+
'_LARGEFILE_SOURCE',
842+
'_LARGEFILE64_SOURCE',
843+
'_FILE_OFFSET_BITS=64',
844+
+ 'USE_NSS_CERTS',
845+
],
846+
'cflags_cc': [
847+
'-D__STRICT_ANSI__',
842848
--- a/brightray/browser/browser_main_parts.cc 2018-01-17 17:55:26.895347000 +0400
843849
+++ b/brightray/browser/browser_main_parts.cc 2018-01-17 17:54:48.566902000 +0400
844850
@@ -167,7 +167,7 @@
@@ -850,4 +856,15 @@ index 1c5f8a7..a733b2e 100644
850856
void OverrideAppLogsPath() {
851857
base::FilePath path;
852858
if (PathService::Get(brightray::DIR_APP_DATA, &path)) {
859+
--- a/package.json 2018-03-04 17:26:36.829462000 +0400
860+
+++ b/package.json 2018-03-04 17:27:01.296858000 +0400
861+
@@ -12,7 +12,7 @@
862+
"dugite": "^1.45.0",
863+
"electabul": "~0.0.4",
864+
"electron-docs-linter": "^2.3.4",
865+
- "electron-typescript-definitions": "^1.2.11",
866+
+ "electron-typescript-definitions": "1.2.11",
867+
"github": "^9.2.0",
868+
"husky": "^0.14.3",
869+
"minimist": "^1.2.0",
853870

‎electron/electron_111.diff‎

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -828,17 +828,23 @@ index 1c5f8a7..a733b2e 100644
828828
],
829829
'xcode_settings': {
830830
'CC': '<(make_clang_dir)/bin/clang',
831-
--- a/brightray/brightray.gypi 2018-01-17 17:52:16.139123000 +0400
832-
+++ b/brightray/brightray.gypi 2018-01-17 17:52:33.313204000 +0400
833-
@@ -121,7 +121,7 @@
834-
'USE_NSS', # deprecated after Chrome 45.
831+
--- a/brightray/brightray.gypi 2018-03-04 15:17:29.848011000 +0400
832+
+++ b/brightray/brightray.gypi 2018-03-04 16:38:25.455412000 +0400
833+
@@ -119,12 +119,13 @@
834+
'USE_OPENSSL',
835835
],
836836
}],
837-
- ['OS in ["linux", "mac"]', {
838-
+ ['OS in ["linux", "mac", "freebsd"]', {
837+
- ['OS=="linux"', {
838+
+ ['OS=="linux" or OS=="freebsd"', {
839839
'defines': [
840-
'WEBRTC_POSIX',
841-
'UCHAR_TYPE=uint16_t',
840+
'USE_X11',
841+
'_LARGEFILE_SOURCE',
842+
'_LARGEFILE64_SOURCE',
843+
'_FILE_OFFSET_BITS=64',
844+
+ 'USE_NSS_CERTS',
845+
],
846+
'cflags_cc': [
847+
'-D__STRICT_ANSI__',
842848
--- a/brightray/browser/browser_main_parts.cc 2018-01-17 17:55:26.895347000 +0400
843849
+++ b/brightray/browser/browser_main_parts.cc 2018-01-17 17:54:48.566902000 +0400
844850
@@ -167,7 +167,7 @@
@@ -850,4 +856,15 @@ index 1c5f8a7..a733b2e 100644
850856
void OverrideAppLogsPath() {
851857
base::FilePath path;
852858
if (PathService::Get(brightray::DIR_APP_DATA, &path)) {
853-
859+
--- a/package.json 2018-03-04 17:26:36.829462000 +0400
860+
+++ b/package.json 2018-03-04 17:27:01.296858000 +0400
861+
@@ -12,7 +12,7 @@
862+
"dugite": "^1.45.0",
863+
"electabul": "~0.0.4",
864+
"electron-docs-linter": "^2.3.4",
865+
- "electron-typescript-definitions": "^1.2.11",
866+
+ "electron-typescript-definitions": "1.2.11",
867+
"github": "^9.2.0",
868+
"husky": "^0.14.3",
869+
"minimist": "^1.2.0",
870+

‎electron/electron_brightrayv3.diff‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ index d089dba..2c443f8 100644
55
@@ -2,6 +2,7 @@
66
'variables': {
77
# The libraries brightray will be compiled to.
8-
'linux_system_libraries': 'gtk+-3.0 dbus-1 x11 x11-xcb xcb xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst xscrnsaver gconf-2.0 gmodule-2.0 nss',
9-
+ 'freebsd_system_libraries': 'gtk+-3.0 dbus-1 x11 x11-xcb xcb xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst xscrnsaver gconf-2.0 gmodule-2.0 nss',
8+
'linux_system_libraries': 'gtk+-2.0 dbus-1 x11 x11-xcb xcb xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst xscrnsaver gconf-2.0 gmodule-2.0',
9+
+ 'freebsd_system_libraries': 'gtk+-2.0 dbus-1 x11 x11-xcb xcb xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst xscrnsaver gconf-2.0 gmodule-2.0 nss',
1010
'conditions': [
1111
['target_arch=="mips64el"', {
1212
'linux_system_libraries': '<(linux_system_libraries) libpulse',
@@ -44,7 +44,7 @@ index d089dba..2c443f8 100644
4444
+ '<!@(<(pkg-config) --libs-only-l <(freebsd_system_libraries))',
4545
+ '-lexecinfo -lkvm -lgconf-2 -lgio-2.0 ',
4646
+ '-lxml2 -lfontconfig -lfreetype -lexpat -lharfbuzz -lpng16 -lcups ',
47-
+ '-lspeechd -lm -lz -lrt -ljpeg ',
47+
+ '-lspeechd -lm -lz -lrt -ljpeg -lwebp -lwebpdemux',
4848
+ '-lasound -lsnappy -lxslt -lcups -lspeechd -ldbus-1 -lFLAC '
4949
+ ],
5050
+ },

0 commit comments

Comments
 (0)