$ git show --format=fuller --patch-with-stat --summary d891785ec1a9fae1fe8e8245480650a896f3008d
commit d891785ec1a9fae1fe8e8245480650a896f3008d
Author: Bernhard Rosenkränzer <bero@lindev.ch>
AuthorDate: Mon Jan 31 13:21:18 2022 +0000
Commit: Bernhard Rosenkränzer <bero@lindev.ch>
CommitDate: Mon Jan 31 13:21:18 2022 +0000
99.0.4844.11, no chromedriver on aarch64
---
.abf.yml | 4 ++--
chromium-browser-dev.spec | 23 ++++++++++++++++-------
wayland-egl.patch | 30 ++++++++++++++++--------------
3 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/.abf.yml b/.abf.yml
index 07f6128..1db4f06 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,3 +1,3 @@
sources:
- chromium-99-patchset-2.tar.xz: b221a1ba1d28f83e981eb98bf31e126dcfa911c7
- chromium-99.0.4840.0.tar.xz: 633304d5f153ce50c87b5e128a36e7e6147ed5e1
+ chromium-99.0.4844.11.tar.xz: 03c2591fb1d0f478a87d5efe8e3c5ec6b1eee1a9
+ chromium-99-patchset-3.tar.xz: 44ba1b8db1949d8540789dcdb730da8ccec00a59
diff --git a/chromium-browser-dev.spec b/chromium-browser-dev.spec
index 84af01b..3a5abc8 100644
--- a/chromium-browser-dev.spec
+++ b/chromium-browser-dev.spec
@@ -78,7 +78,7 @@
Name: chromium-browser-%{channel}
# Working version numbers can be found at
# http://omahaproxy.appspot.com/
-Version: 99.0.4840.0
+Version: 99.0.4844.11
Release: 1%{?extrarelsuffix}
Summary: A fast webkit-based web browser
Group: Networking/WWW
@@ -108,7 +108,6 @@ Patch6: https://src.fedoraproject.org/rpms/chromium/raw/master/f/chromium-77.0.
Patch8: https://src.fedoraproject.org/rpms/chromium/raw/master/f/chromium-71.0.3578.98-widevine-r3.patch
# Try to load widevine from other places
Patch11: https://src.fedoraproject.org/rpms/chromium/raw/master/f/chromium-79.0.3945.56-widevine-other-locations.patch
-%if 0
# Add "Fedora" to the user agent string
#Patch13: https://src.fedoraproject.org/rpms/chromium/raw/master/f/chromium-79.0.3945.56-fedora-user-agent.patch
# https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-unbundle-zlib.patch
@@ -117,7 +116,6 @@ Patch53: chromium-81-unbundle-zlib.patch
Patch54: https://src.fedoraproject.org/rpms/chromium/raw/master/f/chromium-77.0.3865.75-gcc-include-memory.patch
# /../../ui/base/cursor/ozone/bitmap_cursor_factory_ozone.cc:53:15: error: 'find_if' is not a member of 'std'; did you mean 'find'?
#Patch63: https://src.fedoraproject.org/rpms/chromium/raw/master/f/chromium-79.0.3945.56-fix-find_if.patch
-%endif
# From Arch and Gentoo
# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=chromium-dev
@@ -128,7 +126,7 @@ Patch103: https://raw.githubusercontent.com/archlinux/svntogit-packages/packages
### Chromium gcc/libstdc++ support ###
# https://github.com/stha09/chromium-patches
-Source500: https://github.com/stha09/chromium-patches/releases/download/chromium-99-patchset-2/chromium-99-patchset-2.tar.xz
+Source500: https://github.com/stha09/chromium-patches/releases/download/chromium-99-patchset-3/chromium-99-patchset-3.tar.xz
### Chromium Tests Patches ###
# Arch Linux, fix for compile error with system ICU
@@ -179,6 +177,10 @@ BuildRequires: snappy-devel
BuildRequires: jsoncpp-devel
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(atk)
+BuildRequires: pkgconfig(atk-bridge-2.0)
+BuildRequires: pkgconfig(atspi-2)
+BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(wayland-egl)
BuildRequires: pkgconfig(nss)
BuildRequires: pkgconfig(gbm)
@@ -201,8 +203,6 @@ BuildRequires: pkgconfig(libavfilter)
BuildRequires: pkgconfig(libavformat) >= 57.41.100
BuildRequires: pkgconfig(libavutil)
%endif
-BuildRequires: gtk+3.0-devel
-BuildRequires: gtk+2.0-devel
BuildRequires: pkgconfig(nspr)
BuildRequires: pkgconfig(zlib)
BuildRequires: pkgconfig(xscrnsaver)
@@ -468,7 +468,12 @@ out/Release/gn gen --script-executable=/usr/bin/python --args="${CHROMIUM_CORE_G
# As of 36.0.1985.143, use_system_icu breaks the build.
# gyp: Duplicate target definitions for /home/bero/abf/chromium-browser-stable/BUILD/chromium-36.0.1985.143/third_party/icu/icu.gyp:icudata#target
# This should be enabled again once the gyp files are fixed.
+%ifarch %{x86_64}
ninja -C out/Release chrome chrome_sandbox chromedriver
+%else
+# As of 99.x, chromedriver seems to be x86 specific
+ninja -C out/Release chrome chrome_sandbox
+%endif
%install
mkdir -p %{buildroot}%{_bindir}
@@ -479,7 +484,10 @@ mkdir -p %{buildroot}%{_mandir}/man1
install -m 755 %{SOURCE1} %{buildroot}%{_libdir}/%{name}/
install -m 755 out/Release/chrome %{buildroot}%{_libdir}/%{name}/
install -m 4755 out/Release/chrome_sandbox %{buildroot}%{_libdir}/%{name}/chrome-sandbox
+%ifarch %{x86_64}
cp -a out/Release/chromedriver %{buildroot}%{_libdir}/%{name}/chromedriver
+ln -s %{_libdir}/%{name}/chromedriver %{buildroot}%{_bindir}/chromedriver
+%endif
install -m 644 out/Release/locales/*.pak %{buildroot}%{_libdir}/%{name}/locales/
install -m 644 out/Release/chrome_100_percent.pak %{buildroot}%{_libdir}/%{name}/
install -m 644 out/Release/resources.pak %{buildroot}%{_libdir}/%{name}/
@@ -488,7 +496,6 @@ install -m 644 out/Release/resources.pak %{buildroot}%{_libdir}/%{name}/
install -m 644 out/Release/*.bin %{buildroot}%{_libdir}/%{name}/
install -m 644 chrome/browser/resources/default_apps/* %{buildroot}%{_libdir}/%{name}/default_apps/
ln -s %{_libdir}/%{name}/chromium-wrapper %{buildroot}%{_bindir}/%{name}
-ln -s %{_libdir}/%{name}/chromedriver %{buildroot}%{_bindir}/chromedriver
find out/Release/resources/ -name "*.d" -exec rm {} \;
cp -r out/Release/resources %{buildroot}%{_libdir}/%{name}
@@ -548,7 +555,9 @@ cp %{S:4} %{buildroot}%{_datadir}/drirc.d/10-%{name}.conf
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%ifarch %{x86_64}
%files -n chromedriver%{namesuffix}
%doc LICENSE AUTHORS
%{_bindir}/chromedriver
%{_libdir}/%{name}/chromedriver
+%endif
diff --git a/wayland-egl.patch b/wayland-egl.patch
index 58a0798..f869030 100644
--- a/wayland-egl.patch
+++ b/wayland-egl.patch
@@ -1,17 +1,7 @@
---- a/ui/gl/gl_image_native_pixmap.cc 2020-05-18 11:40:06.000000000 -0700
-+++ b/ui/gl/gl_image_native_pixmap.cc 2020-05-22 02:07:16.007770442 -0700
-@@ -288,6 +288,8 @@
- std::move(scoped_fd));
- }
-
-+ handle.planes[0].size = size_.GetArea();
-+
- return handle;
- #endif // !defined(OS_FUCHSIA)
- }
---- a/gpu/command_buffer/service/error_state.cc 2020-05-18 11:39:22.000000000 -0700
-+++ b/gpu/command_buffer/service/error_state.cc 2020-05-22 13:43:09.181180388 -0700
-@@ -115,6 +115,8 @@
+diff -up chromium-99.0.4844.11/gpu/command_buffer/service/error_state.cc.13~ chromium-99.0.4844.11/gpu/command_buffer/service/error_state.cc
+--- chromium-99.0.4844.11/gpu/command_buffer/service/error_state.cc.13~ 2022-01-28 23:31:16.000000000 +0000
++++ chromium-99.0.4844.11/gpu/command_buffer/service/error_state.cc 2022-01-31 03:56:34.553804208 +0000
+@@ -117,6 +117,8 @@ GLenum ErrorStateImpl::GetErrorHandleCon
// buffer.
error = GL_NO_ERROR;
}
@@ -20,3 +10,15 @@
return error;
}
+diff -up chromium-99.0.4844.11/ui/gl/gl_image_native_pixmap.cc.13~ chromium-99.0.4844.11/ui/gl/gl_image_native_pixmap.cc
+--- chromium-99.0.4844.11/ui/gl/gl_image_native_pixmap.cc.13~ 2022-01-31 03:56:34.553804208 +0000
++++ chromium-99.0.4844.11/ui/gl/gl_image_native_pixmap.cc 2022-01-31 04:24:47.799215691 +0000
+@@ -307,6 +307,8 @@ gfx::NativePixmapHandle GLImageNativePix
+ std::move(scoped_fd));
+ }
+
++ handle.planes[0].size = size_.GetArea();
++
+ return handle;
+ #endif // BUILDFLAG(IS_FUCHSIA)
+ }