[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Ungoogled-chromium in core-updates
|
From: |
Andreas Enge |
|
Subject: |
Re: Ungoogled-chromium in core-updates |
|
Date: |
Mon, 20 Feb 2023 14:52:07 +0100 |
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