68
This commit is contained in:
parent
cb0be2c990
commit
14101bb995
1
.gitignore
vendored
1
.gitignore
vendored
@ -65,3 +65,4 @@
|
|||||||
/chromium-67.0.3396.79-clean.tar.xz
|
/chromium-67.0.3396.79-clean.tar.xz
|
||||||
/chromium-67.0.3396.87-clean.tar.xz
|
/chromium-67.0.3396.87-clean.tar.xz
|
||||||
/chromium-67.0.3396.99-clean.tar.xz
|
/chromium-67.0.3396.99-clean.tar.xz
|
||||||
|
/chromium-68.0.3440.106-clean.tar.xz
|
||||||
|
36
chromium-68.0.3440.106-boolfix.patch
Normal file
36
chromium-68.0.3440.106-boolfix.patch
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
diff -up chromium-68.0.3440.106/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix chromium-68.0.3440.106/mojo/public/cpp/bindings/associated_interface_ptr_info.h
|
||||||
|
--- chromium-68.0.3440.106/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix 2018-08-09 03:21:23.066802340 -0400
|
||||||
|
+++ chromium-68.0.3440.106/mojo/public/cpp/bindings/associated_interface_ptr_info.h 2018-08-09 03:25:10.638595925 -0400
|
||||||
|
@@ -45,7 +45,7 @@ class AssociatedInterfacePtrInfo {
|
||||||
|
|
||||||
|
bool is_valid() const { return handle_.is_valid(); }
|
||||||
|
|
||||||
|
- explicit operator bool() const { return handle_.is_valid(); }
|
||||||
|
+ explicit operator bool() const { return (bool) handle_.is_valid(); }
|
||||||
|
|
||||||
|
ScopedInterfaceEndpointHandle PassHandle() {
|
||||||
|
return std::move(handle_);
|
||||||
|
diff -up chromium-68.0.3440.106/mojo/public/cpp/bindings/associated_interface_request.h.boolfix chromium-68.0.3440.106/mojo/public/cpp/bindings/associated_interface_request.h
|
||||||
|
--- chromium-68.0.3440.106/mojo/public/cpp/bindings/associated_interface_request.h.boolfix 2018-08-09 03:21:23.067802318 -0400
|
||||||
|
+++ chromium-68.0.3440.106/mojo/public/cpp/bindings/associated_interface_request.h 2018-08-09 03:24:44.935229067 -0400
|
||||||
|
@@ -50,7 +50,7 @@ class AssociatedInterfaceRequest {
|
||||||
|
// handle.
|
||||||
|
bool is_pending() const { return handle_.is_valid(); }
|
||||||
|
|
||||||
|
- explicit operator bool() const { return handle_.is_valid(); }
|
||||||
|
+ explicit operator bool() const { return (bool) handle_.is_valid(); }
|
||||||
|
|
||||||
|
ScopedInterfaceEndpointHandle PassHandle() { return std::move(handle_); }
|
||||||
|
|
||||||
|
diff -up chromium-68.0.3440.106/mojo/public/cpp/bindings/interface_request.h.boolfix chromium-68.0.3440.106/mojo/public/cpp/bindings/interface_request.h
|
||||||
|
--- chromium-68.0.3440.106/mojo/public/cpp/bindings/interface_request.h.boolfix 2018-08-08 15:11:05.000000000 -0400
|
||||||
|
+++ chromium-68.0.3440.106/mojo/public/cpp/bindings/interface_request.h 2018-08-09 03:21:23.067802318 -0400
|
||||||
|
@@ -54,7 +54,7 @@ class InterfaceRequest {
|
||||||
|
// Indicates whether the request currently contains a valid message pipe.
|
||||||
|
bool is_pending() const { return handle_.is_valid(); }
|
||||||
|
|
||||||
|
- explicit operator bool() const { return handle_.is_valid(); }
|
||||||
|
+ explicit operator bool() const { return (bool) handle_.is_valid(); }
|
||||||
|
|
||||||
|
// Removes the message pipe from the request and returns it.
|
||||||
|
ScopedMessagePipeHandle PassMessagePipe() { return std::move(handle_); }
|
12
chromium-68.0.3440.106-fedora-user-agent.patch
Normal file
12
chromium-68.0.3440.106-fedora-user-agent.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -up chromium-68.0.3440.106/content/common/user_agent.cc.fedora-user-agent chromium-68.0.3440.106/content/common/user_agent.cc
|
||||||
|
--- chromium-68.0.3440.106/content/common/user_agent.cc.fedora-user-agent 2018-08-09 03:27:45.965769824 -0400
|
||||||
|
+++ chromium-68.0.3440.106/content/common/user_agent.cc 2018-08-09 03:28:34.001586650 -0400
|
||||||
|
@@ -135,7 +135,7 @@ std::string getUserAgentPlatform() {
|
||||||
|
#elif defined(OS_MACOSX)
|
||||||
|
"Macintosh; ";
|
||||||
|
#elif defined(USE_X11) || defined(USE_OZONE)
|
||||||
|
- "X11; "; // strange, but that's what Firefox uses
|
||||||
|
+ "X11; Fedora; "; // strange, but that's what Firefox uses
|
||||||
|
#elif defined(OS_ANDROID)
|
||||||
|
"Linux; ";
|
||||||
|
#elif defined(OS_POSIX) || defined(OS_FUCHSIA)
|
12
chromium-68.0.3440.106-fix-build-networking_private.patch
Normal file
12
chromium-68.0.3440.106-fix-build-networking_private.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -up chromium-68.0.3440.106/extensions/browser/api/networking_private/BUILD.gn.fixb chromium-68.0.3440.106/extensions/browser/api/networking_private/BUILD.gn
|
||||||
|
--- chromium-68.0.3440.106/extensions/browser/api/networking_private/BUILD.gn.fixb 2018-08-09 03:56:36.091622243 -0400
|
||||||
|
+++ chromium-68.0.3440.106/extensions/browser/api/networking_private/BUILD.gn 2018-08-09 03:57:03.047001659 -0400
|
||||||
|
@@ -61,7 +61,7 @@ source_set("networking_private") {
|
||||||
|
]
|
||||||
|
deps += [ "//chromeos" ]
|
||||||
|
} else {
|
||||||
|
- not_needed(default_sources)
|
||||||
|
+ not_needed([ "default_sources" ])
|
||||||
|
sources = [
|
||||||
|
"networking_private_stubs.cc",
|
||||||
|
]
|
15
chromium-68.0.3440.106-master-prefs-path.patch
Normal file
15
chromium-68.0.3440.106-master-prefs-path.patch
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
diff -up chromium-68.0.3440.106/chrome/browser/first_run/first_run_internal_linux.cc.etc chromium-68.0.3440.106/chrome/browser/first_run/first_run_internal_linux.cc
|
||||||
|
--- chromium-68.0.3440.106/chrome/browser/first_run/first_run_internal_linux.cc.etc 2018-08-09 03:12:33.444705798 -0400
|
||||||
|
+++ chromium-68.0.3440.106/chrome/browser/first_run/first_run_internal_linux.cc 2018-08-09 03:14:46.275754910 -0400
|
||||||
|
@@ -19,9 +19,9 @@ bool IsOrganicFirstRun() {
|
||||||
|
|
||||||
|
base::FilePath MasterPrefsPath() {
|
||||||
|
// The standard location of the master prefs is next to the chrome binary.
|
||||||
|
+ // ...but we patch it to use /etc/chromium
|
||||||
|
base::FilePath master_prefs;
|
||||||
|
- if (!base::PathService::Get(base::DIR_EXE, &master_prefs))
|
||||||
|
- return base::FilePath();
|
||||||
|
+ master_prefs = base::FilePath("/etc/chromium");
|
||||||
|
return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
|
||||||
|
}
|
||||||
|
|
11
chromium-68.0.3440.106-notest.patch
Normal file
11
chromium-68.0.3440.106-notest.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
diff -up chromium-68.0.3440.106/chrome/test/data/webui_test_resources.grd.notest chromium-68.0.3440.106/chrome/test/data/webui_test_resources.grd
|
||||||
|
--- chromium-68.0.3440.106/chrome/test/data/webui_test_resources.grd.notest 2018-08-09 03:08:33.953029806 -0400
|
||||||
|
+++ chromium-68.0.3440.106/chrome/test/data/webui_test_resources.grd 2018-08-09 03:09:40.264567818 -0400
|
||||||
|
@@ -8,7 +8,6 @@
|
||||||
|
</outputs>
|
||||||
|
<release seq="1">
|
||||||
|
<includes>
|
||||||
|
- <include name="IDR_WEBUI_TEST_I18N_PROCESS_CSS_TEST" file="webui/i18n_process_css_test.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
|
||||||
|
<include name="IDR_WEB_UI_TEST_MOJO_JS" file="${root_gen_dir}/chrome/test/data/webui/web_ui_test.mojom.js" use_base_dir="false" type="BINDATA"/>
|
||||||
|
</includes>
|
||||||
|
</release>
|
51
chromium-68.0.3440.84-cors-string.patch
Normal file
51
chromium-68.0.3440.84-cors-string.patch
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
From 01d891fa0790950549c7bedb34edf869827a372e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jose Dapena Paz <jose.dapena@lge.com>
|
||||||
|
Date: Thu, 31 May 2018 17:03:37 +0000
|
||||||
|
Subject: [PATCH] CORS legacy: add missing string include
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
The cors_legacy.h file includes declarations using std::string, but
|
||||||
|
it is not declared due to missing #include <string>.
|
||||||
|
|
||||||
|
Also drop unneeded declarations in .cpp file.
|
||||||
|
|
||||||
|
Change-Id: I00df799f84a6c3530c2f12f1e52d24c7d9bd6bfd
|
||||||
|
Reviewed-on: https://chromium-review.googlesource.com/1080707
|
||||||
|
Reviewed-by: Tom Sepez <tsepez@chromium.org>
|
||||||
|
Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
|
||||||
|
Cr-Commit-Position: refs/heads/master@{#563282}
|
||||||
|
---
|
||||||
|
services/network/public/cpp/cors/cors_legacy.cc | 2 --
|
||||||
|
services/network/public/cpp/cors/cors_legacy.h | 1 +
|
||||||
|
2 files changed, 1 insertion(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/services/network/public/cpp/cors/cors_legacy.cc b/services/network/public/cpp/cors/cors_legacy.cc
|
||||||
|
index 8f32ac3be64e..f01af63619b5 100644
|
||||||
|
--- a/services/network/public/cpp/cors/cors_legacy.cc
|
||||||
|
+++ b/services/network/public/cpp/cors/cors_legacy.cc
|
||||||
|
@@ -5,8 +5,6 @@
|
||||||
|
#include "services/network/public/cpp/cors/cors_legacy.h"
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
|
-#include <string>
|
||||||
|
-#include <vector>
|
||||||
|
|
||||||
|
#include "url/gurl.h"
|
||||||
|
#include "url/url_util.h"
|
||||||
|
diff --git a/services/network/public/cpp/cors/cors_legacy.h b/services/network/public/cpp/cors/cors_legacy.h
|
||||||
|
index d2cdf026ca3a..dc9295a92c47 100644
|
||||||
|
--- a/services/network/public/cpp/cors/cors_legacy.h
|
||||||
|
+++ b/services/network/public/cpp/cors/cors_legacy.h
|
||||||
|
@@ -5,6 +5,7 @@
|
||||||
|
#ifndef SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_
|
||||||
|
#define SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_
|
||||||
|
|
||||||
|
+#include <string>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
#include "base/component_export.h"
|
||||||
|
--
|
||||||
|
2.17.1
|
||||||
|
|
62
chromium-68.0.3440.84-libjpeg.patch
Normal file
62
chromium-68.0.3440.84-libjpeg.patch
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
From c6b0194f7a4d9f494b2d51f46d2c332e2e5f4050 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Daniel Bratell <bratell@opera.com>
|
||||||
|
Date: Mon, 28 May 2018 13:13:01 +0000
|
||||||
|
Subject: [PATCH] Use the same libjpeg in all of blink/platform
|
||||||
|
|
||||||
|
The normal libjpeg renames some symbols with macros so if its
|
||||||
|
headers are included together with libjpeg-turbo's headers
|
||||||
|
in the same translation unit, there will be an inconsistent
|
||||||
|
renaming of libjpeg symbols. This happened in some extreme
|
||||||
|
jumbo configuration and resulted in confising linker errors.
|
||||||
|
|
||||||
|
This patch changes an include so that jpeglib.h becomes included
|
||||||
|
the same way everywhere.
|
||||||
|
|
||||||
|
Change-Id: I7f122d0919d58371bb40dc0097a766b857b9815e
|
||||||
|
Reviewed-on: https://chromium-review.googlesource.com/1073423
|
||||||
|
Reviewed-by: Kentaro Hara <haraken@chromium.org>
|
||||||
|
Commit-Queue: Daniel Bratell <bratell@opera.com>
|
||||||
|
Cr-Commit-Position: refs/heads/master@{#562243}
|
||||||
|
---
|
||||||
|
.../renderer/platform/image-encoders/image_encoder.cc | 11 +++++++++++
|
||||||
|
.../renderer/platform/image-encoders/image_encoder.h | 2 --
|
||||||
|
2 files changed, 11 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc
|
||||||
|
index 0c7f14c7c0e4..4c450f5d6783 100644
|
||||||
|
--- a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc
|
||||||
|
+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc
|
||||||
|
@@ -4,6 +4,17 @@
|
||||||
|
|
||||||
|
#include "third_party/blink/renderer/platform/image-encoders/image_encoder.h"
|
||||||
|
|
||||||
|
+#include "build/build_config.h"
|
||||||
|
+
|
||||||
|
+#if defined(OS_WIN)
|
||||||
|
+#include <basetsd.h> // Included before jpeglib.h because of INT32 clash
|
||||||
|
+#endif // OS_WIN
|
||||||
|
+#include <stdio.h> // Needed by jpeglib.h
|
||||||
|
+
|
||||||
|
+#include "jpeglib.h" // for JPEG_MAX_DIMENSION
|
||||||
|
+
|
||||||
|
+#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION
|
||||||
|
+
|
||||||
|
namespace blink {
|
||||||
|
|
||||||
|
bool ImageEncoder::Encode(Vector<unsigned char>* dst,
|
||||||
|
diff --git a/third_party/blink/renderer/platform/image-encoders/image_encoder.h b/third_party/blink/renderer/platform/image-encoders/image_encoder.h
|
||||||
|
index 0d1460f34827..40306097d507 100644
|
||||||
|
--- a/third_party/blink/renderer/platform/image-encoders/image_encoder.h
|
||||||
|
+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.h
|
||||||
|
@@ -7,8 +7,6 @@
|
||||||
|
|
||||||
|
#include "third_party/blink/renderer/platform/platform_export.h"
|
||||||
|
#include "third_party/blink/renderer/platform/wtf/vector.h"
|
||||||
|
-#include "third_party/libjpeg/jpeglib.h" // for JPEG_MAX_DIMENSION
|
||||||
|
-#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION
|
||||||
|
#include "third_party/skia/include/core/SkStream.h"
|
||||||
|
#include "third_party/skia/include/encode/SkJpegEncoder.h"
|
||||||
|
#include "third_party/skia/include/encode/SkPngEncoder.h"
|
||||||
|
--
|
||||||
|
2.17.1
|
||||||
|
|
43
chromium-68.0.3440.84-libwebp-shim.patch
Normal file
43
chromium-68.0.3440.84-libwebp-shim.patch
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
diff --git a/build/linux/unbundle/libwebp.gn b/build/linux/unbundle/libwebp.gn
|
||||||
|
index ab92adecf400..12574d87be58 100644
|
||||||
|
--- a/build/linux/unbundle/libwebp.gn
|
||||||
|
+++ b/build/linux/unbundle/libwebp.gn
|
||||||
|
@@ -2,12 +2,34 @@
|
||||||
|
# Use of this source code is governed by a BSD-style license that can be
|
||||||
|
# found in the LICENSE file.
|
||||||
|
|
||||||
|
+import("//build/config/linux/pkg_config.gni")
|
||||||
|
+import("//build/shim_headers.gni")
|
||||||
|
+
|
||||||
|
+pkg_config("system_libwebp") {
|
||||||
|
+ packages = [
|
||||||
|
+ "libwebp",
|
||||||
|
+ "libwebpdemux",
|
||||||
|
+ "libwebpmux",
|
||||||
|
+ ]
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+shim_headers("libwebp_shim") {
|
||||||
|
+ root_path = "src"
|
||||||
|
+ headers = [
|
||||||
|
+ "webp/decode.h",
|
||||||
|
+ "webp/demux.h",
|
||||||
|
+ "webp/encode.h",
|
||||||
|
+ "webp/mux.h",
|
||||||
|
+ "webp/mux_types.h",
|
||||||
|
+ "webp/types.h",
|
||||||
|
+ ]
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
source_set("libwebp_webp") {
|
||||||
|
- libs = [
|
||||||
|
- "webp",
|
||||||
|
- "webpdemux",
|
||||||
|
- "webpmux",
|
||||||
|
+ deps = [
|
||||||
|
+ ":libwebp_shim",
|
||||||
|
]
|
||||||
|
+ public_configs = [ ":system_libwebp" ]
|
||||||
|
}
|
||||||
|
|
||||||
|
group("libwebp") {
|
65
chromium-68.0.3440.84-move-unique-ptr.patch
Normal file
65
chromium-68.0.3440.84-move-unique-ptr.patch
Normal file
@ -0,0 +1,65 @@
|
|||||||
|
From 56cb5f7da1025f6db869e840ed34d3b98b9ab899 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jose Dapena Paz <jose.dapena@lge.com>
|
||||||
|
Date: Tue, 29 May 2018 16:04:14 +0000
|
||||||
|
Subject: [PATCH] GCC: do not std::move unique ptr of forward declared UrlIndex
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
GCC fails to resolve the size of UrlIndex, needed
|
||||||
|
for moving a std::unique_ptr of UrlIndex. This is because
|
||||||
|
moved is done on a forward-declared UrlIndex.
|
||||||
|
|
||||||
|
To avoid the problem, move the call to std::move to the .cc
|
||||||
|
file so the full declaration is available.
|
||||||
|
|
||||||
|
Build error:
|
||||||
|
../../buildtools/third_party/libc++/trunk/include/memory: In instantiation of ‘void std::__1::default_delete<_Tp>::operator()(_Tp*) const [with _Tp = bookmarks::UrlIndex]’:
|
||||||
|
../../buildtools/third_party/libc++/trunk/include/memory:2634:22: required from ‘void std::__1::unique_ptr<_Tp, _Dp>::reset(std::__1::unique_ptr<_Tp, _Dp>::pointer) [with _Tp = bookmarks::UrlIndex; _Dp = std::__1::default_delete<bookmarks::UrlIndex>; std::__1::unique_ptr<_Tp, _Dp>::pointer = bookmarks::UrlIndex*]’
|
||||||
|
../../buildtools/third_party/libc++/trunk/include/memory:2588:24: required from ‘std::__1::unique_ptr<_Tp, _Dp>::~unique_ptr() [with _Tp = bookmarks::UrlIndex; _Dp = std::__1::default_delete<bookmarks::UrlIndex>]’
|
||||||
|
../../components/bookmarks/browser/bookmark_storage.h:107:76: required from here
|
||||||
|
../../buildtools/third_party/libc++/trunk/include/memory:2317:25: error: invalid application of ‘sizeof’ to incomplete type ‘bookmarks::UrlIndex’
|
||||||
|
static_assert(sizeof(_Tp) > 0,
|
||||||
|
|
||||||
|
Bug: 819294
|
||||||
|
Change-Id: I793a807c28e797aaa2e31d9c8b7e09fb6ca6b9e7
|
||||||
|
Reviewed-on: https://chromium-review.googlesource.com/1071648
|
||||||
|
Commit-Queue: Scott Violet <sky@chromium.org>
|
||||||
|
Reviewed-by: Scott Violet <sky@chromium.org>
|
||||||
|
Cr-Commit-Position: refs/heads/master@{#562446}
|
||||||
|
---
|
||||||
|
components/bookmarks/browser/bookmark_storage.cc | 4 ++++
|
||||||
|
components/bookmarks/browser/bookmark_storage.h | 2 +-
|
||||||
|
2 files changed, 5 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/components/bookmarks/browser/bookmark_storage.cc b/components/bookmarks/browser/bookmark_storage.cc
|
||||||
|
index 1633ba1df2a4..3ae0c62292e7 100644
|
||||||
|
--- a/components/bookmarks/browser/bookmark_storage.cc
|
||||||
|
+++ b/components/bookmarks/browser/bookmark_storage.cc
|
||||||
|
@@ -158,6 +158,10 @@ void BookmarkLoadDetails::CreateUrlIndex() {
|
||||||
|
url_index_ = std::make_unique<UrlIndex>(std::move(root_node_));
|
||||||
|
}
|
||||||
|
|
||||||
|
+std::unique_ptr<UrlIndex> BookmarkLoadDetails::owned_url_index() {
|
||||||
|
+ return std::move(url_index_);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
BookmarkPermanentNode* BookmarkLoadDetails::CreatePermanentNode(
|
||||||
|
BookmarkClient* client,
|
||||||
|
BookmarkNode::Type type) {
|
||||||
|
diff --git a/components/bookmarks/browser/bookmark_storage.h b/components/bookmarks/browser/bookmark_storage.h
|
||||||
|
index 08df5bb65d83..0a1b1a1b65b9 100644
|
||||||
|
--- a/components/bookmarks/browser/bookmark_storage.h
|
||||||
|
+++ b/components/bookmarks/browser/bookmark_storage.h
|
||||||
|
@@ -104,7 +104,7 @@ class BookmarkLoadDetails {
|
||||||
|
bool ids_reassigned() const { return ids_reassigned_; }
|
||||||
|
|
||||||
|
void CreateUrlIndex();
|
||||||
|
- std::unique_ptr<UrlIndex> owned_url_index() { return std::move(url_index_); }
|
||||||
|
+ std::unique_ptr<UrlIndex> owned_url_index();
|
||||||
|
|
||||||
|
private:
|
||||||
|
// Creates one of the possible permanent nodes (bookmark bar node, other node
|
||||||
|
--
|
||||||
|
2.17.1
|
||||||
|
|
@ -256,6 +256,9 @@ if __name__ == '__main__':
|
|||||||
parser_add_argument(
|
parser_add_argument(
|
||||||
'--version',
|
'--version',
|
||||||
help='Download a specific version of Chromium')
|
help='Download a specific version of Chromium')
|
||||||
|
parser_add_argument(
|
||||||
|
'--naclvers',
|
||||||
|
help='Display the commit versions of nacl toolchain components')
|
||||||
|
|
||||||
# Parse the args
|
# Parse the args
|
||||||
if optparse:
|
if optparse:
|
||||||
@ -307,7 +310,8 @@ if __name__ == '__main__':
|
|||||||
print "%s is possibly corrupted, exiting." % (latest)
|
print "%s is possibly corrupted, exiting." % (latest)
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
nacl_versions(chromium_version)
|
if (args.naclvers):
|
||||||
|
nacl_versions(chromium_version)
|
||||||
|
|
||||||
if (args.cleansources):
|
if (args.cleansources):
|
||||||
junk_dirs = ['third_party/WebKit/Tools/Scripts/webkitpy/layout_tests',
|
junk_dirs = ['third_party/WebKit/Tools/Scripts/webkitpy/layout_tests',
|
||||||
|
@ -31,9 +31,9 @@
|
|||||||
|
|
||||||
%global __provides_exclude_from %{chromium_path}/.*\\.so|%{chromium_path}/lib/.*\\.so|%{chromium_path}/lib/.*\\.so.*
|
%global __provides_exclude_from %{chromium_path}/.*\\.so|%{chromium_path}/lib/.*\\.so|%{chromium_path}/lib/.*\\.so.*
|
||||||
%if 0%{?rhel} == 7
|
%if 0%{?rhel} == 7
|
||||||
%global privlibs libaccessibility|libanimation|libapdu|libaura_extra|libaura|libbase_i18n|libbase|libbindings_base|libbindings|libblink_android_mojo_bindings_shared|libblink_common|libblink_controller|libblink_core_mojo_bindings_shared|libblink_core|libblink_modules|libblink_mojo_bindings_shared|libblink_offscreen_canvas_mojo_bindings_shared|libblink_platform|libbluetooth|libboringssl|libbrowser_ui_views|libcaptive_portal|libcapture_base|libcapture_lib|libcbor|libcc_animation|libcc_base|libcc_blink|libcc_debug|libcc_ipc|libcc_paint|libcc|libcdm_manager|libchromium_sqlite3|libclearkeycdm|libclient|libcloud_policy_proto_generated_compile|libcodec|libcolor_space|libcommon|libcompositor|libcontent_common_mojo_bindings_shared|libcontent_public_common_mojo_bindings_shared|libcontent|libcrash_key|libcrcrypto|libdbus|libdevice_base|libdevice_event_log|libdevice_features|libdevice_gamepad|libdevices|libdevice_vr_mojo_bindings_blink|libdevice_vr_mojo_bindings_shared|libdevice_vr_mojo_bindings|libdevice_vr|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libEGL|libembedder|libembedder_switches|libevents_base|libevents_devices_x11|libevents_ozone_layout|libevents|libevents_x|libffmpeg|libfido|libfingerprint|libfreetype_harfbuzz|libgcm|libgeolocation|libgeometry_skia|libgeometry|libgesture_detection|libgfx_ipc_buffer_types|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_ipc|libgfx|libgfx_switches|libgfx_x11|libgin|libgles2_implementation|libgles2|libgles2_utils|libGLESv2|libgl_init|libgl_in_process_context|libgl_wrapper|libgpu_ipc_service|libgpu|libgpu_util|libgtk3ui|libheadless|libhost|libicui18n|libicuuc|libinterfaces_shared|libipc_mojom_shared|libipc_mojom|libipc|libkeyboard|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libleveldatabase|libmanager|libmedia_blink|libmedia_devices_mojo_bindings_shared|libmedia_gpu|libmedia_mojo_services|libmedia|libmessage_center|libmessage_support|libmetrics_cpp|libmidi|libmirclient|libmojo_base_lib|libmojo_base_mojom_blink|libmojo_base_mojom_shared|libmojo_base_mojom|libmojo_base_shared_typemap_traits|libmojo_edk_ports|libmojo_edk|libmojo_ime_lib|libmojom_core_shared|libmojo_mojom_bindings_shared|libmojo_mojom_bindings|libmojom_platform_shared|libmojo_public_system_cpp|libmojo_public_system|libnative_theme|libnet|libnet_with_v8|libnetwork_cpp_base|libnetwork_cpp|libnetwork_service|libnetwork_session_configurator|libonc|libplatform|libpolicy_component|libpolicy_proto|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|libpublic|librange|libraster|libresource_coordinator_cpp_base|libresource_coordinator_cpp|libresource_coordinator_public_mojom_blink|libresource_coordinator_public_mojom_shared|libresource_coordinator_public_mojom|libsandbox_services|libsandbox|libseccomp_bpf|libservice_manager_cpp|libservice_manager_cpp_types|libservice_manager_mojom_blink|libservice_manager_mojom_constants_blink|libservice_manager_mojom_constants_shared|libservice_manager_mojom_constants|libservice_manager_mojom_shared|libservice_manager_mojom|libservice|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstub_window|libsuid_sandbox_client|libsurface|libtracing_cpp|libtracing_mojom_shared|libtracing_mojom|libtracing|libui_base_ime|libui_base|libui_base_x|libui_data_pack|libui_devtools|libui_message_center_cpp|libui_touch_selection|libui_views_mus_lib|liburl_ipc|liburl_matcher|liburl|libuser_manager|libuser_prefs|libv8_libbase|libv8_libplatform|libv8|libviews|libviz_common|libviz_resource_format|libVkLayer_core_validation|libVkLayer_object_tracker|libVkLayer_parameter_validation|libVkLayer_threading|libVkLayer_unique_objects|libwebdata_common|libweb_dialogs|libwebview|libwm_public|libwm|libwtf|libx11_events_platform|libx11_window|libbase|libEGL|libGLESv2|libfontconfig
|
%global privlibs libaccessibility|libanimation|libapdu|libaura_extra|libaura|libbase_i18n|libbase|libbindings_base|libbindings|libblink_android_mojo_bindings_shared|libblink_common|libblink_controller|libblink_core_mojo_bindings_shared|libblink_core|libblink_modules|libblink_mojo_bindings_shared|libblink_offscreen_canvas_mojo_bindings_shared|libblink_platform|libbluetooth|libboringssl|libbrowser_ui_views|libcaptive_portal|libcapture_base|libcapture_lib|libcbor|libcc_animation|libcc_base|libcc_blink|libcc_debug|libcc_ipc|libcc_paint|libcc|libcdm_manager|libchromium_sqlite3|libclearkeycdm|libclient|libcloud_policy_proto_generated_compile|libcodec|libcolor_space|libcommon|libcompositor|libcontent_common_mojo_bindings_shared|libcontent_public_common_mojo_bindings_shared|libcontent|libcrash_key|libcrcrypto|libdbus|libdevice_base|libdevice_event_log|libdevice_features|libdevice_gamepad|libdevices|libdevice_vr_mojo_bindings_blink|libdevice_vr_mojo_bindings_shared|libdevice_vr_mojo_bindings|libdevice_vr|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libEGL|libembedder|libembedder_switches|libevents_base|libevents_devices_x11|libevents_ozone_layout|libevents|libevents_x|libffmpeg|libfido|libfingerprint|libfreetype_harfbuzz|libgcm|libgeolocation|libgeometry_skia|libgeometry|libgesture_detection|libgfx_ipc_buffer_types|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_ipc|libgfx|libgfx_switches|libgfx_x11|libgin|libgles2_implementation|libgles2|libgles2_utils|libGLESv2|libgl_init|libgl_in_process_context|libgl_wrapper|libgpu_ipc_service|libgpu|libgpu_util|libgtk3ui|libheadless|libhost|libicui18n|libicuuc|libinterfaces_shared|libipc_mojom_shared|libipc_mojom|libipc|libkeyboard|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libleveldatabase|libmanager|libmedia_blink|libmedia_devices_mojo_bindings_shared|libmedia_gpu|libmedia_mojo_services|libmedia|libmessage_center|libmessage_support|libmetrics_cpp|libmidi|libmirclient|libmojo_base_lib|libmojo_base_mojom_blink|libmojo_base_mojom_shared|libmojo_base_mojom|libmojo_base_shared_typemap_traits|libmojo_edk_ports|libmojo_edk|libmojo_ime_lib|libmojom_core_shared|libmojo_mojom_bindings_shared|libmojo_mojom_bindings|libmojom_platform_shared|libmojo_public_system_cpp|libmojo_public_system|libnative_theme|libnet|libnet_with_v8|libnetwork_cpp_base|libnetwork_cpp|libnetwork_service|libnetwork_session_configurator|libonc|libplatform|libpolicy_component|libpolicy_proto|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|libpublic|librange|libraster|libresource_coordinator_cpp_base|libresource_coordinator_cpp|libresource_coordinator_public_mojom_blink|libresource_coordinator_public_mojom_shared|libresource_coordinator_public_mojom|libsandbox_services|libsandbox|libseccomp_bpf|libservice_manager_cpp|libservice_manager_cpp_types|libservice_manager_mojom_blink|libservice_manager_mojom_constants_blink|libservice_manager_mojom_constants_shared|libservice_manager_mojom_constants|libservice_manager_mojom_shared|libservice_manager_mojom|libservice|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstub_window|libsuid_sandbox_client|libsurface|libtracing_cpp|libtracing_mojom_shared|libtracing_mojom|libtracing|libui_base_ime|libui_base|libui_base_x|libui_data_pack|libui_devtools|libui_message_center_cpp|libui_touch_selection|libui_views_mus_lib|liburl_ipc|liburl_matcher|liburl|libuser_manager|libuser_prefs|libv8_libbase|libv8_libplatform|libv8|libviews|libviz_common|libviz_resource_format|libVkLayer_core_validation|libVkLayer_object_tracker|libVkLayer_parameter_validation|libVkLayer_threading|libVkLayer_unique_objects|libwebdata_common|libweb_dialogs|libwebview|libwm_public|libwm|libwtf|libx11_events_platform|libx11_window|libbase|libEGL|libGLESv2|libfontconfig|libzygote
|
||||||
%else
|
%else
|
||||||
%global privlibs libaccessibility|libanimation|libapdu|libaura_extra|libaura|libbase_i18n|libbase|libbindings_base|libbindings|libblink_android_mojo_bindings_shared|libblink_common|libblink_controller|libblink_core_mojo_bindings_shared|libblink_core|libblink_modules|libblink_mojo_bindings_shared|libblink_offscreen_canvas_mojo_bindings_shared|libblink_platform|libbluetooth|libboringssl|libbrowser_ui_views|libcaptive_portal|libcapture_base|libcapture_lib|libcbor|libcc_animation|libcc_base|libcc_blink|libcc_debug|libcc_ipc|libcc_paint|libcc|libcdm_manager|libchromium_sqlite3|libclearkeycdm|libclient|libcloud_policy_proto_generated_compile|libcodec|libcolor_space|libcommon|libcompositor|libcontent_common_mojo_bindings_shared|libcontent_public_common_mojo_bindings_shared|libcontent|libcrash_key|libcrcrypto|libdbus|libdevice_base|libdevice_event_log|libdevice_features|libdevice_gamepad|libdevices|libdevice_vr_mojo_bindings_blink|libdevice_vr_mojo_bindings_shared|libdevice_vr_mojo_bindings|libdevice_vr|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libEGL|libembedder|libembedder_switches|libevents_base|libevents_devices_x11|libevents_ozone_layout|libevents|libevents_x|libffmpeg|libfido|libfingerprint|libfreetype_harfbuzz|libgcm|libgeolocation|libgeometry_skia|libgeometry|libgesture_detection|libgfx_ipc_buffer_types|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_ipc|libgfx|libgfx_switches|libgfx_x11|libgin|libgles2_implementation|libgles2|libgles2_utils|libGLESv2|libgl_init|libgl_in_process_context|libgl_wrapper|libgpu_ipc_service|libgpu|libgpu_util|libgtk3ui|libheadless|libhost|libicui18n|libicuuc|libinterfaces_shared|libipc_mojom_shared|libipc_mojom|libipc|libkeyboard|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libleveldatabase|libmanager|libmedia_blink|libmedia_devices_mojo_bindings_shared|libmedia_gpu|libmedia_mojo_services|libmedia|libmessage_center|libmessage_support|libmetrics_cpp|libmidi|libmirclient|libmojo_base_lib|libmojo_base_mojom_blink|libmojo_base_mojom_shared|libmojo_base_mojom|libmojo_base_shared_typemap_traits|libmojo_edk_ports|libmojo_edk|libmojo_ime_lib|libmojom_core_shared|libmojo_mojom_bindings_shared|libmojo_mojom_bindings|libmojom_platform_shared|libmojo_public_system_cpp|libmojo_public_system|libnative_theme|libnet|libnet_with_v8|libnetwork_cpp_base|libnetwork_cpp|libnetwork_service|libnetwork_session_configurator|libonc|libplatform|libpolicy_component|libpolicy_proto|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|libpublic|librange|libraster|libresource_coordinator_cpp_base|libresource_coordinator_cpp|libresource_coordinator_public_mojom_blink|libresource_coordinator_public_mojom_shared|libresource_coordinator_public_mojom|libsandbox_services|libsandbox|libseccomp_bpf|libservice_manager_cpp|libservice_manager_cpp_types|libservice_manager_mojom_blink|libservice_manager_mojom_constants_blink|libservice_manager_mojom_constants_shared|libservice_manager_mojom_constants|libservice_manager_mojom_shared|libservice_manager_mojom|libservice|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstub_window|libsuid_sandbox_client|libsurface|libtracing_cpp|libtracing_mojom_shared|libtracing_mojom|libtracing|libui_base_ime|libui_base|libui_base_x|libui_data_pack|libui_devtools|libui_message_center_cpp|libui_touch_selection|libui_views_mus_lib|liburl_ipc|liburl_matcher|liburl|libuser_manager|libuser_prefs|libv8_libbase|libv8_libplatform|libv8|libviews|libviz_common|libviz_resource_format|libVkLayer_core_validation|libVkLayer_object_tracker|libVkLayer_parameter_validation|libVkLayer_threading|libVkLayer_unique_objects|libwebdata_common|libweb_dialogs|libwebview|libwm_public|libwm|libwtf|libx11_events_platform|libx11_window|libbase|libEGL|libGLESv2
|
%global privlibs libaccessibility|libanimation|libapdu|libaura_extra|libaura|libbase_i18n|libbase|libbindings_base|libbindings|libblink_android_mojo_bindings_shared|libblink_common|libblink_controller|libblink_core_mojo_bindings_shared|libblink_core|libblink_modules|libblink_mojo_bindings_shared|libblink_offscreen_canvas_mojo_bindings_shared|libblink_platform|libbluetooth|libboringssl|libbrowser_ui_views|libcaptive_portal|libcapture_base|libcapture_lib|libcbor|libcc_animation|libcc_base|libcc_blink|libcc_debug|libcc_ipc|libcc_paint|libcc|libcdm_manager|libchromium_sqlite3|libclearkeycdm|libclient|libcloud_policy_proto_generated_compile|libcodec|libcolor_space|libcommon|libcompositor|libcontent_common_mojo_bindings_shared|libcontent_public_common_mojo_bindings_shared|libcontent|libcrash_key|libcrcrypto|libdbus|libdevice_base|libdevice_event_log|libdevice_features|libdevice_gamepad|libdevices|libdevice_vr_mojo_bindings_blink|libdevice_vr_mojo_bindings_shared|libdevice_vr_mojo_bindings|libdevice_vr|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libEGL|libembedder|libembedder_switches|libevents_base|libevents_devices_x11|libevents_ozone_layout|libevents|libevents_x|libffmpeg|libfido|libfingerprint|libfreetype_harfbuzz|libgcm|libgeolocation|libgeometry_skia|libgeometry|libgesture_detection|libgfx_ipc_buffer_types|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_ipc|libgfx|libgfx_switches|libgfx_x11|libgin|libgles2_implementation|libgles2|libgles2_utils|libGLESv2|libgl_init|libgl_in_process_context|libgl_wrapper|libgpu_ipc_service|libgpu|libgpu_util|libgtk3ui|libheadless|libhost|libicui18n|libicuuc|libinterfaces_shared|libipc_mojom_shared|libipc_mojom|libipc|libkeyboard|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libleveldatabase|libmanager|libmedia_blink|libmedia_devices_mojo_bindings_shared|libmedia_gpu|libmedia_mojo_services|libmedia|libmessage_center|libmessage_support|libmetrics_cpp|libmidi|libmirclient|libmojo_base_lib|libmojo_base_mojom_blink|libmojo_base_mojom_shared|libmojo_base_mojom|libmojo_base_shared_typemap_traits|libmojo_edk_ports|libmojo_edk|libmojo_ime_lib|libmojom_core_shared|libmojo_mojom_bindings_shared|libmojo_mojom_bindings|libmojom_platform_shared|libmojo_public_system_cpp|libmojo_public_system|libnative_theme|libnet|libnet_with_v8|libnetwork_cpp_base|libnetwork_cpp|libnetwork_service|libnetwork_session_configurator|libonc|libplatform|libpolicy_component|libpolicy_proto|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|libpublic|librange|libraster|libresource_coordinator_cpp_base|libresource_coordinator_cpp|libresource_coordinator_public_mojom_blink|libresource_coordinator_public_mojom_shared|libresource_coordinator_public_mojom|libsandbox_services|libsandbox|libseccomp_bpf|libservice_manager_cpp|libservice_manager_cpp_types|libservice_manager_mojom_blink|libservice_manager_mojom_constants_blink|libservice_manager_mojom_constants_shared|libservice_manager_mojom_constants|libservice_manager_mojom_shared|libservice_manager_mojom|libservice|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstub_window|libsuid_sandbox_client|libsurface|libtracing_cpp|libtracing_mojom_shared|libtracing_mojom|libtracing|libui_base_ime|libui_base|libui_base_x|libui_data_pack|libui_devtools|libui_message_center_cpp|libui_touch_selection|libui_views_mus_lib|liburl_ipc|liburl_matcher|liburl|libuser_manager|libuser_prefs|libv8_libbase|libv8_libplatform|libv8|libviews|libviz_common|libviz_resource_format|libVkLayer_core_validation|libVkLayer_object_tracker|libVkLayer_parameter_validation|libVkLayer_threading|libVkLayer_unique_objects|libwebdata_common|libweb_dialogs|libwebview|libwm_public|libwm|libwtf|libx11_events_platform|libx11_window|libbase|libEGL|libGLESv2|libzygote
|
||||||
%endif
|
%endif
|
||||||
%global __requires_exclude ^(%{privlibs})\\.so*
|
%global __requires_exclude ^(%{privlibs})\\.so*
|
||||||
|
|
||||||
@ -132,15 +132,15 @@ BuildRequires: libicu-devel >= 5.4
|
|||||||
%global chromoting_client_id %nil
|
%global chromoting_client_id %nil
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%global majorversion 67
|
%global majorversion 68
|
||||||
|
|
||||||
%if %{freeworld}
|
%if %{freeworld}
|
||||||
Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
|
Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
|
||||||
%else
|
%else
|
||||||
Name: chromium%{chromium_channel}
|
Name: chromium%{chromium_channel}
|
||||||
%endif
|
%endif
|
||||||
Version: %{majorversion}.0.3396.99
|
Version: %{majorversion}.0.3440.106
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: A WebKit (Blink) powered web browser
|
Summary: A WebKit (Blink) powered web browser
|
||||||
Url: http://www.chromium.org/Home
|
Url: http://www.chromium.org/Home
|
||||||
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
|
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
|
||||||
@ -149,7 +149,7 @@ License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and Open
|
|||||||
Patch0: chromium-67.0.3396.62-gcc5.patch
|
Patch0: chromium-67.0.3396.62-gcc5.patch
|
||||||
Patch1: chromium-45.0.2454.101-linux-path-max.patch
|
Patch1: chromium-45.0.2454.101-linux-path-max.patch
|
||||||
Patch2: chromium-55.0.2883.75-addrfix.patch
|
Patch2: chromium-55.0.2883.75-addrfix.patch
|
||||||
Patch4: chromium-46.0.2490.71-notest.patch
|
Patch4: chromium-68.0.3440.106-notest.patch
|
||||||
# In file included from ../linux/directory.c:21:
|
# In file included from ../linux/directory.c:21:
|
||||||
# In file included from ../../../../native_client/src/nonsfi/linux/abi_conversion.h:20:
|
# In file included from ../../../../native_client/src/nonsfi/linux/abi_conversion.h:20:
|
||||||
# ../../../../native_client/src/nonsfi/linux/linux_syscall_structs.h:44:13: error: GNU-style inline assembly is disabled
|
# ../../../../native_client/src/nonsfi/linux/linux_syscall_structs.h:44:13: error: GNU-style inline assembly is disabled
|
||||||
@ -167,7 +167,7 @@ Patch12: chromium-55.0.2883.75-cups22.patch
|
|||||||
# Use PIE in the Linux sandbox (from openSUSE via Russian Fedora)
|
# Use PIE in the Linux sandbox (from openSUSE via Russian Fedora)
|
||||||
Patch15: chromium-55.0.2883.75-sandbox-pie.patch
|
Patch15: chromium-55.0.2883.75-sandbox-pie.patch
|
||||||
# Use /etc/chromium for master_prefs
|
# Use /etc/chromium for master_prefs
|
||||||
Patch18: chromium-52.0.2743.82-master-prefs-path.patch
|
Patch18: chromium-68.0.3440.106-master-prefs-path.patch
|
||||||
# Disable MADV_FREE (if set by glibc)
|
# Disable MADV_FREE (if set by glibc)
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1361157
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1361157
|
||||||
Patch19: chromium-52.0.2743.116-unset-madv_free.patch
|
Patch19: chromium-52.0.2743.116-unset-madv_free.patch
|
||||||
@ -186,7 +186,7 @@ Patch25: chromium-54.0.2840.59-jpeg-include-dir.patch
|
|||||||
Patch26: chromium-59.0.3071.86-i686-ld-memory-tricks.patch
|
Patch26: chromium-59.0.3071.86-i686-ld-memory-tricks.patch
|
||||||
# obj/content/renderer/renderer/child_frame_compositing_helper.o: In function `content::ChildFrameCompositingHelper::OnSetSurface(cc::SurfaceId const&, gfx::Size const&, float, cc::SurfaceSequence const&)':
|
# obj/content/renderer/renderer/child_frame_compositing_helper.o: In function `content::ChildFrameCompositingHelper::OnSetSurface(cc::SurfaceId const&, gfx::Size const&, float, cc::SurfaceSequence const&)':
|
||||||
# /builddir/build/BUILD/chromium-54.0.2840.90/out/Release/../../content/renderer/child_frame_compositing_helper.cc:214: undefined reference to `cc_blink::WebLayerImpl::setOpaque(bool)'
|
# /builddir/build/BUILD/chromium-54.0.2840.90/out/Release/../../content/renderer/child_frame_compositing_helper.cc:214: undefined reference to `cc_blink::WebLayerImpl::setOpaque(bool)'
|
||||||
Patch27: chromium-63.0.3289.84-setopaque.patch
|
# Patch27: chromium-63.0.3289.84-setopaque.patch
|
||||||
# Use -fpermissive to build WebKit
|
# Use -fpermissive to build WebKit
|
||||||
# Patch31: chromium-56.0.2924.87-fpermissive.patch
|
# Patch31: chromium-56.0.2924.87-fpermissive.patch
|
||||||
# Fix issue with compilation on gcc7
|
# Fix issue with compilation on gcc7
|
||||||
@ -225,7 +225,7 @@ Patch65: chromium-65.0.3325.146-gcc-round-fix.patch
|
|||||||
# Include proper headers to invoke memcpy()
|
# Include proper headers to invoke memcpy()
|
||||||
Patch67: chromium-65.0.3325.146-memcpy-fix.patch
|
Patch67: chromium-65.0.3325.146-memcpy-fix.patch
|
||||||
# ../../mojo/public/cpp/bindings/associated_interface_ptr_info.h:48:43: error: cannot convert 'const mojo::ScopedInterfaceEndpointHandle' to 'bool' in return
|
# ../../mojo/public/cpp/bindings/associated_interface_ptr_info.h:48:43: error: cannot convert 'const mojo::ScopedInterfaceEndpointHandle' to 'bool' in return
|
||||||
Patch85: chromium-67.0.3396.62-boolfix.patch
|
Patch85: chromium-68.0.3440.106-boolfix.patch
|
||||||
# From Debian
|
# From Debian
|
||||||
Patch86: chromium-67.0.3396.62-skia-aarch64-buildfix.patch
|
Patch86: chromium-67.0.3396.62-skia-aarch64-buildfix.patch
|
||||||
# Use lstdc++ on EPEL7 only
|
# Use lstdc++ on EPEL7 only
|
||||||
@ -258,11 +258,23 @@ Patch99: chromium-67.0.3396.62-crashpad-aarch64-buildfix.patch
|
|||||||
# https://bugs.python.org/issue21591
|
# https://bugs.python.org/issue21591
|
||||||
Patch100: chromium-67.0.3396.62-epel7-use-old-python-exec-syntax.patch
|
Patch100: chromium-67.0.3396.62-epel7-use-old-python-exec-syntax.patch
|
||||||
# Add "Fedora" to the user agent string
|
# Add "Fedora" to the user agent string
|
||||||
Patch101: chromium-67.0.3396.87-fedora-user-agent.patch
|
Patch101: chromium-68.0.3440.106-fedora-user-agent.patch
|
||||||
# Try to fix version.py for Rawhide
|
# Try to fix version.py for Rawhide
|
||||||
Patch102: chromium-67.0.3396.99-py3fix.patch
|
Patch102: chromium-67.0.3396.99-py3fix.patch
|
||||||
Patch103: chromium-67.0.3396.99-py2-bootstrap.patch
|
Patch103: chromium-67.0.3396.99-py2-bootstrap.patch
|
||||||
|
# ERROR at //extensions/browser/api/networking_private/BUILD.gn:15:5: Undefined identifier
|
||||||
|
# "networking_cast_private_delegate.cc",
|
||||||
|
# ^------------------------------------
|
||||||
|
# https://chromium.googlesource.com/chromium/src/+/abde0a4bd9f3bfddebe825cc25cc3bc857e3d088%5E%21/#F1
|
||||||
|
Patch104: chromium-68.0.3440.106-fix-build-networking_private.patch
|
||||||
|
# CORS legacy: add missing string include
|
||||||
|
Patch105: chromium-68.0.3440.84-cors-string.patch
|
||||||
|
# Fix libjpeg include handling
|
||||||
|
Patch106: chromium-68.0.3440.84-libjpeg.patch
|
||||||
|
# Fix webp bundling shim
|
||||||
|
Patch107: chromium-68.0.3440.84-libwebp-shim.patch
|
||||||
|
# GCC: do not std::move unique ptr of forward declared UrlIndex
|
||||||
|
Patch108: chromium-68.0.3440.84-move-unique-ptr.patch
|
||||||
|
|
||||||
# Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
|
# Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
|
||||||
# http://build.chromium.org/buildbot/official/
|
# http://build.chromium.org/buildbot/official/
|
||||||
@ -735,7 +747,7 @@ udev.
|
|||||||
%patch24 -p1 -b .nullfix
|
%patch24 -p1 -b .nullfix
|
||||||
%patch25 -p1 -b .jpegfix
|
%patch25 -p1 -b .jpegfix
|
||||||
%patch26 -p1 -b .ldmemory
|
%patch26 -p1 -b .ldmemory
|
||||||
%patch27 -p1 -b .setopaque
|
# %%patch27 -p1 -b .setopaque
|
||||||
# %%patch31 -p1 -b .permissive
|
# %%patch31 -p1 -b .permissive
|
||||||
# %%patch33 -p1 -b .gcc7
|
# %%patch33 -p1 -b .gcc7
|
||||||
%patch36 -p1 -b .revert
|
%patch36 -p1 -b .revert
|
||||||
@ -780,6 +792,11 @@ udev.
|
|||||||
%patch101 -p1 -b .fedora-user-agent
|
%patch101 -p1 -b .fedora-user-agent
|
||||||
%patch102 -p1 -b .py3fix
|
%patch102 -p1 -b .py3fix
|
||||||
%patch103 -p1 -b .py2
|
%patch103 -p1 -b .py2
|
||||||
|
%patch104 -p1 -b .fixb
|
||||||
|
%patch105 -p1 -b .cors
|
||||||
|
%patch106 -p1 -b .libjpeg
|
||||||
|
%patch107 -p1 -b .webp
|
||||||
|
%patch108 -p1 -b .move-unique-ptr
|
||||||
|
|
||||||
|
|
||||||
# Change shebang in all relevant files in this directory and all subdirectories
|
# Change shebang in all relevant files in this directory and all subdirectories
|
||||||
@ -963,7 +980,7 @@ CHROMIUM_BROWSER_GN_DEFINES+=' is_component_ffmpeg=false is_component_build=fals
|
|||||||
%endif
|
%endif
|
||||||
CHROMIUM_BROWSER_GN_DEFINES+=' remove_webcore_debug_symbols=true enable_hangout_services_extension=true'
|
CHROMIUM_BROWSER_GN_DEFINES+=' remove_webcore_debug_symbols=true enable_hangout_services_extension=true'
|
||||||
CHROMIUM_BROWSER_GN_DEFINES+=' use_aura=true'
|
CHROMIUM_BROWSER_GN_DEFINES+=' use_aura=true'
|
||||||
CHROMIUM_BROWSER_GN_DEFINES+=' enable_webrtc=true'
|
# CHROMIUM_BROWSER_GN_DEFINES+=' enable_webrtc=true'
|
||||||
%if 0%{gtk3}
|
%if 0%{gtk3}
|
||||||
CHROMIUM_BROWSER_GN_DEFINES+=' use_gtk3=true'
|
CHROMIUM_BROWSER_GN_DEFINES+=' use_gtk3=true'
|
||||||
%else
|
%else
|
||||||
@ -999,8 +1016,11 @@ build/linux/unbundle/remove_bundled_libraries.py \
|
|||||||
'base/third_party/xdg_user_dirs' \
|
'base/third_party/xdg_user_dirs' \
|
||||||
'chrome/third_party/mozilla_security_manager' \
|
'chrome/third_party/mozilla_security_manager' \
|
||||||
'courgette/third_party' \
|
'courgette/third_party' \
|
||||||
|
'net/third_party/http2' \
|
||||||
'net/third_party/mozilla_security_manager' \
|
'net/third_party/mozilla_security_manager' \
|
||||||
'net/third_party/nss' \
|
'net/third_party/nss' \
|
||||||
|
'net/third_party/quic' \
|
||||||
|
'net/third_party/spdy' \
|
||||||
'third_party/WebKit' \
|
'third_party/WebKit' \
|
||||||
'third_party/adobe' \
|
'third_party/adobe' \
|
||||||
'third_party/analytics' \
|
'third_party/analytics' \
|
||||||
@ -1066,7 +1086,6 @@ build/linux/unbundle/remove_bundled_libraries.py \
|
|||||||
'third_party/libXNVCtrl' \
|
'third_party/libXNVCtrl' \
|
||||||
'third_party/libaddressinput' \
|
'third_party/libaddressinput' \
|
||||||
'third_party/libaom' \
|
'third_party/libaom' \
|
||||||
'third_party/libaom/source/libaom/third_party/x86inc' \
|
|
||||||
'third_party/libdrm' \
|
'third_party/libdrm' \
|
||||||
'third_party/libjingle' \
|
'third_party/libjingle' \
|
||||||
'third_party/libjpeg_turbo' \
|
'third_party/libjpeg_turbo' \
|
||||||
@ -1074,6 +1093,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
|
|||||||
'third_party/libpng' \
|
'third_party/libpng' \
|
||||||
'third_party/libsecret' \
|
'third_party/libsecret' \
|
||||||
'third_party/libsrtp' \
|
'third_party/libsrtp' \
|
||||||
|
'third_party/libsync' \
|
||||||
'third_party/libudev' \
|
'third_party/libudev' \
|
||||||
'third_party/libusb' \
|
'third_party/libusb' \
|
||||||
'third_party/libvpx' \
|
'third_party/libvpx' \
|
||||||
@ -1113,20 +1133,24 @@ build/linux/unbundle/remove_bundled_libraries.py \
|
|||||||
'third_party/pdfium/third_party/libpng16' \
|
'third_party/pdfium/third_party/libpng16' \
|
||||||
'third_party/pdfium/third_party/libtiff' \
|
'third_party/pdfium/third_party/libtiff' \
|
||||||
'third_party/pdfium/third_party/skia_shared' \
|
'third_party/pdfium/third_party/skia_shared' \
|
||||||
|
'third_party/perfetto' \
|
||||||
'third_party/ply' \
|
'third_party/ply' \
|
||||||
'third_party/polymer' \
|
'third_party/polymer' \
|
||||||
'third_party/protobuf' \
|
'third_party/protobuf' \
|
||||||
'third_party/protobuf/third_party/six' \
|
'third_party/protobuf/third_party/six' \
|
||||||
|
'third_party/pyjson5' \
|
||||||
'third_party/qcms' \
|
'third_party/qcms' \
|
||||||
'third_party/qunit' \
|
'third_party/qunit' \
|
||||||
%if 0%{?bundlere2}
|
%if 0%{?bundlere2}
|
||||||
'third_party/re2' \
|
'third_party/re2' \
|
||||||
%endif
|
%endif
|
||||||
|
'third_party/rnnoise' \
|
||||||
'third_party/s2cellid' \
|
'third_party/s2cellid' \
|
||||||
'third_party/sfntly' \
|
'third_party/sfntly' \
|
||||||
'third_party/sinonjs' \
|
'third_party/sinonjs' \
|
||||||
'third_party/skia' \
|
'third_party/skia' \
|
||||||
'third_party/skia/third_party/gif' \
|
'third_party/skia/third_party/gif' \
|
||||||
|
'third_party/skia/third_party/skcms' \
|
||||||
'third_party/skia/third_party/vulkan' \
|
'third_party/skia/third_party/vulkan' \
|
||||||
'third_party/smhasher' \
|
'third_party/smhasher' \
|
||||||
'third_party/snappy' \
|
'third_party/snappy' \
|
||||||
@ -1156,6 +1180,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
|
|||||||
'url/third_party/mozilla' \
|
'url/third_party/mozilla' \
|
||||||
'v8/src/third_party/utf8-decoder' \
|
'v8/src/third_party/utf8-decoder' \
|
||||||
'v8/src/third_party/valgrind' \
|
'v8/src/third_party/valgrind' \
|
||||||
|
'v8/third_party/antlr4' \
|
||||||
'v8/third_party/inspector_protocol' \
|
'v8/third_party/inspector_protocol' \
|
||||||
--do-remove
|
--do-remove
|
||||||
|
|
||||||
@ -1714,6 +1739,15 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Aug 9 2018 Tom Callaway <spot@fedoraproject.org> - 68.0.3440.106-1
|
||||||
|
- update to 68.0.3440.106
|
||||||
|
|
||||||
|
* Wed Aug 8 2018 Tom Callaway <spot@fedoraproject.org> - 68.0.3440.84-1
|
||||||
|
- update to 68.0.3440.84
|
||||||
|
|
||||||
|
* Mon Jul 30 2018 Tom Callaway <spot@fedoraproject.org> - 68.0.3440.75-1
|
||||||
|
- update to 68.0.3440.75
|
||||||
|
|
||||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 67.0.3396.99-2
|
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 67.0.3396.99-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
@ -107,6 +107,7 @@ header_files=" libavcodec/x86/inline_asm.h \
|
|||||||
libavcodec/mpegpicture.h \
|
libavcodec/mpegpicture.h \
|
||||||
libavcodec/mpegutils.h \
|
libavcodec/mpegutils.h \
|
||||||
libavcodec/mpegvideo.h \
|
libavcodec/mpegvideo.h \
|
||||||
|
libavcodec/mpegvideodata.h \
|
||||||
libavcodec/mpegvideodsp.h \
|
libavcodec/mpegvideodsp.h \
|
||||||
libavcodec/mpegvideoencdsp.h \
|
libavcodec/mpegvideoencdsp.h \
|
||||||
libavcodec/options_table.h \
|
libavcodec/options_table.h \
|
||||||
@ -304,7 +305,6 @@ other_files=" BUILD.gn \
|
|||||||
CREDITS.chromium \
|
CREDITS.chromium \
|
||||||
ffmpeg_generated.gni \
|
ffmpeg_generated.gni \
|
||||||
ffmpeg_options.gni \
|
ffmpeg_options.gni \
|
||||||
ffmpegsumo.ver \
|
|
||||||
INSTALL.md \
|
INSTALL.md \
|
||||||
LICENSE.md \
|
LICENSE.md \
|
||||||
MAINTAINERS \
|
MAINTAINERS \
|
||||||
|
2
sources
2
sources
@ -15,4 +15,4 @@ SHA512 (Tinos-BoldItalic.ttf) = 2574de2add94ef976b731fac688951fab49574c9b0ccd259
|
|||||||
SHA512 (Tinos-Bold.ttf) = 54aeca804c06a4d5c57ade596e73df91a6a1c4401c4aadba55d987b3fb73045d35f3df02678b59abb77c4914ec741755536c0adf808c931e4b77848c52c229c4
|
SHA512 (Tinos-Bold.ttf) = 54aeca804c06a4d5c57ade596e73df91a6a1c4401c4aadba55d987b3fb73045d35f3df02678b59abb77c4914ec741755536c0adf808c931e4b77848c52c229c4
|
||||||
SHA512 (Tinos-Italic.ttf) = d4f4f096110ef98a781a2a0e0d319317e5f84e650fe6f4d4f6b0e22a16414278217f37497b904a18540273c0e2d79d4f1faabde3b0eb5446283b318c73bafb38
|
SHA512 (Tinos-Italic.ttf) = d4f4f096110ef98a781a2a0e0d319317e5f84e650fe6f4d4f6b0e22a16414278217f37497b904a18540273c0e2d79d4f1faabde3b0eb5446283b318c73bafb38
|
||||||
SHA512 (Tinos-Regular.ttf) = 58085c5dac6d067d60ba2ab3220c4a0cc1efcf279cadfcfb8746a5e5fa1a6f6daa62750dc2051b3b2d8a51b4d2e9bb0f66594caf2253c0870ed9c7286fa45e8f
|
SHA512 (Tinos-Regular.ttf) = 58085c5dac6d067d60ba2ab3220c4a0cc1efcf279cadfcfb8746a5e5fa1a6f6daa62750dc2051b3b2d8a51b4d2e9bb0f66594caf2253c0870ed9c7286fa45e8f
|
||||||
SHA512 (chromium-67.0.3396.99-clean.tar.xz) = b83d2d2f50bf6e5ce70baecf3f59f50fb7d69339c2f16aea30111650b8d0ccaf051bd1873fe63f94146212b60d59aa72c73bd8f9d96b2e27e3f354b75ba82ba4
|
SHA512 (chromium-68.0.3440.106-clean.tar.xz) = a609975c96674f3a84a33bb3d57271535671e11d0775efeceff4f8a965851216038cf491281aaab0cc64c6e99af033f9c8a93f759f232e8c686408dbc09c8dd5
|
||||||
|
Loading…
Reference in New Issue
Block a user