net-www/inox*: bump to 56.0.2924.87

This commit is contained in:
Julian Ospald 2017-02-17 14:45:07 +01:00
parent 21a098e52d
commit 14e75d9384
No known key found for this signature in database
GPG Key ID: 511B62C09D50CD28
5 changed files with 11 additions and 40 deletions

View File

@ -79,10 +79,8 @@ DEPENDENCIES="
dev-lang/python:*[>=2.5&<3]
dev-lang/yasm
dev-perl/Switch
dev-python/Jinja2[python_abis:2.7]
dev-python/beautifulsoup4[python_abis:2.7]
dev-python/html5lib[python_abis:2.7]
dev-python/ply[python_abis:2.7]
dev-python/simplejson[python_abis:2.7]
dev-scm/git [[ note = [ https://bugs.gentoo.org/show_bug.cgi?id=593476 ] ]]
dev-util/gperf[>=3.0.4]
@ -107,7 +105,7 @@ DEPENDENCIES="
media-libs/freetype:2
media-libs/libpng:=[>=1.2.37]
media-libs/libvpx[>=1.6.0-r1]
media-libs/libwebp[>=0.4]
media-libs/libwebp:=[>=0.4]
media-libs/opus[>=1.1-r1]
media-libs/speex
net-libs/libsrtp
@ -120,7 +118,7 @@ DEPENDENCIES="
virtual/usb:1
x11-libs/cairo[X]
x11-libs/gdk-pixbuf:2.0
providers:gtk2? ( x11-libs/gtk+:2[>=2.16.0] )
providers:gtk2? ( x11-libs/gtk+:2[>=2.16] )
providers:gtk3? ( x11-libs/gtk+:3 )
x11-libs/harfbuzz
x11-libs/libX11
@ -138,7 +136,7 @@ DEPENDENCIES="
cups? (
dev-libs/libgcrypt
net-print/cups
providers:gtk2? ( x11-libs/gtk+:2[>=2.16.0][cups] )
providers:gtk2? ( x11-libs/gtk+:2[>=2.16][cups] )
providers:gtk3? ( x11-libs/gtk+:3[cups] )
)
gconf? ( gnome-platform/GConf:2 )
@ -177,7 +175,7 @@ inox_src_prepare() {
# odd upstream git versioning
edo rm -r "${WORKBASE}"/inox-patchset-${PATCHSET}/archive
# this one is unneded and doesn't apply cleanly
edo rm "${WORKBASE}"/inox-patchset-${PATCHSET}/launcher-branding.patch
edo rm "${WORKBASE}"/inox-patchset-${PATCHSET}/*launcher-branding.patch
# fire up the inox patches
expatch "${WORKBASE}"/inox-patchset-${PATCHSET}/
@ -232,6 +230,8 @@ inox_src_prepare() {
third_party/google_input_tools/third_party/closure_library/third_party/closure
third_party/hunspell
third_party/iccjpeg
third_party/inspector_protocol
third_party/jinja2
third_party/jstemplate
third_party/khronos
third_party/leveldatabase
@ -248,6 +248,7 @@ inox_src_prepare() {
third_party/libyuv
third_party/lss
third_party/lzma_sdk
third_party/markupsafe
third_party/mesa
third_party/modp_b64
third_party/mt19937ar
@ -266,6 +267,7 @@ inox_src_prepare() {
third_party/pdfium/third_party/libpng16
third_party/pdfium/third_party/libtiff
third_party/pdfium/third_party/zlib_v128
third_party/ply
third_party/polymer
third_party/protobuf
third_party/protobuf/third_party/six
@ -285,6 +287,7 @@ inox_src_prepare() {
third_party/zlib/google
url/third_party/mozilla
v8/src/third_party/valgrind
v8/third_party/inspector_protocol
)
# TODO: keep for GN builds

View File

@ -1,31 +0,0 @@
--- a/third_party/WebKit/Source/build/scripts/scripts.gni.orig 2016-06-02 09:54:28.510152077 +0000
+++ b/third_party/WebKit/Source/build/scripts/scripts.gni 2016-06-02 09:54:50.966612510 +0000
@@ -9,10 +9,6 @@
_scripts_dir = "//third_party/WebKit/Source/build/scripts"
scripts_for_in_files = [
- # jinja2/__init__.py contains version string, so sufficient as
- # dependency for whole jinja2 package
- "//third_party/jinja2/__init__.py",
- "//third_party/markupsafe/__init__.py", # jinja2 dep
"$_scripts_dir/hasher.py",
"$_scripts_dir/in_file.py",
"$_scripts_dir/in_generator.py",
--- a/third_party/WebKit/Source/bindings/scripts/scripts.gni.orig 2016-09-09 13:40:51.971660406 +0000
+++ b/third_party/WebKit/Source/bindings/scripts/scripts.gni 2016-09-09 13:41:15.472141236 +0000
@@ -9,15 +9,9 @@
bindings_scripts_output_dir = "$root_gen_dir/blink/bindings/scripts"
jinja_module_files = [
- "//third_party/jinja2/__init__.py",
- "//third_party/markupsafe/__init__.py", # jinja2 dep
]
idl_lexer_parser_files = get_path_info([
- # PLY (Python Lex-Yacc)
- "//third_party/ply/lex.py",
- "//third_party/ply/yacc.py",
-
# Web IDL lexer/parser (base parser)
"//tools/idl_parser/idl_lexer.py",
"//tools/idl_parser/idl_node.py",

View File

@ -2,7 +2,7 @@
# Copyright 2009 Heiko Przybyl <zuxez@cs.tu-berlin.de>
# Distributed under the terms of the GNU General Public License v2
require inox [ patchset="55.0.2883.87" ]
require inox [ patchset="56.0.2924.87" ]
DESCRIPTION+="
Chromium has three release channels: Stable, Beta, and Dev. This package corresponds to the Stable
@ -16,11 +16,10 @@ RESTRICT=test
# http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${PV}-1_{amd64,i386}.deb
# $ strings ./opt/google/chrome/chrome | grep -C 1 " (version:" | head -1
WIDEVINE_VERSION=1.4.8.903
WIDEVINE_VERSION=1.4.8.962
DEFAULT_SRC_PREPARE_PATCHES=(
"${FILES}"/${PN}-53.0.2785.116-glibc-2.24-crash.patch
"${FILES}"/${PN}-55.0.2883.87-system-jinja-r14.patch
)
src_prepare() {