openembedded-devel.lists.openembedded.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 01/14] libpeas: requires gobject-introspection-data DISTRO_FEATURE
@ 2023-05-25 12:13 ross.burton
  2023-05-25 12:13 ` [PATCH 02/14] geoclue: the library doesn't need gobject-introspection ross.burton
                   ` (13 more replies)
  0 siblings, 14 replies; 17+ messages in thread
From: ross.burton @ 2023-05-25 12:13 UTC (permalink / raw)
  To: openembedded-devel; +Cc: nd

From: Ross Burton <ross.burton@arm.com>

Until libpeas 2 is released, g-i is a hard requirement.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb b/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb
index 3bc975a6fa..1e3b0021c3 100644
--- a/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb
+++ b/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb
@@ -11,6 +11,8 @@ GTKDOC_MESON_OPTION = "gtk_doc"
 inherit gnomebase gobject-introspection gtk-doc gtk-icon-cache features_check
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+# FIXME: When upgrading to libpeas 2, g-i is no longer needed.
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
 
 SRC_URI += "file://0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch"
 SRC_URI[archive.sha256sum] = "297cb9c2cccd8e8617623d1a3e8415b4530b8e5a893e3527bbfd1edd13237b4c"
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [PATCH 02/14] geoclue: the library doesn't need gobject-introspection
  2023-05-25 12:13 [PATCH 01/14] libpeas: requires gobject-introspection-data DISTRO_FEATURE ross.burton
@ 2023-05-25 12:13 ` ross.burton
  2023-05-25 12:13 ` [PATCH 03/14] packagegroup-meta-oe.bb: only build libpeas if gobject-introspection is enabled ross.burton
                   ` (12 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: ross.burton @ 2023-05-25 12:13 UTC (permalink / raw)
  To: openembedded-devel; +Cc: nd

From: Ross Burton <ross.burton@arm.com>

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-oe/recipes-navigation/geoclue/geoclue_2.7.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-navigation/geoclue/geoclue_2.7.0.bb b/meta-oe/recipes-navigation/geoclue/geoclue_2.7.0.bb
index d05a309455..6784b099aa 100644
--- a/meta-oe/recipes-navigation/geoclue/geoclue_2.7.0.bb
+++ b/meta-oe/recipes-navigation/geoclue/geoclue_2.7.0.bb
@@ -27,7 +27,7 @@ PACKAGECONFIG[3g] = "-D3g-source=true,-D3g-source=false,modemmanager"
 PACKAGECONFIG[modem-gps] = "-Dmodem-gps-source=true,-Dmodem-gps-source=false,modemmanager"
 PACKAGECONFIG[cdma] = "-Dcdma-source=true,-Dcdma-source=false,modemmanager"
 PACKAGECONFIG[nmea] = "-Dnmea-source=true,-Dnmea-source=false,avahi,avahi-daemon"
-PACKAGECONFIG[lib] = "-Dlibgeoclue=true,-Dlibgeoclue=false,gobject-introspection"
+PACKAGECONFIG[lib] = "-Dlibgeoclue=true,-Dlibgeoclue=false"
 
 GTKDOC_MESON_OPTION = "gtk-doc"
 
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [PATCH 03/14] packagegroup-meta-oe.bb: only build libpeas if gobject-introspection is enabled
  2023-05-25 12:13 [PATCH 01/14] libpeas: requires gobject-introspection-data DISTRO_FEATURE ross.burton
  2023-05-25 12:13 ` [PATCH 02/14] geoclue: the library doesn't need gobject-introspection ross.burton
@ 2023-05-25 12:13 ` ross.burton
  2023-05-25 12:13 ` [PATCH 04/14] eog: requires gobject-introspection-data DISTRO_FEATURE ross.burton
                   ` (11 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: ross.burton @ 2023-05-25 12:13 UTC (permalink / raw)
  To: openembedded-devel; +Cc: nd

From: Ross Burton <ross.burton@arm.com>

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index aef3a05392..469e202175 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -464,7 +464,7 @@ RDEPENDS:packagegroup-meta-oe-gnome ="\
     gtk+ \
     gtkmm3 \
     gtkmm \
-    libpeas \
+    ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "libpeas", "", d)} \
     pyxdg \
     vte9 \
     gnome-theme-adwaita \
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [PATCH 04/14] eog: requires gobject-introspection-data DISTRO_FEATURE
  2023-05-25 12:13 [PATCH 01/14] libpeas: requires gobject-introspection-data DISTRO_FEATURE ross.burton
  2023-05-25 12:13 ` [PATCH 02/14] geoclue: the library doesn't need gobject-introspection ross.burton
  2023-05-25 12:13 ` [PATCH 03/14] packagegroup-meta-oe.bb: only build libpeas if gobject-introspection is enabled ross.burton
@ 2023-05-25 12:13 ` ross.burton
  2023-05-25 12:13 ` [PATCH 05/14] gnome-desktop: gobject-introspection is not in fact mandatory ross.burton
                   ` (10 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: ross.burton @ 2023-05-25 12:13 UTC (permalink / raw)
  To: openembedded-devel; +Cc: nd

From: Ross Burton <ross.burton@arm.com>

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-gnome/recipes-gnome/eog/eog_44.1.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/eog/eog_44.1.bb b/meta-gnome/recipes-gnome/eog/eog_44.1.bb
index 95e421c883..0b7cfca49b 100644
--- a/meta-gnome/recipes-gnome/eog/eog_44.1.bb
+++ b/meta-gnome/recipes-gnome/eog/eog_44.1.bb
@@ -19,7 +19,8 @@ GNOMEBASEBUILDCLASS = "meson"
 
 inherit gnomebase pkgconfig gsettings gobject-introspection gettext mime-xdg features_check gtk-icon-cache
 
-REQUIRED_DISTRO_FEATURES = "opengl"
+# FIXME: whilst eog uses libpeas <2, g-i is needed. This can be removed when libpeas2 is used.
+REQUIRED_DISTRO_FEATURES = "opengl gobject-introspection-data"
 
 SRC_URI += "file://0001-Replace-filename-with-basename.patch"
 SRC_URI[archive.sha256sum] = "e2c963f232fe5a1091dcc18bec25a730e91b02af6e466601efa55e500cd74cab"
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [PATCH 05/14] gnome-desktop: gobject-introspection is not in fact mandatory
  2023-05-25 12:13 [PATCH 01/14] libpeas: requires gobject-introspection-data DISTRO_FEATURE ross.burton
                   ` (2 preceding siblings ...)
  2023-05-25 12:13 ` [PATCH 04/14] eog: requires gobject-introspection-data DISTRO_FEATURE ross.burton
@ 2023-05-25 12:13 ` ross.burton
  2023-05-25 12:13 ` [PATCH 06/14] gnome-photos: requires gobject-introspection-data DISTRO_FEATURE ross.burton
                   ` (9 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: ross.burton @ 2023-05-25 12:13 UTC (permalink / raw)
  To: openembedded-devel; +Cc: nd

From: Ross Burton <ross.burton@arm.com>

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.0.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.0.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.0.bb
index eae9d9d065..03411c88d9 100644
--- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.0.bb
@@ -11,8 +11,6 @@ GNOMEBASEBUILDCLASS = "meson"
 inherit gnomebase itstool pkgconfig upstream-version-is-even gobject-introspection features_check gtk-doc
 
 REQUIRED_DISTRO_FEATURES = "x11 opengl"
-# gobject-introspection is mandatory and cannot be configured
-REQUIRED_DISTRO_FEATURES += "gobject-introspection-data"
 
 GIR_MESON_OPTION = ""
 
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [PATCH 06/14] gnome-photos: requires gobject-introspection-data DISTRO_FEATURE
  2023-05-25 12:13 [PATCH 01/14] libpeas: requires gobject-introspection-data DISTRO_FEATURE ross.burton
                   ` (3 preceding siblings ...)
  2023-05-25 12:13 ` [PATCH 05/14] gnome-desktop: gobject-introspection is not in fact mandatory ross.burton
@ 2023-05-25 12:13 ` ross.burton
  2023-05-25 12:13 ` [PATCH 07/14] grilo-plugins: add PACKAGECONFIG for tracker ross.burton
                   ` (8 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: ross.burton @ 2023-05-25 12:13 UTC (permalink / raw)
  To: openembedded-devel; +Cc: nd

From: Ross Burton <ross.burton@arm.com>

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-gnome/recipes-gnome/gnome-photos/gnome-photos_44.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_44.0.bb b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_44.0.bb
index cdf9780ab8..066a50e525 100644
--- a/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_44.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_44.0.bb
@@ -31,7 +31,7 @@ inherit gnomebase gettext gnome-help features_check
 def gnome_verdir(v):
     return oe.utils.trim_version(v, 1)
 
-REQUIRED_DISTRO_FEATURES = "x11 opengl"
+REQUIRED_DISTRO_FEATURES = "x11 opengl gobject-introspection-data"
 
 PACKAGECONFIG ?= ""
 PACKAGECONFIG[doc] = "-Dmanuals=true,-Dmanuals=false,libxslt-native docbook-xsl-stylesheets-native"
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [PATCH 07/14] grilo-plugins: add PACKAGECONFIG for tracker
  2023-05-25 12:13 [PATCH 01/14] libpeas: requires gobject-introspection-data DISTRO_FEATURE ross.burton
                   ` (4 preceding siblings ...)
  2023-05-25 12:13 ` [PATCH 06/14] gnome-photos: requires gobject-introspection-data DISTRO_FEATURE ross.burton
@ 2023-05-25 12:13 ` ross.burton
  2023-05-25 12:13 ` [PATCH 08/14] nautilus: requires gobject-introspection-data DISTRO_FEATURE ross.burton
                   ` (7 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: ross.burton @ 2023-05-25 12:13 UTC (permalink / raw)
  To: openembedded-devel; +Cc: nd

From: Ross Burton <ross.burton@arm.com>

Add a PACKAGECONFIG for the tracker plugin, and enable it only if
gobject-introspection is enabled.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.16.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.16.bb b/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.16.bb
index 00474ce446..91cbe82ea9 100644
--- a/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.16.bb
+++ b/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.16.bb
@@ -7,7 +7,6 @@ DEPENDS = " \
     gperf-native \
     itstool-native \
     grilo \
-    tracker \
     lua \
     liboauth \
 "
@@ -19,4 +18,7 @@ inherit gnomebase gnome-help vala
 SRC_URI += "file://0001-Avoid-running-trackertestutils.patch"
 SRC_URI[archive.sha256sum] = "fe6f4dbe586c6b8ba2406394e202f22d009d642a96eb3a54f32f6a21d084cdcb"
 
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', 'tracker', '', d)}"
+PACKAGECONFIG[tracker] = "-Denable-tracker3=yes,-Denable-tracker3=no,tracker"
+
 FILES:${PN} += "${libdir}/grilo-0.3"
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [PATCH 08/14] nautilus: requires gobject-introspection-data DISTRO_FEATURE
  2023-05-25 12:13 [PATCH 01/14] libpeas: requires gobject-introspection-data DISTRO_FEATURE ross.burton
                   ` (5 preceding siblings ...)
  2023-05-25 12:13 ` [PATCH 07/14] grilo-plugins: add PACKAGECONFIG for tracker ross.burton
@ 2023-05-25 12:13 ` ross.burton
  2023-05-25 12:13 ` [PATCH 09/14] python3-blivetgui: " ross.burton
                   ` (6 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: ross.burton @ 2023-05-25 12:13 UTC (permalink / raw)
  To: openembedded-devel; +Cc: nd

From: Ross Burton <ross.burton@arm.com>

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-gnome/recipes-gnome/nautilus/nautilus_44.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_44.1.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_44.1.bb
index f7eeb5f5d0..65bef45da7 100644
--- a/meta-gnome/recipes-gnome/nautilus/nautilus_44.1.bb
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus_44.1.bb
@@ -29,7 +29,7 @@ def gnome_verdir(v):
 SRC_URI += "file://0001-Replace-filename-with-basename.patch"
 SRC_URI[archive.sha256sum] = "360802a595e3edbad962c8cea353b62baa8be407513b5162c89c933ca5387aa9"
 
-REQUIRED_DISTRO_FEATURES = "x11 opengl"
+REQUIRED_DISTRO_FEATURES = "x11 opengl gobject-introspection-data"
 
 EXTRA_OEMESON += " \
     -Dtests=none \
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [PATCH 09/14] python3-blivetgui: requires gobject-introspection-data DISTRO_FEATURE
  2023-05-25 12:13 [PATCH 01/14] libpeas: requires gobject-introspection-data DISTRO_FEATURE ross.burton
                   ` (6 preceding siblings ...)
  2023-05-25 12:13 ` [PATCH 08/14] nautilus: requires gobject-introspection-data DISTRO_FEATURE ross.burton
@ 2023-05-25 12:13 ` ross.burton
  2023-05-25 12:13 ` [PATCH 10/14] catfish: " ross.burton
                   ` (5 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: ross.burton @ 2023-05-25 12:13 UTC (permalink / raw)
  To: openembedded-devel; +Cc: nd

From: Ross Burton <ross.burton@arm.com>

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb
index 29e7a267d2..aba127897d 100644
--- a/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb
+++ b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb
@@ -15,7 +15,7 @@ SRC_URI = "git://github.com/storaged-project/blivet-gui.git;branch=master;protoc
            "
 
 inherit features_check
-REQUIRED_DISTRO_FEATURES = "x11 systemd"
+REQUIRED_DISTRO_FEATURES = "x11 systemd gobject-introspection-data"
 
 inherit setuptools3_legacy python3native
 
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [PATCH 10/14] catfish: requires gobject-introspection-data DISTRO_FEATURE
  2023-05-25 12:13 [PATCH 01/14] libpeas: requires gobject-introspection-data DISTRO_FEATURE ross.burton
                   ` (7 preceding siblings ...)
  2023-05-25 12:13 ` [PATCH 09/14] python3-blivetgui: " ross.burton
@ 2023-05-25 12:13 ` ross.burton
  2023-05-25 12:13 ` [PATCH 11/14] menulibre: " ross.burton
                   ` (4 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: ross.burton @ 2023-05-25 12:13 UTC (permalink / raw)
  To: openembedded-devel; +Cc: nd

From: Ross Burton <ross.burton@arm.com>

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb b/meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb
index 8fe879b816..249c8e1bd8 100644
--- a/meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb
+++ b/meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb
@@ -3,7 +3,9 @@ SECTION = "x11/application"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4"
 
-inherit xfce-app python_setuptools_build_meta gtk-icon-cache mime-xdg
+inherit xfce-app python_setuptools_build_meta gtk-icon-cache mime-xdg features_check
+
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
 
 DEPENDS += "python3-distutils-extra-native"
 
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [PATCH 11/14] menulibre: requires gobject-introspection-data DISTRO_FEATURE
  2023-05-25 12:13 [PATCH 01/14] libpeas: requires gobject-introspection-data DISTRO_FEATURE ross.burton
                   ` (8 preceding siblings ...)
  2023-05-25 12:13 ` [PATCH 10/14] catfish: " ross.burton
@ 2023-05-25 12:13 ` ross.burton
  2023-05-25 12:13 ` [PATCH 12/14] xfce4-panel-profiles: " ross.burton
                   ` (3 subsequent siblings)
  13 siblings, 0 replies; 17+ messages in thread
From: ross.burton @ 2023-05-25 12:13 UTC (permalink / raw)
  To: openembedded-devel; +Cc: nd

From: Ross Burton <ross.burton@arm.com>

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-xfce/recipes-apps/menulibre/menulibre_2.2.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-xfce/recipes-apps/menulibre/menulibre_2.2.3.bb b/meta-xfce/recipes-apps/menulibre/menulibre_2.2.3.bb
index 65aa7a53e2..609caf3461 100644
--- a/meta-xfce/recipes-apps/menulibre/menulibre_2.2.3.bb
+++ b/meta-xfce/recipes-apps/menulibre/menulibre_2.2.3.bb
@@ -10,7 +10,7 @@ DEPENDS = " \
 "
 
 inherit setuptools3_legacy gtk-icon-cache features_check
-REQUIRED_DISTRO_FEATURES = "x11"
+REQUIRED_DISTRO_FEATURES = "x11 gobject-introspection-data"
 
 SRC_URI = "git://github.com/bluesabre/menulibre.git;protocol=https;branch=master"
 SRCREV = "86ee9ad7568128fe9555e54799933b2d3762331a"
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [PATCH 12/14] xfce4-panel-profiles: requires gobject-introspection-data DISTRO_FEATURE
  2023-05-25 12:13 [PATCH 01/14] libpeas: requires gobject-introspection-data DISTRO_FEATURE ross.burton
                   ` (9 preceding siblings ...)
  2023-05-25 12:13 ` [PATCH 11/14] menulibre: " ross.burton
@ 2023-05-25 12:13 ` ross.burton
  2023-05-25 23:41   ` [oe] " Khem Raj
  2023-05-25 12:13 ` [PATCH 13/14] xfce4-whiskermenu-plugin: don't forcibly recommend a menu editor ross.burton
                   ` (2 subsequent siblings)
  13 siblings, 1 reply; 17+ messages in thread
From: ross.burton @ 2023-05-25 12:13 UTC (permalink / raw)
  To: openembedded-devel; +Cc: nd

From: Ross Burton <ross.burton@arm.com>

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb b/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb
index ab1b827266..9624f90f92 100644
--- a/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb
+++ b/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit python3native gettext gtk-icon-cache features_check
 
-REQUIRED_DISTRO_FEATURES = "x11"
+REQUIRED_DISTRO_FEATURES = "x11 gobject-distro-features"
 
 DEPENDS += "intltool-native"
 
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [PATCH 13/14] xfce4-whiskermenu-plugin: don't forcibly recommend a menu editor
  2023-05-25 12:13 [PATCH 01/14] libpeas: requires gobject-introspection-data DISTRO_FEATURE ross.burton
                   ` (10 preceding siblings ...)
  2023-05-25 12:13 ` [PATCH 12/14] xfce4-panel-profiles: " ross.burton
@ 2023-05-25 12:13 ` ross.burton
  2023-05-25 12:13 ` [PATCH 14/14] packagegroup-xfce-extended: only build catfish and panel-profies if G-I enabled ross.burton
  2023-05-26  6:14 ` [oe] [PATCH 01/14] libpeas: requires gobject-introspection-data DISTRO_FEATURE Martin Jansa
  13 siblings, 0 replies; 17+ messages in thread
From: ross.burton @ 2023-05-25 12:13 UTC (permalink / raw)
  To: openembedded-devel; +Cc: nd

From: Ross Burton <ross.burton@arm.com>

A menu plugin doesn't need to recommend a specific menu editor.

This also means that the whiskermenu plugin can be built without
gobject-introspection being present, which means menulibre is unbuildable.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../whiskermenu/xfce4-whiskermenu-plugin_2.7.1.bb               | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.7.1.bb b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.7.1.bb
index 6621099cbd..3dfc76f246 100644
--- a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.7.1.bb
+++ b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.7.1.bb
@@ -6,5 +6,3 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 inherit xfce-panel-plugin cmake
 
 SRC_URI[sha256sum] = "04ae0c1764a0d5ec70f18a760d998a2109bb6724f048554d7d6999d9072ca63e"
-
-RRECOMMENDS:${PN} += "menulibre"
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [PATCH 14/14] packagegroup-xfce-extended: only build catfish and panel-profies if G-I enabled
  2023-05-25 12:13 [PATCH 01/14] libpeas: requires gobject-introspection-data DISTRO_FEATURE ross.burton
                   ` (11 preceding siblings ...)
  2023-05-25 12:13 ` [PATCH 13/14] xfce4-whiskermenu-plugin: don't forcibly recommend a menu editor ross.burton
@ 2023-05-25 12:13 ` ross.burton
  2023-05-26  6:14 ` [oe] [PATCH 01/14] libpeas: requires gobject-introspection-data DISTRO_FEATURE Martin Jansa
  13 siblings, 0 replies; 17+ messages in thread
From: ross.burton @ 2023-05-25 12:13 UTC (permalink / raw)
  To: openembedded-devel; +Cc: nd

From: Ross Burton <ross.burton@arm.com>

These recipes need gobject-introspection-data to be enabled.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../recipes-xfce/packagegroups/packagegroup-xfce-extended.bb  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
index 4da2964e8a..711059c8c4 100644
--- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
+++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
@@ -63,6 +63,6 @@ RRECOMMENDS:${PN} = " \
     xfce4-taskmanager \
     gigolo \
     mousepad \
-    catfish \
-    xfce4-panel-profiles \
+    ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "catfish", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "xfce4-panel-profiles", "", d)} \
 "
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 17+ messages in thread

* Re: [oe] [PATCH 12/14] xfce4-panel-profiles: requires gobject-introspection-data DISTRO_FEATURE
  2023-05-25 12:13 ` [PATCH 12/14] xfce4-panel-profiles: " ross.burton
@ 2023-05-25 23:41   ` Khem Raj
  0 siblings, 0 replies; 17+ messages in thread
From: Khem Raj @ 2023-05-25 23:41 UTC (permalink / raw)
  To: Ross Burton; +Cc: openembedded-devel, nd

On Thu, May 25, 2023 at 5:14 AM Ross Burton <ross.burton@arm.com> wrote:
>
> From: Ross Burton <ross.burton@arm.com>
>
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
>  .../xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb         | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb b/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb
> index ab1b827266..9624f90f92 100644
> --- a/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb
> +++ b/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb
> @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
>
>  inherit python3native gettext gtk-icon-cache features_check
>
> -REQUIRED_DISTRO_FEATURES = "x11"
> +REQUIRED_DISTRO_FEATURES = "x11 gobject-distro-features"

typo here, it should be gobject-introspection-data instead of
gobject-distro-features, I have fixed it locally on master-next
no need to send a v2.

>
>  DEPENDS += "intltool-native"
>
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#102855): https://lists.openembedded.org/g/openembedded-devel/message/102855
> Mute This Topic: https://lists.openembedded.org/mt/99128572/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>


^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [oe] [PATCH 01/14] libpeas: requires gobject-introspection-data DISTRO_FEATURE
  2023-05-25 12:13 [PATCH 01/14] libpeas: requires gobject-introspection-data DISTRO_FEATURE ross.burton
                   ` (12 preceding siblings ...)
  2023-05-25 12:13 ` [PATCH 14/14] packagegroup-xfce-extended: only build catfish and panel-profies if G-I enabled ross.burton
@ 2023-05-26  6:14 ` Martin Jansa
  2023-05-26 17:50   ` Khem Raj
  13 siblings, 1 reply; 17+ messages in thread
From: Martin Jansa @ 2023-05-26  6:14 UTC (permalink / raw)
  To: Ross Burton; +Cc: openembedded-devel, nd

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

There is this line already from your previous patch:
https://lists.openembedded.org/g/openembedded-devel/message/102683

On Thu, May 25, 2023 at 2:14 PM Ross Burton <ross.burton@arm.com> wrote:

> From: Ross Burton <ross.burton@arm.com>
>
> Until libpeas 2 is released, g-i is a hard requirement.
>
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
>  meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb
> b/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb
> index 3bc975a6fa..1e3b0021c3 100644
> --- a/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb
> +++ b/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb
> @@ -11,6 +11,8 @@ GTKDOC_MESON_OPTION = "gtk_doc"
>  inherit gnomebase gobject-introspection gtk-doc gtk-icon-cache
> features_check
>
>  ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
> +# FIXME: When upgrading to libpeas 2, g-i is no longer needed.
> +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
>
>  SRC_URI +=
> "file://0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch"
>  SRC_URI[archive.sha256sum] =
> "297cb9c2cccd8e8617623d1a3e8415b4530b8e5a893e3527bbfd1edd13237b4c"
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#102844):
> https://lists.openembedded.org/g/openembedded-devel/message/102844
> Mute This Topic: https://lists.openembedded.org/mt/99128559/3617156
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> Martin.Jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>

[-- Attachment #2: Type: text/html, Size: 3161 bytes --]

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [oe] [PATCH 01/14] libpeas: requires gobject-introspection-data DISTRO_FEATURE
  2023-05-26  6:14 ` [oe] [PATCH 01/14] libpeas: requires gobject-introspection-data DISTRO_FEATURE Martin Jansa
@ 2023-05-26 17:50   ` Khem Raj
  0 siblings, 0 replies; 17+ messages in thread
From: Khem Raj @ 2023-05-26 17:50 UTC (permalink / raw)
  To: Martin Jansa; +Cc: Ross Burton, openembedded-devel, nd

On Thu, May 25, 2023 at 11:14 PM Martin Jansa <Martin.Jansa@gmail.com> wrote:
>
> There is this line already from your previous patch:
> https://lists.openembedded.org/g/openembedded-devel/message/102683

Good catch, I took the comment piece in though and dropped the
duplicate setting.

>
> On Thu, May 25, 2023 at 2:14 PM Ross Burton <ross.burton@arm.com> wrote:
>>
>> From: Ross Burton <ross.burton@arm.com>
>>
>> Until libpeas 2 is released, g-i is a hard requirement.
>>
>> Signed-off-by: Ross Burton <ross.burton@arm.com>
>> ---
>>  meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb b/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb
>> index 3bc975a6fa..1e3b0021c3 100644
>> --- a/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb
>> +++ b/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb
>> @@ -11,6 +11,8 @@ GTKDOC_MESON_OPTION = "gtk_doc"
>>  inherit gnomebase gobject-introspection gtk-doc gtk-icon-cache features_check
>>
>>  ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
>> +# FIXME: When upgrading to libpeas 2, g-i is no longer needed.
>> +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
>>
>>  SRC_URI += "file://0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch"
>>  SRC_URI[archive.sha256sum] = "297cb9c2cccd8e8617623d1a3e8415b4530b8e5a893e3527bbfd1edd13237b4c"
>> --
>> 2.34.1
>>
>>
>>
>>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#102862): https://lists.openembedded.org/g/openembedded-devel/message/102862
> Mute This Topic: https://lists.openembedded.org/mt/99128559/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>


^ permalink raw reply	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2023-05-26 17:51 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-25 12:13 [PATCH 01/14] libpeas: requires gobject-introspection-data DISTRO_FEATURE ross.burton
2023-05-25 12:13 ` [PATCH 02/14] geoclue: the library doesn't need gobject-introspection ross.burton
2023-05-25 12:13 ` [PATCH 03/14] packagegroup-meta-oe.bb: only build libpeas if gobject-introspection is enabled ross.burton
2023-05-25 12:13 ` [PATCH 04/14] eog: requires gobject-introspection-data DISTRO_FEATURE ross.burton
2023-05-25 12:13 ` [PATCH 05/14] gnome-desktop: gobject-introspection is not in fact mandatory ross.burton
2023-05-25 12:13 ` [PATCH 06/14] gnome-photos: requires gobject-introspection-data DISTRO_FEATURE ross.burton
2023-05-25 12:13 ` [PATCH 07/14] grilo-plugins: add PACKAGECONFIG for tracker ross.burton
2023-05-25 12:13 ` [PATCH 08/14] nautilus: requires gobject-introspection-data DISTRO_FEATURE ross.burton
2023-05-25 12:13 ` [PATCH 09/14] python3-blivetgui: " ross.burton
2023-05-25 12:13 ` [PATCH 10/14] catfish: " ross.burton
2023-05-25 12:13 ` [PATCH 11/14] menulibre: " ross.burton
2023-05-25 12:13 ` [PATCH 12/14] xfce4-panel-profiles: " ross.burton
2023-05-25 23:41   ` [oe] " Khem Raj
2023-05-25 12:13 ` [PATCH 13/14] xfce4-whiskermenu-plugin: don't forcibly recommend a menu editor ross.burton
2023-05-25 12:13 ` [PATCH 14/14] packagegroup-xfce-extended: only build catfish and panel-profies if G-I enabled ross.burton
2023-05-26  6:14 ` [oe] [PATCH 01/14] libpeas: requires gobject-introspection-data DISTRO_FEATURE Martin Jansa
2023-05-26 17:50   ` Khem Raj

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).