From c0da75a3b8606f4322d94b9b265b6603a686189c Mon Sep 17 00:00:00 2001 From: JustKidding Date: Fri, 6 Oct 2023 09:20:21 -0500 Subject: upgpkg: ungoogled-chromium 117.0.5938.149-1 upstream release --- .SRCINFO | 16 +++--- PKGBUILD | 11 ++-- ...-X11-pixmap-in-the-NativePixmapEGLX11Bind.patch | 67 ++++++++++++++++++++++ 3 files changed, 83 insertions(+), 11 deletions(-) create mode 100644 free-the-X11-pixmap-in-the-NativePixmapEGLX11Bind.patch diff --git a/.SRCINFO b/.SRCINFO index 3b89fe2..d7ca44f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = ungoogled-chromium pkgdesc = A lightweight approach to removing Google web service dependency - pkgver = 117.0.5938.88 + pkgver = 117.0.5938.149 pkgrel = 1 url = https://github.com/ungoogled-software/ungoogled-chromium arch = x86_64 @@ -56,32 +56,34 @@ pkgbase = ungoogled-chromium 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=117.0.5938.88 - provides = chromedriver=117.0.5938.88 + provides = chromium=117.0.5938.149 + provides = chromedriver=117.0.5938.149 conflicts = chromium conflicts = chromedriver options = !lto - source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-117.0.5938.88.tar.xz + source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-117.0.5938.149.tar.xz source = https://github.com/foutrelis/chromium-launcher/archive/v8/chromium-launcher-8.tar.gz source = https://github.com/stha09/chromium-patches/releases/download/chromium-116-patchset-2/chromium-116-patchset-2.tar.xz source = add-memory-for-std-unique_ptr-in-third_party-ip.patch source = roll-src-third_party-libavif-src-b33d9ebfc.676aded35.patch + source = free-the-X11-pixmap-in-the-NativePixmapEGLX11Bind.patch source = REVERT-disable-autoupgrading-debug-info.patch source = material-color-utilities-cmath.patch source = use-oauth2-client-switches-as-default.patch - source = ungoogled-chromium-117.0.5938.88-1.tar.gz::https://github.com/ungoogled-software/ungoogled-chromium/archive/117.0.5938.88-1.tar.gz + source = ungoogled-chromium-117.0.5938.149-1.tar.gz::https://github.com/ungoogled-software/ungoogled-chromium/archive/117.0.5938.149-1.tar.gz source = ozone-add-va-api-support-to-wayland.patch source = vaapi-add-av1-support.patch source = remove-main-main10-profile-limit.patch - sha256sums = 4691d80039e4155d1a3c4676ee68a1e526ddad61a3cf59f65d596a1a2d56c906 + sha256sums = ddd7c852bd191c0917ab800655da341e7583c2377ca220ae077fc5de7fc7d9df sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a sha256sums = 25ad7c1a5e0b7332f80ed15ccf07d7e871d8ffb4af64df7c8fef325a527859b0 sha256sums = 7b9708f0dbfd697be7043d3cfe52da991185aa0ee29a3b8263506cd3ae4d41a9 sha256sums = 30841fbe0785f8df584eeaa86584fe75f89da26e71df80cf536887557ddef0b6 + sha256sums = ab1eb107ec1c915065dc59cf4832da27e17d60eb29038e2aec633daeb946cc6a sha256sums = 1b782b0f6d4f645e4e0daa8a4852d63f0c972aa0473319216ff04613a0592a69 sha256sums = 55e6097d347be40cffebf3ce13ba84ea92d940f60865f1bd7c9af1ef2a2ef8e1 sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711 - sha256sums = 97d67f4783702537355cdfcaad67024413102478ec5a431b2d51b454e8baea33 + sha256sums = 0afcc1fef6e18c612e7a25c65f08b98d0db3e621c80ff855cbfd5a791b6ad03a sha256sums = e9e8d3a82da818f0a67d4a09be4ecff5680b0534d7f0198befb3654e9fab5b69 sha256sums = e742cc5227b6ad6c3e0c2026edd561c6d3151e7bf0afb618578ede181451b307 sha256sums = be8d3475427553feb5bd46665ead3086301ed93c9a41cf6cc2644811c5bda51c diff --git a/PKGBUILD b/PKGBUILD index a5f9e2c..eb46309 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,9 +9,9 @@ # Contributor: Pierre Schmitz # Contributor: Jan "heftig" Steffens # Contributor: Daniel J Griffiths - + pkgname=ungoogled-chromium -pkgver=117.0.5938.88 +pkgver=117.0.5938.149 pkgrel=1 _launcher_ver=8 _gcc_patchset=116-patchset-2 @@ -36,14 +36,16 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom https://github.com/stha09/chromium-patches/releases/download/chromium-$_gcc_patchset/chromium-$_gcc_patchset.tar.xz add-memory-for-std-unique_ptr-in-third_party-ip.patch roll-src-third_party-libavif-src-b33d9ebfc.676aded35.patch + free-the-X11-pixmap-in-the-NativePixmapEGLX11Bind.patch REVERT-disable-autoupgrading-debug-info.patch material-color-utilities-cmath.patch use-oauth2-client-switches-as-default.patch) -sha256sums=('4691d80039e4155d1a3c4676ee68a1e526ddad61a3cf59f65d596a1a2d56c906' +sha256sums=('ddd7c852bd191c0917ab800655da341e7583c2377ca220ae077fc5de7fc7d9df' '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a' '25ad7c1a5e0b7332f80ed15ccf07d7e871d8ffb4af64df7c8fef325a527859b0' '7b9708f0dbfd697be7043d3cfe52da991185aa0ee29a3b8263506cd3ae4d41a9' '30841fbe0785f8df584eeaa86584fe75f89da26e71df80cf536887557ddef0b6' + 'ab1eb107ec1c915065dc59cf4832da27e17d60eb29038e2aec633daeb946cc6a' '1b782b0f6d4f645e4e0daa8a4852d63f0c972aa0473319216ff04613a0592a69' '55e6097d347be40cffebf3ce13ba84ea92d940f60865f1bd7c9af1ef2a2ef8e1' 'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711') @@ -63,7 +65,7 @@ source=(${source[@]} vaapi-add-av1-support.patch remove-main-main10-profile-limit.patch) sha256sums=(${sha256sums[@]} - '97d67f4783702537355cdfcaad67024413102478ec5a431b2d51b454e8baea33' + '0afcc1fef6e18c612e7a25c65f08b98d0db3e621c80ff855cbfd5a791b6ad03a' 'e9e8d3a82da818f0a67d4a09be4ecff5680b0534d7f0198befb3654e9fab5b69' 'e742cc5227b6ad6c3e0c2026edd561c6d3151e7bf0afb618578ede181451b307' 'be8d3475427553feb5bd46665ead3086301ed93c9a41cf6cc2644811c5bda51c') @@ -133,6 +135,7 @@ prepare() { # Upstream fixes patch -Np1 -i ../add-memory-for-std-unique_ptr-in-third_party-ip.patch patch -Np1 -i ../roll-src-third_party-libavif-src-b33d9ebfc.676aded35.patch + 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 diff --git a/free-the-X11-pixmap-in-the-NativePixmapEGLX11Bind.patch b/free-the-X11-pixmap-in-the-NativePixmapEGLX11Bind.patch new file mode 100644 index 0000000..b59596b --- /dev/null +++ b/free-the-X11-pixmap-in-the-NativePixmapEGLX11Bind.patch @@ -0,0 +1,67 @@ +From 42d57d016f5fb6d2a1a354743b9be911c1be87e8 Mon Sep 17 00:00:00 2001 +From: Jianhui Dai +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 +Commit-Queue: Ted (Chromium) Meyer +Reviewed-by: Maksim Sisov +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 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 -- cgit v1.2.3