commit 77925287bc6b87b44f9af026d58477b2aa4e937e Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Wed Oct 26 11:59:48 2022 +0100 Update to 107.0.5304.68 chromium-freeworld.spec | 19 +++++++++---------- chromium-names.patch | 16 ++++++++-------- fix_py311.patch | 11 ----------- sources | 4 ++-- 4 files changed, 19 insertions(+), 31 deletions(-) --- diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec index ca17255..a7ed6f3 100644 --- a/chromium-freeworld.spec +++ b/chromium-freeworld.spec @@ -42,7 +42,7 @@ ##############################Package Definitions###################################### Name: chromium-freeworld -Version: 106.0.5249.119 +Version: 107.0.5304.68 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) @@ -50,7 +50,7 @@ URL: https://www.chromium.org/Home Source0: https://commondatastorage.googleapis.com/chromium-browser-official/chromi... # Patchset composed by Stephan Hartmann. -%global patchset_revision chromium-106-patchset-3 +%global patchset_revision chromium-107-patchset-1 Source1: https://github.com/stha09/chromium-patches/archive/%{patchset_revision}/c... # The following two source files are copied and modified from the chromium source @@ -103,6 +103,8 @@ BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-scanner) BuildRequires: pkgconfig(wayland-server) +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: python3-devel BuildRequires: python-unversioned-command @@ -196,8 +198,7 @@ Patch404: chromium-md5-based-build-id.patch Patch405: chromium-names.patch Patch406: allow-to-override-clang-through-env-variables.patch Patch407: chromium-rpm-fusion-brand.patch -Patch408: fix_py311.patch -Patch409: add_missing_include.patch +Patch408: add_missing_include.patch %description %{name} is an open-source web browser, powered by WebKit (Blink) @@ -214,9 +215,6 @@ Patch409: add_missing_include.patch %{__scm_apply_patch -p1} <%{patchset_root}/%{1} %patchset_apply chromium-103-VirtualCursor-std-layout.patch -%patchset_apply chromium-106-AutofillPopupControllerImpl-namespace.patch -%patchset_apply chromium-106-LinuxInputMethodContext-include.patch -%patchset_apply chromium-106-ReverseBeaconTimeoutSorter-constexpr.patch # Apply patches up to #1000 from this spec. %autopatch -M1000 -p1 @@ -345,9 +343,7 @@ gn_arg system_libdir=\"%{_lib}\" gn_arg use_allocator=\"none\" gn_arg use_icf=false gn_arg enable_js_type_check=false -gn_arg use_system_libwayland=true -gn_arg use_system_wayland_scanner=true -gn_arg use_bundled_weston=false +gn_arg use_system_libffi=true # ffmpeg gn_arg ffmpeg_branding=\"Chrome\" @@ -513,6 +509,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda %{chromiumdir}/vk_swiftshader_icd.json #########################################changelogs################################################# %changelog +* Tue Oct 25 2022 Leigh Scott <leigh123linux(a)gmail.com&gt; - 107.0.5304.68-1 +- Update to 107.0.5304.68 + * Wed Oct 12 2022 Leigh Scott <leigh123linux(a)gmail.com&gt; - 106.0.5249.119-1 - Update to 106.0.5249.119 diff --git a/chromium-names.patch b/chromium-names.patch index 2f141c4..912911f 100644 --- a/chromium-names.patch +++ b/chromium-names.patch @@ -11,9 +11,9 @@ Replace hard-coded "chromium-browser" with package name. --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -5636,6 +5636,7 @@ - "themes/theme_service_aura_linux.cc", - "themes/theme_service_aura_linux.h", +@@ -6449,6 +6449,7 @@ static_library("browser") { + "first_run/upgrade_util_linux.cc", + "first_run/upgrade_util_linux.h", ] + configs += [ "//third_party/rpm_fusion:defines" ] deps += [ "//chrome/app/theme:chrome_unscaled_resources_grit" ] @@ -21,7 +21,7 @@ Replace hard-coded "chromium-browser" with package name. if (use_dbus) { --- a/chrome/browser/shell_integration_linux.cc +++ b/chrome/browser/shell_integration_linux.cc -@@ -415,7 +415,7 @@ std::string GetIconName() { +@@ -466,7 +466,7 @@ std::string GetIconName() { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) return "google-chrome"; #else // BUILDFLAG(CHROMIUM_BRANDING) @@ -32,7 +32,7 @@ Replace hard-coded "chromium-browser" with package name. --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -83,6 +83,7 @@ +@@ -86,6 +86,7 @@ source_set("channel_info") { sources += [ "channel_info_lacros.cc" ] } else if (is_posix) { sources += [ "channel_info_posix.cc" ] @@ -42,7 +42,7 @@ Replace hard-coded "chromium-browser" with package name. } --- a/chrome/common/channel_info_posix.cc +++ b/chrome/common/channel_info_posix.cc -@@ -96,7 +96,7 @@ std::string GetDesktopName(base::Environ +@@ -120,7 +120,7 @@ std::string GetDesktopName(base::Environ std::string name; if (env->GetVar("CHROME_DESKTOP", &name) && !name.empty()) return name; @@ -53,7 +53,7 @@ Replace hard-coded "chromium-browser" with package name. #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) --- a/media/audio/BUILD.gn +++ b/media/audio/BUILD.gn -@@ -294,6 +294,8 @@ source_set("audio") { +@@ -308,6 +308,8 @@ source_set("audio") { "pulse/pulse_util.h", ] @@ -64,7 +64,7 @@ Replace hard-coded "chromium-browser" with package name. if (link_pulseaudio) { --- a/media/audio/pulse/pulse_util.cc +++ b/media/audio/pulse/pulse_util.cc -@@ -37,8 +37,8 @@ namespace { +@@ -38,8 +38,8 @@ namespace { constexpr char kBrowserDisplayName[] = "google-chrome"; #define PRODUCT_STRING "Google Chrome" #else diff --git a/sources b/sources index 67da6bb..1e46580 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (chromium-106.0.5249.119.tar.xz) = 9f2d01c9a670a36eff3de4423a7cf3b59b10053e17275646cff7438ce02c5b96b6d79640d5e58b499c419e019f09442bec7ecbd9e6b1cbd7632f9eb864d4f138 -SHA512 (chromium-patches-chromium-106-patchset-3.tar.gz) = c0be244ef3d2d021cbf6a4dbbb5035e44de941fd4fcace4d89b625b5bb37263829dbf0ddcdf9c68538583ce2ee5fe61e6f29a72faf22c2492a978c70a8fb5afe +SHA512 (chromium-107.0.5304.68.tar.xz) = a887eeb7a3fb5b800d00581b77b253dbad4d6da42159d3c0b0464d10593780e64942af27715aaff3fbdbc350f8d380d2f53de20fe9a4a107bb7ebffb89fc23e7 +SHA512 (chromium-patches-chromium-107-patchset-1.tar.gz) = 440f9adc5c7340ece36f9bac6e0f010010d2cca0642c69c5931f440b1e0097c6c70b5d9f04dafe3ceffc989a050eae3aaee229836757625fdaee508677f8abd3