1 |
commit: 141059e3d9e1295de9e428f08a31d83aae3d18e0 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 27 22:55:48 2018 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 27 22:56:20 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=141059e3 |
7 |
|
8 |
www-client/chromium: beta channel bump (65.0.3325.88) |
9 |
|
10 |
Package-Manager: Portage-2.3.24_p18, Repoman-2.3.6_p99 |
11 |
|
12 |
www-client/chromium/Manifest | 2 +- |
13 |
....3315.3.ebuild => chromium-65.0.3325.88.ebuild} | 87 ++++++++++++---------- |
14 |
2 files changed, 50 insertions(+), 39 deletions(-) |
15 |
|
16 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
17 |
index 30ed7155bf8..49fb9e58e9c 100644 |
18 |
--- a/www-client/chromium/Manifest |
19 |
+++ b/www-client/chromium/Manifest |
20 |
@@ -1,4 +1,4 @@ |
21 |
DIST chromium-64.0.3282.167.tar.xz 482246360 BLAKE2B b4785c20f33081015ac31fed9dbd108dc78160d95c4ea7055b8fffdb714fe9ef120727cd6b88d4e4a15b0c429f04c7c512cca90c5313128e0001a4ae5b908b6f SHA512 1bee80d2e8d4332cfc307efdac8eb11a48e42f3927e63e7a9d5ff2bbad6c4534926669f21defbf0553160f5bb28596723be8bd0e3dfa19ca9a1e854bcf42fd77 |
22 |
DIST chromium-64.0.3282.186.tar.xz 482247144 BLAKE2B b59c5afeeed33fe081f35d0ee228a0d67a97fc1370c7d3ab90304ea6e236ee0f7fecd2c36df0acbdf384f42e2f90926cbdd56e683afc95e78d4bdc64b6d24453 SHA512 a8a435ee8506cfefaaf2df7447010df5db69fa6907844872d00643f55723a9bd7771649658f5151c857ac037adcbc8bdf2a5375dd105f78d068277ef021af7d8 |
23 |
-DIST chromium-65.0.3315.3.tar.xz 532475512 BLAKE2B 1a118ddd05f2b939ff0fd84f85e1c22789713351776d889bafb55ddb2b897b2921050a3df3b7d5e3224be84539d95dddce1a27a948c61b29c788ed9f8e194e02 SHA512 c7f0feda90c0df15058473d39482e9b9a9b3236dcb90ff8ba7ad53afde2fce4901b2cbd678d8470560cc0cb6e31c8d3caee9f0a9f100d82d95feacabcdb7f8ce |
24 |
DIST chromium-65.0.3325.73.tar.xz 570268564 BLAKE2B 8d1a9cf38f12ea3566463f42772671268de68d8c49170d60733be8eee7492850be739f19377365366740dcbad3414538eb00765281c966b6cedb85b74709448f SHA512 96ed3862c3fc21afac8d18f4b43f98d29a086e83dfe25af54b6358e139a8b3c9ec761cc463ce287b04a9082c5e62dbc605d4c97f8ec358599a24c7830c890418 |
25 |
+DIST chromium-65.0.3325.88.tar.xz 570275184 BLAKE2B a08ae19acfd7a80ae43c0654432588bfa7ea09a0b0f14583cf8e79b3c5997a348bcba12e52002d79214576030574695d32069cbe7037b53dad120aadf6c2a830 SHA512 5166e64f96e5b2bd30b28ed769a8c93b2c1de3eb52c18776222b16758002b6d87ca241bd95c7b37316e1afc5379ff49b77fbf552ab9c0ea868105d66ce400070 |
26 |
|
27 |
diff --git a/www-client/chromium/chromium-65.0.3315.3.ebuild b/www-client/chromium/chromium-65.0.3325.88.ebuild |
28 |
similarity index 95% |
29 |
rename from www-client/chromium/chromium-65.0.3315.3.ebuild |
30 |
rename to www-client/chromium/chromium-65.0.3325.88.ebuild |
31 |
index c2d2f2fcaf7..ede298f25fd 100644 |
32 |
--- a/www-client/chromium/chromium-65.0.3315.3.ebuild |
33 |
+++ b/www-client/chromium/chromium-65.0.3325.88.ebuild |
34 |
@@ -101,6 +101,7 @@ DEPEND="${COMMON_DEPEND} |
35 |
sys-apps/hwids[usb(+)] |
36 |
>=sys-devel/bison-2.4.3 |
37 |
sys-devel/flex |
38 |
+ >=sys-devel/clang-5 |
39 |
virtual/pkgconfig |
40 |
dev-vcs/git |
41 |
$(python_gen_any_dep ' |
42 |
@@ -150,23 +151,23 @@ PATCHES=( |
43 |
"${FILESDIR}/chromium-memcpy-r0.patch" |
44 |
"${FILESDIR}/chromium-clang-r2.patch" |
45 |
"${FILESDIR}/chromium-gn-r0.patch" |
46 |
- "${FILESDIR}/chromium-vulkan-r0.patch" |
47 |
- "${FILESDIR}/chromium-gcc-r0.patch" |
48 |
- "${FILESDIR}/chromium-ffmpeg-r0.patch" |
49 |
+ "${FILESDIR}/chromium-math.h-r0.patch" |
50 |
+ "${FILESDIR}/chromium-clang-r3.patch" |
51 |
+ "${FILESDIR}/chromium-stdint.patch" |
52 |
) |
53 |
|
54 |
pre_build_checks() { |
55 |
- if [[ ${MERGE_TYPE} != binary ]]; then |
56 |
- local -x CPP="$(tc-getCXX) -E" |
57 |
- if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then |
58 |
- # bugs: #601654 |
59 |
- die "At least clang 3.9.1 is required" |
60 |
- fi |
61 |
- if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then |
62 |
- # bugs: #535730, #525374, #518668, #600288, #627356 |
63 |
- die "At least gcc 5.0 is required" |
64 |
- fi |
65 |
- fi |
66 |
+ #if [[ ${MERGE_TYPE} != binary ]]; then |
67 |
+ # local -x CPP="$(tc-getCXX) -E" |
68 |
+ # if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then |
69 |
+ # # bugs: #601654 |
70 |
+ # die "At least clang 3.9.1 is required" |
71 |
+ # fi |
72 |
+ # if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then |
73 |
+ # # bugs: #535730, #525374, #518668, #600288, #627356 |
74 |
+ # die "At least gcc 5.0 is required" |
75 |
+ # fi |
76 |
+ #fi |
77 |
|
78 |
# Check build requirements, bug #541816 and bug #471810 . |
79 |
CHECKREQS_MEMORY="3G" |
80 |
@@ -265,7 +266,6 @@ src_prepare() { |
81 |
third_party/libXNVCtrl |
82 |
third_party/libaddressinput |
83 |
third_party/libaom |
84 |
- third_party/libaom/source/libaom/third_party/x86inc |
85 |
third_party/libjingle |
86 |
third_party/libphonenumber |
87 |
third_party/libsecret |
88 |
@@ -274,6 +274,7 @@ src_prepare() { |
89 |
third_party/libwebm |
90 |
third_party/libxml/chromium |
91 |
third_party/libyuv |
92 |
+ third_party/llvm |
93 |
third_party/lss |
94 |
third_party/lzma_sdk |
95 |
third_party/markupsafe |
96 |
@@ -374,6 +375,32 @@ src_configure() { |
97 |
|
98 |
local myconf_gn="" |
99 |
|
100 |
+ # Make sure the build system will use the right tools, bug #340795. |
101 |
+ tc-export AR CC CXX NM |
102 |
+ |
103 |
+ if ! tc-is-clang; then |
104 |
+ # Force clang since gcc is pretty broken at the moment. |
105 |
+ CC=clang |
106 |
+ CXX=clang++ |
107 |
+ fi |
108 |
+ |
109 |
+ if tc-is-clang; then |
110 |
+ myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" |
111 |
+ else |
112 |
+ myconf_gn+=" is_clang=false" |
113 |
+ fi |
114 |
+ |
115 |
+ # Define a custom toolchain for GN |
116 |
+ myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\"" |
117 |
+ |
118 |
+ if tc-is-cross-compiler; then |
119 |
+ tc-export BUILD_{AR,CC,CXX,NM} |
120 |
+ myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\"" |
121 |
+ myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\"" |
122 |
+ else |
123 |
+ myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\"" |
124 |
+ fi |
125 |
+ |
126 |
# GN needs explicit config for Debug/Release as opposed to inferring it from build directory. |
127 |
myconf_gn+=" is_debug=false" |
128 |
|
129 |
@@ -442,12 +469,6 @@ src_configure() { |
130 |
|
131 |
myconf_gn+=" fieldtrial_testing_like_official_build=true" |
132 |
|
133 |
- if tc-is-clang; then |
134 |
- myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" |
135 |
- else |
136 |
- myconf_gn+=" is_clang=false" |
137 |
- fi |
138 |
- |
139 |
# Never use bundled gold binary. Disable gold linker flags for now. |
140 |
# Do not use bundled clang. |
141 |
# Trying to use gold results in linker crash. |
142 |
@@ -512,22 +533,8 @@ src_configure() { |
143 |
fi |
144 |
fi |
145 |
|
146 |
- # Make sure the build system will use the right tools, bug #340795. |
147 |
- tc-export AR CC CXX NM |
148 |
- |
149 |
- # Define a custom toolchain for GN |
150 |
- myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\"" |
151 |
- |
152 |
- if tc-is-cross-compiler; then |
153 |
- tc-export BUILD_{AR,CC,CXX,NM} |
154 |
- myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\"" |
155 |
- myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\"" |
156 |
- else |
157 |
- myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\"" |
158 |
- fi |
159 |
- |
160 |
# https://bugs.gentoo.org/588596 |
161 |
- append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks) |
162 |
+ #append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks) |
163 |
|
164 |
# Bug 491582. |
165 |
export TMPDIR="${WORKDIR}/temp" |
166 |
@@ -561,6 +568,8 @@ src_compile() { |
167 |
# Calling this here supports resumption via FEATURES=keepwork |
168 |
python_setup |
169 |
|
170 |
+ #"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die |
171 |
+ |
172 |
# Build mksnapshot and pax-mark it. |
173 |
local x |
174 |
for x in mksnapshot v8_context_snapshot_generator; do |
175 |
@@ -634,8 +643,10 @@ src_install() { |
176 |
doins -r out/Release/locales |
177 |
doins -r out/Release/resources |
178 |
|
179 |
- insinto "${CHROMIUM_HOME}/swiftshader" |
180 |
- doins out/Release/swiftshader/*.so |
181 |
+ if [[ -d out/Release/swiftshader ]]; then |
182 |
+ insinto "${CHROMIUM_HOME}/swiftshader" |
183 |
+ doins out/Release/swiftshader/*.so |
184 |
+ fi |
185 |
|
186 |
# Install icons and desktop entry. |
187 |
local branding size |