Ungoogled-chromium in core-updates

Ungoogled-chromium in core-updates

[Andreas Enge]

Hello,

ungoogled-chromium fails to build for me on core-updates with the message
that openjpeg.h is not found although the openjpeg package is a dependency.
If someone knowing the package could have a look, that would be great;
it is difficult to see what the difference is between master and core-updates
that causes this failure.

Andreas


FAILED: obj/third_party/pdfium/core/fpdfapi/page/page/cpdf_dib.o 
clang++ -MMD -MF obj/third_party/pdfium/core/fpdfapi/page/page/cpdf_dib.o.d -DUSE_UDEV -DUSE_AURA=1 -DUSE_GLIB=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D_FORTIFY_SOURCE=2 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -D_GNU_SOURCE -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DPNG_PREFIX -DPNG_USE_READ_MACROS -DPDF_ENABLE_V8 -DPDF_ENABLE_XFA -DPDF_ENABLE_XFA_BMP -DPDF_ENABLE_XFA_GIF -DPDF_ENABLE_XFA_PNG -DPDF_ENABLE_XFA_TIFF -DUSING_SYSTEM_ICU=1 -DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC -DU_IMPORT=U_EXPORT -I../.. -Igen -I../../third_party/pdfium -I/gnu/store/8p1b5591vbc2zq016p4l6sqy7g46q213-openjpeg-2.5.0/include/openjpeg-2.3 -I/gnu/store/8p1b5591vbc2zq016p4l6sqy7g46q213-openjpeg-2.5.0/include/openjpeg-2.4 -Igen/shim_headers/icuuc_shim -I../../third_party/abseil-cpp -Wall -Wextra -Wimplicit-fallthrough -Wextra-semi -Wunreachable-code-aggressive -Wthread-safety -Wno-missing-field-initializers -Wno-unused-parameter -Wno-psabi -Wloop-analysis -Wno-unneeded-internal-declaration -Wenum-compare-conditional -Wno-ignored-pragma-optimize -Wno-deprecated-builtins -Wno-bitfield-constant-conversion -Wshadow -fno-delete-null-pointer-checks -fno-ident -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pthread -fcolor-diagnostics -fmerge-all-constants -fcrash-diagnostics-dir=../../tools/clang/crashreports -mllvm -instcombine-lower-dbg-declare=0 -ffp-contract=off -flto=thin -fsplit-lto-unit -fwhole-program-vtables -m64 -msse3 -ffile-compilation-dir=. -no-canonical-prefixes -ftrivial-auto-var-init=pattern -O2 -fdata-sections -ffunction-sections -fno-unique-section-names -fno-omit-frame-pointer -gdwarf-4 -g2 -gdwarf-aranges -ggnu-pubnames -Xclang -fuse-ctor-homing -fsanitize=cfi-vcall -fsanitize-ignorelist=../../tools/cfi/ignores.txt -fsanitize=cfi-icall -fvisibility=hidden -Wheader-hygiene -Wstring-conversion -Wtautological-overlap-compare -Wc++11-narrowing -Wdeprecated-copy -Wtautological-unsigned-zero-compare -Wshadow -Wexit-time-destructors -Wglobal-constructors -I/gnu/store/mmqd3yr23k4lj0skanvrzjc38ji7hjx8-freetype-2.13.0/include/freetype2 -I/gnu/store/jh3lzmv8g2r3rh7z6dgxzjs36j4vdywa-libpng-1.6.37/include/libpng16 -std=c++20 -Wno-trigraphs -gsimple-template-names -fno-exceptions -fno-rtti -fvisibility-inlines-hidden -c ../../third_party/pdfium/core/fpdfapi/page/cpdf_dib.cpp -o obj/third_party/pdfium/core/fpdfapi/page/page/cpdf_dib.o
In file included from ../../third_party/pdfium/core/fpdfapi/page/cpdf_dib.cpp:33:
../../third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.h:16:10: fatal error: 'openjpeg.h' file not found
#include <openjpeg.h>
         ^~~~~~~~~~~~
1 error generated.
[7414/52515] ACTION //third_party/devtools-frontend/src/front_end/ui/components/panel_feedback:devtools_entrypoint-bundle-bundle(//build/toolchain/linux/unbundle:default)
[7415/52515] ACTION //third_party/devtools-frontend/src/front_end/ui/components/panel_introduction_steps:devtools_entrypoint-bundle-tsconfig(//build/toolchain/linux/unbundle:default)
[7416/52515] CXX obj/third_party/pdfium/core/fpdfapi/page/page/cpdf_docpagedata.o
ninja: build stopped: subcommand failed.
error: in phase 'build': uncaught exception:
%exception #<&invoke-error program: "ninja" arguments: ("-C" "out/Release" "-j" "4" "chrome" "chromedriver") exit-status: 1 term-signal: #f stop-signal: #f> 
phase `build' failed after 3376.5 seconds
command "ninja" "-C" "out/Release" "-j" "4" "chrome" "chromedriver" failed with status 1
builder for `/gnu/store/2lmiazrdbkqng4qwriavpyrxyq47j0hv-ungoogled-chromium-109.0.5414.119-1.drv' failed with exit code 1
build of /gnu/store/2lmiazrdbkqng4qwriavpyrxyq47j0hv-ungoogled-chromium-109.0.5414.119-1.drv failed
View build log at '/var/log/guix/drvs/2l/miazrdbkqng4qwriavpyrxyq47j0hv-ungoogled-chromium-109.0.5414.119-1.drv.gz'.
guix build: error: build of `/gnu/store/2lmiazrdbkqng4qwriavpyrxyq47j0hv-ungoogled-chromium-109.0.5414.119-1.drv' failed

Re: Ungoogled-chromium in core-updates

[Andreas Enge]

Am Mon, Feb 20, 2023 at 02:43:04PM +0100 schrieb Andreas Enge:
> it is difficult to see what the difference is between master and core-updates
> that causes this failure.

No, it is easy (except that merging makes the history non-linear),
we now use openjpeg-2.5 instead of openjpeg-2.4.
Maybe updating ungoogled-chromium would be the best option.
Right now there is a clash between
commit 503fb0dcb4cab921b5e280f119725850e65abbc9
Author: Marius Bakke <marius@gnu.org>
Date:   Sat Sep 17 18:00:27 2022 +0200
    gnu: ungoogled-chromium: Generalize OpenJPEG substitution.
    * gnu/packages/chromium.scm (ungoogled-chromium)[arguments]: Don't hard code
    openjpeg version.
that leads to
                (substitute* "third_party/pdfium/BUILD.gn"
                  (("/usr/include/openjpeg-")
                   (string-append openjpeg "/include/openjpeg-")))
in connection with third_party/pdfium/BUILD.gn containing
config("pdfium_common_config") {
  cflags = []
  cflags_cc = []
  ldflags = []
  include_dirs = [ ".", "/usr/include/openjpeg-2.3", "/usr/include/openjpeg-2.4" ]

A trivial patch would be to hardcode again... I will have a look.

Andreas

Re: Ungoogled-chromium in core-updates

[Andreas Enge]

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

The attached patch makes some progress; actually it simply moves to a later
Debian patchset.

third_party/pdfium now compiles with it, but the build fails later on with
the attached error message. So I have not yet pushed the patch, since it
does not solve the problem; or would it be okay to push partial progress?


The problem looks precisely like the bug here:
   https://bugs.gentoo.org/786597
which is supposed to be fixed upstream a long time ago.
But their patch
   https://786597.bugs.gentoo.org/attachment.cgi?id=732880
still applies...
It is also in the Debian patches as fixes/clang-and-gcc11.patch.
Something to try another day!

Andreas


[18303/52515] CXX obj/sql/sql/cursor.o
FAILED: obj/sql/sql/cursor.o 
clang++ -MMD -MF obj/sql/sql/cursor.o.d -DIS_SQL_IMPL -DUSE_UDEV -DUSE_AURA=1 -DUSE_GLIB=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D_FORTIFY_SOURCE=2 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -D_GNU_SOURCE -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_40 -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40 -DSQLITE_OMIT_ANALYZE -DSQLITE_OMIT_AUTOINIT -DSQLITE_OMIT_AUTOMATIC_INDEX -DSQLITE_OMIT_AUTORESET -DSQLITE_OMIT_COMPILEOPTION_DIAGS -DSQLITE_OMIT_COMPLETE -DSQLITE_OMIT_EXPLAIN -DSQLITE_OMIT_GET_TABLE -DSQLITE_OMIT_INTROSPECTION_PRAGMAS -DSQLITE_DEFAULT_LOOKASIDE=0,0 -DSQLITE_OMIT_LOOKASIDE -DSQLITE_OMIT_TCL_VARIABLE -DSQLITE_OMIT_REINDEX -DSQLITE_OMIT_TRACE -DSQLITE_OMIT_UPSERT -DSQLITE_OMIT_WINDOWFUNC -DSQLITE_ENABLE_FTS3 -DSQLITE_DISABLE_FTS3_UNICODE -DSQLITE_DISABLE_FTS4_DEFERRED -DSQLITE_ENABLE_ICU -DSQLITE_SECURE_DELETE -DSQLITE_THREADSAFE=1 -DSQLITE_MAX_WORKER_THREADS=0 -DSQLITE_MAX_MMAP_SIZE=268435456 -DSQLITE_DEFAULT_FILE_PERMISSIONS=0600 -DSQLITE_DEFAULT_LOCKING_MODE=1 -DSQLITE_DEFAULT_MEMSTATUS=1 -DSQLITE_DEFAULT_PAGE_SIZE=4096 -DSQLITE_DEFAULT_PCACHE_INITSZ=0 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_USE_ALLOCA -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_JSON -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_HAVE_ISNAN -DSQLITE_ENABLE_BATCH_ATOMIC_WRITE -DSQLITE_TEMP_STORE=3 -DSQLITE_ENABLE_LOCKING_STYLE=0 -I../.. -Igen -I../../third_party/perfetto/include -Igen/third_party/perfetto/build_config -Igen/third_party/perfetto -Igen/shim_headers/zlib_shim -Igen/shim_headers/libevent_shim -Igen/shim_headers/icui18n_shim -Igen/shim_headers/icuuc_shim -I../../third_party/abseil-cpp -I../../third_party/boringssl/src/include -I../../third_party/protobuf/src -Igen/protoc_out -Wall -Wextra -Wimplicit-fallthrough -Wextra-semi -Wunreachable-code-aggressive -Wthread-safety -Wno-missing-field-initializers -Wno-unused-parameter -Wno-psabi -Wloop-analysis -Wno-unneeded-internal-declaration -Wenum-compare-conditional -Wno-ignored-pragma-optimize -Wno-deprecated-builtins -Wno-bitfield-constant-conversion -Wshadow -fno-delete-null-pointer-checks -fno-ident -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pthread -fcolor-diagnostics -fmerge-all-constants -fcrash-diagnostics-dir=../../tools/clang/crashreports -mllvm -instcombine-lower-dbg-declare=0 -ffp-contract=off -flto=thin -fsplit-lto-unit -fwhole-program-vtables -m64 -msse3 -ffile-compilation-dir=. -no-canonical-prefixes -ftrivial-auto-var-init=pattern -O2 -fdata-sections -ffunction-sections -fno-unique-section-names -fno-omit-frame-pointer -gdwarf-4 -g2 -gdwarf-aranges -ggnu-pubnames -Xclang -fuse-ctor-homing -fsanitize=cfi-vcall -fsanitize-ignorelist=../../tools/cfi/ignores.txt -fsanitize=cfi-icall -fvisibility=hidden -Wheader-hygiene -Wstring-conversion -Wtautological-overlap-compare -I/gnu/store/jppi8qal1yrw6q6fn4kv04swwb70s50c-glib-2.72.3/include/glib-2.0 -I/gnu/store/jppi8qal1yrw6q6fn4kv04swwb70s50c-glib-2.72.3/lib/glib-2.0/include -DPROTOBUF_ALLOW_DEPRECATED=1 -std=c++20 -Wno-trigraphs -gsimple-template-names -fno-exceptions -fno-rtti -fvisibility-inlines-hidden -c ../../sql/recover_module/cursor.cc -o obj/sql/sql/cursor.o
In file included from ../../sql/recover_module/cursor.cc:5:
../../sql/recover_module/cursor.h:66:5: error: static assertion failed due to requirement 'std::is_standard_layout<sql::recover::VirtualCursor>::value': needed for the reinterpret_cast below
    static_assert(std::is_standard_layout<VirtualCursor>::value,
    ^             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
[18304/52515] CXX obj/sql/sql/module.o
FAILED: obj/sql/sql/module.o 
clang++ -MMD -MF obj/sql/sql/module.o.d -DIS_SQL_IMPL -DUSE_UDEV -DUSE_AURA=1 -DUSE_GLIB=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D_FORTIFY_SOURCE=2 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -D_GNU_SOURCE -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_40 -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40 -DSQLITE_OMIT_ANALYZE -DSQLITE_OMIT_AUTOINIT -DSQLITE_OMIT_AUTOMATIC_INDEX -DSQLITE_OMIT_AUTORESET -DSQLITE_OMIT_COMPILEOPTION_DIAGS -DSQLITE_OMIT_COMPLETE -DSQLITE_OMIT_EXPLAIN -DSQLITE_OMIT_GET_TABLE -DSQLITE_OMIT_INTROSPECTION_PRAGMAS -DSQLITE_DEFAULT_LOOKASIDE=0,0 -DSQLITE_OMIT_LOOKASIDE -DSQLITE_OMIT_TCL_VARIABLE -DSQLITE_OMIT_REINDEX -DSQLITE_OMIT_TRACE -DSQLITE_OMIT_UPSERT -DSQLITE_OMIT_WINDOWFUNC -DSQLITE_ENABLE_FTS3 -DSQLITE_DISABLE_FTS3_UNICODE -DSQLITE_DISABLE_FTS4_DEFERRED -DSQLITE_ENABLE_ICU -DSQLITE_SECURE_DELETE -DSQLITE_THREADSAFE=1 -DSQLITE_MAX_WORKER_THREADS=0 -DSQLITE_MAX_MMAP_SIZE=268435456 -DSQLITE_DEFAULT_FILE_PERMISSIONS=0600 -DSQLITE_DEFAULT_LOCKING_MODE=1 -DSQLITE_DEFAULT_MEMSTATUS=1 -DSQLITE_DEFAULT_PAGE_SIZE=4096 -DSQLITE_DEFAULT_PCACHE_INITSZ=0 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_USE_ALLOCA -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_JSON -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_HAVE_ISNAN -DSQLITE_ENABLE_BATCH_ATOMIC_WRITE -DSQLITE_TEMP_STORE=3 -DSQLITE_ENABLE_LOCKING_STYLE=0 -I../.. -Igen -I../../third_party/perfetto/include -Igen/third_party/perfetto/build_config -Igen/third_party/perfetto -Igen/shim_headers/zlib_shim -Igen/shim_headers/libevent_shim -Igen/shim_headers/icui18n_shim -Igen/shim_headers/icuuc_shim -I../../third_party/abseil-cpp -I../../third_party/boringssl/src/include -I../../third_party/protobuf/src -Igen/protoc_out -Wall -Wextra -Wimplicit-fallthrough -Wextra-semi -Wunreachable-code-aggressive -Wthread-safety -Wno-missing-field-initializers -Wno-unused-parameter -Wno-psabi -Wloop-analysis -Wno-unneeded-internal-declaration -Wenum-compare-conditional -Wno-ignored-pragma-optimize -Wno-deprecated-builtins -Wno-bitfield-constant-conversion -Wshadow -fno-delete-null-pointer-checks -fno-ident -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pthread -fcolor-diagnostics -fmerge-all-constants -fcrash-diagnostics-dir=../../tools/clang/crashreports -mllvm -instcombine-lower-dbg-declare=0 -ffp-contract=off -flto=thin -fsplit-lto-unit -fwhole-program-vtables -m64 -msse3 -ffile-compilation-dir=. -no-canonical-prefixes -ftrivial-auto-var-init=pattern -O2 -fdata-sections -ffunction-sections -fno-unique-section-names -fno-omit-frame-pointer -gdwarf-4 -g2 -gdwarf-aranges -ggnu-pubnames -Xclang -fuse-ctor-homing -fsanitize=cfi-vcall -fsanitize-ignorelist=../../tools/cfi/ignores.txt -fsanitize=cfi-icall -fvisibility=hidden -Wheader-hygiene -Wstring-conversion -Wtautological-overlap-compare -I/gnu/store/jppi8qal1yrw6q6fn4kv04swwb70s50c-glib-2.72.3/include/glib-2.0 -I/gnu/store/jppi8qal1yrw6q6fn4kv04swwb70s50c-glib-2.72.3/lib/glib-2.0/include -DPROTOBUF_ALLOW_DEPRECATED=1 -std=c++20 -Wno-trigraphs -gsimple-template-names -fno-exceptions -fno-rtti -fvisibility-inlines-hidden -c ../../sql/recover_module/module.cc -o obj/sql/sql/module.o
In file included from ../../sql/recover_module/module.cc:18:
../../sql/recover_module/cursor.h:66:5: error: static assertion failed due to requirement 'std::is_standard_layout<sql::recover::VirtualCursor>::value': needed for the reinterpret_cast below
    static_assert(std::is_standard_layout<VirtualCursor>::value,
    ^             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
[18305/52515] CXX obj/sql/sql/pager.o
[18306/52515] CXX obj/sql/sql/parsing.o
ninja: build stopped: subcommand failed.
error: in phase 'build': uncaught exception:
%exception #<&invoke-error program: "ninja" arguments: ("-C" "out/Release" "-j" "4" "chrome" "chromedriver") exit-status: 1 term-signal: #f stop-signal: #f> 
phase `build' failed after 6785.3 seconds
command "ninja" "-C" "out/Release" "-j" "4" "chrome" "chromedriver" failed with status 1
builder for `/gnu/store/mainrdainjqmcym7vy771bdl2vqc7gml-ungoogled-chromium-109.0.5414.119-1.drv' failed with exit code 1
build of /gnu/store/mainrdainjqmcym7vy771bdl2vqc7gml-ungoogled-chromium-109.0.5414.119-1.drv failed
View build log at '/var/log/guix/drvs/ma/inrdainjqmcym7vy771bdl2vqc7gml-ungoogled-chromium-109.0.5414.119-1.drv.gz'.



[-- Attachment #2: 0001-gnu-ungoogled-chromium-Fix-openjpeg-include-path.patch --]
[-- Type: text/plain, Size: 1729 bytes --]

From 8203c9d425d5e154d33103cf789a03ff3d4de366 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: Fix openjpeg include path.

* gnu/packages/chromium.scm (%debian-revision): Move to a later release
for Debian patches.
(%ungoogled-origin): Update hash accordingly.
---
 gnu/packages/chromium.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm
index e321ae3fe6..de6b7222a8 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
-- 
2.39.1

Re: Ungoogled-chromium in core-updates

[Andreas Enge]

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

Re: Ungoogled-chromium in core-updates

[Andreas Enge]

Ungoogled-chromium compiles on core-updates! I now even tried it out
and it shows a website :)

One problem less.

Andreas

Re: Ungoogled-chromium in core-updates

[Ludovic Courtès]

Andreas Enge <andreas@enge.fr> skribis:

> Ungoogled-chromium compiles on core-updates! I now even tried it out
> and it shows a website :)

Wo0t! Quite an achievement!!

Ludo’.

Re: Ungoogled-chromium in core-updates

[Andreas Enge]

Am Sat, Feb 25, 2023 at 03:41:58PM +0100 schrieb Andreas Enge:
> Ungoogled-chromium compiles on core-updates! I now even tried it out
> and it shows a website :)

Ah, this is a crazy program - C++!
It just failed after 17h of compilation in the very last step:
[52515/52515] LINK ./chrome
FAILED: chrome
since I had only 51 GB of free space on my disk...

Otherwise said, I expect it to still build, but will not try it again
myself :)

Andreas

Re: Ungoogled-chromium in core-updates

[Leo Famulari]

On Tue, Mar 07, 2023 at 06:14:46PM +0100, Andreas Enge wrote:
> Ah, this is a crazy program - C++!
> It just failed after 17h of compilation in the very last step:
> [52515/52515] LINK ./chrome
> FAILED: chrome
> since I had only 51 GB of free space on my disk...
> 
> Otherwise said, I expect it to still build, but will not try it again
> myself :)

Haha! Yes, I think you can count this as a success :)