danyspin97/hasufell-repository
1
0
Fork 0
forked from hasufell/hasufell-repository
Code Issues Pull Requests Releases Wiki Activity

net-www/inox*: bump to 54.0.2840.100

Browse Source
This commit is contained in:
Julian Ospald
2016-12-04 16:21:30 +01:00
parent d79dd8aba3
commit 3e60327bba
8 changed files with 351 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/net-www/inox/files/inox-53.0.2785.116-glibc-2.24-crash.patch Normal file
View File

@@ -0,0 +1,18 @@
Source: https://bugzilla.redhat.com/show_bug.cgi?id=1361157
Upstream: Reported, https://bugs.chromium.org/p/chromium/issues/detail?id=604652
Reason: Fix crashing tabs and extensions when chromium is build against glibc 2.24
--- a/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2016-08-03 21:02:37.000000000 +0200
+++ b/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2016-08-14 10:59:51.395354850 +0200
@@ -41,6 +41,11 @@
#include <errno.h>
#include <sys/mman.h>
+#if OS(LINUX) && defined(MADV_FREE)
+// Added in Linux 4.5, but we don't want to depend on 4.5 at runtime
+#undef MADV_FREE
+#endif
+
#ifndef MADV_FREE
#define MADV_FREE MADV_DONTNEED
#endif

59
packages/net-www/inox/files/inox-54.0.2840.90-system-jinja-r13.patch Normal file
View File

@@ -0,0 +1,59 @@
--- 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.

13
packages/net-www/inox/files/issue2248343002_1.patch
View File

@@ -1,13 +0,0 @@
Index: printing/backend/print_backend_cups.cc
diff --git a/printing/backend/print_backend_cups.cc b/printing/backend/print_backend_cups.cc
index 8bacfd76a7b0d891bd542ee19187c5b2701f0dbe..b469a1c657e5d383ed80961abb11a081ea8c8dce 100644
--- a/printing/backend/print_backend_cups.cc
+++ b/printing/backend/print_backend_cups.cc
@@ -4,6 +4,7 @@
#include "printing/backend/print_backend_cups.h"
+#include <cups/ppd.h>
#include <dlfcn.h>
#include <errno.h>
#include <pthread.h>

20
packages/net-www/inox/files/toolchain/BUILD.gn Normal file
View File

@@ -0,0 +1,20 @@
import("//build/toolchain/gcc_toolchain.gni")
gcc_toolchain("default") {
cc = getenv("CC")
cxx = getenv("CXX")
ar = getenv("AR")
nm = getenv("NM")
ld = cxx
extra_cflags = getenv("CFLAGS")
extra_cppflags = getenv("CPPFLAGS")
extra_cxxflags = getenv("CXXFLAGS")
extra_ldflags = getenv("LDFLAGS")
toolchain_args = {
current_cpu = current_cpu
current_os = current_os
}
}

7
packages/net-www/inox/inox-53.0.2785.143.exheres-0 → packages/net-www/inox/inox-54.0.2840.100.exheres-0
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="53.0.2785.101" ]
require inox [ patchset="54.0.2840.100" ]
DESCRIPTION+="
Chromium has three release channels: Stable, Beta, and Dev. This package corresponds to the Stable
@@ -16,10 +16,11 @@ 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.893
WIDEVINE_VERSION=1.4.8.903
DEFAULT_SRC_PREPARE_PATCHES=(
"${FILES}"/issue2248343002_1.patch
"${FILES}"/${PN}-53.0.2785.116-glibc-2.24-crash.patch
"${FILES}"/${PN}-54.0.2840.90-system-jinja-r13.patch
)
src_prepare() {