GNU bug report logs - #76663
[PATCH gnome-team] gnu: flatpak: Propagate inputs as required by pkg-config.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 76663 in the body.
You can then email your comments to 76663 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH gnome-team] gnu: flatpak: Propagate inputs as required by
 pkg-config.
Date: Sat, 1 Mar 2025 17:52:57 +0100

* gnu/packages/package-management.scm (flatpak)[inputs]: Move dconf, gpgme,
json-glib, libarchive, libseccomp and libxau from here…
[propagated-inputs]: … to here.
---
Hi Guix,

this is a more or less "emergency patch" as gnome transitively requires
flatpak, but flatpak does not propagate enough inputs to let dependent
packages be aware of them.  The alternative would be to add these inputs
to said dependents (or finally fix the way pkg-config handles this, but
that's outside our scope IIUC)

Cheers

 gnu/packages/package-management.scm | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 7b3756d0aa3..4cc53a2ce3a 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -2138,24 +2138,29 @@ (define-public flatpak
            bash-minimal
            bubblewrap
            curl
-           dconf
            fuse
            gdk-pixbuf
-           gpgme
-           json-glib
-           libarchive
            libcap
            libostree
-           libseccomp
            libsoup-minimal-2
-           libxau
            libxml2
            p11-kit
            polkit
            util-linux
            xdg-dbus-proxy
            zstd))
-    (propagated-inputs (list glib-networking gnupg gsettings-desktop-schemas))
+    (propagated-inputs (list glib-networking
+                             gnupg
+                             gsettings-desktop-schemas
+                             ;; The following are listed in Requires.private of
+                             ;; `flatpak.pc'.
+                             curl
+                             dconf
+                             gpgme
+                             json-glib
+                             libarchive
+                             libseccomp
+                             libxau))
     (home-page "https://flatpak.org")
     (synopsis "System for building, distributing, and running sandboxed desktop
 applications")

base-commit: 87d0295b308f354ec1c25212f6937b39eb8ae8bf
-- 
2.48.1

Message #10 received at 76663 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: vivien <at> planete-kraus.eu, 76663 <at> debbugs.gnu.org
Subject: Re: [bug#76663] [PATCH gnome-team] gnu: flatpak: Propagate inputs
 as required by pkg-config.
Date: Sun, 02 Mar 2025 14:31:24 +0900

Hi Liliana,

Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes:

> * gnu/packages/package-management.scm (flatpak)[inputs]: Move dconf, gpgme,
> json-glib, libarchive, libseccomp and libxau from here…
> [propagated-inputs]: … to here.
> ---
> Hi Guix,
>
> this is a more or less "emergency patch" as gnome transitively requires
> flatpak, but flatpak does not propagate enough inputs to let dependent
> packages be aware of them.  The alternative would be to add these inputs
> to said dependents (or finally fix the way pkg-config handles this, but
> that's outside our scope IIUC)

That'd be welcome, but best kept separated from this current GNOME team
effort.

> Cheers
>
>  gnu/packages/package-management.scm | 19 ++++++++++++-------
>  1 file changed, 12 insertions(+), 7 deletions(-)
>
> diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
> index 7b3756d0aa3..4cc53a2ce3a 100644
> --- a/gnu/packages/package-management.scm
> +++ b/gnu/packages/package-management.scm
> @@ -2138,24 +2138,29 @@ (define-public flatpak
>             bash-minimal
>             bubblewrap
>             curl
> -           dconf
>             fuse
>             gdk-pixbuf
> -           gpgme
> -           json-glib
> -           libarchive
>             libcap
>             libostree
> -           libseccomp
>             libsoup-minimal-2
> -           libxau
>             libxml2
>             p11-kit
>             polkit
>             util-linux
>             xdg-dbus-proxy
>             zstd))
> -    (propagated-inputs (list glib-networking gnupg gsettings-desktop-schemas))
> +    (propagated-inputs (list glib-networking
> +                             gnupg
> +                             gsettings-desktop-schemas
> +                             ;; The following are listed in Requires.private of
> +                             ;; `flatpak.pc'.
> +                             curl
> +                             dconf
> +                             gpgme
> +                             json-glib
> +                             libarchive
> +                             libseccomp
> +                             libxau))

Reviewed-by: Maxim Cournoyer <maxim.cournoyer <at> gmail>

-- 
Thanks,
Maxim

Message #15 received at 76663-done <at> debbugs.gnu.org (full text, mbox):

From: 宋文武 <iyzsong <at> envs.net>
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: vivien <at> planete-kraus.eu, Liliana Marie Prikler <liliana.prikler <at> gmail.com>,
 76663-done <at> debbugs.gnu.org
Subject: Re: bug#76663: [PATCH gnome-team] gnu: flatpak: Propagate inputs as
 required by pkg-config.
Date: Wed, 05 Mar 2025 17:18:54 +0800

> [...]
>> * gnu/packages/package-management.scm (flatpak)[inputs]: Move dconf, gpgme,
>> json-glib, libarchive, libseccomp and libxau from here…
>> [propagated-inputs]: … to here.

This seems had be merged as commit 174d98e2a6, so close.

Also it may worth to know that those deps in Requires.private are
actually not needed, as meson has a bug:

  https://github.com/mesonbuild/meson/issues/3970

It should only add thoes in Requires.private when build a static
library.

Message #18 received at 76663-done <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: 宋文武 <iyzsong <at> envs.net>
Cc: vivien <at> planete-kraus.eu, Liliana Marie Prikler <liliana.prikler <at> gmail.com>,
 76663-done <at> debbugs.gnu.org
Subject: Re: bug#76663: [PATCH gnome-team] gnu: flatpak: Propagate inputs as
 required by pkg-config.
Date: Thu, 06 Mar 2025 09:34:46 +0900

Hi,

宋文武 <iyzsong <at> envs.net> writes:

>> [...]
>>> * gnu/packages/package-management.scm (flatpak)[inputs]: Move dconf, gpgme,
>>> json-glib, libarchive, libseccomp and libxau from here…
>>> [propagated-inputs]: … to here.
>
> This seems had be merged as commit 174d98e2a6, so close.
>
> Also it may worth to know that those deps in Requires.private are
> actually not needed, as meson has a bug:
>
>   https://github.com/mesonbuild/meson/issues/3970
>
> It should only add thoes in Requires.private when build a static
> library.

That's unfortunately not the case, as I found out the hard way when
working on a past pkgconf series (not merged yet).

See my answer in
https://github.com/mesonbuild/meson/issues/3970#issuecomment-2702398182

-- 
Thanks,
Maxim

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.