Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c412340facae5f83e0a3bb8fe72fcaa3ef9f0a8f
commit c412340facae5f83e0a3bb8fe72fcaa3ef9f0a8f Author: DeX77 <[email protected]> Date: Sun Dec 4 16:46:14 2016 +0100 chromium-browser-55.0.2883.75-1-x86_64 * version bump diff --git a/source/xapps-extra/chromium-browser/FrugalBuild b/source/xapps-extra/chromium-browser/FrugalBuild index 3a725a0..b2f5563 100644 --- a/source/xapps-extra/chromium-browser/FrugalBuild +++ b/source/xapps-extra/chromium-browser/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Marius Cirsta <[email protected]> pkgname=chromium-browser -pkgver=54.0.2840.100 +pkgver=55.0.2883.75 pkgrel=1 pkgdesc='Development version of Chromium browser' url='http://www.chromium.org/' @@ -25,8 +25,8 @@ up2date="lynx -dump 'http://chromium.woolyss.com/#stable-chromium-version' | \ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${pkgver}.tar.xz \ $pkgname.desktop \ $pkgname.sh \ - chromium-system-jinja-r13.patch \ - chromium-system-ffmpeg-r3.patch \ + chromium-system-jinja-r14.patch \ + chromium-system-ffmpeg-r4.patch \ gtk2_disable_fix.patch \ chromium-last-commit-position-r1.patch \ chromium-52.0.2743.116-unset-madv_free.patch \ @@ -35,13 +35,12 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom chromium-47.0.2526.80-nacl-ignore-broken-fd-counter.patch \ chromium-52.0.2723.2-use_system_harfbuzz.patch \ chromium-52.0.2743.82-widevinefix.patch \ - chromium-54.0.2840.59-gcc5.patch \ chromium-54.0.2840.59-nullfix.patch) -sha1sums=('bf51814c569110714a4b1266f96c5bbc45af1a80' \ +sha1sums=('8a36da476a83068871ea0e6b1a92cb52b7f049be' \ '264b8e7c4e3273263d504e041e5e4d152677922c' \ '4c41d59b4d85a9f0443d6ca1dec456e50059dab5' \ - 'c121b8ab729efc99040a2908d763110428c62b72' \ - '07331ea52fdbf30b1bddc66d439921016d2bf720' \ + 'cb2fd59666b2904546d27e863613db515633a5f4' \ + 'e7db42be95f3ca28a270df45d884b12f66686716' \ 'f67ed24248c0ec152908d8c206c0efebe2a92997' \ 'd03e6465cd5a84580f9dad5d45f24ccd42bb71e6' \ '17ba326edbd5df0aba71958d9eea56ba9653c995' \ @@ -50,7 +49,6 @@ sha1sums=('bf51814c569110714a4b1266f96c5bbc45af1a80' \ 'af663b4b7a7a9e6f0075c4f60f0b4310a77d2d89' \ '4ac2af324c6927507d214ba3b6512ad1a879a2ff' \ '452ca515e91ff27957ee1b5dfd975f2daabc5b64' \ - '196755fc44de6fac4863495feb70b92ee971c5d6' \ 'a3e76fd3e890eabab86d14fc41ca9b17b03317e4') chromium_path="chromium" @@ -70,7 +68,7 @@ _google_default_client_secret='2bNvMsN-57D44Q5ireW62LcZ' build() { - Fcd + Fcd Fpatchall conditional_bundled_libraries+=" @@ -205,11 +203,11 @@ build() { zlib ffmpeg" - Fexec build/linux/unbundle/replace_gn_files.py --system-libraries ${gn_system_libraries} + Fexec build/linux/unbundle/replace_gn_files.py --system-libraries ${gn_system_libraries} || Fdie - Fexec touch chrome/test/data/webui/i18n_process_css_test.html + Fexec touch chrome/test/data/webui/i18n_process_css_test.html || Fdie - Fexec third_party/libaddressinput/chromium/tools/update-strings.py + Fexec third_party/libaddressinput/chromium/tools/update-strings.py || Fdie myconf_gn+=" is_debug=false" # myconf_gn+=" is_debug=true" @@ -250,11 +248,11 @@ build() { myconf_gn+=" treat_warnings_as_errors=false" myconf_gn+=" fatal_linker_warnings=false" - Fexec tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn}" + Fexec tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn}" || Fdie Fexec out/Release/gn gen --args="${myconf_gn}" out/Release || Fdie - Fexec ninja -C out/Release chrome chrome_sandbox chromedriver + Fexec ninja -C out/Release chrome chrome_sandbox chromedriver || Fdie Fmkdir usr/lib/${chromium_path} Fexerel out/Release/chrome usr/lib/${chromium_path}/chromium diff --git a/source/xapps-extra/chromium-browser/chromium-system-ffmpeg-r2.patch b/source/xapps-extra/chromium-browser/chromium-system-ffmpeg-r2.patch deleted file mode 100644 index 8d67ef3..0000000 --- a/source/xapps-extra/chromium-browser/chromium-system-ffmpeg-r2.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/media/ffmpeg/ffmpeg_common.h 2015-11-27 12:01:56.155462264 +0000 -+++ b/media/ffmpeg/ffmpeg_common.h 2015-11-27 12:03:03.348846300 +0000 -@@ -19,10 +19,6 @@ - - // Include FFmpeg header files. - extern "C" { --// Disable deprecated features which result in spammy compile warnings. This --// list of defines must mirror those in the 'defines' section of BUILD.gn file & --// ffmpeg.gyp file or the headers below will generate different structures! --#define FF_API_CONVERGENCE_DURATION 0 - // Upstream libavcodec/utils.c still uses the deprecated - // av_dup_packet(), causing deprecation warnings. - // The normal fix for such things is to disable the feature as below, -@@ -36,7 +32,6 @@ - MSVC_PUSH_DISABLE_WARNING(4244); - #include <libavcodec/avcodec.h> - #include <libavformat/avformat.h> --#include <libavformat/internal.h> - #include <libavformat/avio.h> - #include <libavutil/avutil.h> - #include <libavutil/imgutils.h> -diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc -index 155e980..7ba327a 100644 ---- a/media/filters/ffmpeg_demuxer.cc -+++ b/media/filters/ffmpeg_demuxer.cc -@@ -1034,24 +1034,6 @@ - // If no estimate is found, the stream entry will be kInfiniteDuration(). - std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams, - kInfiniteDuration()); -- const AVFormatInternal* internal = format_context->internal; -- if (internal && internal->packet_buffer && -- format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) { -- struct AVPacketList* packet_buffer = internal->packet_buffer; -- while (packet_buffer != internal->packet_buffer_end) { -- DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index), -- start_time_estimates.size()); -- const AVStream* stream = -- format_context->streams[packet_buffer->pkt.stream_index]; -- if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) { -- const base::TimeDelta packet_pts = -- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts); -- if (packet_pts < start_time_estimates[stream->index]) -- start_time_estimates[stream->index] = packet_pts; -- } -- packet_buffer = packet_buffer->next; -- } -- } - - AVStream* audio_stream = NULL; - AudioDecoderConfig audio_config; diff --git a/source/xapps-extra/chromium-browser/chromium-system-ffmpeg-r3.patch b/source/xapps-extra/chromium-browser/chromium-system-ffmpeg-r4.patch similarity index 79% rename from source/xapps-extra/chromium-browser/chromium-system-ffmpeg-r3.patch rename to source/xapps-extra/chromium-browser/chromium-system-ffmpeg-r4.patch index 023dd26..3abfc16 100644 --- a/source/xapps-extra/chromium-browser/chromium-system-ffmpeg-r3.patch +++ b/source/xapps-extra/chromium-browser/chromium-system-ffmpeg-r4.patch @@ -1,17 +1,17 @@ ---- a/media/ffmpeg/ffmpeg_common.h 2015-11-27 12:01:56.155462264 +0000 -+++ b/media/ffmpeg/ffmpeg_common.h 2015-11-27 12:03:03.348846300 +0000 -@@ -19,10 +19,6 @@ +--- a/media/ffmpeg/ffmpeg_common.h.orig 2016-09-09 13:16:07.757294768 +0000 ++++ b/media/ffmpeg/ffmpeg_common.h 2016-09-09 13:16:41.705989273 +0000 +@@ -22,10 +22,6 @@ // Include FFmpeg header files. extern "C" { -// Disable deprecated features which result in spammy compile warnings. This --// list of defines must mirror those in the 'defines' section of BUILD.gn file & --// ffmpeg.gyp file or the headers below will generate different structures! +-// list of defines must mirror those in the 'defines' section of FFmpeg's +-// BUILD.gn file or the headers below will generate different structures! -#define FF_API_CONVERGENCE_DURATION 0 // Upstream libavcodec/utils.c still uses the deprecated // av_dup_packet(), causing deprecation warnings. // The normal fix for such things is to disable the feature as below, -@@ -36,7 +32,6 @@ +@@ -35,7 +35,6 @@ MSVC_PUSH_DISABLE_WARNING(4244); #include <libavcodec/avcodec.h> #include <libavformat/avformat.h> @@ -19,9 +19,9 @@ #include <libavformat/avio.h> #include <libavutil/avutil.h> #include <libavutil/imgutils.h> ---- a/media/filters/ffmpeg_demuxer.cc.orig 2016-08-01 10:52:01.528177808 +0000 -+++ b/media/filters/ffmpeg_demuxer.cc 2016-08-01 10:52:27.160707694 +0000 -@@ -1150,24 +1150,6 @@ +--- a/media/filters/ffmpeg_demuxer.cc.orig 2016-09-09 14:21:40.185828912 +0000 ++++ b/media/filters/ffmpeg_demuxer.cc 2016-09-09 14:21:52.894089352 +0000 +@@ -1185,24 +1185,6 @@ // If no estimate is found, the stream entry will be kInfiniteDuration. std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams, kInfiniteDuration); @@ -45,4 +45,4 @@ - } std::unique_ptr<MediaTracks> media_tracks(new MediaTracks()); - AVStream* audio_stream = NULL; + diff --git a/source/xapps-extra/chromium-browser/chromium-system-jinja-r13.patch b/source/xapps-extra/chromium-browser/chromium-system-jinja-r13.patch deleted file mode 100644 index 845ac94..0000000 --- a/source/xapps-extra/chromium-browser/chromium-system-jinja-r13.patch +++ /dev/null @@ -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. diff --git a/source/xapps-extra/chromium-browser/chromium-system-jinja-r14.patch b/source/xapps-extra/chromium-browser/chromium-system-jinja-r14.patch new file mode 100644 index 0000000..4dba044 --- /dev/null +++ b/source/xapps-extra/chromium-browser/chromium-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", _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
