uppkg -> 119.0.6045.59-1

.SRCINFO

@@ -1,7 +1,7 @@
 pkgbase = ungoogled-chromium-xdg
 	pkgdesc = A lightweight approach to removing Google web service dependency - without creating a useless ~/.pki directory
-	pkgver = 118.0.5993.117
-	pkgrel = 2
+	pkgver = 119.0.6045.59
+	pkgrel = 1
 	url = https://github.com/ungoogled-software/ungoogled-chromium
 	arch = x86_64
 	license = BSD
@@ -46,7 +46,6 @@ pkgbase = ungoogled-chromium-xdg
 	depends = opus
 	depends = harfbuzz
 	depends = re2
-	depends = libavif
 	depends = jsoncpp
 	depends = libxslt
 	depends = libpng
@@ -56,30 +55,28 @@ pkgbase = ungoogled-chromium-xdg
 	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 = chromedriver=118.0.5993.117
+	provides = chromium=119.0.6045.59
+	provides = chromedriver=119.0.6045.59
 	conflicts = chromium
 	conflicts = chromedriver
 	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
 	source = xdg-basedir.patch
 	source = no-omnibox-suggestion-autocomplete.patch
 	source = index.html
-	source = ungoogled-chromium-118.0.5993.117-1.tar.gz::https://github.com/ungoogled-software/ungoogled-chromium/archive/refs/tags/118.0.5993.117-1.tar.gz
-	sha256sums = 7029d851e4a2e8d5a145a6f6ba76f18f5c3043f57b2c750b35d96e92f3453786
+	source = ungoogled-chromium-119.0.6045.59-1.zip::https://github.com/Ahrotahn/ungoogled-chromium/archive/refs/heads/update.zip
+	sha256sums = 039cba06c694aef9318f2a2c89c176ce3e9147a7bc2324f856077f8002b15d0e
 	sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a
-	sha256sums = 0d1eb054965711a2d4ed6b4cb7f06cbda5b374a48e1b99c8c38ebf6375a781a9
-	sha256sums = ab1eb107ec1c915065dc59cf4832da27e17d60eb29038e2aec633daeb946cc6a
+	sha256sums = 09ecf142254525ddb9c2dbbb2c71775e68722412923a5a9bba5cc2e46af8d087
 	sha256sums = 1b782b0f6d4f645e4e0daa8a4852d63f0c972aa0473319216ff04613a0592a69
 	sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711
 	sha256sums = f97e6cd3c4d2e04f5d9a0ea234fe768d6ba0fa9f4ecd5c7b2ca91030a1249078
 	sha256sums = ff1591fa38e0ede7e883dc7494b813641b7a1a7cb1ded00d9baaee987c1dbea8
 	sha256sums = a4cdd2b86f32d5302c2792be841ff40d982b19bb58a4e63df9d77f4c706b8665
-	sha256sums = 41afb5933668b67059d48613c136c4535ed7a5a3387361cd118aff38593ae4e3
+	sha256sums = 9317d3bd5d11ce82230564b841fb7cba8082c50e87699e9cda0d90ebbabfb2df
 
 pkgname = ungoogled-chromium-xdg

PKGBUILD

@@ -10,8 +10,8 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=ungoogled-chromium-xdg
-pkgver=118.0.5993.117
-pkgrel=2
+pkgver=119.0.6045.59
+pkgrel=1
 _launcher_ver=8
 _manual_clone=0
 pkgdesc="A lightweight approach to removing Google web service dependency - without creating a useless ~/.pki directory"
@@ -32,16 +32,14 @@ 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
         xdg-basedir.patch
         no-omnibox-suggestion-autocomplete.patch
         index.html)
-sha256sums=('7029d851e4a2e8d5a145a6f6ba76f18f5c3043f57b2c750b35d96e92f3453786'
+sha256sums=('039cba06c694aef9318f2a2c89c176ce3e9147a7bc2324f856077f8002b15d0e'
             '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
-            '0d1eb054965711a2d4ed6b4cb7f06cbda5b374a48e1b99c8c38ebf6375a781a9'
-            'ab1eb107ec1c915065dc59cf4832da27e17d60eb29038e2aec633daeb946cc6a'
+            '09ecf142254525ddb9c2dbbb2c71775e68722412923a5a9bba5cc2e46af8d087'
             '1b782b0f6d4f645e4e0daa8a4852d63f0c972aa0473319216ff04613a0592a69'
             'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711'
             'f97e6cd3c4d2e04f5d9a0ea234fe768d6ba0fa9f4ecd5c7b2ca91030a1249078'
@@ -56,13 +54,13 @@ fi
 provides=("chromium=${pkgver}" "chromedriver=${pkgver}")
 conflicts=('chromium' 'chromedriver')
 _uc_usr=ungoogled-software
-# _uc_ver=$pkgver-1
-_uc_ver=118.0.5993.117-1
+_uc_ver=$pkgver-1
+# _uc_ver=118.0.5993.117-1
 source=(${source[@]}
-        ${pkgname%-*}-$_uc_ver.tar.gz::https://github.com/$_uc_usr/ungoogled-chromium/archive/refs/tags/$_uc_ver.tar.gz)
-        # ${pkgname%-*}-$_uc_ver.zip::https://github.com/Ahrotahn/${pkgname%-*}/archive/refs/heads/update.zip)
+        # ${pkgname%-*}-$_uc_ver.tar.gz::https://github.com/$_uc_usr/ungoogled-chromium/archive/refs/tags/$_uc_ver.tar.gz)
+        ${pkgname%-*}-$_uc_ver.zip::https://github.com/Ahrotahn/${pkgname%-*}/archive/refs/heads/update.zip)
 sha256sums=(${sha256sums[@]}
-            '41afb5933668b67059d48613c136c4535ed7a5a3387361cd118aff38593ae4e3')
+            '9317d3bd5d11ce82230564b841fb7cba8082c50e87699e9cda0d90ebbabfb2df')
 
 # Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
 # Keys are the names in the above script; values are the dependencies in Arch
@@ -77,7 +75,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
@@ -127,20 +125,18 @@ 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
 
 
 

free-the-X11-pixmap-in-the-NativePixmapEGLX11Bind.patch

@@ -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