all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Andreas Enge <andreas@enge.fr>
To: guix-devel@gnu.org
Subject: Re: Ungoogled-chromium in core-updates
Date: Mon, 20 Feb 2023 14:52:07 +0100	[thread overview]
Message-ID: <Y/N7BzDXZfAUJdFa@jurong> (raw)
In-Reply-To: <Y/N46M3kYK4kUPLj@jurong>

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



  reply	other threads:[~2023-02-20 13:52 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-20 13:43 Ungoogled-chromium in core-updates Andreas Enge
2023-02-20 13:52 ` Andreas Enge [this message]
2023-02-20 20:41   ` Andreas Enge
2023-02-21 15:07     ` Andreas Enge
2023-02-25 14:41       ` Andreas Enge
2023-02-25 18:38         ` Ludovic Courtès
2023-03-07 17:14         ` Andreas Enge
2023-03-07 17:51           ` Leo Famulari

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Y/N7BzDXZfAUJdFa@jurong \
    --to=andreas@enge.fr \
    --cc=guix-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.