Djam/chromium-browser-stable
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/chromium-browser-stable.git synced 2025-02-23 14:42:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3 from alekseyz/chromium-browser-stable:rosa2014.1

Browse source 
Updated to 60.0.3112.90
This commit is contained in:
alzim 2017-08-14 12:19:28 +03:00
commit cd582d4b6d
16 changed files with 195 additions and 242 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.abf.yml
View file

@ -1,6 +1,5 @@
sources:
chromium-59.0.3071.115.tar.xz: 78d2fbded029f7bcb9b51e6aa0f2d99c4df935c2
chromium-60.0.3112.90.tar.xz: 4188fd736efdac2d7ffcbd9b9310de8e902e1b50
depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5
freetype2-5a3490e054bda8a318ebde482c7fb30213cab3d9.tar.xz: 017a2252d1363ae1a1e9c5ebf325a91a2018be1b
icons.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3
new-system-icons.tar.xz: 89339b8b3b05359a8745ed7968fe148902a2fa28

44
chromium-43-no-ffmpeg-internal.patch
View file

@ -1,44 +0,0 @@
diff -up chromium-55.0.2873.0/media/ffmpeg/ffmpeg_common.h.no-ffmpeg-internal chromium-55.0.2873.0/media/ffmpeg/ffmpeg_common.h
--- chromium-55.0.2873.0/media/ffmpeg/ffmpeg_common.h.no-ffmpeg-internal 2016-10-01 13:50:19.637104288 +0200
+++ chromium-55.0.2873.0/media/ffmpeg/ffmpeg_common.h 2016-10-01 13:50:19.680103748 +0200
@@ -27,7 +27,6 @@ extern "C" {
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 -up chromium-55.0.2873.0/media/filters/ffmpeg_demuxer.cc.no-ffmpeg-internal chromium-55.0.2873.0/media/filters/ffmpeg_demuxer.cc
--- chromium-55.0.2873.0/media/filters/ffmpeg_demuxer.cc.no-ffmpeg-internal 2016-10-01 13:50:19.682103722 +0200
+++ chromium-55.0.2873.0/media/filters/ffmpeg_demuxer.cc 2016-10-01 13:54:34.142904717 +0200
@@ -1223,29 +1223,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);
- // We ignore kNoTimestamp here since -int64_t::min() is possible; see
- // https://crbug.com/700501. Technically this is a valid value, but in
- // practice shouldn't occur, so just ignore it when estimating.
- if (packet_pts != kNoTimestamp && packet_pts != kInfiniteDuration &&
- packet_pts < start_time_estimates[stream->index]) {
- start_time_estimates[stream->index] = packet_pts;
- }
- }
- packet_buffer = packet_buffer->next;
- }
- }
std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());

139
chromium-52-pdfium-system-libtiff-libpng.patch
View file

@ -1,7 +1,7 @@
diff -up chromium-55.0.2883.11/third_party/pdfium/BUILD.gn.pdfium-system-libtiff-libpng chromium-55.0.2883.11/third_party/pdfium/BUILD.gn
--- chromium-55.0.2883.11/third_party/pdfium/BUILD.gn.pdfium-system-libtiff-libpng 2016-10-14 00:04:44.000000000 +0200
+++ chromium-55.0.2883.11/third_party/pdfium/BUILD.gn 2016-10-15 12:25:53.045704800 +0200
@@ -19,7 +19,6 @@
diff -up chromium-60.0.3112.40/third_party/pdfium/BUILD.gn.pdfium-system-libtiff-libpng chromium-60.0.3112.40/third_party/pdfium/BUILD.gn
--- chromium-60.0.3112.40/third_party/pdfium/BUILD.gn.pdfium-system-libtiff-libpng 2017-06-22 00:04:09.000000000 +0200
+++ chromium-60.0.3112.40/third_party/pdfium/BUILD.gn 2017-06-24 00:05:50.521671902 +0200
@@ -19,7 +19,6 @@ config("pdfium_common_config") {
ldflags = []
include_dirs = [ "." ]
defines = [
@ -9,55 +9,10 @@ diff -up chromium-55.0.2883.11/third_party/pdfium/BUILD.gn.pdfium-system-libtiff
"PNG_PREFIX",
"PNG_USE_READ_MACROS",
]
diff -up chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/codec_int.h.pdfium-system-libtiff-libpng chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/codec_int.h
--- chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/codec_int.h.pdfium-system-libtiff-libpng 2016-10-15 12:25:53.046704787 +0200
+++ chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/codec_int.h 2016-10-15 12:31:21.588574456 +0200
@@ -16,7 +16,7 @@
#include "core/fxcodec/fx_codec.h"
#include "core/fxcodec/jbig2/JBig2_Context.h"
-#include "third_party/libopenjpeg20/openjpeg.h"
+#include <openjpeg.h>
class CPDF_ColorSpace;
diff -up chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_flate.cpp.pdfium-system-libtiff-libpng chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_flate.cpp
--- chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_flate.cpp.pdfium-system-libtiff-libpng 2016-10-15 12:25:53.046704787 +0200
+++ chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_flate.cpp 2016-10-15 12:31:34.987406010 +0200
@@ -15,7 +15,7 @@
#include "core/fxcrt/fx_ext.h"
#include "third_party/base/numerics/safe_conversions.h"
#include "third_party/base/ptr_util.h"
-#include "third_party/zlib/zlib.h"
+#include <zlib.h>
extern "C" {
diff -up chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp.pdfium-system-libtiff-libpng chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp
--- chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp.pdfium-system-libtiff-libpng 2016-10-14 00:04:44.000000000 +0200
+++ chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp 2016-10-15 12:31:50.153215350 +0200
@@ -17,7 +17,7 @@
#include "core/fxcrt/fx_safe_types.h"
#include "third_party/base/ptr_util.h"
#include "third_party/lcms2-2.6/include/lcms2.h"
-#include "third_party/libopenjpeg20/openjpeg.h"
+#include <openjpeg.h>
static void fx_error_callback(const char* msg, void* client_data) {
(void)client_data;
@@ -728,7 +728,7 @@
image = nullptr;
return false;
}
- image->pdfium_use_colorspace = !!m_ColorSpace;
+// image->pdfium_use_colorspace = !!m_ColorSpace;
if (!parameters.nb_tile_to_decode) {
if (!opj_set_decode_area(l_codec, image, parameters.DA_x0, parameters.DA_y0,
diff -up chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_png.cpp.pdfium-system-libtiff-libpng chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_png.cpp
--- chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/ccodec_pngmodule.cpp.pdfium-system-libtiff-libpng 2016-10-15 12:25:53.047704775 +0200
+++ chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/ccodec_pngmodule.cpp 2016-10-15 12:32:27.308748242 +0200
@@ -10,10 +10,7 @@
diff -up chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/ccodec_pngmodule.cpp.pdfium-system-libtiff-libpng chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/ccodec_pngmodule.cpp
--- chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/ccodec_pngmodule.cpp.pdfium-system-libtiff-libpng 2017-06-22 00:04:10.000000000 +0200
+++ chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/ccodec_pngmodule.cpp 2017-06-24 00:05:50.523671865 +0200
@@ -12,10 +12,7 @@
#include "core/fxcodec/fx_codec.h"
#include "core/fxge/fx_dib.h"
@ -69,10 +24,10 @@ diff -up chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_pn
static void _png_error_data(png_structp png_ptr, png_const_charp error_msg) {
if (png_get_error_ptr(png_ptr)) {
diff -up chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_tiff.cpp.pdfium-system-libtiff-libpng chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_tiff.cpp
--- chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/ccodec_tiffmodule.cpp.pdfium-system-libtiff-libpng 2016-10-14 00:04:44.000000000 +0200
+++ chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/ccodec_tiffmodule.cpp 2016-10-15 12:32:46.897501978 +0200
@@ -9,7 +9,7 @@
diff -up chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/ccodec_tiffmodule.cpp.pdfium-system-libtiff-libpng chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/ccodec_tiffmodule.cpp
--- chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/ccodec_tiffmodule.cpp.pdfium-system-libtiff-libpng 2017-06-22 00:04:10.000000000 +0200
+++ chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/ccodec_tiffmodule.cpp 2017-06-24 00:05:50.524671846 +0200
@@ -18,7 +18,7 @@
#include "third_party/base/ptr_util.h"
extern "C" {
@ -81,7 +36,7 @@ diff -up chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_ti
}
class CCodec_TiffContext {
@@ -143,7 +143,7 @@ TIFF* tiff_open(void* context, const cha
@@ -179,7 +179,7 @@ TIFF* tiff_open(void* context, const cha
tiff_write, tiff_seek, tiff_close, tiff_get_size,
tiff_map, tiff_unmap);
if (tif) {
@ -90,9 +45,54 @@ diff -up chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_ti
}
return tif;
}
diff -up chromium-55.0.2883.11/third_party/pdfium/third_party/BUILD.gn.pdfium-system-libtiff-libpng chromium-55.0.2883.11/third_party/pdfium/third_party/BUILD.gn
--- chromium-55.0.2883.11/third_party/pdfium/third_party/BUILD.gn.pdfium-system-libtiff-libpng 2016-10-14 00:04:44.000000000 +0200
+++ chromium-55.0.2883.11/third_party/pdfium/third_party/BUILD.gn 2016-10-15 12:25:53.048704762 +0200
diff -up chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/cjpx_decoder.h.pdfium-system-libtiff-libpng chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/cjpx_decoder.h
--- chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/cjpx_decoder.h.pdfium-system-libtiff-libpng 2017-06-24 00:05:50.526671809 +0200
+++ chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/cjpx_decoder.h 2017-06-25 12:29:14.039984794 +0200
@@ -10,7 +10,7 @@
#include <vector>
#include "core/fxcrt/cfx_unowned_ptr.h"
-#include "third_party/libopenjpeg20/openjpeg.h"
+#include <openjpeg.h>
class CPDF_ColorSpace;
diff -up chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/codec_int.h.pdfium-system-libtiff-libpng chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/codec_int.h
--- chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/codec_int.h.pdfium-system-libtiff-libpng 2017-06-22 00:04:10.000000000 +0200
+++ chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/codec_int.h 2017-06-24 00:05:50.521671902 +0200
@@ -16,7 +16,7 @@
#include "core/fxcodec/fx_codec.h"
#include "core/fxcodec/jbig2/JBig2_Context.h"
-#include "third_party/libopenjpeg20/openjpeg.h"
+#include <openjpeg.h>
class CPDF_ColorSpace;
diff -up chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp.pdfium-system-libtiff-libpng chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp
--- chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp.pdfium-system-libtiff-libpng 2017-06-22 00:04:10.000000000 +0200
+++ chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp 2017-06-24 00:26:21.330902789 +0200
@@ -16,7 +16,7 @@
#include "core/fxcodec/fx_codec.h"
#include "core/fxcrt/fx_safe_types.h"
#include "third_party/base/ptr_util.h"
-#include "third_party/libopenjpeg20/openjpeg.h"
+#include <openjpeg.h>
#if defined(USE_SYSTEM_LCMS2)
#include <lcms2.h>
@@ -733,7 +733,7 @@ bool CJPX_Decoder::Init(const unsigned c
image = nullptr;
return false;
}
- image->pdfium_use_colorspace = !!m_ColorSpace;
+// image->pdfium_use_colorspace = !!m_ColorSpace;
if (!parameters.nb_tile_to_decode) {
if (!opj_set_decode_area(l_codec, image, parameters.DA_x0, parameters.DA_y0,
diff -up chromium-60.0.3112.40/third_party/pdfium/third_party/BUILD.gn.pdfium-system-libtiff-libpng chromium-60.0.3112.40/third_party/pdfium/third_party/BUILD.gn
--- chromium-60.0.3112.40/third_party/pdfium/third_party/BUILD.gn.pdfium-system-libtiff-libpng 2017-06-22 00:04:10.000000000 +0200
+++ chromium-60.0.3112.40/third_party/pdfium/third_party/BUILD.gn 2017-06-24 22:25:18.901585830 +0200
@@ -5,6 +5,7 @@
import("//build/config/arm.gni")
import("//build_overrides/build.gni")
@ -101,7 +101,7 @@ diff -up chromium-55.0.2883.11/third_party/pdfium/third_party/BUILD.gn.pdfium-sy
group("third_party") {
deps = [
@@ -318,164 +319,33 @@
@@ -351,164 +352,33 @@ group("lcms2") {
}
}
@ -188,7 +188,7 @@ diff -up chromium-55.0.2883.11/third_party/pdfium/third_party/BUILD.gn.pdfium-sy
- defines = []
- cflags = []
- deps = [
- "//third_party/zlib",
- ":zlib",
+pkg_config("fx_libpng_config") {
+ packages = [
+ "libpng",
@ -237,8 +237,8 @@ diff -up chromium-55.0.2883.11/third_party/pdfium/third_party/BUILD.gn.pdfium-sy
- configs -= [ "//build/config/win:lean_and_mean" ]
- }
- deps = [
- ":zlib",
- "//third_party:jpeg",
- "//third_party/zlib",
- ]
- sources = [
- "libtiff/tif_aux.c",
@ -284,14 +284,3 @@ diff -up chromium-55.0.2883.11/third_party/pdfium/third_party/BUILD.gn.pdfium-sy
}
}
--- chromium-59.0.3071.86/third_party/pdfium/core/fxcodec/codec/cjpx_decoder.h.system-openjpg 2017-06-05 21:04:21.000000000 +0200
+++ chromium-59.0.3071.86/third_party/pdfium/core/fxcodec/codec/cjpx_decoder.h 2017-06-08 02:14:04.774234999 +0200
@@ -9,7 +9,7 @@
#include <vector>
-#include "third_party/libopenjpeg20/openjpeg.h"
+#include <openjpeg.h>
class CPDF_ColorSpace;

7
chromium-53-bignum-werror-fix.patch
View file

@ -1,7 +1,6 @@
diff -up chromium-53.0.2785.46/third_party/WebKit/Source/wtf/BUILD.gn.bignum-werror-fix chromium-53.0.2785.46/third_party/WebKit/Source/wtf/BUILD.gn
--- chromium-53.0.2785.46/third_party/WebKit/Source/wtf/BUILD.gn.bignum-werror-fix 2016-08-05 00:05:30.000000000 +0200
+++ chromium-53.0.2785.46/third_party/WebKit/Source/wtf/BUILD.gn 2016-08-09 00:35:13.104099938 +0200
@@ -85,6 +85,7 @@ component("wtf") {
--- chromium-60.0.3112.40/third_party/WebKit/Source/platform/wtf/BUILD.gn.bignum-werror-fix 2017-06-22 00:03:16.000000000 +0200
+++ chromium-60.0.3112.40/third_party/WebKit/Source/platform/wtf/BUILD.gn 2017-06-25 13:21:32.311720897 +0200
@@ -296,6 +296,7 @@
libs = [ "log" ]
}
if (is_linux) {

18
chromium-53-ffmpeg-no-deprecation-errors.patch
View file

@ -1,7 +1,7 @@
--- chromium-53.0.2785.46/build/linux/unbundle/ffmpeg.gn.ffmpeg-deprecation 2016-08-05 00:05:10.000000000 +0200
+++ chromium-53.0.2785.46/build/linux/unbundle/ffmpeg.gn 2016-08-09 21:22:45.143683293 +0200
@@ -17,6 +17,12 @@
defines = [ "USE_SYSTEM_FFMPEG=1" ]
--- chromium-60.0.3112.40/build/linux/unbundle/ffmpeg.gn.ffmpeg-deprecation 2017-06-25 13:24:47.390218631 +0200
+++ chromium-60.0.3112.40/build/linux/unbundle/ffmpeg.gn 2017-06-25 13:32:48.528583949 +0200
@@ -19,6 +19,12 @@
flags = [ "USE_SYSTEM_FFMPEG=true" ]
}
+config("ffmpeg_deprecations") {
@ -13,10 +13,10 @@
shim_headers("ffmpeg_shim") {
root_path = "."
headers = [
@@ -33,5 +39,6 @@
public_configs = [
":system_ffmpeg",
":using_system_ffmpeg",
+ ":ffmpeg_deprecations",
@@ -33,5 +39,5 @@
":ffmpeg_features",
":ffmpeg_shim",
]
- public_configs = [ ":system_ffmpeg" ]
+ public_configs = [ ":system_ffmpeg", ":ffmpeg_deprecations" ]
}

9
chromium-53-gn-system-icu-jsoncpp.patch
View file

@ -1,7 +1,7 @@
diff -up chromium-55.0.2873.0/build/linux/unbundle/jsoncpp.gn.gn-system-icu-jsoncpp chromium-55.0.2873.0/build/linux/unbundle/jsoncpp.gn
--- chromium-55.0.2873.0/build/linux/unbundle/jsoncpp.gn.gn-system-icu-jsoncpp 2016-10-01 16:21:27.343107786 +0200
+++ chromium-55.0.2873.0/build/linux/unbundle/jsoncpp.gn 2016-10-01 16:21:27.343107786 +0200
@@ -0,0 +1,27 @@
@@ -0,0 +1,28 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
@ -21,7 +21,8 @@ diff -up chromium-55.0.2873.0/build/linux/unbundle/jsoncpp.gn.gn-system-icu-json
+ "json/reader.h",
+ "json/value.h",
+ "json/writer.h"
+ ]
+ ]
+}
+
+source_set("jsoncpp") {
+ deps = [
@ -32,8 +33,8 @@ diff -up chromium-55.0.2873.0/build/linux/unbundle/jsoncpp.gn.gn-system-icu-json
diff -up chromium-55.0.2873.0/build/linux/unbundle/replace_gn_files.py.gn-system-icu-jsoncpp chromium-55.0.2873.0/build/linux/unbundle/replace_gn_files.py
--- chromium-55.0.2873.0/build/linux/unbundle/replace_gn_files.py.gn-system-icu-jsoncpp 2016-10-01 16:21:27.343107786 +0200
+++ chromium-55.0.2873.0/build/linux/unbundle/replace_gn_files.py 2016-10-01 17:17:38.913721403 +0200
@@ -21,6 +21,7 @@
'flac': 'third_party/flac/BUILD.gn',
@@ -22,6 +22,7 @@
'freetype': 'third_party/freetype/BUILD.gn',
'harfbuzz-ng': 'third_party/harfbuzz-ng/BUILD.gn',
'icu': 'third_party/icu/BUILD.gn',
+ 'jsoncpp' : 'third_party/jsoncpp/BUILD.gn',

10
chromium-55-gn-bootstrap-fix.patch Normal file
View file

@ -0,0 +1,10 @@
--- chromium-60.0.3112.40/tools/gn/bootstrap/bootstrap.py.gn-bootstrap 2017-06-22 00:03:20.000000000 +0200
+++ chromium-60.0.3112.40/tools/gn/bootstrap/bootstrap.py 2017-06-25 14:16:34.080226787 +0200
@@ -487,6 +487,7 @@
'base/sys_info.cc',
'base/task_runner.cc',
'base/task_scheduler/delayed_task_manager.cc',
+ 'base/task_scheduler/environment_config.cc',
'base/task_scheduler/post_task.cc',
'base/task_scheduler/priority_queue.cc',
'base/task_scheduler/scheduler_lock_impl.cc',

11
chromium-58-glib.patch Normal file
View file

@ -0,0 +1,11 @@
--- chromium-58.0.3029.81/build/config/linux/BUILD.gn.glib 2017-04-19 21:06:28.000000000 +0200
+++ chromium-58.0.3029.81/build/config/linux/BUILD.gn 2017-04-23 23:12:26.097911010 +0200
@@ -93,7 +93,7 @@
"gthread-2.0",
]
defines = [
- "GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32",
+ "GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_52",
"GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26",
]
}

11
chromium-59-dma-buf-h.patch
View file

@ -1,11 +0,0 @@
--- chromium-59.0.3071.86/ui/gfx/linux/client_native_pixmap_dmabuf.cc.dma-buf_h 2017-06-05 21:03:30.000000000 +0200
+++ chromium-59.0.3071.86/ui/gfx/linux/client_native_pixmap_dmabuf.cc 2017-06-11 16:43:16.154326678 +0200
@@ -17,7 +17,7 @@
#include "base/strings/stringprintf.h"
#include "base/trace_event/trace_event.h"
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
#include <linux/types.h>
struct local_dma_buf_sync {

36
chromium-59-gcc4.patch
View file

@ -1,16 +1,25 @@
--- chromium-59.0.3071.115/third_party/pdfium/xfa/fde/xml/cfde_xmlinstruction.cpp-orig 2017-06-26 22:04:29.000000000 +0300
+++ chromium-59.0.3071.115/third_party/pdfium/xfa/fde/xml/cfde_xmlinstruction.cpp 2017-07-27 21:11:10.199479706 +0300
--- chromium-60.0.3112.90/third_party/pdfium/core/fxcrt/cfx_chariter.cpp-orig 2017-08-03 01:06:39.000000000 +0300
+++ chromium-60.0.3112.90/third_party/pdfium/core/fxcrt/cfx_chariter.cpp 2017-08-11 04:30:36.855434602 +0300
@@ -49,5 +49,5 @@
std::unique_ptr<IFX_CharIter> CFX_CharIter::Clone() {
auto pIter = pdfium::MakeUnique<CFX_CharIter>(m_wsText);
pIter->m_nIndex = m_nIndex;
- return pIter;
+ return std::move(pIter);
}
--- chromium-60.0.3112.90/third_party/pdfium/core/fxcrt/xml/cfx_xmlinstruction.cpp-orig 2017-08-03 01:06:39.000000000 +0300
+++ chromium-60.0.3112.90/third_party/pdfium/core/fxcrt/xml/cfx_xmlinstruction.cpp 2017-08-11 06:35:33.933786799 +0300
@@ -23,7 +23,7 @@
auto pClone = pdfium::MakeUnique<CFDE_XMLInstruction>(GetName());
auto pClone = pdfium::MakeUnique<CFX_XMLInstruction>(GetName());
pClone->SetAttributes(GetAttributes());
pClone->m_TargetData = m_TargetData;
- return pClone;
+ return std::move(pClone);
}
void CFDE_XMLInstruction::AppendData(const CFX_WideString& wsData) {
--- chromium-59.0.3071.115/third_party/pdfium/xfa/fde/xml/cfde_xmlelement.cpp-orig 2017-07-27 23:42:24.853530256 +0300
+++ chromium-59.0.3071.115/third_party/pdfium/xfa/fde/xml/cfde_xmlelement.cpp 2017-07-27 23:39:40.148476817 +0300
void CFX_XMLInstruction::AppendData(const CFX_WideString& wsData) {
--- chromium-60.0.3112.90/third_party/pdfium/core/fxcrt/xml/cfx_xmlelement.cpp-orig 2017-08-03 01:06:39.000000000 +0300
+++ chromium-60.0.3112.90/third_party/pdfium/core/fxcrt/xml/cfx_xmlelement.cpp 2017-08-11 06:43:34.242091820 +0300
@@ -38,7 +38,7 @@
pChild = pChild->m_pNext;
}
@ -19,9 +28,9 @@
+ return std::move(pClone);
}
CFX_WideString CFDE_XMLElement::GetLocalTagName() const {
--- chromium-59.0.3071.115/third_party/pdfium/xfa/fxfa/fm2js/xfa_fmparse.cpp-orig 2017-06-26 22:04:29.000000000 +0300
+++ chromium-59.0.3071.115/third_party/pdfium/xfa/fxfa/fm2js/xfa_fmparse.cpp 2017-07-28 00:48:27.307139021 +0300
CFX_WideString CFX_XMLElement::GetLocalTagName() const {
--- chromium-59.0.3071.115/third_party/pdfium/xfa/fxfa/fm2js/cxfa_fmparse.cpp-orig 2017-06-26 22:04:29.000000000 +0300
+++ chromium-59.0.3071.115/third_party/pdfium/xfa/fxfa/fm2js/cxfa_fmparse.cpp 2017-07-28 00:48:27.307139021 +0300
@@ -839,7 +839,7 @@
pExp = pdfium::MakeUnique<CXFA_FMBlockExpression>(line,
std::move(expressions));
@ -40,3 +49,12 @@
}
std::unique_ptr<CXFA_FMExpression> CXFA_FMParse::ParseWhileExpression() {
--- chromium-60.0.3112.90/third_party/pdfium/xfa/fde/cfde_txtedtbuf.cpp-orig 2017-08-03 01:06:39.000000000 +0300
+++ chromium-60.0.3112.90/third_party/pdfium/xfa/fde/cfde_txtedtbuf.cpp 2017-08-11 14:11:33.236818536 +0300
@@ -349,5 +349,5 @@
pIter->m_nCurIndex = m_nCurIndex;
pIter->m_nIndex = m_nIndex;
pIter->m_Alias = m_Alias;
- return pIter;
+ return std::move(pIter);
}

12
chromium-59.0.3071.115-pdfium-freetype.patch
View file

@ -1,12 +0,0 @@
diff -urN chromium-59.0.3071.115.orig/third_party/pdfium/core/fxge/freetype/fx_freetype.cpp chromium-59.0.3071.115/third_party/pdfium/core/fxge/freetype/fx_freetype.cpp
--- chromium-59.0.3071.115.orig/third_party/pdfium/core/fxge/freetype/fx_freetype.cpp 2017-06-28 13:54:02.380847926 +0300
+++ chromium-59.0.3071.115/third_party/pdfium/core/fxge/freetype/fx_freetype.cpp 2017-06-28 13:54:59.089557933 +0300
@@ -6,7 +6,7 @@
#include "core/fxge/fx_freetype.h"
-#include "third_party/freetype/src/src/psnames/pstables.h"
+#include "third_party/freetype/src/psnames/pstables.h"
static int xyq_search_node(char* glyph_name,
int name_offset,

13
chromium-60-i586.patch Normal file
View file

@ -0,0 +1,13 @@
--- chromium-60.0.3112.90/third_party/angle/src/vulkan_support/BUILD.gn.bak 2017-08-03 00:06:35.000000000 +0200
+++ chromium-60.0.3112.90/third_party/angle/src/vulkan_support/BUILD.gn 2017-08-07 23:31:49.143982208 +0200
@@ -174,10 +174,6 @@
defines = [ "VULKAN_NON_CMAKE_BUILD" ]
if (is_clang || !is_win) {
cflags = [ "-Wno-unused-function" ]
-
- # See https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/issues/1649
- # TODO(jmadill): Lift this once github issue is fixed.
- cflags += [ "-Wno-ignored-attributes" ]
}
if (is_linux) {
defines += [

22
chromium-60.0.3112.90-c99.patch Normal file
View file

@ -0,0 +1,22 @@
--- chromium-60.0.3112.90/third_party/angle/src/angle.gyp-orig 2017-08-03 01:06:35.000000000 +0300
+++ chromium-60.0.3112.90/third_party/angle/src/angle.gyp 2017-08-10 19:57:40.395212825 +0300
@@ -35,7 +35,7 @@
['OS=="linux" and use_x11==1 and chromeos==0',
{
'angle_enable_gl%': 1,
- 'angle_enable_vulkan%': 1,
+ 'angle_enable_vulkan%': 0,
}],
['OS=="mac"',
{
--- chromium-60.0.3112.90/third_party/angle/gni/angle.gni-orig 2017-08-03 01:06:35.000000000 +0300
+++ chromium-60.0.3112.90/third_party/angle/gni/angle.gni 2017-08-11 00:20:58.882062089 +0300
@@ -20,7 +20,7 @@
import("//build/config/win/visual_studio_version.gni")
} else if (is_linux && use_x11 && !is_chromeos) {
angle_enable_gl = true
- angle_enable_vulkan = true
+ angle_enable_vulkan = false
} else if (is_mac || ozone_platform_gbm) {
angle_enable_gl = true
} else if (is_android) {

45
chromium-browser-stable.spec
View file

@ -22,7 +22,7 @@
Summary: A fast web browser based on the Blink engine
Name: chromium-browser-stable
Version: 59.0.3071.115
Version: 60.0.3112.90
Release: 1
License: BSD, LGPL
Group: Networking/WWW
@ -37,8 +37,6 @@ Source10: %{name}.rpmlintrc
Source30: master_preferences
Source31: default_bookmarks.html
Source32: chromium.default
# https://groups.google.com/a/chromium.org/d/msg/chromium-packagers/wuInaKJkosg/kMfIV_7wDgAJ
Source50: freetype2-5a3490e054bda8a318ebde482c7fb30213cab3d9.tar.xz
Source100: icons.tar.bz2
Source997: depot_tools.tar.xz
Source999: new-system-icons.tar.xz
@ -57,14 +55,14 @@ Patch27: chromium-53-link-libgio-libpci-libudev-libbrlapi.patch
Patch28: chromium-53-gn-system-icu-jsoncpp.patch
# (cjw) build pdfium with system libtiff and libpng
Patch30: chromium-52-pdfium-system-libtiff-libpng.patch
# (cjw) fix gn bootstrap by adding missing base file to compile list
Patch31: chromium-55-gn-bootstrap-fix.patch
# (cjw) Recognize mimetypes for matroska (.mkv) and AVI (.avi) formats (video/x-matroska and audio/x-matroska, video/x-msvideo) + handle A52 "AC3" and DTS compressed audio.
Patch32: chromium-55-extra-media.patch
# (cjw) Do not use ffmpeg internal header(s)
Patch34: chromium-43-no-ffmpeg-internal.patch
# (cjw) fix webrtc build with system ffmpeg
Patch35: chromium-50-system-ffmpeg-3.patch
# new kernel header is not available in userspace
Patch36: chromium-59-dma-buf-h.patch
# (cjw) fix build with current glib...
Patch36: chromium-58-glib.patch
# New from Debian
Patch500: chromium-third-party-cookies-off-by-default.patch
@ -87,10 +85,11 @@ Patch507: issue1688073002_40001.diff
Patch508: chromium-59-gcc4.patch
# This patch is required in addition to passing the enable_swiftshader=false build flag.
Patch509: really-disable-swiftshader-on-x86.patch
Patch510: chromium-60-i586.patch
Patch511: chromium-60.0.3112.90-c99.patch
Patch600: fix_for_system_ffmpeg_ABI.patch
# https://bugs.chromium.org/p/pdfium/issues/detail?id=733
Patch601: chromium-59.0.3071.115-pdfium-freetype.patch
# ROSA Build
Patch600: chromium-buildname-60.0.3112.90.patch
Provides: %{crname} = %{EVRD}
Conflicts: chromium-browser-unstable
@ -124,6 +123,7 @@ BuildRequires: pkgconfig(libavcodec)
%endif
BuildRequires: pkgconfig(flac)
BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glib-2.0)
@ -204,7 +204,6 @@ your profile before changing channels.
%{_crdir}/themes
%{_crdir}/default_apps
%dir %{_crdir}/pepper
#%{_crdir}/lib*.so*
%{_mandir}/man1/%{crname}*
%{_datadir}/applications/*.desktop
%{_iconsdir}/hicolor/*/apps/chromium*
@ -257,12 +256,8 @@ members of the Chromium and WebDriver teams.
#----------------------------------------------------------------------------
%prep
%setup -q -T -c -n freetype -a 50
%setup -qn chromium-%{version} -a 997 -a 999
# https://groups.google.com/a/chromium.org/d/msg/chromium-packagers/wuInaKJkosg/kMfIV_7wDgAJ
cp -a ../freetype/* third_party/freetype/
%patch0 -p1
%patch4 -p1 -b .prefs
@ -272,9 +267,9 @@ cp -a ../freetype/* third_party/freetype/
%patch27 -p1
%patch28 -p1
%patch30 -p1
%patch31 -p1
%patch32 -p1
%if 0%{?ffmpeg}
%patch34 -p1
%patch35 -p1
%endif
%patch36 -p1
@ -294,15 +289,16 @@ cp -a ../freetype/* third_party/freetype/
%endif
%patch508 -p1
%patch509 -p1
%patch510 -p1
%patch511 -p1
%patch600 -p1
%patch601 -p1
# files we do not want from upstream source bundles
rm -rf breakpad/src/processor/testdata/
rm -rf chrome/app/test_data/dlls/
rm -rf chrome/common/extensions/docs/
#rm -rf chrome/test/data/
rm -rf chrome/test/data/{android,app_shim,apptest,ash,autofill,automation,automation_proxy_snapshot,banners,bookmark_html_reader,bookmarks,captive_portal,chromedriver,chrome_endure,chromeos,chromeproxy,cld2_component,click_modifier,components,constrained_files,content,content_setting_bubble,devtools,diagnostics,dom_automation,dom_checker,dom_distiller,downloads,drive_first_run,dromaeo,durable,edge_database_reader,edge_profile,encoding_tests,extensions,fast_shutdown,fast_tab_close,favicon,feeds,file_select_helper,find_in_page,firefox320_profile,firefox35_profile,firefox3_nss,firefox3_nss_mac,firefox3_profile,firefox_profile,firefox_searchplugins,focus,frame_dom_access,frame_tree,ftp,fullscreen_mouselock,geolocation,google,gpu,History,image_decoding,image_search,import,indexeddb,inspector,installer,interstitial_page,keyboard,login,media,native_messaging,navigation_interception,notifications,page_cycler,page_load_metrics,panels,password,pdf,pepper,perf,permissions,plugin_power_saver,policy,popup_blocker,predictor,prefs,pref_service,prerender,printing,profiles,push_messaging,referrer_policy,requirements_checker,safe_browsing,SafeBrowsing,save_page,scroll,sdch,search,session_history,session_restore,sessions,settings,speech,ssl,subresource_filter,sunspider,sync,template_url_scraper,textinput,third_party,top_sites,translate,unit,v8_benchmark_v6,viewsource,web_app_info,webapps,webrtc,websocket,webui_test_resources.grd,whitelists,workers}
touch chrome/test/data/webui/i18n_process_css_test.html
rm -rf chrome/tools/test/reference_build/chrome_linux/
rm -rf components/test/data/component_updater/jebgalgnebhfojomionfpkfelancnnkf/component1.dll
@ -326,6 +322,7 @@ rm -rf third_party/lcov
rm -rf third_party/libexif/sources
rm -rf third_party/libjpeg/*.[ch]
rm -rf third_party/libjpeg_turbo/*.[ch]
rm -f third_party/pdfium/third_party/libopenjpeg20/*.[ch]
rm -rf third_party/libpng/*.[ch]
rm -rf third_party/libxslt/{libexslt,libxslt,linux,mac,win32}
#rm -rf third_party/mesa/src/src
@ -360,11 +357,6 @@ rm -f third_party/checkstyle/checkstyle-6.5-all.jar
rm -rf third_party/sfntly/src/cpp/ext
#rm -rf third_party/node
# Remove bundled ICU; its header files appear to get picked up instead of
# the system ones, leading to errors during the final link stage.
# https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/BNGvJc08B6Q
#find third_party/icu -type f \! -regex '.*\.\(gn\|gni\|isolate\)' -delete
### build with widevine support
# Patch from crbug (chromium bugtracker)
@ -381,7 +373,7 @@ mkdir -p third_party/node/linux/node-linux-x64/bin
ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/node
%build
%define system_gn_list ffmpeg flac harfbuzz-ng libxslt snappy yasm libpng zlib jsoncpp
%define system_gn_list ffmpeg flac harfbuzz-ng libxslt snappy yasm libpng zlib jsoncpp freetype
# opus
# icu
# libevent
@ -409,7 +401,6 @@ ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/node
custom_toolchain="%{_sourcedir}:default" \
proprietary_codecs=true \
linux_link_libgio = true \
linux_link_libpci = true \
linux_link_libudev = true \
linux_link_libspeechd = true \
enable_ac3_eac3_audio_demuxing=true \
@ -421,7 +412,6 @@ ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/node
pdf_enable_xfa=true \
use_pulseaudio=true \
use_allocator="none" \
use_gtk3=false \
treat_warnings_as_errors=false \
fatal_linker_warnings=false \
use_aura=true \
@ -447,6 +437,9 @@ LD=%{__cxx}; export LD
CFLAGS=$(echo "$CFLAGS"|sed -e 's/-gdwarf-4//' -e 's/-fvar-tracking-assignments//' -e 's/-frecord-gcc-switches//')
CXXFLAGS=$(echo "$CXXFLAGS"|sed -e 's/-gdwarf-4//' -e 's/-fvar-tracking-assignments//' -e 's/-frecord-gcc-switches//')
CFLAGS="$CFLAGS -Wno-error=pointer-to-int-cast -Wno-error=int-to-pointer-cast"
CXXFLAGS="$CXXFLAGS -Wno-error=attributes -Wno-error=comment -Wno-error=unused-variable -Wno-error=pointer-to-int-cast"
python tools/gn/bootstrap/bootstrap.py --gn-gen-args='%{gn_config}'
out/Release/gn gen --args='%{gn_config}' out/Release

11
chromium-buildname-60.0.3112.90.patch Normal file
View file

@ -0,0 +1,11 @@
--- chromium-60.0.3112.20.old/components/version_ui_strings.grdp 2017-06-08 16:55:00.495103433 +0200
+++ chromium-60.0.3112.20/components/version_ui_strings.grdp 2017-06-08 16:55:36.027102220 +0200
@@ -7,7 +7,7 @@
Official Build
</message>
<message name="IDS_VERSION_UI_UNOFFICIAL" desc="unofficial build on the about:version page">
- Developer Build
+ Сборка ROSA
</message>
<message name="IDS_VERSION_UI_32BIT" desc="32-bit on the chrome://version page">
(32-bit)

46
fix_for_system_ffmpeg_ABI.patch
View file

@ -1,46 +0,0 @@
diff -up chromium-48.0.2564.8/media/ffmpeg/ffmpeg_common.h.disable_ffmpeg_api_change chromium-48.0.2564.8/media/ffmpeg/ffmpeg_common.h
--- chromium-48.0.2564.8/media/ffmpeg/ffmpeg_common.h.disable_ffmpeg_api_change 2015-11-18 13:16:05.867971946 +0100
+++ chromium-48.0.2564.8/media/ffmpeg/ffmpeg_common.h 2015-11-18 13:19:20.130249467 +0100
@@ -22,18 +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 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,
-// but the upstream code does not yet compile with it disabled.
-// (In this case, the fix is replacing the call with a new function.)
-// In the meantime, we directly disable those warnings in the C file.
-//#define FF_API_AVPACKET_OLD_API 0
-
// Temporarily disable possible loss of data warning.
// TODO(scherkus): fix and upstream the compiler warnings.
MSVC_PUSH_DISABLE_WARNING(4244);
--- chromium-55.0.2873.0/third_party/ffmpeg/BUILD.gn.disable_ffmpeg_api_change 2016-09-28 07:51:54.000000000 +0200
+++ chromium-55.0.2873.0/third_party/ffmpeg/BUILD.gn 2016-10-01 13:44:59.429129847 +0200
@@ -169,21 +169,6 @@
"_POSIX_C_SOURCE=200112",
"_XOPEN_SOURCE=600",
"PIC",
-
- # Disable deprecated features that generate spammy warnings.
- # media/ffmpeg/ffmpeg_common.h defines these as well and must be kept
- # in sync with this file.
- "FF_API_CONVERGENCE_DURATION=0",
-
- # Upstream libavcodec/utils.c still uses the deprecated
- # av_dup_packet(), avcodec_encode_{audio,video}2(), and
- # libavformat/utils.c still accesses the deprecated AVStream.codec,
- # causing deprecation warnings.
- # The normal fix for such things is to disable the features like setting
- # "FF_API_AVPACKET_OLD_API=0", but the upstream code does not yet compile
- # with it disabled (in the case of av_dup_packet()), and has no FF_API*
- # gate for avcodec_encode_{audio,video}2() or AVStream.codec. In the
- # meantime, we directly disable those warnings locally in the C files.
]
# So we can append below and assume they're defined.