[chromium-freeworld] Update to 93.0.4577.82
by Leigh Scott
commit e9796196ea03ce377dd071ce45ff83ccb72a7683
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Sep 14 18:31:29 2021 +0100
Update to 93.0.4577.82
chromium-freeworld.spec | 9 ++++++---
sources | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 11a6b85..063474b 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -27,8 +27,8 @@
%global system_re2 1
##############################Package Definitions######################################
Name: chromium-freeworld
-Version: 93.0.4577.63
-Release: 3%{?dist}
+Version: 93.0.4577.82
+Release: 1%{?dist}
Summary: Chromium built with all freeworld codecs and VA-API support
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)
URL: https://www.chromium.org/Home
@@ -140,7 +140,7 @@ BuildRequires: desktop-file-utils
# install AppData files
BuildRequires: libappstream-glib
# Mojojojo need this >:(
-BuildRequires: java-1.8.0-openjdk
+BuildRequires: java-1.8.0-openjdk-headless
# Libstdc++ static needed for linker
BuildRequires: libstdc++-static
# Runtime Requirements
@@ -723,6 +723,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/swiftshader/libGLESv2.so
#########################################changelogs#################################################
%changelog
+* Tue Sep 14 2021 Leigh Scott <leigh123linux(a)gmail.com> - 93.0.4577.82-1
+- Update to 93.0.4577.82
+
* Sat Sep 11 2021 Leigh Scott <leigh123linux(a)gmail.com> - 93.0.4577.63-3
- Use clang to compile
diff --git a/sources b/sources
index 1377b38..08f48de 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
+SHA512 (chromium-93.0.4577.82.tar.xz) = 730e4a316fee4a5be1bf95301cf25c0c1d192ceeb661f051c1d74b7083fe928f1c5fd24c744cbbda6ef39c9edc64607a2621644e153e5e3de2201b5ac60e4d64
SHA512 (chromium-patches-chromium-93-patchset-6.tar.gz) = 254ef9df8c6809cd941d5cace5ec21708e1592ecd3068ec2c1fdcd8f745b3b21577a4320ad01085a4252a5b491c0d8ac8836f9a9511ed0670197a2f83222435c
-SHA512 (chromium-93.0.4577.63.tar.xz) = b7d85dfe34d9a37e6b4f9b440ba6aaa2778d30f8bda583151dd6e5d2ab9d6136ee1ab321bfc5f59aa10b289c07f72298db11182d06ede8574ac280b2b6d8fa2f
3 years, 2 months
[chromium-freeworld] Add fedora clang-format patch
by Leigh Scott
commit 7fbf9344ea591c66d3166ec0c366c3bf2a94fdfc
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Sep 14 08:32:49 2021 +0100
Add fedora clang-format patch
chromium-clang-format.patch | 34 ++++++++++++++++++++++++++++++++++
chromium-freeworld.spec | 1 +
2 files changed, 35 insertions(+)
---
diff --git a/chromium-clang-format.patch b/chromium-clang-format.patch
new file mode 100644
index 0000000..77e842e
--- /dev/null
+++ b/chromium-clang-format.patch
@@ -0,0 +1,34 @@
+diff -up chromium-93.0.4577.63/buildtools/linux64/clang-format.clang-format-py3 chromium-93.0.4577.63/buildtools/linux64/clang-format
+--- chromium-93.0.4577.63/buildtools/linux64/clang-format.clang-format-py3 2021-09-03 04:42:46.736294345 +0000
++++ chromium-93.0.4577.63/buildtools/linux64/clang-format 2021-09-03 04:59:55.296512600 +0000
+@@ -10,9 +10,9 @@ import sys
+ args = sys.argv[1:]
+ inputfiles = [a for a in args if not a.startswith('-')]
+
+-contents = ''
++contents = b''
+ if '-' in args or not inputfiles:
+- contents = sys.stdin.read()
++ contents = sys.stdin.buffer.read()
+
+ # Tarball builds may or may not have depot_tools in $PATH. In the former case,
+ # running 'clang-format' will call back into this script infinitely. Strip off
+@@ -34,14 +34,14 @@ try:
+ stdout, stderr = proc.communicate(input=contents)
+ # Ignore if clang-format fails. Eg: it may be too old to support C++14.
+ if proc.returncode == 0:
+- sys.stdout.write(stdout)
+- sys.stderr.write(stderr)
++ sys.stdout.buffer.write(stdout)
++ sys.stderr.buffer.write(stderr)
+ sys.exit(0)
+ except OSError:
+ # Ignore if clang-format is not installed.
+ pass
+
+ # If any failure happens, continue with unformatted files.
+-sys.stdout.write(contents)
++sys.stdout.buffer.write(contents)
+ for inputfile in inputfiles:
+- sys.stdout.write(open(inputfile).read())
++ sys.stdout.buffer.write(open(inputfile).read())
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index ad3cea6..11a6b85 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -180,6 +180,7 @@ Patch303: chromium-java-only-allowed-in-android-builds.patch
Patch304: chromium-update-highway-0.12.2.patch
Patch305: chromium-aarch64-cxxflags-addition.patch
Patch306: chromium-93-old-freetype.patch
+Patch307: chromium-clang-format.patch
Patch1303: chromium-rawhide-gcc-std-max-fix.patch
# RPM Fusion patches [free/chromium-freeworld]:
3 years, 2 months
[chromium-freeworld] Add patch to support old clang
by Leigh Scott
commit 3480d852247a384ee89d5653e1b2773c8f50832a
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Sep 13 17:33:48 2021 +0100
Add patch to support old clang
chromium-clang-nomerge.patch | 43 +++++++++++++++++++++++++++++++++++++++++++
chromium-freeworld.spec | 2 ++
2 files changed, 45 insertions(+)
---
diff --git a/chromium-clang-nomerge.patch b/chromium-clang-nomerge.patch
new file mode 100644
index 0000000..b4513f2
--- /dev/null
+++ b/chromium-clang-nomerge.patch
@@ -0,0 +1,43 @@
+Upstream-status: Inapproriate
+
+Upstream suggests to use Chromium's hermetic clang
+instead.
+
+Signed-off-by: Maksim Sisov <msisov(a)igalia.com>
+---
+From bde3186ccba169391fb428fcc296b2236ada0010 Mon Sep 17 00:00:00 2001
+From: Maksim Sisov <msisov(a)igalia.com>
+Date: Wed, 5 May 2021 15:20:43 +0300
+Subject: [PATCH] nomerge attribute on declaration is only available since
+ clang 12
+
+This change fixes builds with older clangs that do not allow
+nomerge attributes on declaration. Otherwise, the following error
+is produced -
+
+build error: 'nomerge' attribute cannot be applied to a declaration
+
+See https://reviews.llvm.org/D92800
+
+Change-Id: I32e1f7dc9049737d54d8a16de5308aa5aae1ced1
+---
+ base/compiler_specific.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/base/compiler_specific.h b/base/compiler_specific.h
+index 6693e9ea33e9..d3b425abe9ca 100644
+--- a/base/compiler_specific.h
++++ b/base/compiler_specific.h
+@@ -340,7 +340,8 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) {
+ #endif // defined(__clang_analyzer__)
+
+ // Use nomerge attribute to disable optimization of merging multiple same calls.
+-#if defined(__clang__) && __has_attribute(nomerge)
++#if defined(__clang__) && (__clang_major__ >= 12) && \
++ __has_attribute(nomerge) && !defined(OS_CHROMEOS)
+ #define NOMERGE [[clang::nomerge]]
+ #else
+ #define NOMERGE
+--
+2.25.1
+
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 30a3ddf..ad3cea6 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -162,8 +162,10 @@ Patch201: chromium-93-EnumTable-crash.patch
# Arch Linux patches:
Patch226: chromium-93-ffmpeg-4.4.patch
+# Suse patches:
Patch231: remove-llvm13-warning-flags.patch
Patch232: chromium-91-sql-standard-layout-type.patch
+Patch233: chromium-clang-nomerge.patch
# Upstream patches:
Patch251: chromium-sandbox-syscall-broker-use-struct-kernel_stat.patch
3 years, 2 months
