Browse Source

uppkg -> 117.0.5938.62-1

Noah Vogt 1 year ago
parent
commit
ebed95cedc
5 changed files with 66 additions and 16 deletions
  1. 11 7
      .SRCINFO
  2. 1 0
      .gitignore
  3. 16 9
      PKGBUILD
  4. 27 0
      add-memory-for-std-unique_ptr-in-third_party-ip.patch
  5. 11 0
      material-color-utilities-cmath.patch

+ 11 - 7
.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = ungoogled-chromium-xdg
 	pkgdesc = A lightweight approach to removing Google web service dependency - without creating a useless ~/.pki directory
-	pkgver = 116.0.5845.187
+	pkgver = 117.0.5938.62
 	pkgrel = 1
 	url = https://github.com/ungoogled-software/ungoogled-chromium
 	arch = x86_64
@@ -55,28 +55,32 @@ 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=116.0.5845.187
-	provides = chromedriver=116.0.5845.187
+	provides = chromium=117.0.5938.62
+	provides = chromedriver=117.0.5938.62
 	conflicts = chromium
 	conflicts = chromedriver
 	options = !lto
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-116.0.5845.187.tar.xz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-117.0.5938.62.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 = REVERT-disable-autoupgrading-debug-info.patch
+	source = material-color-utilities-cmath.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-116.0.5845.187-1.tar.gz::https://github.com/ungoogled-software/ungoogled-chromium/archive/refs/tags/116.0.5845.187-1.tar.gz
-	sha256sums = 512ab82a9dc5f2b7a0ce1e9156fc1005402c15f1d655475c5dcf8c8978f65494
+	source = ungoogled-chromium-117.0.5938.62-1.zip::https://github.com/Ahrotahn/ungoogled-chromium/archive/refs/heads/update.zip
+	sha256sums = 8b8c697208ef9fe014de112c62ebd19268cd6cd9430838700afa985c715175d7
 	sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a
 	sha256sums = 25ad7c1a5e0b7332f80ed15ccf07d7e871d8ffb4af64df7c8fef325a527859b0
+	sha256sums = 7b9708f0dbfd697be7043d3cfe52da991185aa0ee29a3b8263506cd3ae4d41a9
 	sha256sums = 1b782b0f6d4f645e4e0daa8a4852d63f0c972aa0473319216ff04613a0592a69
+	sha256sums = 55e6097d347be40cffebf3ce13ba84ea92d940f60865f1bd7c9af1ef2a2ef8e1
 	sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711
 	sha256sums = f97e6cd3c4d2e04f5d9a0ea234fe768d6ba0fa9f4ecd5c7b2ca91030a1249078
 	sha256sums = ff1591fa38e0ede7e883dc7494b813641b7a1a7cb1ded00d9baaee987c1dbea8
 	sha256sums = a4cdd2b86f32d5302c2792be841ff40d982b19bb58a4e63df9d77f4c706b8665
-	sha256sums = 40ab758e06d32bb65b3f046165b268cf204238fcb91be35a979f2c81f6ce2d88
+	sha256sums = f308fc5fc8c6a6fafef0b3d96526bb02081210a9c3e08b498edefc0117fd0ca5
 
 pkgname = ungoogled-chromium-xdg

+ 1 - 0
.gitignore

@@ -5,3 +5,4 @@ pkg
 *.tar.*
 *.log
 nohup.out
+*.zip

+ 16 - 9
PKGBUILD

@@ -10,7 +10,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=ungoogled-chromium-xdg
-pkgver=116.0.5845.187
+pkgver=117.0.5938.62
 pkgrel=1
 _launcher_ver=8
 _gcc_patchset=116-patchset-2
@@ -33,15 +33,19 @@ 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://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
         REVERT-disable-autoupgrading-debug-info.patch
+        material-color-utilities-cmath.patch
         use-oauth2-client-switches-as-default.patch
         xdg-basedir.patch
         no-omnibox-suggestion-autocomplete.patch
         index.html)
-sha256sums=('512ab82a9dc5f2b7a0ce1e9156fc1005402c15f1d655475c5dcf8c8978f65494'
+sha256sums=('8b8c697208ef9fe014de112c62ebd19268cd6cd9430838700afa985c715175d7'
             '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
             '25ad7c1a5e0b7332f80ed15ccf07d7e871d8ffb4af64df7c8fef325a527859b0'
+            '7b9708f0dbfd697be7043d3cfe52da991185aa0ee29a3b8263506cd3ae4d41a9'
             '1b782b0f6d4f645e4e0daa8a4852d63f0c972aa0473319216ff04613a0592a69'
+            '55e6097d347be40cffebf3ce13ba84ea92d940f60865f1bd7c9af1ef2a2ef8e1'
             'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711'
             'f97e6cd3c4d2e04f5d9a0ea234fe768d6ba0fa9f4ecd5c7b2ca91030a1249078'
             'ff1591fa38e0ede7e883dc7494b813641b7a1a7cb1ded00d9baaee987c1dbea8'
@@ -57,10 +61,10 @@ conflicts=('chromium' 'chromedriver')
 _uc_usr=ungoogled-software
 _uc_ver=$pkgver-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[@]}
-            '40ab758e06d32bb65b3f046165b268cf204238fcb91be35a979f2c81f6ce2d88')
+            'f308fc5fc8c6a6fafef0b3d96526bb02081210a9c3e08b498edefc0117fd0ca5')
 
 # 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
@@ -124,18 +128,23 @@ prepare() {
   # runtime -- this allows signing into Chromium without baked-in values
   patch -Np1 -i ../use-oauth2-client-switches-as-default.patch
 
+  # Upstream fixes
+  patch -Np1 -i ../add-memory-for-std-unique_ptr-in-third_party-ip.patch
 
   # Revert addition of compiler flag that needs newer clang
   patch -Rp1 -i ../REVERT-disable-autoupgrading-debug-info.patch
 
+  # Build fixes
+  patch -Np0 -i ../material-color-utilities-cmath.patch
+
   # Fixes for building with libstdc++ instead of libc++
   patch -Np1 -i ../patches/chromium-114-ruy-include.patch
   patch -Np1 -i ../patches/chromium-114-vk_mem_alloc-include.patch
   patch -Np1 -i ../patches/chromium-114-maldoca-include.patch
-  patch -Np1 -i ../patches/chromium-116-object_paint_properties_sparse-include.patch
-  patch -Np1 -i ../patches/chromium-116-profile_view_utils-include.patch
 
 
+  # Custom Patches
+
   # move ~/.pki directory to ${XDG_DATA_HOME:-$HOME/.local}/share/pki
   patch -p1 -i ../xdg-basedir.patch
 
@@ -144,8 +153,6 @@ prepare() {
   # called 'shoulder surfing').
   patch -p1 -i ../no-omnibox-suggestion-autocomplete.patch
 
-  # Custom Patches
-
 
   # Ungoogled Chromium changes
   if [[ -d "$srcdir/${pkgname%xdg*}$_uc_ver" ]]

+ 27 - 0
add-memory-for-std-unique_ptr-in-third_party-ip.patch

@@ -0,0 +1,27 @@
+From 5a8dfcaf84b5af5aeb738702651e98bfc43d6d45 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Wed, 9 Aug 2023 15:36:26 +0000
+Subject: [PATCH] IWYU: add memory for std::unique_ptr in //third_party/ipcz
+
+Bug: 957519
+Change-Id: I600f415a59206da283046b638a4f68eda0892ac7
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4754274
+Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
+Reviewed-by: Robert Sesek <rsesek@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#1181503}
+---
+ third_party/ipcz/src/ipcz/router_link.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/third_party/ipcz/src/ipcz/router_link.h b/third_party/ipcz/src/ipcz/router_link.h
+index 09bc5626d99..619638cc7f1 100644
+--- a/third_party/ipcz/src/ipcz/router_link.h
++++ b/third_party/ipcz/src/ipcz/router_link.h
+@@ -7,6 +7,7 @@
+ 
+ #include <cstddef>
+ #include <functional>
++#include <memory>
+ #include <string>
+ #include <utility>
+ 

+ 11 - 0
material-color-utilities-cmath.patch

@@ -0,0 +1,11 @@
+--- third_party/material_color_utilities/src/cpp/palettes/tones.cc.orig	2023-08-30 22:58:42.101555407 +0000
++++ third_party/material_color_utilities/src/cpp/palettes/tones.cc	2023-08-30 22:58:54.082340977 +0000
+@@ -14,6 +14,8 @@
+  * limitations under the License.
+  */
+ 
++#include <cmath>
++
+ #include "cpp/palettes/tones.h"
+ 
+ #include "cpp/cam/cam.h"