| 1 |
commit: fd5fb1553ba548e3b5553c46170ea3b91a71fed2 |
| 2 |
Author: Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 24 10:23:02 2016 +0000 |
| 4 |
Commit: Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 24 10:23:02 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd5fb155 |
| 7 |
|
| 8 |
www-client/chromium: dev channel bump (54.0.2837.0) |
| 9 |
|
| 10 |
Fix build with system libjpeg (bug #584518). |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.28 |
| 13 |
|
| 14 |
www-client/chromium/Manifest | 2 +- |
| 15 |
...0.2824.0.ebuild => chromium-54.0.2837.0.ebuild} | 302 ++++++++++----------- |
| 16 |
www-client/chromium/files/chromium-gn-r5.patch | 27 ++ |
| 17 |
3 files changed, 176 insertions(+), 155 deletions(-) |
| 18 |
|
| 19 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
| 20 |
index 7d9a41e..43da9dc 100644 |
| 21 |
--- a/www-client/chromium/Manifest |
| 22 |
+++ b/www-client/chromium/Manifest |
| 23 |
@@ -1,5 +1,5 @@ |
| 24 |
DIST chromium-52.0.2743.116.tar.xz 458156660 SHA256 a194ae1edb041024b3d4b6ba438f32fefdb6f1ecb24a96c50248a486b237a101 SHA512 c9a8b6d7a22d3b086f1761678f1fa047191a8e44bc6ebe8745e76ea92420b1330fc6e4134ca7bc22c0367e7a25df04900156d0ebb44eae3ef7f98d1deb5362e5 WHIRLPOOL 90cc620e9dab964690a24606ae456e20f1a9dc556301fef33f3599a395ec247cb03712c94522a681f20332b54163896e118463b1b402aff6153b513deb25c5cc |
| 25 |
DIST chromium-53.0.2785.34.tar.xz 460739532 SHA256 261ba008c96b335a55feff18785b01484af2d678f85b58206008b31c9e9c372f SHA512 99e0b7a30e34f70ec844ef50f02eadadead2b83f2a47ca7d5779cf0a90bf49e7d3efc1bbc98eb4d1294ed283edd04a993a639003a365e06ae8b2adf26cc1c865 WHIRLPOOL dec533670c1664f88ea32fe253644e479b81fb93bd93f1bc5dbfe41c56979a7642afdfcd041ddf05ca3f0da8e1bedc7ddf48779be3b965038026f65ab199f344 |
| 26 |
DIST chromium-53.0.2785.70.tar.xz 460838212 SHA256 edd660ea30eeb1a3fccb1c18c725c96bf464b6ea34134c8210ef9dfa8cd35179 SHA512 7029915f983f854ceb2e43b1bc896b2954eb2ca4f704a81070a837e2435ffd0f5a4e4128456826fc70e439997febb1eb715ed33b3336734f137952632f61dd7e WHIRLPOOL d6e51313b37c6408e6f41900b984f1cc835fb247dfb0371eaca9554425df5df2ae1d56e4efd31093c2ffcd0359b457338558ee8e66cd1a67f69528f5461cd5b2 |
| 27 |
-DIST chromium-54.0.2824.0.tar.xz 459683224 SHA256 7aae8ea2ae681b6971624c1dbcbf9cb56353456a20b91f369381488c8f2e0e94 SHA512 4867661f78fe72c32e8cea5a476cedd5fee9586fe8df8a7bd79f793542caa15fe52596996f8615f66376e75d9bdd92aeaa8aa6241472503ae015ef761f6435a3 WHIRLPOOL 88baed0d7fb13b815df82ffcd5e511ac9ef6ee92d98dff571f5ba5115300859345490c27fa45dab7c3dc99e5cd44310bcaa502ae37808b8694ce1276293d3549 |
| 28 |
DIST chromium-54.0.2832.2.tar.xz 479876132 SHA256 105145178e6995b57821966b77512918b873e180bfaf6a4991f55c769df04b12 SHA512 e4d4f813df9036d9769003cc115d89139365a898e0ad98faa503bcd066133fa27f653861df1e09d36156f05e30b27ade15e9be2e0c205748feb1ab7913ee2989 WHIRLPOOL 0772494f4956b9e75f09f5ba1ed955178102917c5a59f45f9f34f44d23d334647a6090406c8bc8f9f6dada54758118ed8d1dbdd961f9c3ec30e122a81acc1ad4 |
| 29 |
+DIST chromium-54.0.2837.0.tar.xz 479983852 SHA256 4813772a104aefc630bd80f81c663f702659fe8a7d592839bf04a1d252e20d75 SHA512 f052afd0b32a1de30df55792c91fbc595489eb347b775e05db7f272e5d88ffc2ff8d498d35c811f2c4e4c14b6cd57d18549dddbbf6b085f5bbe533723dfc2dde WHIRLPOOL d37ec6920ce4922ff2dfd3b4c59691d735301b6124d49f6a854b7eca6975e0588ff975d8337d293a242014d2a5a747695a0dad4216e3c53b552d4a43a6c3a3dc |
| 30 |
|
| 31 |
diff --git a/www-client/chromium/chromium-54.0.2824.0.ebuild b/www-client/chromium/chromium-54.0.2837.0.ebuild |
| 32 |
similarity index 77% |
| 33 |
rename from www-client/chromium/chromium-54.0.2824.0.ebuild |
| 34 |
rename to www-client/chromium/chromium-54.0.2837.0.ebuild |
| 35 |
index fd8faba..7164ae1 100644 |
| 36 |
--- a/www-client/chromium/chromium-54.0.2824.0.ebuild |
| 37 |
+++ b/www-client/chromium/chromium-54.0.2837.0.ebuild |
| 38 |
@@ -31,7 +31,7 @@ QA_FLAGS_IGNORED=".*\.nexe" |
| 39 |
# right tools for it, bug #469144 . |
| 40 |
QA_PRESTRIPPED=".*\.nexe" |
| 41 |
|
| 42 |
-RDEPEND=" |
| 43 |
+COMMON_DEPEND=" |
| 44 |
app-arch/bzip2:= |
| 45 |
cups? ( >=net-print/cups-1.3.11:= ) |
| 46 |
>=dev-libs/elfutils-0.149 |
| 47 |
@@ -40,17 +40,19 @@ RDEPEND=" |
| 48 |
>=dev-libs/jsoncpp-0.5.0-r1:= |
| 49 |
dev-libs/nspr:= |
| 50 |
>=dev-libs/nss-3.14.3:= |
| 51 |
+ >=dev-libs/re2-0.2016.05.01:= |
| 52 |
gnome? ( >=gnome-base/gconf-2.24.0:= ) |
| 53 |
gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) |
| 54 |
>=media-libs/alsa-lib-1.0.19:= |
| 55 |
media-libs/fontconfig:= |
| 56 |
media-libs/freetype:= |
| 57 |
media-libs/libexif:= |
| 58 |
+ media-libs/libjpeg-turbo:= |
| 59 |
media-libs/libpng:= |
| 60 |
media-libs/libvpx:=[svc] |
| 61 |
media-libs/speex:= |
| 62 |
pulseaudio? ( media-sound/pulseaudio:= ) |
| 63 |
- system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:= ) |
| 64 |
+ system-ffmpeg? ( >=media-video/ffmpeg-3.0.1:= ) |
| 65 |
sys-apps/dbus:= |
| 66 |
sys-apps/pciutils:= |
| 67 |
>=sys-libs/libcap-2.22:= |
| 68 |
@@ -84,8 +86,20 @@ RDEPEND=" |
| 69 |
kerberos? ( virtual/krb5 ) |
| 70 |
!gn? ( |
| 71 |
>=app-accessibility/speech-dispatcher-0.8:= |
| 72 |
- )" |
| 73 |
-DEPEND="${RDEPEND} |
| 74 |
+ ) |
| 75 |
+" |
| 76 |
+# For nvidia-drivers blocker, see bug #413637 . |
| 77 |
+RDEPEND="${COMMON_DEPEND} |
| 78 |
+ !=www-client/chromium-9999 |
| 79 |
+ !<www-plugins/chrome-binary-plugins-37 |
| 80 |
+ x11-misc/xdg-utils |
| 81 |
+ virtual/opengl |
| 82 |
+ virtual/ttf-fonts |
| 83 |
+ selinux? ( sec-policy/selinux-chromium ) |
| 84 |
+ tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) |
| 85 |
+ widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] ) |
| 86 |
+" |
| 87 |
+DEPEND="${COMMON_DEPEND} |
| 88 |
>=app-arch/gzip-1.7 |
| 89 |
!arm? ( |
| 90 |
dev-lang/yasm |
| 91 |
@@ -97,29 +111,18 @@ DEPEND="${RDEPEND} |
| 92 |
sys-apps/hwids[usb(+)] |
| 93 |
>=sys-devel/bison-2.4.3 |
| 94 |
sys-devel/flex |
| 95 |
- virtual/pkgconfig" |
| 96 |
+ virtual/pkgconfig |
| 97 |
+ $(python_gen_any_dep ' |
| 98 |
+ dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}] |
| 99 |
+ >=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}] |
| 100 |
+ dev-python/html5lib[${PYTHON_USEDEP}] |
| 101 |
+ dev-python/jinja[${PYTHON_USEDEP}] |
| 102 |
+ dev-python/ply[${PYTHON_USEDEP}] |
| 103 |
+ dev-python/simplejson[${PYTHON_USEDEP}] |
| 104 |
+ ') |
| 105 |
+" |
| 106 |
|
| 107 |
-# For nvidia-drivers blocker, see bug #413637 . |
| 108 |
-RDEPEND+=" |
| 109 |
- !=www-client/chromium-9999 |
| 110 |
- !<www-plugins/chrome-binary-plugins-37 |
| 111 |
- x11-misc/xdg-utils |
| 112 |
- virtual/opengl |
| 113 |
- virtual/ttf-fonts |
| 114 |
- selinux? ( sec-policy/selinux-chromium ) |
| 115 |
- tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) |
| 116 |
- widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )" |
| 117 |
- |
| 118 |
-# Python dependencies. The DEPEND part needs to be kept in sync |
| 119 |
-# with python_check_deps. |
| 120 |
-DEPEND+=" $(python_gen_any_dep ' |
| 121 |
- dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}] |
| 122 |
- >=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}] |
| 123 |
- dev-python/html5lib[${PYTHON_USEDEP}] |
| 124 |
- dev-python/jinja[${PYTHON_USEDEP}] |
| 125 |
- dev-python/ply[${PYTHON_USEDEP}] |
| 126 |
- dev-python/simplejson[${PYTHON_USEDEP}] |
| 127 |
-')" |
| 128 |
+# Keep this in sync with the python_gen_any_dep call. |
| 129 |
python_check_deps() { |
| 130 |
has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && |
| 131 |
has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" && |
| 132 |
@@ -159,16 +162,16 @@ For other desktop environments, try one of the following: |
| 133 |
|
| 134 |
PATCHES=( |
| 135 |
"${FILESDIR}/${PN}-system-ffmpeg-r3.patch" |
| 136 |
- "${FILESDIR}/${PN}-system-jinja-r12.patch" |
| 137 |
+ "${FILESDIR}/${PN}-system-jinja-r13.patch" |
| 138 |
"${FILESDIR}/${PN}-widevine-r1.patch" |
| 139 |
- "${FILESDIR}/${PN}-last-commit-position-r1.patch" |
| 140 |
- "${FILESDIR}/${PN}-gn-r4.patch" |
| 141 |
+ "${FILESDIR}/${PN}-gn-r5.patch" |
| 142 |
) |
| 143 |
|
| 144 |
pkg_pretend() { |
| 145 |
- if [[ $(tc-getCC) == *gcc* ]] && \ |
| 146 |
- [[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then |
| 147 |
- die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.' |
| 148 |
+ if [[ ${MERGE_TYPE} != binary ]]; then |
| 149 |
+ if tc-is-gcc && ! version_is_at_least 4.8 "$(gcc-version)"; then |
| 150 |
+ die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.' |
| 151 |
+ fi |
| 152 |
fi |
| 153 |
|
| 154 |
# Check build requirements, bug #541816 and bug #471810 . |
| 155 |
@@ -183,13 +186,6 @@ pkg_pretend() { |
| 156 |
} |
| 157 |
|
| 158 |
pkg_setup() { |
| 159 |
- if [[ "${SLOT}" == "0" ]]; then |
| 160 |
- CHROMIUM_SUFFIX="" |
| 161 |
- else |
| 162 |
- CHROMIUM_SUFFIX="-${SLOT}" |
| 163 |
- fi |
| 164 |
- CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}" |
| 165 |
- |
| 166 |
# Make sure the build system will use the right python, bug #344367. |
| 167 |
python-any-r1_pkg_setup |
| 168 |
|
| 169 |
@@ -199,130 +195,127 @@ pkg_setup() { |
| 170 |
src_prepare() { |
| 171 |
default |
| 172 |
|
| 173 |
- local conditional_bundled_libraries="" |
| 174 |
+ local keeplibs=( |
| 175 |
+ base/third_party/dmg_fp |
| 176 |
+ base/third_party/dynamic_annotations |
| 177 |
+ base/third_party/icu |
| 178 |
+ base/third_party/nspr |
| 179 |
+ base/third_party/superfasthash |
| 180 |
+ base/third_party/symbolize |
| 181 |
+ base/third_party/valgrind |
| 182 |
+ base/third_party/xdg_mime |
| 183 |
+ base/third_party/xdg_user_dirs |
| 184 |
+ breakpad/src/third_party/curl |
| 185 |
+ chrome/third_party/mozilla_security_manager |
| 186 |
+ courgette/third_party |
| 187 |
+ net/third_party/mozilla_security_manager |
| 188 |
+ net/third_party/nss |
| 189 |
+ third_party/WebKit |
| 190 |
+ third_party/analytics |
| 191 |
+ third_party/angle |
| 192 |
+ third_party/angle/src/common/third_party/numerics |
| 193 |
+ third_party/angle/src/third_party/compiler |
| 194 |
+ third_party/angle/src/third_party/libXNVCtrl |
| 195 |
+ third_party/angle/src/third_party/murmurhash |
| 196 |
+ third_party/angle/src/third_party/trace_event |
| 197 |
+ third_party/boringssl |
| 198 |
+ third_party/brotli |
| 199 |
+ third_party/cacheinvalidation |
| 200 |
+ third_party/catapult |
| 201 |
+ third_party/catapult/third_party/polymer |
| 202 |
+ third_party/catapult/third_party/py_vulcanize |
| 203 |
+ third_party/catapult/third_party/py_vulcanize/third_party/rcssmin |
| 204 |
+ third_party/catapult/third_party/py_vulcanize/third_party/rjsmin |
| 205 |
+ third_party/catapult/tracing/third_party/d3 |
| 206 |
+ third_party/catapult/tracing/third_party/gl-matrix |
| 207 |
+ third_party/catapult/tracing/third_party/jszip |
| 208 |
+ third_party/catapult/tracing/third_party/mannwhitneyu |
| 209 |
+ third_party/ced |
| 210 |
+ third_party/cld_2 |
| 211 |
+ third_party/cld_3 |
| 212 |
+ third_party/cros_system_api |
| 213 |
+ third_party/cython/python_flags.py |
| 214 |
+ third_party/devscripts |
| 215 |
+ third_party/dom_distiller_js |
| 216 |
+ third_party/fips181 |
| 217 |
+ third_party/flatbuffers |
| 218 |
+ third_party/flot |
| 219 |
+ third_party/google_input_tools |
| 220 |
+ third_party/google_input_tools/third_party/closure_library |
| 221 |
+ third_party/google_input_tools/third_party/closure_library/third_party/closure |
| 222 |
+ third_party/hunspell |
| 223 |
+ third_party/iccjpeg |
| 224 |
+ third_party/icu |
| 225 |
+ third_party/jstemplate |
| 226 |
+ third_party/khronos |
| 227 |
+ third_party/leveldatabase |
| 228 |
+ third_party/libXNVCtrl |
| 229 |
+ third_party/libaddressinput |
| 230 |
+ third_party/libjingle |
| 231 |
+ third_party/libphonenumber |
| 232 |
+ third_party/libsecret |
| 233 |
+ third_party/libsrtp |
| 234 |
+ third_party/libudev |
| 235 |
+ third_party/libusb |
| 236 |
+ third_party/libwebm |
| 237 |
+ third_party/libxml/chromium |
| 238 |
+ third_party/libyuv |
| 239 |
+ third_party/lss |
| 240 |
+ third_party/lzma_sdk |
| 241 |
+ third_party/mesa |
| 242 |
+ third_party/modp_b64 |
| 243 |
+ third_party/mt19937ar |
| 244 |
+ third_party/openh264 |
| 245 |
+ third_party/openmax_dl |
| 246 |
+ third_party/opus |
| 247 |
+ third_party/ots |
| 248 |
+ third_party/pdfium |
| 249 |
+ third_party/pdfium/third_party/agg23 |
| 250 |
+ third_party/pdfium/third_party/base |
| 251 |
+ third_party/pdfium/third_party/bigint |
| 252 |
+ third_party/pdfium/third_party/freetype |
| 253 |
+ third_party/pdfium/third_party/lcms2-2.6 |
| 254 |
+ third_party/pdfium/third_party/libjpeg |
| 255 |
+ third_party/pdfium/third_party/libopenjpeg20 |
| 256 |
+ third_party/pdfium/third_party/libpng16 |
| 257 |
+ third_party/pdfium/third_party/libtiff |
| 258 |
+ third_party/pdfium/third_party/zlib_v128 |
| 259 |
+ third_party/polymer |
| 260 |
+ third_party/protobuf |
| 261 |
+ third_party/protobuf/third_party/six |
| 262 |
+ third_party/qcms |
| 263 |
+ third_party/sfntly |
| 264 |
+ third_party/skia |
| 265 |
+ third_party/smhasher |
| 266 |
+ third_party/sqlite |
| 267 |
+ third_party/tcmalloc |
| 268 |
+ third_party/usrsctp |
| 269 |
+ third_party/web-animations-js |
| 270 |
+ third_party/webdriver |
| 271 |
+ third_party/webrtc |
| 272 |
+ third_party/widevine |
| 273 |
+ third_party/woff2 |
| 274 |
+ third_party/x86inc |
| 275 |
+ third_party/zlib/google |
| 276 |
+ url/third_party/mozilla |
| 277 |
+ v8/src/third_party/valgrind |
| 278 |
+ ) |
| 279 |
if ! use system-ffmpeg; then |
| 280 |
- conditional_bundled_libraries+=" third_party/ffmpeg" |
| 281 |
+ keeplibs+=( third_party/ffmpeg ) |
| 282 |
fi |
| 283 |
if use gn; then |
| 284 |
- conditional_bundled_libraries+=" |
| 285 |
+ keeplibs+=( |
| 286 |
base/third_party/libevent |
| 287 |
third_party/adobe |
| 288 |
third_party/speech-dispatcher |
| 289 |
third_party/usb_ids |
| 290 |
third_party/xdg-utils |
| 291 |
third_party/yasm/run_yasm.py |
| 292 |
- " |
| 293 |
+ ) |
| 294 |
fi |
| 295 |
|
| 296 |
# Remove most bundled libraries. Some are still needed. |
| 297 |
- build/linux/unbundle/remove_bundled_libraries.py \ |
| 298 |
- ${conditional_bundled_libraries} \ |
| 299 |
- 'base/third_party/dmg_fp' \ |
| 300 |
- 'base/third_party/dynamic_annotations' \ |
| 301 |
- 'base/third_party/icu' \ |
| 302 |
- 'base/third_party/nspr' \ |
| 303 |
- 'base/third_party/superfasthash' \ |
| 304 |
- 'base/third_party/symbolize' \ |
| 305 |
- 'base/third_party/valgrind' \ |
| 306 |
- 'base/third_party/xdg_mime' \ |
| 307 |
- 'base/third_party/xdg_user_dirs' \ |
| 308 |
- 'breakpad/src/third_party/curl' \ |
| 309 |
- 'chrome/third_party/mozilla_security_manager' \ |
| 310 |
- 'courgette/third_party' \ |
| 311 |
- 'net/third_party/mozilla_security_manager' \ |
| 312 |
- 'net/third_party/nss' \ |
| 313 |
- 'third_party/WebKit' \ |
| 314 |
- 'third_party/analytics' \ |
| 315 |
- 'third_party/angle' \ |
| 316 |
- 'third_party/angle/src/common/third_party/numerics' \ |
| 317 |
- 'third_party/angle/src/third_party/compiler' \ |
| 318 |
- 'third_party/angle/src/third_party/libXNVCtrl' \ |
| 319 |
- 'third_party/angle/src/third_party/murmurhash' \ |
| 320 |
- 'third_party/angle/src/third_party/trace_event' \ |
| 321 |
- 'third_party/boringssl' \ |
| 322 |
- 'third_party/brotli' \ |
| 323 |
- 'third_party/cacheinvalidation' \ |
| 324 |
- 'third_party/catapult' \ |
| 325 |
- 'third_party/catapult/third_party/polymer' \ |
| 326 |
- 'third_party/catapult/third_party/py_vulcanize' \ |
| 327 |
- 'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \ |
| 328 |
- 'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \ |
| 329 |
- 'third_party/catapult/tracing/third_party/d3' \ |
| 330 |
- 'third_party/catapult/tracing/third_party/gl-matrix' \ |
| 331 |
- 'third_party/catapult/tracing/third_party/jszip' \ |
| 332 |
- 'third_party/catapult/tracing/third_party/mannwhitneyu' \ |
| 333 |
- 'third_party/ced' \ |
| 334 |
- 'third_party/cld_2' \ |
| 335 |
- 'third_party/cros_system_api' \ |
| 336 |
- 'third_party/cython/python_flags.py' \ |
| 337 |
- 'third_party/devscripts' \ |
| 338 |
- 'third_party/dom_distiller_js' \ |
| 339 |
- 'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \ |
| 340 |
- 'third_party/fips181' \ |
| 341 |
- 'third_party/flatbuffers' \ |
| 342 |
- 'third_party/flot' \ |
| 343 |
- 'third_party/google_input_tools' \ |
| 344 |
- 'third_party/google_input_tools/third_party/closure_library' \ |
| 345 |
- 'third_party/google_input_tools/third_party/closure_library/third_party/closure' \ |
| 346 |
- 'third_party/hunspell' \ |
| 347 |
- 'third_party/iccjpeg' \ |
| 348 |
- 'third_party/icu' \ |
| 349 |
- 'third_party/jstemplate' \ |
| 350 |
- 'third_party/khronos' \ |
| 351 |
- 'third_party/leveldatabase' \ |
| 352 |
- 'third_party/libXNVCtrl' \ |
| 353 |
- 'third_party/libaddressinput' \ |
| 354 |
- 'third_party/libjingle' \ |
| 355 |
- 'third_party/libjpeg_turbo' \ |
| 356 |
- 'third_party/libphonenumber' \ |
| 357 |
- 'third_party/libsecret' \ |
| 358 |
- 'third_party/libsrtp' \ |
| 359 |
- 'third_party/libudev' \ |
| 360 |
- 'third_party/libusb' \ |
| 361 |
- 'third_party/libwebm' \ |
| 362 |
- 'third_party/libxml/chromium' \ |
| 363 |
- 'third_party/libyuv' \ |
| 364 |
- 'third_party/lss' \ |
| 365 |
- 'third_party/lzma_sdk' \ |
| 366 |
- 'third_party/mesa' \ |
| 367 |
- 'third_party/modp_b64' \ |
| 368 |
- 'third_party/mt19937ar' \ |
| 369 |
- 'third_party/openh264' \ |
| 370 |
- 'third_party/openmax_dl' \ |
| 371 |
- 'third_party/opus' \ |
| 372 |
- 'third_party/ots' \ |
| 373 |
- 'third_party/pdfium' \ |
| 374 |
- 'third_party/pdfium/third_party/agg23' \ |
| 375 |
- 'third_party/pdfium/third_party/base' \ |
| 376 |
- 'third_party/pdfium/third_party/bigint' \ |
| 377 |
- 'third_party/pdfium/third_party/freetype' \ |
| 378 |
- 'third_party/pdfium/third_party/lcms2-2.6' \ |
| 379 |
- 'third_party/pdfium/third_party/libjpeg' \ |
| 380 |
- 'third_party/pdfium/third_party/libopenjpeg20' \ |
| 381 |
- 'third_party/pdfium/third_party/libpng16' \ |
| 382 |
- 'third_party/pdfium/third_party/libtiff' \ |
| 383 |
- 'third_party/pdfium/third_party/zlib_v128' \ |
| 384 |
- 'third_party/polymer' \ |
| 385 |
- 'third_party/protobuf' \ |
| 386 |
- 'third_party/protobuf/third_party/six' \ |
| 387 |
- 'third_party/qcms' \ |
| 388 |
- 'third_party/re2' \ |
| 389 |
- 'third_party/sfntly' \ |
| 390 |
- 'third_party/skia' \ |
| 391 |
- 'third_party/smhasher' \ |
| 392 |
- 'third_party/sqlite' \ |
| 393 |
- 'third_party/tcmalloc' \ |
| 394 |
- 'third_party/usrsctp' \ |
| 395 |
- 'third_party/web-animations-js' \ |
| 396 |
- 'third_party/webdriver' \ |
| 397 |
- 'third_party/webrtc' \ |
| 398 |
- 'third_party/widevine' \ |
| 399 |
- 'third_party/woff2' \ |
| 400 |
- 'third_party/x86inc' \ |
| 401 |
- 'third_party/zlib/google' \ |
| 402 |
- 'url/third_party/mozilla' \ |
| 403 |
- 'v8/src/third_party/valgrind' \ |
| 404 |
- --do-remove || die |
| 405 |
+ build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die |
| 406 |
} |
| 407 |
|
| 408 |
src_configure() { |
| 409 |
@@ -347,12 +340,10 @@ src_configure() { |
| 410 |
# Use system-provided libraries. |
| 411 |
# TODO: use_system_hunspell (upstream changes needed). |
| 412 |
# TODO: use_system_icu (bug #576370). |
| 413 |
- # TODO: use_system_libjpeg (bug #584518). |
| 414 |
# TODO: use_system_libsrtp (bug #459932). |
| 415 |
# TODO: use_system_libusb (http://crbug.com/266149). |
| 416 |
# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077). |
| 417 |
# TODO: use_system_protobuf (bug #525560). |
| 418 |
- # TODO: use_system_re2 (bug #571156). |
| 419 |
# TODO: use_system_ssl (http://crbug.com/58087). |
| 420 |
# TODO: use_system_sqlite (http://crbug.com/22208). |
| 421 |
myconf_gyp+=" |
| 422 |
@@ -378,11 +369,13 @@ src_configure() { |
| 423 |
flac |
| 424 |
harfbuzz-ng |
| 425 |
libevent |
| 426 |
+ libjpeg |
| 427 |
libpng |
| 428 |
libvpx |
| 429 |
libwebp |
| 430 |
libxml |
| 431 |
libxslt |
| 432 |
+ re2 |
| 433 |
snappy |
| 434 |
yasm |
| 435 |
zlib" |
| 436 |
@@ -441,7 +434,7 @@ src_configure() { |
| 437 |
myconf_gyp+=" -Dfieldtrial_testing_like_official_build=1" |
| 438 |
myconf_gn+=" fieldtrial_testing_like_official_build=true" |
| 439 |
|
| 440 |
- if [[ $(tc-getCC) == *clang* ]]; then |
| 441 |
+ if tc-is-clang; then |
| 442 |
myconf_gyp+=" -Dclang=1" |
| 443 |
myconf_gn+=" is_clang=true clang_base_path=\"/usr\" clang_use_chrome_plugins=false" |
| 444 |
else |
| 445 |
@@ -621,6 +614,7 @@ src_compile() { |
| 446 |
} |
| 447 |
|
| 448 |
src_install() { |
| 449 |
+ local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}" |
| 450 |
exeinto "${CHROMIUM_HOME}" |
| 451 |
doexe out/Release/chrome || die |
| 452 |
|
| 453 |
|
| 454 |
diff --git a/www-client/chromium/files/chromium-gn-r5.patch b/www-client/chromium/files/chromium-gn-r5.patch |
| 455 |
new file mode 100644 |
| 456 |
index 00000000..beb844f |
| 457 |
--- /dev/null |
| 458 |
+++ b/www-client/chromium/files/chromium-gn-r5.patch |
| 459 |
@@ -0,0 +1,27 @@ |
| 460 |
+Index: tools/gn/bootstrap/bootstrap.py |
| 461 |
+diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py |
| 462 |
+index aab92c243167769cb7ccbb2bd50672800ab43e3e..b07fd0a8eaf139e4d09e1641ce265353a3cd3ee5 100755 |
| 463 |
+--- a/tools/gn/bootstrap/bootstrap.py |
| 464 |
++++ b/tools/gn/bootstrap/bootstrap.py |
| 465 |
+@@ -445,6 +445,21 @@ def write_gn_ninja(path, root_gen_dir, options): |
| 466 |
+ 'base/synchronization/lock.cc', |
| 467 |
+ 'base/sys_info.cc', |
| 468 |
+ 'base/task_runner.cc', |
| 469 |
++ 'base/task_scheduler/delayed_task_manager.cc', |
| 470 |
++ 'base/task_scheduler/post_task.cc', |
| 471 |
++ 'base/task_scheduler/priority_queue.cc', |
| 472 |
++ 'base/task_scheduler/scheduler_lock_impl.cc', |
| 473 |
++ 'base/task_scheduler/scheduler_service_thread.cc', |
| 474 |
++ 'base/task_scheduler/scheduler_worker.cc', |
| 475 |
++ 'base/task_scheduler/scheduler_worker_pool_impl.cc', |
| 476 |
++ 'base/task_scheduler/scheduler_worker_stack.cc', |
| 477 |
++ 'base/task_scheduler/sequence.cc', |
| 478 |
++ 'base/task_scheduler/sequence_sort_key.cc', |
| 479 |
++ 'base/task_scheduler/task.cc', |
| 480 |
++ 'base/task_scheduler/task_scheduler.cc', |
| 481 |
++ 'base/task_scheduler/task_scheduler_impl.cc', |
| 482 |
++ 'base/task_scheduler/task_tracker.cc', |
| 483 |
++ 'base/task_scheduler/task_traits.cc', |
| 484 |
+ 'base/third_party/dmg_fp/dtoa_wrapper.cc', |
| 485 |
+ 'base/third_party/dmg_fp/g_fmt.cc', |
| 486 |
+ 'base/third_party/icu/icu_utf.cc', |
Archives