#10 Update chromium to 68
Closed 5 years ago by hellbangerkarna. Opened 5 years ago by hellbangerkarna.
https://github.com/biswasab/chromium_fedora_pagure master  into  master

Merge pull request #1 from kathenas/master
Akarshan Biswas • 5 years ago  
Changes...
Phil Wyett • 5 years ago  
Upgrade to 68.0.3440.106
Akarshan Biswas • 5 years ago  
chromium-68.0.3440.106-fedora-user-agent.patch
file added
+11
@@ -0,0 +1,11 @@

+ --- chromium-68.0.3440.106/content/common/user_agent.cc	2018-07-31 23:08:44.000000000 +0100

+ +++ chromium-68.0.3440.106/content/common/user_agent.cc.fedora-user-agent	2018-08-08 05:52:29.389266662 +0100

+ @@ -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)

chromium-68.0.3440.106-master-prefs-path.patch
file added
+14
@@ -0,0 +1,14 @@

+ --- chromium-68.0.3440.106/chrome/browser/first_run/first_run_internal_linux.cc	2018-07-31 23:08:30.000000000 +0100

+ +++ chromium-68.0.3440.106/chrome/browser/first_run/first_run_internal_linux.cc.master-prefs-path	2018-08-08 04:44:25.965580996 +0100

+ @@ -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);

+  }

+  

chromium-68.0.3440.106-notest.patch
file added
+10
@@ -0,0 +1,10 @@

+ --- chromium-68.0.3440.106/chrome/test/data/webui_test_resources.grd	2018-07-31 23:08:37.000000000 +0100

+ +++ chromium-68.0.3440.106/chrome/test/data/webui_test_resources.grd.notest	2018-08-08 04:11:22.326392724 +0100

+ @@ -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>

chromium-68.0.3440.84-cors-string.patch
file added
+51
@@ -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

+ 

chromium-68.0.3440.84-libjpeg.patch
file added
+62
@@ -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

+ 

chromium-68.0.3440.84-libwebp-shim.patch
file added
+43
@@ -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") {

chromium-68.0.3440.84-move-unique-ptr.patch
file added
+65
@@ -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

+ 

chromium.spec
file modified
+56 -18
@@ -31,9 +31,9 @@

  

  %global __provides_exclude_from %{chromium_path}/.*\\.so|%{chromium_path}/lib/.*\\.so|%{chromium_path}/lib/.*\\.so.*

  %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

- %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

  %global __requires_exclude ^(%{privlibs})\\.so*

  
@@ -132,15 +132,15 @@

  %global chromoting_client_id %nil

  %endif

  

- %global majorversion 67

+ %global majorversion 68

  

  %if %{freeworld}

  Name:		chromium%{chromium_channel}%{?freeworld:-freeworld}

  %else

  Name:		chromium%{chromium_channel}

  %endif

- Version:	%{majorversion}.0.3396.99

- Release:	2%{?dist}

+ Version:	%{majorversion}.0.3440.106

+ Release:	1%{?dist}

  Summary:	A WebKit (Blink) powered web browser

  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)
@@ -149,7 +149,9 @@

  Patch0:		chromium-67.0.3396.62-gcc5.patch

  Patch1:		chromium-45.0.2454.101-linux-path-max.patch

  Patch2:		chromium-55.0.2883.75-addrfix.patch

- Patch4:		chromium-46.0.2490.71-notest.patch

+ 

+ #This patch needs upgrade/removal

+ Patch4:		chromium-68.0.3440.106-notest.patch

  # In file included from ../linux/directory.c:21:

  # 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
@@ -167,7 +169,8 @@

  # Use PIE in the Linux sandbox (from openSUSE via Russian Fedora)

  Patch15:	chromium-55.0.2883.75-sandbox-pie.patch

  # Use /etc/chromium for master_prefs

- Patch18:	chromium-52.0.2743.82-master-prefs-path.patch

+ #This patch needs upgrade/removal

+ Patch18:	chromium-68.0.3440.106-master-prefs-path.patch

  # Disable MADV_FREE (if set by glibc)

  # https://bugzilla.redhat.com/show_bug.cgi?id=1361157

  Patch19:	chromium-52.0.2743.116-unset-madv_free.patch
@@ -186,7 +189,9 @@

  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&)':

  # /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

+ 

+ #This patch needs upgrade or removal

+ #Patch27:	chromium-63.0.3289.84-setopaque.patch

  # Use -fpermissive to build WebKit

  # Patch31:	chromium-56.0.2924.87-fpermissive.patch

  # Fix issue with compilation on gcc7
@@ -225,7 +230,8 @@

  # Include proper headers to invoke memcpy()

  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

- Patch85:	chromium-67.0.3396.62-boolfix.patch

+ #This patch needs upgrade or removal

+ #Patch85:	chromium-67.0.3396.62-boolfix.patch

  # From Debian

  Patch86:	chromium-67.0.3396.62-skia-aarch64-buildfix.patch

  # Use lstdc++ on EPEL7 only
@@ -258,11 +264,22 @@

  # https://bugs.python.org/issue21591

  Patch100:	chromium-67.0.3396.62-epel7-use-old-python-exec-syntax.patch

  # Add "Fedora" to the user agent string

- Patch101:	chromium-67.0.3396.87-fedora-user-agent.patch

+ #This patch needs upgrade or removal

+ Patch101:	chromium-68.0.3440.106-fedora-user-agent.patch

  # Try to fix version.py for Rawhide

  Patch102:	chromium-67.0.3396.99-py3fix.patch

  Patch103:	chromium-67.0.3396.99-py2-bootstrap.patch

  

+ #Fixed builing with GCC8 on chromium 68

+ Patch104:       chromium-68.0.3440.84-move-unique-ptr.patch

+ #Fix cors_legecy.h. Also drop unneeded declarations in .cpp file.

+ Patch105:       chromium-68.0.3440.84-cors-string.patch

+ #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.

+ Patch106:       chromium-68.0.3440.84-libjpeg.patch

+ 

+ #Import Libwebp-shim as dependency

+ #These patches are taken from  https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79f1141

+ Patch107:       chromium-68.0.3440.84-libwebp-shim.patch

  

  # Use chromium-latest.py to generate clean tarball from released build tarballs, found here:

  # http://build.chromium.org/buildbot/official/
@@ -451,6 +468,10 @@

  # remote desktop needs this

  BuildRequires:	pam-devel

  BuildRequires:	systemd

+ %if 0%{?fedora} > 28

+ BuildRequires: python-unversioned-command

+ %endif

+ 

  # for third_party/test_fonts

  %if 0%{?rhel} == 7

  Source100:      https://github.com/google/fonts/blob/master/apache/arimo/Arimo-Bold.ttf
@@ -727,7 +748,7 @@

  %patch9 -p1 -b .modern-libusbx

  %patch12 -p1 -b .cups22

  %patch15 -p1 -b .sandboxpie

- %patch18 -p1 -b .etc

+ %patch18 -p1 -b .master-prefs-path

  # %%patch19 -p1 -b .madv_free

  %patch20 -p1 -b .gnsystem

  %patch21 -p1 -b .lastcommit
@@ -735,7 +756,7 @@

  %patch24 -p1 -b .nullfix

  %patch25 -p1 -b .jpegfix

  %patch26 -p1 -b .ldmemory

- %patch27 -p1 -b .setopaque

+ #%patch27 -p1 -b .setopaque

  # %%patch31 -p1 -b .permissive

  # %%patch33 -p1 -b .gcc7

  %patch36 -p1 -b .revert
@@ -757,7 +778,7 @@

  # %%patch63 -p1 -b .nolibc++

  %patch65 -p1 -b .gcc-round-fix

  %patch67 -p1 -b .memcpyfix

- %patch85 -p1 -b .boolfix

+ #%patch85 -p1 -b .boolfix

  %patch86 -p1 -b .aarch64fix

  %if 0%{?rhel} == 7

  %patch87 -p1 -b .epel7
@@ -780,12 +801,16 @@

  %patch101 -p1 -b .fedora-user-agent

  %patch102 -p1 -b .py3fix

  %patch103 -p1 -b .py2

- 

+ %patch104 -p1 -b .move

+ %patch105 -p1 -b .cors-string

+ %patch106 -p1 -b .libjpeg

+ %patch107 -p1 -b .libwebp-shim

  

  # Change shebang in all relevant files in this directory and all subdirectories

  # See `man find` for how the `-exec command {} +` syntax works

- find -type f -exec sed -i '1s=^#!/usr/bin/\(python\|env python\)[23]\?=#!%{__python2}=' {} +

- 

+ #This will be deprecated! Use export PYTHON_DISALLOW_AMBIGUOUS_VERSION=0 instead

+ #find -type f -exec sed -i '1s=^#!/usr/bin/\(python\|env python\)[23]\?=#!%{__python2}=' {} +

+ export PYTHON_DISALLOW_AMBIGUOUS_VERSION=0

  %if 0%{?asan}

  export CC="clang"

  export CXX="clang++"
@@ -963,7 +988,7 @@

  %endif

  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+=' enable_webrtc=true'

+ #CHROMIUM_BROWSER_GN_DEFINES+=' enable_webrtc=true'

  %if 0%{gtk3}

  CHROMIUM_BROWSER_GN_DEFINES+=' use_gtk3=true'

  %else
@@ -999,8 +1024,11 @@

  	'base/third_party/xdg_user_dirs' \

  	'chrome/third_party/mozilla_security_manager' \

  	'courgette/third_party' \

+         'net/third_party/http2' \

  	'net/third_party/mozilla_security_manager' \

+         'net/third_party/quic' \

  	'net/third_party/nss' \

+         'net/third_party/spdy' \

  	'third_party/WebKit' \

  	'third_party/adobe' \

  	'third_party/analytics' \
@@ -1066,7 +1094,6 @@

  	'third_party/libXNVCtrl' \

  	'third_party/libaddressinput' \

  	'third_party/libaom' \

- 	'third_party/libaom/source/libaom/third_party/x86inc' \

  	'third_party/libdrm' \

  	'third_party/libjingle' \

  	'third_party/libjpeg_turbo' \
@@ -1074,6 +1101,7 @@

  	'third_party/libpng' \

  	'third_party/libsecret' \

          'third_party/libsrtp' \

+         'third_party/libsync' \

  	'third_party/libudev' \

  	'third_party/libusb' \

  	'third_party/libvpx' \
@@ -1113,20 +1141,24 @@

          'third_party/pdfium/third_party/libpng16' \

          'third_party/pdfium/third_party/libtiff' \

  	'third_party/pdfium/third_party/skia_shared' \

+         'third_party/perfetto' \

          'third_party/ply' \

  	'third_party/polymer' \

  	'third_party/protobuf' \

  	'third_party/protobuf/third_party/six' \

+         'third_party/pyjson5' \

  	'third_party/qcms' \

  	'third_party/qunit' \

  %if 0%{?bundlere2}

  	'third_party/re2' \

  %endif

+         'third_party/rnnoise' \

  	'third_party/s2cellid' \

  	'third_party/sfntly' \

  	'third_party/sinonjs' \

  	'third_party/skia' \

  	'third_party/skia/third_party/gif' \

+         'third_party/skia/third_party/skcms' \

  	'third_party/skia/third_party/vulkan' \

  	'third_party/smhasher' \

  	'third_party/snappy' \
@@ -1156,6 +1188,7 @@

  	'url/third_party/mozilla' \

  	'v8/src/third_party/utf8-decoder' \

  	'v8/src/third_party/valgrind' \

+         'v8/third_party/antlr4' \

  	'v8/third_party/inspector_protocol' \

  	--do-remove

  
@@ -1272,6 +1305,7 @@

  sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"Fedora Project"/' $FILE

  

  %build

+ export PYTHON_DISALLOW_AMBIGUOUS_VERSION=0

  %if 0%{?rhel} == 7

  . /opt/rh/devtoolset-7/enable

  %endif
@@ -1714,6 +1748,10 @@

  

  

  %changelog

+ * Thu Aug 09 2018 Akarshan Biswas <akarshan.biswas@hotmail.com> 68.0.3440.106-1 

+ - Updated to 68.0.3440.106

+ - Updated to 68.0.3440.84 and added patches to fix build

+ 

  * 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

  

sources
file modified
+1 -1
@@ -15,4 +15,4 @@

  SHA512 (Tinos-Bold.ttf) = 54aeca804c06a4d5c57ade596e73df91a6a1c4401c4aadba55d987b3fb73045d35f3df02678b59abb77c4914ec741755536c0adf808c931e4b77848c52c229c4

  SHA512 (Tinos-Italic.ttf) = d4f4f096110ef98a781a2a0e0d319317e5f84e650fe6f4d4f6b0e22a16414278217f37497b904a18540273c0e2d79d4f1faabde3b0eb5446283b318c73bafb38

  SHA512 (Tinos-Regular.ttf) = 58085c5dac6d067d60ba2ab3220c4a0cc1efcf279cadfcfb8746a5e5fa1a6f6daa62750dc2051b3b2d8a51b4d2e9bb0f66594caf2253c0870ed9c7286fa45e8f

- SHA512 (chromium-67.0.3396.99-clean.tar.xz) = b83d2d2f50bf6e5ce70baecf3f59f50fb7d69339c2f16aea30111650b8d0ccaf051bd1873fe63f94146212b60d59aa72c73bd8f9d96b2e27e3f354b75ba82ba4

+ SHA512 (chromium-68.0.3440.106-clean.tar.xz) = f2f7b60915315fe53d334a6500a19d3819465a26e25e1bd9a61025d02eceeae17f1bfa63f7e63ab208567197538a83809e968565b2c4a7ed2604a995c3e63fce

no initial comment

-Added few patches to fix build from gentoo.
-Some patches are commented out because they need either upgrade/removal. (especially master pref patch)
-Fixed dependencies
-/usr/bin/python has moved to a separate package. Use that instead of shebanging python files. For fedora < 29, i.e, Fedora 28 , PYTHON_DISALLOW_AMBIGUOUS_VERSION=0 can be set as an environmental variable. refer
- I haven't tested on epl/rhel or fedora<28. Also some extra patches maybe required to fix building on GCC < 8.1.x.
This PR should be reviewed first before merging. Thank you.

Updates for patches that need updating 'notest', 'fedora-user-agent' etc. can be grabbed from WIP repo below.

https://src.fedoraproject.org/fork/kathenas/rpms/chromium/tree/kathenas_68_stable_0001

@kathenas Thanks. Do you have github? Please do a PR so that I can refresh this PR, Link : github so that your contribution can be recorded. Please. Thank you.

@kathenas Thanks. Do you have github? Please do a PR so that I can refresh the PR, Link : github so that your contribution can recorded. Please. Thank you.

https://github.com/biswasab/chromium_fedora_pagure/pull/1

2 new commits added

  • Merge pull request #1 from kathenas/master
  • Changes...
5 years ago

Pull-Request has been closed by hellbangerkarna

5 years ago