Re: Ungoogled-chromium in core-updates

[Andreas Enge <andreas@enge.fr>]

[-- Attachment #1: Type: text/plain, Size: 536 bytes --]

Am Mon, Feb 20, 2023 at 09:41:23PM +0100 schrieb Andreas Enge:
> It is also in the Debian patches as fixes/clang-and-gcc11.patch.

It helps to go further, new patch attached.
Now I get until the message below.

[45812/52515] CXX obj/third_party/blink/renderer/core/core/attribution_src_loader.o
FAILED: obj/third_party/blink/renderer/core/core/attribution_src_loader.o
fatal error: error in backend: IO failure on output stream: No space left on device

22GB of free space are not enough :-(

I may give it a try on bayfront.

Andreas


[-- Attachment #2: 0001-gnu-ungoogled-chromium-Adapt-patches.patch --]
[-- Type: text/plain, Size: 2049 bytes --]

From 203cc1bdaaf614a3a99d60d79daa4cd280bc617c Mon Sep 17 00:00:00 2001
From: Andreas Enge <andreas@enge.fr>
Date: Mon, 20 Feb 2023 21:17:48 +0100
Subject: [PATCH] gnu: ungoogled-chromium: Adapt patches.

* gnu/packages/chromium.scm (%debian-revision): Move to a later release
for Debian patches.
(%ungoogled-origin): Update hash accordingly.
(%debian-patches): Enable "fixes/clang-and-gcc11.patch".
---
 gnu/packages/chromium.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm
index e321ae3fe6..47153e3531 100644
--- a/gnu/packages/chromium.scm
+++ b/gnu/packages/chromium.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2019-2023 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
+;;; Copyright © 2023 Andreas Enge <andreas@enge.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -318,7 +319,9 @@ (define %blacklisted-files
 
 (define %chromium-version "109.0.5414.119")
 (define %ungoogled-revision (string-append %chromium-version "-1"))
-(define %debian-revision "debian/102.0.5005.61-1")
+(define %debian-revision "debian/103.0.5060.53-1")
+  ;; This is the first release supporting openjpeg@2.5 in openjpeg.patch;
+  ;; it still includes jsoncpp.patch, which also appears to be needed.
 (define %arch-revision "a0b214b3bdfbc7ee3d9004a70494a2b9e3da2c80")
 
 (define %ungoogled-origin
@@ -342,7 +345,7 @@ (define %debian-origin
                                 ((_ version) version))))
     (sha256
      (base32
-      "1ln6r1qzlr7dsgvcbssvvc34my4mpkwv9hmvlb2dhjncs7isp65j"))))
+      "0bmbp1y0cykcbjhvsk330d11f7qnwmapcwxv76vdbl8cjfb6h60w"))))
 
 (define (origin-file origin file)
   (computed-file
@@ -355,7 +358,8 @@ (define (debian-patch name)
 
 (define %debian-patches
   (map debian-patch
-       '("system/jsoncpp.patch"
+       '("fixes/clang-and-gcc11.patch"
+         "system/jsoncpp.patch"
          "system/zlib.patch"
          "system/openjpeg.patch")))
 
-- 
2.39.1