net-www/inox*: bump to 55.0.2883.87

2016-12-18 15:50:10 +01:00 · 2016-12-18 15:50:10 +01:00 · 8f05312012
commit 8f05312012
parent 8abe250ae6
6 changed files with 35 additions and 64 deletions
--- a/packages/net-www/exlibs/inox.exlib
+++ b/packages/net-www/exlibs/inox.exlib
@ -96,6 +96,7 @@ DEPENDENCIES="
        dev-libs/dbus-glib:1[>=0.84]
        dev-libs/expat
        dev-libs/glib:2[>=2.26] [[ note = [ for gsettings ] ]]
+        dev-libs/icu:=
        dev-libs/libxml2:2.0[>=2.6.32]
        dev-libs/libxslt[>=1.1.26]
        dev-libs/nspr[>=4.0]
@ -221,7 +222,6 @@ inox_src_prepare() {
        third_party/cld_2
        third_party/cld_3
        third_party/cros_system_api
-        third_party/cython/python_flags.py
        third_party/devscripts
        third_party/dom_distiller_js
        third_party/fips181
@ -232,7 +232,6 @@ inox_src_prepare() {
        third_party/google_input_tools/third_party/closure_library/third_party/closure
        third_party/hunspell
        third_party/iccjpeg
-        third_party/icu
        third_party/jstemplate
        third_party/khronos
        third_party/leveldatabase
@ -340,6 +339,7 @@ inox_src_configure() {
    local gn_system_libraries="
        flac
        harfbuzz-ng
+        icu
        libjpeg
        libpng
        libvpx
@ -532,7 +532,6 @@ inox_src_install() {

    insinto ${dest}
    doins -r *.pak locales resources
-    doins icudtl.dat
    doins -r *.bin

    doins libwidevinecdmadapter.so
--- a/packages/net-www/inox-flash-plugin/inox-flash-plugin-54.0.2840.100_1.exheres-0
+++ b/packages/net-www/inox-flash-plugin/inox-flash-plugin-54.0.2840.100_1.exheres-0
--- a/packages/net-www/inox-widevine-plugin/inox-widevine-plugin-54.0.2840.100_1.exheres-0
+++ b/packages/net-www/inox-widevine-plugin/inox-widevine-plugin-54.0.2840.100_1.exheres-0
--- a/packages/net-www/inox/files/inox-54.0.2840.90-system-jinja-r13.patch
+++ b/packages/net-www/inox/files/inox-54.0.2840.90-system-jinja-r13.patch
@ -1,59 +0,0 @@
--- a/third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig	2014-08-19 09:55:10.330972228 +0000
-+++ b/third_party/WebKit/Source/bindings/scripts/scripts.gyp	2014-08-19 09:55:26.387286232 +0000
-@@ -54,7 +54,6 @@
-     'actions': [{
-       'action_name': 'cache_jinja_templates',
-       'inputs': [
-        '<@(jinja_module_files)',
-         'code_generator_v8.py',
-         '<@(code_generator_template_files)',
-       ],
--- a/third_party/WebKit/Source/build/scripts/scripts.gypi.orig	2014-08-19 10:00:00.216521733 +0000
-+++ b/third_party/WebKit/Source/build/scripts/scripts.gypi	2014-08-19 10:00:11.464735099 +0000
-@@ -2,10 +2,6 @@
- {
-     'variables': {
-         'scripts_for_in_files': [
-            # jinja2/__init__.py contains version string, so sufficient as
-            # dependency for whole jinja2 package
-            '<(DEPTH)/third_party/jinja2/__init__.py',
-            '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-             'hasher.py',
-             'in_file.py',
-             'in_generator.py',
--- a/third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig	2014-08-19 10:53:02.824618979 +0000
-+++ b/third_party/WebKit/Source/bindings/scripts/scripts.gypi	2014-08-19 10:53:20.784957370 +0000
-@@ -12,9 +12,6 @@
-       '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-     ],
-     'idl_lexer_parser_files': [
-      # PLY (Python Lex-Yacc)
-      '<(DEPTH)/third_party/ply/lex.py',
-      '<(DEPTH)/third_party/ply/yacc.py',
-       # Web IDL lexer/parser (base parser)
-       '<(DEPTH)/tools/idl_parser/idl_lexer.py',
-       '<(DEPTH)/tools/idl_parser/idl_node.py',
--- 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/BUILD.gn.orig	2016-06-02 10:03:01.100658943 +0000
-+++ b/third_party/WebKit/Source/bindings/scripts/BUILD.gn	2016-06-02 10:03:13.240907715 +0000
-@@ -36,7 +36,7 @@
- action("cached_jinja_templates") {
-   script = "code_generator_v8.py"
- 
-  inputs = jinja_module_files + [ "code_generator_v8.py" ] +
-+  inputs = [ "code_generator_v8.py" ] +
-            code_generator_template_files
- 
-   # Dummy file to track dependency.
--- a/packages/net-www/inox/files/inox-55.0.2883.87-system-jinja-r14.patch
+++ b/packages/net-www/inox/files/inox-55.0.2883.87-system-jinja-r14.patch
@ -0,0 +1,31 @@
+--- 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",
--- a/packages/net-www/inox/inox-54.0.2840.100.exheres-0
+++ b/packages/net-www/inox/inox-54.0.2840.100.exheres-0
@ -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="54.0.2840.100" ]
+require inox [ patchset="55.0.2883.87" ]

 DESCRIPTION+="
 Chromium has three release channels: Stable, Beta, and Dev. This package corresponds to the Stable
@ -20,7 +20,7 @@ WIDEVINE_VERSION=1.4.8.903

 DEFAULT_SRC_PREPARE_PATCHES=(
    "${FILES}"/${PN}-53.0.2785.116-glibc-2.24-crash.patch
-    "${FILES}"/${PN}-54.0.2840.90-system-jinja-r13.patch
+    "${FILES}"/${PN}-55.0.2883.87-system-jinja-r14.patch
 )

 src_prepare() {