Browse Source

Update to 88.0.4324.104-1

tags/90.0.4430.93-1
wchen342 3 months ago
parent
commit
954a888371
Signed by: wchen342 GPG Key ID: 9C19365D69B04CEC
18 changed files with 377 additions and 189 deletions
  1. +20
    -0
      chromium-86.0.4240.75-widevine-other-locations.patch
  2. +0
    -22
      chromium-87-ServiceWorkerContainerHost-crash.patch
  3. +27
    -0
      chromium-88-AXTreeFormatter-include.patch
  4. +21
    -0
      chromium-88-BookmarkModelObserver-include.patch
  5. +36
    -0
      chromium-88-CompositorFrameReporter-dcheck.patch
  6. +20
    -0
      chromium-88-StringPool-include.patch
  7. +59
    -0
      chromium-88-dawn-static.patch
  8. +21
    -0
      chromium-88-federated_learning-include.patch
  9. +25
    -0
      chromium-88-ityp-include.patch
  10. +27
    -26
      chromium-88.0.4324.11-enable-hardware-accelerated-mjpeg.patch
  11. +9
    -9
      chromium-88.0.4324.11-norar.patch
  12. +1
    -1
      chromium-88.0.4324.96-rhel8-force-disable-use_gnome_keyring.patch
  13. +0
    -12
      chromium-gcc11.patch
  14. +1
    -1
      chromium-missing-std-vector.patch
  15. +0
    -6
      chromium-symbolic.svg
  16. +0
    -39
      chromium-widevine-locations.patch
  17. +3
    -3
      sources
  18. +107
    -70
      ungoogled-chromium.spec

+ 20
- 0
chromium-86.0.4240.75-widevine-other-locations.patch View File

@ -0,0 +1,20 @@
diff -up chromium-86.0.4240.75/chrome/common/chrome_paths.cc.widevine-other-locations chromium-86.0.4240.75/chrome/common/chrome_paths.cc
--- chromium-86.0.4240.75/chrome/common/chrome_paths.cc.widevine-other-locations 2020-10-14 14:47:36.000823668 -0400
+++ chromium-86.0.4240.75/chrome/common/chrome_paths.cc 2020-10-14 14:54:49.347207638 -0400
@@ -379,6 +379,16 @@ bool PathProvider(int key, base::FilePat
#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \
BUILDFLAG(BUNDLE_WIDEVINE_CDM)
case chrome::DIR_BUNDLED_WIDEVINE_CDM:
+ base::PathService::Get(base::DIR_HOME, &cur);
+ cur = cur.Append(FILE_PATH_LITERAL(".local/lib/libwidevinecdm.so"));
+ if (base::PathExists(cur)) {
+ break;
+ }
+ // Yes, this has an arch hardcoded in the path, but at this time, it is the only place to find libwidevinecdm.so
+ if (base::PathExists(base::FilePath(FILE_PATH_LITERAL("/opt/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so")))) {
+ cur = base::FilePath(FILE_PATH_LITERAL("/opt/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"));
+ break;
+ }
if (!GetComponentDirectory(&cur))
return false;
#if !defined(OS_CHROMEOS)

+ 0
- 22
chromium-87-ServiceWorkerContainerHost-crash.patch View File

@ -1,22 +0,0 @@
Bug: https://bugs.gentoo.org/750038
Upstream bug: https://crbug.com/1135070
--- a/content/browser/service_worker/service_worker_container_host.cc
+++ b/content/browser/service_worker/service_worker_container_host.cc
@@ -626,6 +626,16 @@
int64_t registration_id) {
DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId());
DCHECK(base::Contains(registration_object_hosts_, registration_id));
+
+ // ServiceWorkerRegistrationObjectHost to be deleted may have the last reference to
+ // ServiceWorkerRegistration that indirectly owns this ServiceWorkerContainerHost.
+ // If we erase the object host directly from the map, |this| could be deleted
+ // during the map operation and may crash. To avoid the case, we take the
+ // ownership of the object host from the map first, and then erase the entry
+ // from the map. See https://crbug.com/1135070 for details.
+ std::unique_ptr<ServiceWorkerRegistrationObjectHost> to_be_deleted =
+ std::move(registration_object_hosts_[registration_id]);
+ DCHECK(to_be_deleted);
registration_object_hosts_.erase(registration_id);
}

+ 27
- 0
chromium-88-AXTreeFormatter-include.patch View File

@ -0,0 +1,27 @@
From 6e402d97c2dec5726f37e95f97b7f7e12b1d3b1d Mon Sep 17 00:00:00 2001
From: Jose Dapena Paz <[email protected]>
Date: Wed, 11 Nov 2020 11:02:13 +0100
Subject: [PATCH] IWYU: include headers for std::vector and std::unique_ptr in AXTreeFormatter
Fix these build errors with libstdc++:
../../ui/accessibility/platform/inspect/tree_formatter.h:35:12: error: ‘std::vector’ has not been declared
../../ui/accessibility/platform/inspect/tree_formatter.h:61:16: error: ‘unique_ptr’ in namespace ‘std’ does not name a template type
Bug: 957519
Change-Id: I402ac0644255b3cd4932ff2fe72d999b125a7895
---
diff --git a/ui/accessibility/platform/inspect/tree_formatter.h b/ui/accessibility/platform/inspect/tree_formatter.h
index 4a70a4d..bb23768 100644
--- a/ui/accessibility/platform/inspect/tree_formatter.h
+++ b/ui/accessibility/platform/inspect/tree_formatter.h
@@ -5,6 +5,9 @@
#ifndef UI_ACCESSIBILITY_PLATFORM_INSPECT_TREE_FORMATTER_H_
#define UI_ACCESSIBILITY_PLATFORM_INSPECT_TREE_FORMATTER_H_
+#include <memory>
+#include <vector>
+
#include "ui/accessibility/platform/inspect/inspect.h"
#include "ui/gfx/native_widget_types.h"

+ 21
- 0
chromium-88-BookmarkModelObserver-include.patch View File

@ -0,0 +1,21 @@
From 127ec3b1bf26ab37f2ae8333f284008868756274 Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <[email protected]>
Date: Sat, 21 Nov 2020 15:59:23 +0000
Subject: [PATCH] IWYU: size_t is defined stddef.h
Change-Id: I4400ac7c6004b49ec6e72c44f2754e2166642f88
---
diff --git a/components/bookmarks/browser/bookmark_model_observer.h b/components/bookmarks/browser/bookmark_model_observer.h
index 69c40e7..0e5eb96 100644
--- a/components/bookmarks/browser/bookmark_model_observer.h
+++ b/components/bookmarks/browser/bookmark_model_observer.h
@@ -7,6 +7,8 @@
#include <set>
+#include <stddef.h>
+
class GURL;
namespace bookmarks {

+ 36
- 0
chromium-88-CompositorFrameReporter-dcheck.patch View File

@ -0,0 +1,36 @@
From 56c654a91600e3bf254aa9f66c1151b0850b6ee4 Mon Sep 17 00:00:00 2001
From: Jose Dapena Paz <[email protected]>
Date: Wed, 11 Nov 2020 10:24:47 +0100
Subject: [PATCH] GCC: do not pass unique_ptr to DCHECK_NE, but the actual pointer, in CompositorFrameReporter
DCHECK_NE comparison requires CheckOpValueStr to be defined for the
type, or providing an output stream operator. A unique_ptr does not
provide any.
Compilation in GCC is failing in CompositorFrameReporter because of
this:
../../cc/metrics/compositor_frame_reporter.cc: In member function ‘void cc::CompositorFrameReporter::ReportEventLatencyHistograms() const’:
../../base/check_op.h:224:59: error: no matching function for call to ‘CheckOpValueStr(const std::unique_ptr<cc::EventMetrics>&)’
Fixed comparing the result of get() method for unique_ptr instead of
the unique_ptr.
Bug: 819294
Change-Id: I11103d1867c7196c1de92e72f9f12dcfd31c29f1
(updated to use DCHECK as suggested in comments)
---
diff --git a/cc/metrics/compositor_frame_reporter.cc b/cc/metrics/compositor_frame_reporter.cc
index 725beb0..fafd0f3 100644
--- a/cc/metrics/compositor_frame_reporter.cc
+++ b/cc/metrics/compositor_frame_reporter.cc
@@ -686,7 +686,7 @@
void CompositorFrameReporter::ReportEventLatencyHistograms() const {
for (const auto& event_metrics : events_metrics_) {
- DCHECK_NE(event_metrics, nullptr);
+ DCHECK(event_metrics);
const std::string histogram_base_name =
GetEventLatencyHistogramBaseName(*event_metrics);
const int event_type_index = static_cast<int>(event_metrics->type());

+ 20
- 0
chromium-88-StringPool-include.patch View File

@ -0,0 +1,20 @@
From 372366b4180533f27d3250a50810828370d697b0 Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <[email protected]>
Date: Sat, 21 Nov 2020 16:12:18 +0000
Subject: [PATCH] IWYU: include limits for std::numeric_limits
Change-Id: Ia5226e1432a622f4f4abc8f1b18bcab8638a73c6
---
diff --git a/src/trace_processor/containers/string_pool.h b/src/trace_processor/containers/string_pool.h
index 11ae91c..58c6db2 100644
--- a/third_party/perfetto/src/trace_processor/containers/string_pool.h
+++ b/third_party/perfetto/src/trace_processor/containers/string_pool.h
@@ -22,6 +22,7 @@
#include <unordered_map>
#include <vector>
+#include <limits>
#include "perfetto/ext/base/optional.h"
#include "perfetto/ext/base/paged_memory.h"

+ 59
- 0
chromium-88-dawn-static.patch View File

@ -0,0 +1,59 @@
From 75a1f5234e4b544b4d16eddb995d39685da21361 Mon Sep 17 00:00:00 2001
From: Ivan Murashov <[email protected]>
Date: Fri, 20 Nov 2020 09:38:56 +0000
Subject: [PATCH] Remove storage class specifier for the explicit template specialization
According to the http://www.eel.is/c++draft/temp.expl.spec:
An explicit specialization shall not use a storage-class-specifier
other than thread_local.
Clang doesn't claims about it, but GCC does.
An error example for GCC 8.4.0:
gen/third_party/dawn/src/dawn_wire/client/ApiObjects_autogen.h:25:5:
error: explicit template specialization cannot have a storage class
Bug: dawn:384
Change-Id: Iaf86722a943d19c9796a7f112885666ac88f20ca
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/33480
Commit-Queue: Corentin Wallez <[email protected]>
Reviewed-by: Corentin Wallez <[email protected]>
---
diff --git a/third_party/dawn/generator/templates/dawn_wire/client/ApiObjects.h b/third_party/dawn/generator/templates/dawn_wire/client/ApiObjects.h
index 0d8421b..bbf9817 100644
--- a/third_party/dawn/generator/templates/dawn_wire/client/ApiObjects.h
+++ b/third_party/dawn/generator/templates/dawn_wire/client/ApiObjects.h
@@ -21,7 +21,9 @@
namespace dawn_wire { namespace client {
template <typename T>
- static constexpr ObjectType ObjectTypeToTypeEnum = static_cast<ObjectType>(-1);
+ struct ObjectTypeToTypeEnum {
+ static constexpr ObjectType value = static_cast<ObjectType>(-1);
+ };
{% for type in by_category["object"] %}
{% set Type = type.name.CamelCase() %}
@@ -41,7 +43,9 @@
}
template <>
- static constexpr ObjectType ObjectTypeToTypeEnum<{{type.name.CamelCase()}}> = ObjectType::{{type.name.CamelCase()}};
+ struct ObjectTypeToTypeEnum<{{Type}}> {
+ static constexpr ObjectType value = ObjectType::{{Type}};
+ };
{% endfor %}
}} // namespace dawn_wire::client
diff --git a/third_party/dawn/src/dawn_wire/client/Device.h b/third_party/dawn/src/dawn_wire/client/Device.h
index eef03a5..a0036a4 100644
--- a/third_party/dawn/src/dawn_wire/client/Device.h
+++ b/third_party/dawn/src/dawn_wire/client/Device.h
@@ -65,7 +65,7 @@
template <typename T>
void TrackObject(T* object) {
- mObjects[ObjectTypeToTypeEnum<T>].Append(object);
+ mObjects[ObjectTypeToTypeEnum<T>::value].Append(object);
}
void CancelCallbacksForDisconnect() override;

+ 21
- 0
chromium-88-federated_learning-include.patch View File

@ -0,0 +1,21 @@
From bcb20babee602b55fe4bd026e13a41d10b89632f Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <[email protected]>
Date: Sat, 21 Nov 2020 15:55:02 +0000
Subject: [PATCH] IWYU: include limits for std::numeric_limits
Change-Id: I1b6b07ebb397a29c84d3ed51ae41523e3ecab497
---
diff --git a/components/federated_learning/floc_constants.cc b/components/federated_learning/floc_constants.cc
index df66e5d..2eb50f1 100644
--- a/components/federated_learning/floc_constants.cc
+++ b/components/federated_learning/floc_constants.cc
@@ -4,6 +4,8 @@
#include "components/federated_learning/floc_constants.h"
+#include <limits>
+
namespace federated_learning {
// This is only for experimentation and won't be served to websites.

+ 25
- 0
chromium-88-ityp-include.patch View File

@ -0,0 +1,25 @@
From bc383a5dd7fa8f2b535f28815fd6932fbc0d2a45 Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <[email protected]>
Date: Wed, 28 Oct 2020 16:00:35 +0000
Subject: [PATCH] IWYU: include stddef.h for size_t
---
third_party/dawn/src/common/ityp_array.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/third_party/dawn/src/common/ityp_array.h b/third_party/dawn/src/common/ityp_array.h
index 48e080f..c784198 100644
--- a/third_party/dawn/src/common/ityp_array.h
+++ b/third_party/dawn/src/common/ityp_array.h
@@ -21,6 +21,8 @@
#include <array>
#include <type_traits>
+#include <stddef.h>
+
namespace ityp {
// ityp::array is a helper class that wraps std::array with the restriction that
--
2.26.2

chromium-86.0.4240.75-enable-hardware-accelerated-mjpeg.patch → chromium-88.0.4324.11-enable-hardware-accelerated-mjpeg.patch View File

@ -1,7 +1,7 @@
diff -up chromium-86.0.4240.75/chrome/browser/about_flags.cc.vaapi chromium-86.0.4240.75/chrome/browser/about_flags.cc
--- chromium-86.0.4240.75/chrome/browser/about_flags.cc.vaapi 2020-10-07 12:38:37.000000000 -0400
+++ chromium-86.0.4240.75/chrome/browser/about_flags.cc 2020-10-14 15:46:27.429435196 -0400
@@ -3112,12 +3112,12 @@ const FeatureEntry kFeatureEntries[] = {
diff -up chromium-88.0.4324.11/chrome/browser/about_flags.cc.accel-mjpeg chromium-88.0.4324.11/chrome/browser/about_flags.cc
--- chromium-88.0.4324.11/chrome/browser/about_flags.cc.accel-mjpeg 2020-11-19 20:51:19.000000000 -0500
+++ chromium-88.0.4324.11/chrome/browser/about_flags.cc 2020-11-30 16:14:32.393366384 -0500
@@ -3309,12 +3309,12 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop,
MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)},
#endif // ENABLE_VR
@ -17,41 +17,43 @@ diff -up chromium-86.0.4240.75/chrome/browser/about_flags.cc.vaapi chromium-86.0
{"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName,
flag_descriptions::kSystemKeyboardLockDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)},
diff -up chromium-86.0.4240.75/chrome/browser/flag_descriptions.cc.vaapi chromium-86.0.4240.75/chrome/browser/flag_descriptions.cc
--- chromium-86.0.4240.75/chrome/browser/flag_descriptions.cc.vaapi 2020-10-07 12:38:38.000000000 -0400
+++ chromium-86.0.4240.75/chrome/browser/flag_descriptions.cc 2020-10-14 15:46:27.430435203 -0400
@@ -3519,16 +3519,19 @@ const char kVideoToolboxVp9DecodingDescr
diff -up chromium-88.0.4324.11/chrome/browser/flag_descriptions.cc.accel-mjpeg chromium-88.0.4324.11/chrome/browser/flag_descriptions.cc
--- chromium-88.0.4324.11/chrome/browser/flag_descriptions.cc.accel-mjpeg 2020-11-30 16:14:32.393366384 -0500
+++ chromium-88.0.4324.11/chrome/browser/flag_descriptions.cc 2020-11-30 16:20:50.174195910 -0500
@@ -3572,9 +3572,9 @@ const char kVideoToolboxVp9DecodingDescr
#endif
-// Chrome OS -------------------------------------------------------------------
-
-#if defined(OS_CHROMEOS)
+// Chrome OS and Linux -------------------------------------------------------------------
+// Chrome OS and Linux ---------------------------------------------------------
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
const char kAcceleratedMjpegDecodeName[] =
"Hardware-accelerated mjpeg decode for captured frame";
const char kAcceleratedMjpegDecodeDescription[] =
@@ -3582,6 +3582,12 @@ const char kAcceleratedMjpegDecodeDescri
"Enable hardware-accelerated mjpeg decode for captured frame where "
"available.";
+#endif
+// Chrome OS -----------------------------------------------------------------------------
+#endif
+
+// Chrome OS -------------------------------------------------------------------
+
+#if defined(OS_CHROMEOS)
const char kAggregatedMlAppRankingName[] = "Rank suggested apps with ML.";
const char kAggregatedMlAppRankingDescription[] =
"Use the aggregated ML model to rank the suggested apps.";
diff -up chromium-86.0.4240.75/chrome/browser/flag_descriptions.h.vaapi chromium-86.0.4240.75/chrome/browser/flag_descriptions.h
--- chromium-86.0.4240.75/chrome/browser/flag_descriptions.h.vaapi 2020-10-14 15:46:27.431435211 -0400
+++ chromium-86.0.4240.75/chrome/browser/flag_descriptions.h 2020-10-14 15:56:25.774118708 -0400
@@ -2026,13 +2026,19 @@ extern const char kVideoToolboxVp9Decodi
+
const char kAllowDisableMouseAccelerationName[] =
"Allow disabling mouse acceleration";
const char kAllowDisableMouseAccelerationDescription[] =
diff -up chromium-88.0.4324.11/chrome/browser/flag_descriptions.h.accel-mjpeg chromium-88.0.4324.11/chrome/browser/flag_descriptions.h
--- chromium-88.0.4324.11/chrome/browser/flag_descriptions.h.accel-mjpeg 2020-11-30 16:14:32.394366389 -0500
+++ chromium-88.0.4324.11/chrome/browser/flag_descriptions.h 2020-11-30 16:22:13.831601058 -0500
@@ -2068,13 +2068,19 @@ extern const char kVideoToolboxVp9Decodi
#endif // defined(OS_MAC)
-// Chrome OS ------------------------------------------------------------------
+// Chrome OS and Linux ---------------------------------------------------------
+// Chrome OS and Linux --------------------------------------------------------
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
@ -61,11 +63,10 @@ diff -up chromium-86.0.4240.75/chrome/browser/flag_descriptions.h.vaapi chromium
+#endif
+
+// Chrome OS -------------------------------------------------------------------
+// Chrome OS ------------------------------------------------------------------
+
+#if defined(OS_CHROMEOS)
+
extern const char kAggregatedMlAppRankingName[];
extern const char kAggregatedMlAppRankingDescription[];
extern const char kAllowDisableMouseAccelerationName[];
extern const char kAllowDisableMouseAccelerationDescription[];
diff -up chromium-86.0.4240.75/gpu/config/software_rendering_list.json.vaapi chromium-86.0.4240.75/gpu/config/software_rendering_list.json

chromium-86.0.4240.75-norar.patch → chromium-88.0.4324.11-norar.patch View File

@ -1,6 +1,6 @@
diff -up chromium-86.0.4240.75/chrome/common/safe_browsing/DEPS.nounrar chromium-86.0.4240.75/chrome/common/safe_browsing/DEPS
--- chromium-86.0.4240.75/chrome/common/safe_browsing/DEPS.nounrar 2020-10-14 17:14:37.800975059 -0400
+++ chromium-86.0.4240.75/chrome/common/safe_browsing/DEPS 2020-10-14 17:14:37.806975106 -0400
diff -up chromium-88.0.4324.11/chrome/common/safe_browsing/DEPS.nounrar chromium-88.0.4324.11/chrome/common/safe_browsing/DEPS
--- chromium-88.0.4324.11/chrome/common/safe_browsing/DEPS.nounrar 2020-11-19 20:51:23.000000000 -0500
+++ chromium-88.0.4324.11/chrome/common/safe_browsing/DEPS 2020-11-30 16:04:30.599454130 -0500
@@ -1,6 +1,5 @@
include_rules = [
"+components/safe_browsing",
@ -8,9 +8,9 @@ diff -up chromium-86.0.4240.75/chrome/common/safe_browsing/DEPS.nounrar chromium
- "+third_party/unrar",
"+third_party/zlib",
]
diff -up chromium-86.0.4240.75/chrome/services/file_util/BUILD.gn.nounrar chromium-86.0.4240.75/chrome/services/file_util/BUILD.gn
--- chromium-86.0.4240.75/chrome/services/file_util/BUILD.gn.nounrar 2020-10-14 17:30:58.473704551 -0400
+++ chromium-86.0.4240.75/chrome/services/file_util/BUILD.gn 2020-10-14 17:31:25.511917656 -0400
diff -up chromium-88.0.4324.11/chrome/services/file_util/BUILD.gn.nounrar chromium-88.0.4324.11/chrome/services/file_util/BUILD.gn
--- chromium-88.0.4324.11/chrome/services/file_util/BUILD.gn.nounrar 2020-11-19 20:51:24.000000000 -0500
+++ chromium-88.0.4324.11/chrome/services/file_util/BUILD.gn 2020-11-30 16:04:30.599454130 -0500
@@ -15,7 +15,6 @@ source_set("file_util") {
"//base",
"//chrome/common/safe_browsing",
@ -19,9 +19,9 @@ diff -up chromium-86.0.4240.75/chrome/services/file_util/BUILD.gn.nounrar chromi
"//components/safe_browsing:buildflags",
"//mojo/public/cpp/bindings",
]
diff -up chromium-86.0.4240.75/chrome/services/file_util/safe_archive_analyzer.cc.nounrar chromium-86.0.4240.75/chrome/services/file_util/safe_archive_analyzer.cc
--- chromium-86.0.4240.75/chrome/services/file_util/safe_archive_analyzer.cc.nounrar 2020-10-14 17:14:37.255970763 -0400
+++ chromium-86.0.4240.75/chrome/services/file_util/safe_archive_analyzer.cc 2020-10-14 17:14:37.259970795 -0400
diff -up chromium-88.0.4324.11/chrome/services/file_util/safe_archive_analyzer.cc.nounrar chromium-88.0.4324.11/chrome/services/file_util/safe_archive_analyzer.cc
--- chromium-88.0.4324.11/chrome/services/file_util/safe_archive_analyzer.cc.nounrar 2020-11-19 20:51:24.000000000 -0500
+++ chromium-88.0.4324.11/chrome/services/file_util/safe_archive_analyzer.cc 2020-11-30 16:04:30.599454130 -0500
@@ -45,10 +45,14 @@ void SafeArchiveAnalyzer::AnalyzeDmgFile
void SafeArchiveAnalyzer::AnalyzeRarFile(base::File rar_file,
base::File temporary_file,

chromium-76.0.3809.132-rhel8-force-disable-use_gnome_keyring.patch → chromium-88.0.4324.96-rhel8-force-disable-use_gnome_keyring.patch View File

@ -5,6 +5,6 @@ diff -up chromium-76.0.3809.132/components/os_crypt/features.gni.rhel8 chromium-
declare_args() {
# Whether to use libgnome-keyring (deprecated by libsecret).
# See http://crbug.com/466975 and http://crbug.com/355223.
- use_gnome_keyring = is_desktop_linux && use_glib
- use_gnome_keyring = is_linux && use_glib
+ use_gnome_keyring = false
}

+ 0
- 12
chromium-gcc11.patch View File

@ -1,15 +1,3 @@
diff --git a/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc b/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc
index 19f9aab5b..8073637e9 100644
--- a/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc
+++ b/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc
@@ -35,6 +35,7 @@
#include "absl/synchronization/internal/graphcycles.h"
+#include <limits>
#include <algorithm>
#include <array>
#include "absl/base/internal/hide_ptr.h"
diff --git a/third_party/angle/src/libANGLE/HandleAllocator.cpp b/third_party/angle/src/libANGLE/HandleAllocator.cpp
index 013f1dfb2..3ce63c192 100644
--- a/third_party/angle/src/libANGLE/HandleAllocator.cpp


+ 1
- 1
chromium-missing-std-vector.patch View File

@ -6,5 +6,5 @@
#include <string>
+#include <vector>
#include "base/gtest_prod_util.h"
#include "base/macros.h"
#include "base/no_destructor.h"

+ 0
- 6
chromium-symbolic.svg View File

@ -1,6 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
<g fill="#bebebe">
<path d="M8 0a8 8 0 00-6.3066406 3.078125l2.3867187 4.1308594A4 4 0 018 4h6.929688A8 8 0 008 0zM1.0703125 4A8 8 0 000 8a8 8 0 006.8886719 7.921875l2.3847656-4.130859A4 4 0 018 12a4 4 0 01-3.4648438-2 4 4 0 01-.0078124-.0136719L1.0703125 4zm9.5742185 1A4 4 0 0112 8a4 4 0 01-.535156 2L8 16a8 8 0 008-8 8 8 0 00-.585938-3h-4.769531z"/>
<circle r="3" cy="8" cx="8"/>
</g>
</svg>

+ 0
- 39
chromium-widevine-locations.patch View File

@ -1,39 +0,0 @@
Description: try alternative locations for the Widevine CDM library:
- $HOME/.local/lib/WidevineCdm/ (snap-friendly, see https://launchpad.net/bugs/1738149)
- /opt/google/chrome/WidevineCdm/ (installed by official google chrome package)
The manifest lives at the top level, whereas libwidevinecdm.so is inside
a platform specific directory, see media::GetPlatformSpecificDirectory(…).
Author: Olivier Tilloy <[email protected]>
Source: https://bazaar.launchpad.net/~chromium-team/chromium-browser/disco-dev/view/head:/debian/patches/widevine-other-locations
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -377,8 +377,17 @@ bool PathProvider(int key, base::FilePat
break;
#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \
- BUILDFLAG(BUNDLE_WIDEVINE_CDM)
+ BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
case chrome::DIR_BUNDLED_WIDEVINE_CDM:
+ base::PathService::Get(base::DIR_HOME, &cur);
+ cur = cur.Append(FILE_PATH_LITERAL(".local/lib"))
+ .AppendASCII(kWidevineCdmBaseDirectory);
+ if (base::PathExists(cur))
+ break;
+ cur = base::FilePath(FILE_PATH_LITERAL("/opt/google/chrome"))
+ .AppendASCII(kWidevineCdmBaseDirectory);
+ if (base::PathExists(cur))
+ break;
if (!GetComponentDirectory(&cur))
return false;
#if !defined(OS_CHROMEOS)
@@ -388,7 +397,7 @@ bool PathProvider(int key, base::FilePat
#endif // !defined(OS_CHROMEOS)
break;
#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) &&
- // BUILDFLAG(BUNDLE_WIDEVINE_CDM)
+ // BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && \
BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)

+ 3
- 3
sources View File

@ -19,6 +19,6 @@ SHA512 (NotoSansSymbols2-Regular.ttf) = 8889d356da290fb4a75584db238a874eaea41c7e
SHA512 (NotoSansTibetan-Regular.ttf) = 7256b3219b0607e86d58661dd382a1429babc412b82a4fce659b2db41cd8ebd9d7183c9dddd55b5deae45140627951698edbc7f6b5d36cd486e23c1886a98971
SHA512 (node-v10.15.3-linux-x64.tar.gz) = 5eb544ef706562981340a82acc79e2162c6a3e4049b4a95f69ce353ee5b0f929c60b1fc457e8249b3fb0696f82fc28c5f543f5947db19fae4e9d5c21b906bb20
SHA512 (xcb-proto-1.14.tar.xz) = de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690
SHA512 (depot_tools.git-master.tar.gz) = 2681d9bfd2855c8a20636712fbf4654ae8cdc1cc45dd7d2a3d13c44089244c8bc17e2519f23bad0f11387e27439a8a17e2161b0393aa12419c9ee6b849399686
SHA512 (chromium-87.0.4280.141-clean.tar.xz) = d5f97753d409fa627be12312b7685148ff4a81e85ac468b3d7c890d54dddca9293ba312dae9ab207d429d4592ce9c1935244d74e9d1ffa1e045b301a6341256f
SHA512 (ungoogled-chromium-87.0.4280.141-1.tar.gz) = 0917df65e878311c1fbff2e3db451926a88d711296f4ecdf8a86b82943ac02a2d948dd1b47f7f4855030813b00a2d8e26eecd423dcb14db92b23c9dee41a41c7
SHA512 (depot_tools.git-master.tar.gz) = dd275415491d402911dc4f76d61a177874bc792aaeca6fc2017635fc5526957870bca3ba211e46b6acb60a0b904a028feaf703a1e052b6209b8ac6f627f96419
SHA512 (chromium-88.0.4324.104-clean.tar.xz) = d47cd8c70bd365b36e5d3f2e0d1407bd46534790d7c153b176b350573d75b8e9c3726972eff6d25e30f9500e1e479bb2b6a62b684bd10be22eb22198d03bb4c9
SHA512 (ungoogled-chromium-88.0.4324.104-1.tar.gz) = de8062266d3c2539d71d3e816487e27d40206729748be72e0e9741e40b451d2ad8231f37fc05ab680822a8fc68071afd205d9a6f48e9aa232e45e2c165f09378

+ 107
- 70
ungoogled-chromium.spec View File

@ -5,6 +5,19 @@
%global numjobs 12
%endif
# This flag is so I can build things very fast on a giant system.
# Do not enable in Koji builds.
# Doesn't work on RHEL 7
%if 0%{?rhel} == 7
%global use_all_cpus 0
%else
%global use_all_cpus 1
%endif
%if %{use_all_cpus}
%global numjobs %{_smp_build_ncpus}
%endif
# Fancy build status, so we at least know, where we are..
# %1 where
# %2 what
@ -12,14 +25,19 @@
export NINJA_STATUS="[%2:%f/%t] " ; \
../depot_tools/ninja -j %{numjobs} -C '%1' -vvv '%2'
# We'd like to always have this on.
# We'd like to always have this on...
# ... but the libva in EL7 is too old.
%if 0%{?rhel} == 7
%global use_vaapi 0
%else
%global use_vaapi 1
%endif
# 2020-08-20: F33+ aarch64 has a binutils bug trying to link clear_key_cdm
# https://bugzilla.redhat.com/show_bug.cgi?id=1869884
%global build_clear_key_cdm 1
#Do not turn it on in Fedora copr!
# NEVER EVER EVER turn this on in official builds
%global freeworld 0
%if %{freeworld}
%global lsuffix freeworld
@ -46,6 +64,9 @@
%global chromium_browser_channel %{name}%{chromium_channel}
%global chromium_path %{_libdir}/%{name}%{chromium_channel}
# We don't want any libs in these directories to generate Provides
# Requires is trickier.
# To generate this list, go into %%{buildroot}%%{chromium_path} and run
# for i in `find . -name "*.so" | sort`; do NAME=`basename -s .so $i`; printf "$NAME|"; done
# for RHEL7, append libfontconfig to the end
@ -139,7 +160,7 @@ BuildRequires: libicu-devel >= 5.4
#Build with debugging symbols
%global debug_pkg 0
%global majorversion 87
%global majorversion 88
%global revision 1
%if %{freeworld}
@ -147,7 +168,7 @@ Name: ungoogled-chromium%{nsuffix}
%else
Name: ungoogled-chromium
%endif
Version: %{majorversion}.0.4280.141
Version: %{majorversion}.0.4324.104
Release: 1%{?dist}.%{revision}
%if %{?freeworld}
# chromium-freeworld
@ -170,7 +191,7 @@ Patch4: chromium-60.0.3112.78-jpeg-nomangle.patch
# Do not mangle zlib
Patch5: chromium-77.0.3865.75-no-zlib-mangle.patch
# Do not use unrar code, it is non-free
Patch6: chromium-86.0.4240.75-norar.patch
Patch6: chromium-88.0.4324.11-norar.patch
# Use Gentoo's Widevine hack
# https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-widevine-r3.patch
Patch7: chromium-71.0.3578.98-widevine-r3.patch
@ -178,6 +199,8 @@ Patch7: chromium-71.0.3578.98-widevine-r3.patch
Patch8: chromium-83.0.4103.61-disable-fontconfig-cache-magic.patch
# drop rsp clobber, which breaks gcc9 (thanks to Jeff Law)
Patch9: chromium-78.0.3904.70-gcc9-drop-rsp-clobber.patch
# Try to load widevine from other places
Patch10: chromium-86.0.4240.75-widevine-other-locations.patch
# Try to fix version.py for Rawhide
Patch11: chromium-71.0.3578.98-py2-bootstrap.patch
@ -194,33 +217,44 @@ Patch54: chromium-79-gcc-protobuf-alignas.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-78-protobuf-RepeatedPtrField-export.patch
Patch55: chromium-78-protobuf-RepeatedPtrField-export.patch
# ../../third_party/perfetto/include/perfetto/base/task_runner.h:48:55: error: 'uint32_t' has not been declared
Patch57: chromium-80.0.3987.87-missing-cstdint-header.patch
Patch56: chromium-80.0.3987.87-missing-cstdint-header.patch
# Missing <cstring> (thanks c++17)
Patch58: chromium-80.0.3987.106-missing-cstring-header.patch
Patch57: chromium-80.0.3987.106-missing-cstring-header.patch
# prepare for using system ffmpeg (clean)
# http://svnweb.mageia.org/packages/cauldron/chromium-browser-stable/current/SOURCES/chromium-53-ffmpeg-no-deprecation-errors.patch?view=markup
Patch59: chromium-53-ffmpeg-no-deprecation-errors.patch
Patch58: chromium-53-ffmpeg-no-deprecation-errors.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-84-blink-disable-clang-format.patch
Patch61: chromium-84-blink-disable-clang-format.patch
Patch59: chromium-84-blink-disable-clang-format.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-fix-char_traits.patch
Patch62: chromium-fix-char_traits.patch
Patch60: chromium-fix-char_traits.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-87-CursorFactory-include.patch
Patch63: chromium-87-CursorFactory-include.patch
Patch61: chromium-87-CursorFactory-include.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-87-openscreen-include.patch
Patch64: chromium-87-openscreen-include.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-87-ServiceWorkerContainerHost-crash.patch
Patch65: chromium-87-ServiceWorkerContainerHost-crash.patch
Patch62: chromium-87-openscreen-include.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-88-AXTreeFormatter-include.patch
Patch63: chromium-88-AXTreeFormatter-include.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-88-vaapi-attribute.patch
Patch66: chromium-88-vaapi-attribute.patch
Patch64: chromium-88-vaapi-attribute.patch
# Silence GCC warnings during gn compile
Patch68: chromium-84.0.4147.105-gn-gcc-cleanup.patch
Patch65: chromium-84.0.4147.105-gn-gcc-cleanup.patch
# Fix missing cstring in remoting code
Patch69: chromium-84.0.4147.125-remoting-cstring.patch
Patch66: chromium-84.0.4147.125-remoting-cstring.patch
# Apply fix_textrels hack for i686 (even without lld)
Patch70: chromium-84.0.4147.125-i686-fix_textrels.patch
Patch67: chromium-84.0.4147.125-i686-fix_textrels.patch
# Work around binutils bug in aarch64 (F33+)
Patch71: chromium-84.0.4147.125-aarch64-clearkeycdm-binutils-workaround.patch
Patch68: chromium-84.0.4147.125-aarch64-clearkeycdm-binutils-workaround.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-88-BookmarkModelObserver-include.patch
Patch69: chromium-88-BookmarkModelObserver-include.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-88-CompositorFrameReporter-dcheck.patch
Patch70: chromium-88-CompositorFrameReporter-dcheck.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-88-dawn-static.patch
Patch71: chromium-88-dawn-static.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-88-federated_learning-include.patch
Patch72: chromium-88-federated_learning-include.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-88-ityp-include.patch
Patch73: chromium-88-ityp-include.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-88-StringPool-include.patch
Patch74: chromium-88-StringPool-include.patch
# Use lstdc++ on EPEL7 only
Patch101: chromium-75.0.3770.100-epel7-stdc++.patch
@ -245,12 +279,12 @@ Patch109: chromium-87.0.4280.66-el7-no-sys-random.patch
# VAAPI
# Upstream turned VAAPI on in Linux in 86
Patch202: chromium-86.0.4240.75-enable-hardware-accelerated-mjpeg.patch
Patch202: chromium-88.0.4324.11-enable-hardware-accelerated-mjpeg.patch
Patch203: chromium-86.0.4240.75-vaapi-i686-fpermissive.patch
Patch205: chromium-86.0.4240.75-fix-vaapi-on-intel.patch
# Apply these patches to work around EPEL8 issues
Patch300: chromium-76.0.3809.132-rhel8-force-disable-use_gnome_keyring.patch
Patch300: chromium-88.0.4324.96-rhel8-force-disable-use_gnome_keyring.patch
# And fixes for new compilers
Patch400: chromium-gcc11.patch
@ -263,17 +297,8 @@ Patch503: chromium-manpage.patch
Patch600: chromium-default-user-data-dir.patch
# Additional patches:
Patch700: chromium-widevine-locations.patch
Patch701: chromium-missing-std-vector.patch
Patch700: chromium-missing-std-vector.patch
# Unfortunately, Fedora & Copr forbids uploading sources with patent-encumbered
# ffmpeg code even if they are never compiled and linked to target binaries,
# so we must repackage upstream tarballs to satisfy this requirement. However,
# we cannot simply delete all code of ffmpeg because this will disable support
# for some commonly-used free codecs such as Ogg Theora. Instead, helper
# scripts included in official Fedora packages are copied, modified, and used
# to automate the repackaging work.
# Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
# http://build.chromium.org/buildbot/official/
# For Chromium Fedora use chromium-latest.py --stable --ffmpegclean --ffmpegarm
@ -313,13 +338,9 @@ Source20: https://www.x.org/releases/individual/proto/xcb-proto-1.14.tar.xz
# Add our own appdata file.
Source21: %{name}.appdata.xml
Source22: chromium-symbolic.svg
# License
Source25: LICENSE
# ungoogled-chromium source
%global ungoogled_chromium_revision 87.0.4280.141-1
%global ungoogled_chromium_revision 88.0.4324.104-1
Source300: https://github.com/Eloston/ungoogled-chromium/archive/%{ungoogled_chromium_revision}/ungoogled-chromium-%{ungoogled_chromium_revision}.tar.gz
# We can assume gcc and binutils.
@ -564,6 +585,11 @@ Requires: libcanberra-gtk3%{_isa}
Requires: libcanberra-gtk2%{_isa}
%endif
%if 0%{?fedora}
# This enables support for u2f tokens
Requires: u2f-hidraw-policy
%endif
%if 0%{?rhel} == 7
ExclusiveArch: x86_64 i686
%else
@ -574,13 +600,6 @@ ExclusiveArch: x86_64 i686 aarch64
Requires(post): /usr/sbin/semanage
Requires(post): /usr/sbin/restorecon
#Some recommendations
%if 0%{?rhel} == 7
# Recommends is not backported
%else
Recommends: libva-utils
%endif
%if %{?freeworld}
%description
%{name} is a distribution of ungoogled-chromium, built with all possible codecs.
@ -634,6 +653,7 @@ Requires: minizip%{_isa}
%patch7 -p1 -b .widevine-hack
%patch8 -p1 -b .nofontconfigcache
%patch9 -p1 -b .gcc9
%patch10 -p1 -b .widevine-other-locations
%patch11 -p1 -b .py2
# Short term fixes (usually gcc and backports)
@ -645,19 +665,25 @@ Requires: minizip%{_isa}
%patch53 -p1 -b .gcc-include-memory
%patch54 -p1 -b .base-gcc-no-alignas
%patch55 -p1 -b .protobuf-export
%patch57 -p1 -b .missing-cstdint
%patch58 -p1 -b .missing-cstring
%patch59 -p1 -b .ffmpeg-deprecations
%patch61 -p1 -b .blink-disable-clang-format
%patch62 -p1 -b .fix-char_traits
%patch63 -p1 -b .CursorFactory-include
%patch64 -p1 -b .openscreen-include
%patch65 -p1 -b .ServiceWorkerContainerHost-crash
%patch66 -p1 -b .vaapi-attribute
%patch68 -p1 -b .gn-gcc-cleanup
%patch69 -p1 -b .remoting-cstring
%patch70 -p1 -b .i686-textrels
%patch71 -p1 -b .aarch64-clearkeycdm-binutils-workaround
%patch56 -p1 -b .missing-cstdint
%patch57 -p1 -b .missing-cstring
%patch58 -p1 -b .ffmpeg-deprecations
%patch59 -p1 -b .blink-disable-clang-format
%patch60 -p1 -b .fix-char_traits
%patch61 -p1 -b .CursorFactory-include
%patch62 -p1 -b .openscreen-include
%patch63 -p1 -b .AXTreeFormatter-include
%patch64 -p1 -b .vaapi-attribute
%patch65 -p1 -b .gn-gcc-cleanup
%patch66 -p1 -b .remoting-cstring
%patch67 -p1 -b .i686-textrels
%patch68 -p1 -b .aarch64-clearkeycdm-binutils-workaround
%patch69 -p1 -b .BookmarkModelObserver-include
%patch70 -p1 -b .CompositorFrameReporter-dcheck
%patch71 -p1 -b .dawn-static
%patch72 -p1 -b .federated_learning-include
%patch73 -p1 -b .ityp-include
%patch74 -p1 -b .StringPool-include
# EPEL specific patches
%if 0%{?rhel} == 7
@ -695,8 +721,7 @@ Requires: minizip%{_isa}
%patch600 -p1 -b .default-user-dir
# Additional patches:
%patch700 -p1 -b .widevine-locations
%patch701 -p1 -b .missing-std-vector
%patch700 -p1 -b .missing-std-vector
# Change shebang in all relevant files in this directory and all subdirectories
# See `man find` for how the `-exec command {} +` syntax works
@ -802,17 +827,19 @@ UNGOOGLED_CHROMIUM_GN_DEFINES+=' use_gnome_keyring=false use_glib=true'
UNGOOGLED_CHROMIUM_GN_DEFINES+=' use_gio=true use_pulseaudio=true icu_use_data_file = true'
UNGOOGLED_CHROMIUM_GN_DEFINES+=' enable_nacl=false'
UNGOOGLED_CHROMIUM_GN_DEFINES+=' is_component_ffmpeg=false is_component_build=false'
UNGOOGLED_CHROMIUM_GN_DEFINES+=' blink_symbol_level=0 enable_hangout_services_extension=false'
UNGOOGLED_CHROMIUM_GN_DEFINES+=' enable_hangout_services_extension=false'
%if %{debug_pkg}
UNGOOGLED_CHROMIUM_GN_DEFINES+=' symbol_level=1'
UNGOOGLED_CHROMIUM_GN_DEFINES+=' blink_symbol_level=1 symbol_level=1'
%else
UNGOOGLED_CHROMIUM_GN_DEFINES+=' symbol_level=0'
UNGOOGLED_CHROMIUM_GN_DEFINES+=' blink_symbol_level=0 symbol_level=0'
%endif
UNGOOGLED_CHROMIUM_GN_DEFINES+=' enable_widevine=true'
%if %{use_vaapi}
%if 0%{?fedora} >= 28
UNGOOGLED_CHROMIUM_GN_DEFINES+=' use_vaapi=true'
%endif
%else
UNGOOGLED_CHROMIUM_GN_DEFINES+=' use_vaapi=false'
%endif
%if 0%{?fedora}
UNGOOGLED_CHROMIUM_GN_DEFINES+=' rtc_use_pipewire=true rtc_link_pipewire=true'
@ -932,6 +959,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/flatbuffers' \
'third_party/fontconfig' \
'third_party/freetype' \
'third_party/fusejs' \
'third_party/glslang' \
'third_party/google_input_tools' \
'third_party/google_input_tools/third_party/closure_library' \
@ -971,6 +999,8 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/libvpx/source/libvpx/third_party/x86inc' \
'third_party/libwebm' \
'third_party/libwebp' \
'third_party/libx11' \
'third_party/libxcb-keysyms' \
'third_party/libxml' \
'third_party/libxml/chromium' \
'third_party/libxslt' \
@ -1051,6 +1081,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/swiftshader/third_party/SPIRV-Headers' \
'third_party/tcmalloc' \
'third_party/test_fonts' \
'third_party/ukey2' \
'third_party/usb_ids' \
'third_party/usrsctp' \
'third_party/vulkan' \
@ -1068,6 +1099,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/widevine' \
'third_party/woff2' \
'third_party/wuffs' \
'third_party/x11proto' \
'third_party/xcbproto' \
'third_party/xdg-utils' \
'third_party/zxcvbn-cpp' \
@ -1175,9 +1207,6 @@ if python2 -c 'import google ; print google.__path__' 2> /dev/null ; then \
exit 1 ; \
fi
tools/gn/bootstrap/bootstrap.py --gn-gen-args="$UNGOOGLED_CHROMIUM_GN_DEFINES"
%{builddir}/gn --script-executable=%{__python2} gen --args="$UNGOOGLED_CHROMIUM_GN_DEFINES" %{builddir}
# ungoogled-chromium: patches
python3 -B %{ungoogled_chromium_root}/utils/patches.py apply . %{ungoogled_chromium_root}/patches
@ -1190,6 +1219,9 @@ python3 -B %{ungoogled_chromium_root}/utils/domain_substitution.py apply . \
-c %{_builddir}/dsc.tar.gz
%endif
tools/gn/bootstrap/bootstrap.py --gn-gen-args="$UNGOOGLED_CHROMIUM_GN_DEFINES"
%{builddir}/gn --script-executable=%{__python2} gen --args="$UNGOOGLED_CHROMIUM_GN_DEFINES" %{builddir}
%if %{bundlelibusbx}
# no hackity hack hack
%else
@ -1269,8 +1301,8 @@ rm -rf %{buildroot}
ln -s %{chromium_path}/%{chromium_browser_channel}.sh %{buildroot}%{_bindir}/%{chromium_browser_channel}
mkdir -p %{buildroot}%{_mandir}/man1/
pushd %{builddir}
cp -a *.pak locales resources icudtl.dat %{buildroot}%{chromium_path}
pushd %{builddir}
cp -a *.pak locales resources icudtl.dat %{buildroot}%{chromium_path}
%ifarch x86_64 i686 aarch64
cp -a swiftshader %{buildroot}%{chromium_path}
%endif
@ -1333,8 +1365,8 @@ rm -rf %{buildroot}
mkdir -p %{buildroot}%{_datadir}/applications/
desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE4}
install -D -m0644 %{SOURCE21} ${RPM_BUILD_ROOT}%{_datadir}/metainfo/%{name}.appdata.xml
appstream-util validate-relax --nonet ${RPM_BUILD_ROOT}%{_datadir}/metainfo/%{name}.appdata.xml
install -D -m0644 %{SOURCE21} ${RPM_BUILD_ROOT}%{_datadir}/metainfo/%{chromium_browser_channel}.appdata.xml
appstream-util validate-relax --nonet ${RPM_BUILD_ROOT}%{_datadir}/metainfo/%{chromium_browser_channel}.appdata.xml
mkdir -p %{buildroot}%{_datadir}/gnome-control-center/default-apps/
cp -a %{SOURCE9} %{buildroot}%{_datadir}/gnome-control-center/default-apps/
@ -1449,10 +1481,15 @@ fi
%{_bindir}/chromedriver
%{chromium_path}/chromedriver
%endif
%changelog
* Wed Jan 1 2021 wchen342 <[email protected]> - 87.0.4280.141-1
* Fri Jan 29 2021 wchen342 <[email protected]> - 88.0.4324.104-1
- Update Chromium to 88.0.4324.104
- Update ungoogled-chromium to 88.0.4324.104-1
* Fri Jan 1 2021 wchen342 <[email protected]> - 87.0.4280.141-1
- Update Chromium to 87.0.4280.141
- Update ungoogled-chromium to 87.0.4280.141-1
- Add back RHEL (CentOS) support


Loading…
Cancel
Save