diff mbox series

[meta-oe,PATCHv2] flatpak: add PACKAGECONFIG for dconf

Message ID 20240629060010.8833-1-f_l_k@t-online.de
State Under Review
Headers show
Series [meta-oe,PATCHv2] flatpak: add PACKAGECONFIG for dconf | expand

Commit Message

Markus Volk June 29, 2024, 6 a.m. UTC
Disable by default to avoid a requirement for meta-gnome

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 meta-oe/recipes-extended/flatpak/flatpak_1.15.8.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Martin Jansa June 30, 2024, 7:09 a.m. UTC | #1
Is the runtime dependency added automatically in do_package? Or why
didn't you keep it as 4th param in PACKAGECONFIG?

On Sat, Jun 29, 2024 at 7:59 AM Markus Volk via lists.openembedded.org
<f_l_k=t-online.de@lists.openembedded.org> wrote:
>
> Disable by default to avoid a requirement for meta-gnome
>
> Signed-off-by: Markus Volk <f_l_k@t-online.de>
> ---
>  meta-oe/recipes-extended/flatpak/flatpak_1.15.8.bb | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/meta-oe/recipes-extended/flatpak/flatpak_1.15.8.bb b/meta-oe/recipes-extended/flatpak/flatpak_1.15.8.bb
> index 8351e7d65..3c1de93c5 100644
> --- a/meta-oe/recipes-extended/flatpak/flatpak_1.15.8.bb
> +++ b/meta-oe/recipes-extended/flatpak/flatpak_1.15.8.bb
> @@ -19,7 +19,6 @@ REQUIRED_DISTRO_FEATURES = "polkit"
>  DEPENDS = " \
>      appstream \
>      bison-native \
> -    dconf \
>      fuse3 \
>      gdk-pixbuf \
>      glib-2.0 \
> @@ -36,7 +35,6 @@ DEPENDS = " \
>
>  RDEPENDS:${PN} = " \
>      ca-certificates \
> -    dconf \
>      flatpak-xdg-utils \
>      fuse3-utils \
>  "
> @@ -49,6 +47,7 @@ GTKDOC_MESON_ENABLE_FLAG = 'enabled'
>  GTKDOC_MESON_DISABLE_FLAG = 'disabled'
>
>  PACKAGECONFIG[curl] = "-Dhttp_backend=curl,,curl"
> +PACKAGECONFIG[dconf] = "-Ddconf=enabled,-Ddconf=disabled,dconf"
>  PACKAGECONFIG[docbook_docs] = "-Ddocbook_docs=enabled,-Ddocbook_docs=disabled,xmlto-native"
>  PACKAGECONFIG[man] = "-Dman=enabled,-Dman=disabled,libxslt-native"
>  PACKAGECONFIG[soup] = "-Dhttp_backend=soup,,libsoup-2.4"
> --
> 2.45.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#111157): https://lists.openembedded.org/g/openembedded-devel/message/111157
> Mute This Topic: https://lists.openembedded.org/mt/106941795/3617156
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [martin.jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Markus Volk June 30, 2024, 2:04 p.m. UTC | #2
On Sun, Jun 30 2024 at 09:09:15 AM +02:00:00, Martin Jansa 
<martin.jansa@gmail.com> wrote:
> Is the runtime dependency added automatically in do_package? Or why
> didn't you keep it as 4th param in PACKAGECONFIG?

I took a look at $[WORKDIR}/flatpak.specs and dconf was listed there 
for BuildRequires an Requires.
That suggests to me that it is added automatically. But maybe I'm wrong 
here?
diff mbox series

Patch

diff --git a/meta-oe/recipes-extended/flatpak/flatpak_1.15.8.bb b/meta-oe/recipes-extended/flatpak/flatpak_1.15.8.bb
index 8351e7d65..3c1de93c5 100644
--- a/meta-oe/recipes-extended/flatpak/flatpak_1.15.8.bb
+++ b/meta-oe/recipes-extended/flatpak/flatpak_1.15.8.bb
@@ -19,7 +19,6 @@  REQUIRED_DISTRO_FEATURES = "polkit"
 DEPENDS = " \
     appstream \
     bison-native \
-    dconf \
     fuse3 \
     gdk-pixbuf \
     glib-2.0 \
@@ -36,7 +35,6 @@  DEPENDS = " \
 
 RDEPENDS:${PN} = " \
     ca-certificates \
-    dconf \
     flatpak-xdg-utils \
     fuse3-utils \
 "
@@ -49,6 +47,7 @@  GTKDOC_MESON_ENABLE_FLAG = 'enabled'
 GTKDOC_MESON_DISABLE_FLAG = 'disabled'
 
 PACKAGECONFIG[curl] = "-Dhttp_backend=curl,,curl"
+PACKAGECONFIG[dconf] = "-Ddconf=enabled,-Ddconf=disabled,dconf"
 PACKAGECONFIG[docbook_docs] = "-Ddocbook_docs=enabled,-Ddocbook_docs=disabled,xmlto-native"
 PACKAGECONFIG[man] = "-Dman=enabled,-Dman=disabled,libxslt-native"
 PACKAGECONFIG[soup] = "-Dhttp_backend=soup,,libsoup-2.4"