[Pkg-chromium-commit] [pkg-chromium] 02/02: release 47.0.2526.80-3
Michael Gilbert
mgilbert at moszumanska.debian.org
Sun Dec 20 00:04:49 UTC 2015
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository pkg-chromium.
commit fb846a6b9785b88a35b037c8eba61fc2dd4a1634
Author: Michael Gilbert <mgilbert at debian.org>
Date: Sun Dec 20 00:04:24 2015 +0000
release 47.0.2526.80-3
---
debian/changelog | 9 ++
debian/chromium.install | 2 +
debian/patches/fullscreen-ui.patch | 11 --
debian/patches/series | 2 +-
debian/patches/system/jpeg.patch | 210 +++++++++++++++++++++++++++++++++++++
debian/rules | 4 +-
debian/scripts/chromium | 2 +-
7 files changed, 226 insertions(+), 14 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e0a295f..717ee85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+chromium-browser (47.0.2526.80-3) unstable; urgency=medium
+
+ * Drop change to the fullscreen UI (closes: #808076).
+ * Fix installation of the English language pak (closes: #808046).
+ * Avoid symbol conflicts between the jpeg library embedded in pdfium and
+ the system jpeg library (closes: #794031).
+
+ -- Michael Gilbert <mgilbert at debian.org> Wed, 16 Dec 2015 02:27:17 +0000
+
chromium-browser (47.0.2526.80-2) unstable; urgency=medium
* Greatly simplify the arch:all build.
diff --git a/debian/chromium.install b/debian/chromium.install
index 64dea6b..5e0256f 100644
--- a/debian/chromium.install
+++ b/debian/chromium.install
@@ -5,6 +5,8 @@ out/Release/*.bin usr/lib/chromium
out/Release/*.pak usr/lib/chromium
out/Release/icudtl.dat usr/lib/chromium
+out/Release/resources/en-US.pak usr/lib/chromium/locales
+
debian/presubj usr/share/bug/chromium
debian/master_preferences usr/share/chromium
diff --git a/debian/patches/fullscreen-ui.patch b/debian/patches/fullscreen-ui.patch
deleted file mode 100644
index 98fa363..0000000
--- a/debian/patches/fullscreen-ui.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/chrome/browser/ui/views/frame/browser_view.cc
-+++ b/chrome/browser/ui/views/frame/browser_view.cc
-@@ -1009,6 +1009,8 @@ void BrowserView::UpdateExclusiveAccessE
- }
-
- bool BrowserView::ShouldHideUIForFullscreen() const {
-+ return false;
-+
- // Immersive mode needs UI for the slide-down top panel.
- if (immersive_mode_controller_->IsEnabled())
- return false;
diff --git a/debian/patches/series b/debian/patches/series
index f68e839..7252704 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,10 +8,10 @@ disable/default-browser-warning.patch
ps-print.patch
gpu-timeout.patch
-fullscreen-ui.patch
master-preferences.patch
chromedriver-revision.patch
+system/jpeg.patch
system/nspr.patch
system/clang.patch
# system/vaapi.patch
diff --git a/debian/patches/system/jpeg.patch b/debian/patches/system/jpeg.patch
new file mode 100644
index 0000000..8e92072
--- /dev/null
+++ b/debian/patches/system/jpeg.patch
@@ -0,0 +1,210 @@
+From 7e84668966d8b844e11af9d60e1bc6979ab46b2c Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos at 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(+)
+
+--- a/third_party/pdfium/core/include/thirdparties/libjpeg/jpeglib.h
++++ b/third_party/pdfium/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)
+
+--- a/third_party/pdfium/third_party/libjpeg/jpeglib.h
++++ b/third_party/pdfium/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)
diff --git a/debian/rules b/debian/rules
index 81a7666..8e6e008 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
export LDFLAGS+=-Wl,--no-keep-memory -Wl,--reduce-memory-overheads -Wl,--hash-size=7919
# more verbose linker output
-export LDFLAGS+=-Wl,--trace -Wl,--print-memory-usage
+export LDFLAGS+=-Wl,--stats
# treat all warnings as errors
defines=werror=
@@ -112,10 +112,12 @@ override_dh_auto_build-arch:
mv out/Release/chrome out/Release/chromium || true
mv out/Release/chrome.1 out/Release/chromium.1 || true
mv out/Release/chrome_sandbox out/Release/chrome-sandbox || true
+ mv out/Release/locales/en-US.pak out/Release/resources || true
chmod 4755 out/Release/chrome-sandbox # suid sandbox
override_dh_auto_build-indep:
ninja $(njobs) -C out/Release packed_resources
+ rm -f out/Release/locales/en-US.pak
override_dh_auto_install-arch:
dh_auto_install
diff --git a/debian/scripts/chromium b/debian/scripts/chromium
index 1219b90..b388bc2 100644
--- a/debian/scripts/chromium
+++ b/debian/scripts/chromium
@@ -51,7 +51,7 @@ export CHROME_DESKTOP="chromium.desktop"
# Set CHROME_VERSION_EXTRA text, which is displayed in the About dialog
DIST=`cat /etc/debian_version`
-export CHROME_VERSION_EXTRA="Built on Debian $BUILD_DIST, running on Debian $DIST"
+export CHROME_VERSION_EXTRA="built on Debian $BUILD_DIST, running on Debian $DIST"
want_debug=0
want_temp_profile=0
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-chromium/pkg-chromium.git
More information about the Pkg-chromium-commit
mailing list