summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2023-10-28 06:10:15 -0400
committergraysky2023-10-28 06:10:15 -0400
commit22b331f9b0540b9be0929e62839cac580225938e (patch)
tree1010d14e07e64cd436b9e817b15974bab6052e8e
parent59c8ffa08e29962dd6c56e8ce073164ba9d17281 (diff)
downloadaur-22b331f9b0540b9be0929e62839cac580225938e.tar.gz
Update to 119.0.6045.59-1
-rw-r--r--.SRCINFO15
-rw-r--r--PKGBUILD18
-rw-r--r--free-the-X11-pixmap-in-the-NativePixmapEGLX11Bind.patch67
3 files changed, 13 insertions, 87 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4a3dac8c25df..58f2b0ac0ba6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = chromium-no-extras
pkgdesc = Chromium without hangout services, widevine, or chromedriver
- pkgver = 118.0.5993.117
+ pkgver = 119.0.6045.59
pkgrel = 1
url = https://www.chromium.org/Home
arch = x86_64
@@ -46,7 +46,6 @@ pkgbase = chromium-no-extras
depends = opus
depends = harfbuzz
depends = re2
- depends = libavif
depends = jsoncpp
depends = libxslt
depends = libpng
@@ -56,19 +55,17 @@ pkgbase = chromium-no-extras
optdepends = qt5-base: enable Qt5 with --enable-features=AllowQt
optdepends = org.freedesktop.secrets: password storage backend on GNOME / Xfce
optdepends = kwallet: support for storing passwords in KWallet on Plasma
- provides = chromium=118.0.5993.117
+ provides = chromium=119.0.6045.59
conflicts = chromium
options = !lto
- source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-118.0.5993.117.tar.xz
+ source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-119.0.6045.59.tar.xz
source = https://github.com/foutrelis/chromium-launcher/archive/v8/chromium-launcher-8.tar.gz
- source = https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/118/chromium-patches-118.tar.bz2
- source = free-the-X11-pixmap-in-the-NativePixmapEGLX11Bind.patch
+ source = https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/119/chromium-patches-119.tar.bz2
source = REVERT-disable-autoupgrading-debug-info.patch
source = use-oauth2-client-switches-as-default.patch
- sha256sums = 7029d851e4a2e8d5a145a6f6ba76f18f5c3043f57b2c750b35d96e92f3453786
+ sha256sums = 039cba06c694aef9318f2a2c89c176ce3e9147a7bc2324f856077f8002b15d0e
sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a
- sha256sums = 0d1eb054965711a2d4ed6b4cb7f06cbda5b374a48e1b99c8c38ebf6375a781a9
- sha256sums = ab1eb107ec1c915065dc59cf4832da27e17d60eb29038e2aec633daeb946cc6a
+ sha256sums = 09ecf142254525ddb9c2dbbb2c71775e68722412923a5a9bba5cc2e46af8d087
sha256sums = 1b782b0f6d4f645e4e0daa8a4852d63f0c972aa0473319216ff04613a0592a69
sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711
diff --git a/PKGBUILD b/PKGBUILD
index 547507d3a0e9..41c8c1921f44 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
_pkgname=chromium
pkgname=chromium-no-extras
-pkgver=118.0.5993.117
+pkgver=119.0.6045.59
pkgrel=1
_launcher_ver=8
_manual_clone=0
@@ -30,13 +30,11 @@ options=('!lto') # Chromium adds its own flags for ThinLTO
source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz
https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver/chromium-launcher-$_launcher_ver.tar.gz
https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${pkgver%%.*}/chromium-patches-${pkgver%%.*}.tar.bz2
- free-the-X11-pixmap-in-the-NativePixmapEGLX11Bind.patch
REVERT-disable-autoupgrading-debug-info.patch
use-oauth2-client-switches-as-default.patch)
-sha256sums=('7029d851e4a2e8d5a145a6f6ba76f18f5c3043f57b2c750b35d96e92f3453786'
+sha256sums=('039cba06c694aef9318f2a2c89c176ce3e9147a7bc2324f856077f8002b15d0e'
'213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
- '0d1eb054965711a2d4ed6b4cb7f06cbda5b374a48e1b99c8c38ebf6375a781a9'
- 'ab1eb107ec1c915065dc59cf4832da27e17d60eb29038e2aec633daeb946cc6a'
+ '09ecf142254525ddb9c2dbbb2c71775e68722412923a5a9bba5cc2e46af8d087'
'1b782b0f6d4f645e4e0daa8a4852d63f0c972aa0473319216ff04613a0592a69'
'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711')
@@ -58,7 +56,7 @@ declare -gA _system_libs=(
[icu]=icu
[jsoncpp]=jsoncpp
#[libaom]=aom
- [libavif]=libavif
+ #[libavif]=libavif # needs https://github.com/AOMediaCodec/libavif/commit/5410b23f76
[libdrm]=
[libjpeg]=libjpeg
[libpng]=libpng
@@ -116,19 +114,17 @@ prepare() {
patch -Np1 -i ../use-oauth2-client-switches-as-default.patch
# Upstream fixes
- patch -Np1 -i ../free-the-X11-pixmap-in-the-NativePixmapEGLX11Bind.patch
# Revert addition of compiler flag that needs newer clang
patch -Rp1 -i ../REVERT-disable-autoupgrading-debug-info.patch
# Fixes for building with libstdc++ instead of libc++
- patch -Np1 -i ../chromium-patches-*/chromium-114-maldoca-include.patch
patch -Np1 -i ../chromium-patches-*/chromium-114-ruy-include.patch
patch -Np1 -i ../chromium-patches-*/chromium-114-vk_mem_alloc-include.patch
patch -Np1 -i ../chromium-patches-*/chromium-117-material-color-include.patch
- patch -Np1 -i ../chromium-patches-*/chromium-118-SensorReadingField-include.patch
- patch -Np1 -i ../chromium-patches-*/chromium-118-LightweightDetector-include.patch
- patch -Np1 -i ../chromium-patches-*/chromium-118-system-freetype.patch
+ patch -Np1 -i ../chromium-patches-*/chromium-119-FragmentDataIterator-std.patch
+ patch -Np1 -i ../chromium-patches-*/chromium-119-at-spi-variable-consumption.patch
+ patch -Np1 -i ../chromium-patches-*/chromium-119-clang16.patch
# Link to system tools required by the build
mkdir -p third_party/node/linux/node-linux-x64/bin
diff --git a/free-the-X11-pixmap-in-the-NativePixmapEGLX11Bind.patch b/free-the-X11-pixmap-in-the-NativePixmapEGLX11Bind.patch
deleted file mode 100644
index b59596b955d3..000000000000
--- a/free-the-X11-pixmap-in-the-NativePixmapEGLX11Bind.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 42d57d016f5fb6d2a1a354743b9be911c1be87e8 Mon Sep 17 00:00:00 2001
-From: Jianhui Dai <jianhui.j.dai@intel.com>
-Date: Fri, 22 Sep 2023 21:30:04 +0000
-Subject: [PATCH] [GL] Free the X11 pixmap in the NativePixmapEGLX11Binding
- destructor
-
-This CL frees the X11 pixmap in the NativePixmapEGLX11Binding destructor
-to prevent a memory leak in the X server.
-
-Bug: 1467689
-Change-Id: Id4cba30825417db52176f9165db34d7234a05a05
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4886249
-Reviewed-by: Ted (Chromium) Meyer <tmathmeyer@chromium.org>
-Commit-Queue: Ted (Chromium) Meyer <tmathmeyer@chromium.org>
-Reviewed-by: Maksim Sisov <msisov@igalia.com>
-Cr-Commit-Position: refs/heads/main@{#1200486}
----
- .../platform/x11/native_pixmap_egl_x11_binding.cc | 12 +++++++++---
- .../platform/x11/native_pixmap_egl_x11_binding.h | 2 ++
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/ui/ozone/platform/x11/native_pixmap_egl_x11_binding.cc b/ui/ozone/platform/x11/native_pixmap_egl_x11_binding.cc
-index 46a2d3274b9..b46eb67b9de 100644
---- a/ui/ozone/platform/x11/native_pixmap_egl_x11_binding.cc
-+++ b/ui/ozone/platform/x11/native_pixmap_egl_x11_binding.cc
-@@ -147,9 +147,17 @@ NativePixmapEGLX11Binding::~NativePixmapEGLX11Binding() {
- if (surface_) {
- eglDestroySurface(display_, surface_);
- }
-+
-+ if (pixmap_ != x11::Pixmap::None) {
-+ auto* connection = x11::Connection::Get();
-+ connection->FreePixmap({pixmap_});
-+ }
- }
-
- bool NativePixmapEGLX11Binding::Initialize(x11::Pixmap pixmap) {
-+ CHECK_NE(pixmap, x11::Pixmap::None);
-+ pixmap_ = pixmap;
-+
- if (eglInitialize(display_, nullptr, nullptr) != EGL_TRUE) {
- return false;
- }
-@@ -223,9 +231,7 @@ std::unique_ptr<NativePixmapGLBinding> NativePixmapEGLX11Binding::Create(
- return nullptr;
- }
-
-- // TODO(https://crbug.com/1411749): if we early out below, should we call
-- // FreePixmap()?
--
-+ // Transfer the ownership of `pixmap` to `NativePixmapEGLX11Binding`.
- if (!binding->Initialize(std::move(pixmap))) {
- VLOG(1) << "Unable to initialize binding from pixmap";
- return nullptr;
-diff --git a/ui/ozone/platform/x11/native_pixmap_egl_x11_binding.h b/ui/ozone/platform/x11/native_pixmap_egl_x11_binding.h
-index 013df3f776a..99b262b82ce 100644
---- a/ui/ozone/platform/x11/native_pixmap_egl_x11_binding.h
-+++ b/ui/ozone/platform/x11/native_pixmap_egl_x11_binding.h
-@@ -47,6 +47,8 @@ class NativePixmapEGLX11Binding : public NativePixmapGLBinding {
- EGLSurface surface_ = nullptr;
- EGLDisplay display_;
- gfx::BufferFormat format_;
-+
-+ x11::Pixmap pixmap_ = x11::Pixmap::None;
- };
-
- } // namespace ui