mirror of
https://gitdl.cn/https://github.com/chakralinux/gtk.git
synced 2025-01-24 01:42:13 +08:00
chromium 46.0.2490.80
This commit is contained in:
parent
98cdcb3140
commit
8352913ee7
@ -0,0 +1,218 @@
|
||||
From 7e84668966d8b844e11af9d60e1bc6979ab46b2c Mon Sep 17 00:00:00 2001
|
||||
From: Evangelos Foutras <evangelos@foutrelis.com>
|
||||
Date: Mon, 19 Oct 2015 12:00:28 +0300
|
||||
Subject: [PATCH] Add FPDFAPIJPEG_ prefix to more libjpeg functions
|
||||
|
||||
Chromium built with use_system_libjpeg=1 can mistakenly try to use
|
||||
symbols exported by the libjpeg library that's bundled with pdfium.
|
||||
|
||||
These name conflicts result in failure to encode the contents of a
|
||||
canvas element using toDataURL('image/jpeg').
|
||||
|
||||
BUG=505226
|
||||
---
|
||||
core/include/thirdparties/libjpeg/jpeglib.h | 35 +++++++++++++++++++++++++++++
|
||||
third_party/libjpeg/jpeglib.h | 35 +++++++++++++++++++++++++++++
|
||||
2 files changed, 70 insertions(+)
|
||||
|
||||
diff --git a/core/include/thirdparties/libjpeg/jpeglib.h b/core/include/thirdparties/libjpeg/jpeglib.h
|
||||
index 7de5ab7..f6af4f2 100644
|
||||
--- a/core/include/thirdparties/libjpeg/jpeglib.h
|
||||
+++ b/core/include/thirdparties/libjpeg/jpeglib.h
|
||||
@@ -20,33 +20,53 @@
|
||||
#define jdiv_round_up FOXIT_PREFIX(jdiv_round_up)
|
||||
#define jinit_1pass_quantizer FOXIT_PREFIX(jinit_1pass_quantizer)
|
||||
#define jinit_2pass_quantizer FOXIT_PREFIX(jinit_2pass_quantizer)
|
||||
+#define jinit_c_coef_controller FOXIT_PREFIX(jinit_c_coef_controller)
|
||||
+#define jinit_c_main_controller FOXIT_PREFIX(jinit_c_main_controller)
|
||||
+#define jinit_c_master_control FOXIT_PREFIX(jinit_c_master_control)
|
||||
+#define jinit_c_prep_controller FOXIT_PREFIX(jinit_c_prep_controller)
|
||||
+#define jinit_color_converter FOXIT_PREFIX(jinit_color_converter)
|
||||
#define jinit_color_deconverter FOXIT_PREFIX(jinit_color_deconverter)
|
||||
+#define jinit_compress_master FOXIT_PREFIX(jinit_compress_master)
|
||||
#define jinit_d_coef_controller FOXIT_PREFIX(jinit_d_coef_controller)
|
||||
#define jinit_d_main_controller FOXIT_PREFIX(jinit_d_main_controller)
|
||||
#define jinit_d_post_controller FOXIT_PREFIX(jinit_d_post_controller)
|
||||
+#define jinit_downsampler FOXIT_PREFIX(jinit_downsampler)
|
||||
+#define jinit_forward_dct FOXIT_PREFIX(jinit_forward_dct)
|
||||
#define jinit_huff_decoder FOXIT_PREFIX(jinit_huff_decoder)
|
||||
+#define jinit_huff_encoder FOXIT_PREFIX(jinit_huff_encoder)
|
||||
#define jinit_input_controller FOXIT_PREFIX(jinit_input_controller)
|
||||
#define jinit_inverse_dct FOXIT_PREFIX(jinit_inverse_dct)
|
||||
#define jinit_marker_reader FOXIT_PREFIX(jinit_marker_reader)
|
||||
+#define jinit_marker_writer FOXIT_PREFIX(jinit_marker_writer)
|
||||
#define jinit_master_decompress FOXIT_PREFIX(jinit_master_decompress)
|
||||
#define jinit_memory_mgr FOXIT_PREFIX(jinit_memory_mgr)
|
||||
#define jinit_merged_upsampler FOXIT_PREFIX(jinit_merged_upsampler)
|
||||
#define jinit_phuff_decoder FOXIT_PREFIX(jinit_phuff_decoder)
|
||||
+#define jinit_phuff_encoder FOXIT_PREFIX(jinit_phuff_encoder)
|
||||
#define jinit_upsampler FOXIT_PREFIX(jinit_upsampler)
|
||||
+#define jpeg_CreateCompress FOXIT_PREFIX(jpeg_CreateCompress)
|
||||
#define jpeg_CreateDecompress FOXIT_PREFIX(jpeg_CreateDecompress)
|
||||
#define jpeg_abort FOXIT_PREFIX(jpeg_abort)
|
||||
+#define jpeg_abort_compress FOXIT_PREFIX(jpeg_abort_compress)
|
||||
#define jpeg_abort_decompress FOXIT_PREFIX(jpeg_abort_decompress)
|
||||
+#define jpeg_add_quant_table FOXIT_PREFIX(jpeg_add_quant_table)
|
||||
#define jpeg_alloc_huff_table FOXIT_PREFIX(jpeg_alloc_huff_table)
|
||||
#define jpeg_alloc_quant_table FOXIT_PREFIX(jpeg_alloc_quant_table)
|
||||
#define jpeg_calc_output_dimensions FOXIT_PREFIX(jpeg_calc_output_dimensions)
|
||||
#define jpeg_consume_input FOXIT_PREFIX(jpeg_consume_input)
|
||||
+#define jpeg_default_colorspace FOXIT_PREFIX(jpeg_default_colorspace)
|
||||
#define jpeg_destroy FOXIT_PREFIX(jpeg_destroy)
|
||||
+#define jpeg_destroy_compress FOXIT_PREFIX(jpeg_destroy_compress)
|
||||
#define jpeg_destroy_decompress FOXIT_PREFIX(jpeg_destroy_decompress)
|
||||
+#define jpeg_fdct_ifast FOXIT_PREFIX(jpeg_fdct_ifast)
|
||||
+#define jpeg_fdct_islow FOXIT_PREFIX(jpeg_fdct_islow)
|
||||
#define jpeg_fill_bit_buffer FOXIT_PREFIX(jpeg_fill_bit_buffer)
|
||||
+#define jpeg_finish_compress FOXIT_PREFIX(jpeg_finish_compress)
|
||||
#define jpeg_finish_decompress FOXIT_PREFIX(jpeg_finish_decompress)
|
||||
#define jpeg_finish_output FOXIT_PREFIX(jpeg_finish_output)
|
||||
#define jpeg_free_large FOXIT_PREFIX(jpeg_free_large)
|
||||
#define jpeg_free_small FOXIT_PREFIX(jpeg_free_small)
|
||||
+#define jpeg_gen_optimal_table FOXIT_PREFIX(jpeg_gen_optimal_table)
|
||||
#define jpeg_get_large FOXIT_PREFIX(jpeg_get_large)
|
||||
#define jpeg_get_small FOXIT_PREFIX(jpeg_get_small)
|
||||
#define jpeg_has_multiple_scans FOXIT_PREFIX(jpeg_has_multiple_scans)
|
||||
@@ -58,6 +78,7 @@
|
||||
#define jpeg_idct_ifast FOXIT_PREFIX(jpeg_idct_ifast)
|
||||
#define jpeg_idct_islow FOXIT_PREFIX(jpeg_idct_islow)
|
||||
#define jpeg_input_complete FOXIT_PREFIX(jpeg_input_complete)
|
||||
+#define jpeg_make_c_derived_tbl FOXIT_PREFIX(jpeg_make_c_derived_tbl)
|
||||
#define jpeg_make_d_derived_tbl FOXIT_PREFIX(jpeg_make_d_derived_tbl)
|
||||
#define jpeg_mem_available FOXIT_PREFIX(jpeg_mem_available)
|
||||
#define jpeg_mem_init FOXIT_PREFIX(jpeg_mem_init)
|
||||
@@ -65,18 +86,32 @@
|
||||
#define jpeg_natural_order FOXIT_PREFIX(jpeg_natural_order)
|
||||
#define jpeg_new_colormap FOXIT_PREFIX(jpeg_new_colormap)
|
||||
#define jpeg_open_backing_store FOXIT_PREFIX(jpeg_open_backing_store)
|
||||
+#define jpeg_quality_scaling FOXIT_PREFIX(jpeg_quality_scaling)
|
||||
#define jpeg_read_coefficients FOXIT_PREFIX(jpeg_read_coefficients)
|
||||
#define jpeg_read_header FOXIT_PREFIX(jpeg_read_header)
|
||||
#define jpeg_read_raw_data FOXIT_PREFIX(jpeg_read_raw_data)
|
||||
#define jpeg_read_scanlines FOXIT_PREFIX(jpeg_read_scanlines)
|
||||
#define jpeg_resync_to_restart FOXIT_PREFIX(jpeg_resync_to_restart)
|
||||
#define jpeg_save_markers FOXIT_PREFIX(jpeg_save_markers)
|
||||
+#define jpeg_set_colorspace FOXIT_PREFIX(jpeg_set_colorspace)
|
||||
+#define jpeg_set_defaults FOXIT_PREFIX(jpeg_set_defaults)
|
||||
+#define jpeg_set_linear_quality FOXIT_PREFIX(jpeg_set_linear_quality)
|
||||
#define jpeg_set_marker_processor FOXIT_PREFIX(jpeg_set_marker_processor)
|
||||
+#define jpeg_set_quality FOXIT_PREFIX(jpeg_set_quality)
|
||||
+#define jpeg_simple_progression FOXIT_PREFIX(jpeg_simple_progression)
|
||||
+#define jpeg_start_compress FOXIT_PREFIX(jpeg_start_compress)
|
||||
#define jpeg_start_decompress FOXIT_PREFIX(jpeg_start_decompress)
|
||||
#define jpeg_start_output FOXIT_PREFIX(jpeg_start_output)
|
||||
#define jpeg_std_error FOXIT_PREFIX(jpeg_std_error)
|
||||
#define jpeg_std_message_table FOXIT_PREFIX(jpeg_std_message_table)
|
||||
#define jpeg_stdio_src FOXIT_PREFIX(jpeg_stdio_src)
|
||||
+#define jpeg_suppress_tables FOXIT_PREFIX(jpeg_suppress_tables)
|
||||
+#define jpeg_write_m_byte FOXIT_PREFIX(jpeg_write_m_byte)
|
||||
+#define jpeg_write_m_header FOXIT_PREFIX(jpeg_write_m_header)
|
||||
+#define jpeg_write_marker FOXIT_PREFIX(jpeg_write_marker)
|
||||
+#define jpeg_write_raw_data FOXIT_PREFIX(jpeg_write_raw_data)
|
||||
+#define jpeg_write_scanlines FOXIT_PREFIX(jpeg_write_scanlines)
|
||||
+#define jpeg_write_tables FOXIT_PREFIX(jpeg_write_tables)
|
||||
#define jround_up FOXIT_PREFIX(jround_up)
|
||||
#define jzero_far FOXIT_PREFIX(jzero_far)
|
||||
|
||||
diff --git a/third_party/libjpeg/jpeglib.h b/third_party/libjpeg/jpeglib.h
|
||||
index 7de5ab7..f6af4f2 100644
|
||||
--- a/third_party/libjpeg/jpeglib.h
|
||||
+++ b/third_party/libjpeg/jpeglib.h
|
||||
@@ -20,33 +20,53 @@
|
||||
#define jdiv_round_up FOXIT_PREFIX(jdiv_round_up)
|
||||
#define jinit_1pass_quantizer FOXIT_PREFIX(jinit_1pass_quantizer)
|
||||
#define jinit_2pass_quantizer FOXIT_PREFIX(jinit_2pass_quantizer)
|
||||
+#define jinit_c_coef_controller FOXIT_PREFIX(jinit_c_coef_controller)
|
||||
+#define jinit_c_main_controller FOXIT_PREFIX(jinit_c_main_controller)
|
||||
+#define jinit_c_master_control FOXIT_PREFIX(jinit_c_master_control)
|
||||
+#define jinit_c_prep_controller FOXIT_PREFIX(jinit_c_prep_controller)
|
||||
+#define jinit_color_converter FOXIT_PREFIX(jinit_color_converter)
|
||||
#define jinit_color_deconverter FOXIT_PREFIX(jinit_color_deconverter)
|
||||
+#define jinit_compress_master FOXIT_PREFIX(jinit_compress_master)
|
||||
#define jinit_d_coef_controller FOXIT_PREFIX(jinit_d_coef_controller)
|
||||
#define jinit_d_main_controller FOXIT_PREFIX(jinit_d_main_controller)
|
||||
#define jinit_d_post_controller FOXIT_PREFIX(jinit_d_post_controller)
|
||||
+#define jinit_downsampler FOXIT_PREFIX(jinit_downsampler)
|
||||
+#define jinit_forward_dct FOXIT_PREFIX(jinit_forward_dct)
|
||||
#define jinit_huff_decoder FOXIT_PREFIX(jinit_huff_decoder)
|
||||
+#define jinit_huff_encoder FOXIT_PREFIX(jinit_huff_encoder)
|
||||
#define jinit_input_controller FOXIT_PREFIX(jinit_input_controller)
|
||||
#define jinit_inverse_dct FOXIT_PREFIX(jinit_inverse_dct)
|
||||
#define jinit_marker_reader FOXIT_PREFIX(jinit_marker_reader)
|
||||
+#define jinit_marker_writer FOXIT_PREFIX(jinit_marker_writer)
|
||||
#define jinit_master_decompress FOXIT_PREFIX(jinit_master_decompress)
|
||||
#define jinit_memory_mgr FOXIT_PREFIX(jinit_memory_mgr)
|
||||
#define jinit_merged_upsampler FOXIT_PREFIX(jinit_merged_upsampler)
|
||||
#define jinit_phuff_decoder FOXIT_PREFIX(jinit_phuff_decoder)
|
||||
+#define jinit_phuff_encoder FOXIT_PREFIX(jinit_phuff_encoder)
|
||||
#define jinit_upsampler FOXIT_PREFIX(jinit_upsampler)
|
||||
+#define jpeg_CreateCompress FOXIT_PREFIX(jpeg_CreateCompress)
|
||||
#define jpeg_CreateDecompress FOXIT_PREFIX(jpeg_CreateDecompress)
|
||||
#define jpeg_abort FOXIT_PREFIX(jpeg_abort)
|
||||
+#define jpeg_abort_compress FOXIT_PREFIX(jpeg_abort_compress)
|
||||
#define jpeg_abort_decompress FOXIT_PREFIX(jpeg_abort_decompress)
|
||||
+#define jpeg_add_quant_table FOXIT_PREFIX(jpeg_add_quant_table)
|
||||
#define jpeg_alloc_huff_table FOXIT_PREFIX(jpeg_alloc_huff_table)
|
||||
#define jpeg_alloc_quant_table FOXIT_PREFIX(jpeg_alloc_quant_table)
|
||||
#define jpeg_calc_output_dimensions FOXIT_PREFIX(jpeg_calc_output_dimensions)
|
||||
#define jpeg_consume_input FOXIT_PREFIX(jpeg_consume_input)
|
||||
+#define jpeg_default_colorspace FOXIT_PREFIX(jpeg_default_colorspace)
|
||||
#define jpeg_destroy FOXIT_PREFIX(jpeg_destroy)
|
||||
+#define jpeg_destroy_compress FOXIT_PREFIX(jpeg_destroy_compress)
|
||||
#define jpeg_destroy_decompress FOXIT_PREFIX(jpeg_destroy_decompress)
|
||||
+#define jpeg_fdct_ifast FOXIT_PREFIX(jpeg_fdct_ifast)
|
||||
+#define jpeg_fdct_islow FOXIT_PREFIX(jpeg_fdct_islow)
|
||||
#define jpeg_fill_bit_buffer FOXIT_PREFIX(jpeg_fill_bit_buffer)
|
||||
+#define jpeg_finish_compress FOXIT_PREFIX(jpeg_finish_compress)
|
||||
#define jpeg_finish_decompress FOXIT_PREFIX(jpeg_finish_decompress)
|
||||
#define jpeg_finish_output FOXIT_PREFIX(jpeg_finish_output)
|
||||
#define jpeg_free_large FOXIT_PREFIX(jpeg_free_large)
|
||||
#define jpeg_free_small FOXIT_PREFIX(jpeg_free_small)
|
||||
+#define jpeg_gen_optimal_table FOXIT_PREFIX(jpeg_gen_optimal_table)
|
||||
#define jpeg_get_large FOXIT_PREFIX(jpeg_get_large)
|
||||
#define jpeg_get_small FOXIT_PREFIX(jpeg_get_small)
|
||||
#define jpeg_has_multiple_scans FOXIT_PREFIX(jpeg_has_multiple_scans)
|
||||
@@ -58,6 +78,7 @@
|
||||
#define jpeg_idct_ifast FOXIT_PREFIX(jpeg_idct_ifast)
|
||||
#define jpeg_idct_islow FOXIT_PREFIX(jpeg_idct_islow)
|
||||
#define jpeg_input_complete FOXIT_PREFIX(jpeg_input_complete)
|
||||
+#define jpeg_make_c_derived_tbl FOXIT_PREFIX(jpeg_make_c_derived_tbl)
|
||||
#define jpeg_make_d_derived_tbl FOXIT_PREFIX(jpeg_make_d_derived_tbl)
|
||||
#define jpeg_mem_available FOXIT_PREFIX(jpeg_mem_available)
|
||||
#define jpeg_mem_init FOXIT_PREFIX(jpeg_mem_init)
|
||||
@@ -65,18 +86,32 @@
|
||||
#define jpeg_natural_order FOXIT_PREFIX(jpeg_natural_order)
|
||||
#define jpeg_new_colormap FOXIT_PREFIX(jpeg_new_colormap)
|
||||
#define jpeg_open_backing_store FOXIT_PREFIX(jpeg_open_backing_store)
|
||||
+#define jpeg_quality_scaling FOXIT_PREFIX(jpeg_quality_scaling)
|
||||
#define jpeg_read_coefficients FOXIT_PREFIX(jpeg_read_coefficients)
|
||||
#define jpeg_read_header FOXIT_PREFIX(jpeg_read_header)
|
||||
#define jpeg_read_raw_data FOXIT_PREFIX(jpeg_read_raw_data)
|
||||
#define jpeg_read_scanlines FOXIT_PREFIX(jpeg_read_scanlines)
|
||||
#define jpeg_resync_to_restart FOXIT_PREFIX(jpeg_resync_to_restart)
|
||||
#define jpeg_save_markers FOXIT_PREFIX(jpeg_save_markers)
|
||||
+#define jpeg_set_colorspace FOXIT_PREFIX(jpeg_set_colorspace)
|
||||
+#define jpeg_set_defaults FOXIT_PREFIX(jpeg_set_defaults)
|
||||
+#define jpeg_set_linear_quality FOXIT_PREFIX(jpeg_set_linear_quality)
|
||||
#define jpeg_set_marker_processor FOXIT_PREFIX(jpeg_set_marker_processor)
|
||||
+#define jpeg_set_quality FOXIT_PREFIX(jpeg_set_quality)
|
||||
+#define jpeg_simple_progression FOXIT_PREFIX(jpeg_simple_progression)
|
||||
+#define jpeg_start_compress FOXIT_PREFIX(jpeg_start_compress)
|
||||
#define jpeg_start_decompress FOXIT_PREFIX(jpeg_start_decompress)
|
||||
#define jpeg_start_output FOXIT_PREFIX(jpeg_start_output)
|
||||
#define jpeg_std_error FOXIT_PREFIX(jpeg_std_error)
|
||||
#define jpeg_std_message_table FOXIT_PREFIX(jpeg_std_message_table)
|
||||
#define jpeg_stdio_src FOXIT_PREFIX(jpeg_stdio_src)
|
||||
+#define jpeg_suppress_tables FOXIT_PREFIX(jpeg_suppress_tables)
|
||||
+#define jpeg_write_m_byte FOXIT_PREFIX(jpeg_write_m_byte)
|
||||
+#define jpeg_write_m_header FOXIT_PREFIX(jpeg_write_m_header)
|
||||
+#define jpeg_write_marker FOXIT_PREFIX(jpeg_write_marker)
|
||||
+#define jpeg_write_raw_data FOXIT_PREFIX(jpeg_write_raw_data)
|
||||
+#define jpeg_write_scanlines FOXIT_PREFIX(jpeg_write_scanlines)
|
||||
+#define jpeg_write_tables FOXIT_PREFIX(jpeg_write_tables)
|
||||
#define jround_up FOXIT_PREFIX(jround_up)
|
||||
#define jzero_far FOXIT_PREFIX(jzero_far)
|
||||
|
||||
--
|
||||
2.6.1
|
||||
|
@ -1,36 +0,0 @@
|
||||
From 241364c6f4d44165ce2dc707b9ad141dcc880d1b Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 27 Jun 2015 13:29:52 -0700
|
||||
Subject: [PATCH] Demand for newer POSIX macro
|
||||
|
||||
Reason for change: Define _POSIX_C_SOURCE such that it demands correct
|
||||
posix interfaces, netdb.h declares interfaces such as
|
||||
getaddrinfo if __USE_POSIX, i.e. POSIX.1:1990 or later.
|
||||
However, these interfaces were new in the 2001 edition of POSIX
|
||||
therefore ask for Extension from POSIX.1:2001 since we use addrinfo
|
||||
structure here.
|
||||
|
||||
Change-Id: Icb1c92745d1a0ca958108ae80c270c630628729e
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Reviewed-on: https://boringssl-review.googlesource.com/5253
|
||||
Reviewed-by: Adam Langley <agl@google.com>
|
||||
---
|
||||
crypto/bio/socket_helper.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/crypto/bio/socket_helper.c b/crypto/bio/socket_helper.c
|
||||
index b1cdd1a..481278f 100644
|
||||
--- a/crypto/bio/socket_helper.c
|
||||
+++ b/crypto/bio/socket_helper.c
|
||||
@@ -12,7 +12,7 @@
|
||||
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
|
||||
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
|
||||
|
||||
-#define _POSIX_SOURCE
|
||||
+#define _POSIX_C_SOURCE 200112L
|
||||
|
||||
#include <openssl/bio.h>
|
||||
#include <openssl/err.h>
|
||||
--
|
||||
2.5.0
|
||||
|
@ -1,5 +1,5 @@
|
||||
pkgname=chromium
|
||||
pkgver=45.0.2454.101
|
||||
pkgver=46.0.2490.80
|
||||
pkgrel=1
|
||||
pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser. Include PepperFlash and libpdf plugins"
|
||||
arch=('x86_64')
|
||||
@ -7,7 +7,7 @@ url="http://www.chromium.org/"
|
||||
license=('BSD')
|
||||
depends=('gtk2' 'dbus-glib' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' 'libxss' 'libgcrypt'
|
||||
'ttf-dejavu' 'dbus' 'desktop-file-utils' 'hicolor-icon-theme' 'systemd' 'speech-dispatcher'
|
||||
'flac' 'opus' 'libxml2' 'libpulse' 'icu' 'zlib' 'harfbuzz' 'glib2' 'libexif')
|
||||
'flac' 'opus' 'libxml2' 'libpulse' 'icu' 'zlib' 'harfbuzz' 'glib2' 'libexif' 'libxslt')
|
||||
makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring' 'elfutils' 'lib32-gcc-libs'
|
||||
'subversion' 'ninja' 'clang')
|
||||
optdepends=('pepperflashplugin: Pepper Flash plugin')
|
||||
@ -22,9 +22,9 @@ source=(http://commondatastorage.googleapis.com/chromium-browser-official/${pkgn
|
||||
search_engine_type.diff
|
||||
prepopulated_engines_json.diff
|
||||
chromium-widevine.patch
|
||||
0001-Demand-for-newer-POSIX-macro.patch)
|
||||
0001-Add-FPDFAPIJPEG_-prefix-to-more-libjpeg-functions.patch)
|
||||
|
||||
sha1sums=('2256960eae4f92f421adbeccb997cb92534749eb'
|
||||
sha1sums=('589341fc5bd931ea6525c7da629dae27c85b391c'
|
||||
'1ffba5152cb749300a016efec909b828eba9a64a'
|
||||
'3ab45403f3e8ddfeeba6a5aee9f683d57883fb90'
|
||||
'19eff765ec1316f4ae057d48919b2fdd6b3a5bea'
|
||||
@ -33,7 +33,7 @@ sha1sums=('2256960eae4f92f421adbeccb997cb92534749eb'
|
||||
'abeb1e424b35bbca954a5afea39418a5e198ac64'
|
||||
'79fc829d740183d85fb147a3a44e572a8f304dbe'
|
||||
'6e9f007005dabd1f254304abccfa39f3b8275eea'
|
||||
'aae9267ef4a0542c2dc4c944d8018e65a684c7af')
|
||||
'8327cf96c653af4c9a2e53d6b0ba17530389c970')
|
||||
|
||||
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
|
||||
# Note: These are for Chakra Linux use ONLY. For your own distribution, please
|
||||
@ -44,10 +44,13 @@ _google_default_client_secret=TPvjII_2SwZn_9Ic0kRKqjtG
|
||||
|
||||
prepare() {
|
||||
cd "$srcdir/$pkgname-$pkgver"
|
||||
|
||||
# Fix BoringSSL build with glibc 2.22 (FS#45965)
|
||||
patch -Np1 -d third_party/boringssl/src < ../0001-Demand-for-newer-POSIX-macro.patch
|
||||
|
||||
# https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/9JX1N2nf4PU/discussion
|
||||
touch chrome/test/data/webui/i18n_process_css_test.html
|
||||
|
||||
# https://code.google.com/p/chromium/issues/detail?id=505226
|
||||
patch -d third_party/pdfium -Np1 <../0001-Add-FPDFAPIJPEG_-prefix-to-more-libjpeg-functions.patch
|
||||
|
||||
# Set DDG as default search
|
||||
patch -p1 -i "$srcdir/template_url_prepopulate_data.diff"
|
||||
patch -p1 -i "$srcdir/search_engine_type.diff"
|
||||
@ -100,6 +103,8 @@ build() {
|
||||
-Dlinux_use_bundled_gold=0
|
||||
-Dlinux_use_gold_flags=0
|
||||
-Dlogging_like_official_build=1
|
||||
-Dtracing_like_official_build=1
|
||||
-Dfieldtrial_testing_like_official_build=1
|
||||
-Drelease_extra_cflags="$CFLAGS"
|
||||
-Dlibspeechd_h_prefix=speech-dispatcher/
|
||||
-Dffmpeg_branding=Chrome
|
||||
|
Loading…
Reference in New Issue
Block a user