[PATCH v2 1/2] Add gnome help packages to image according to IMAGE_LINGUAS

[PATCH v2 1/2] Add gnome help packages to image according to IMAGE_LINGUAS

[Andreas Müller]

In case

* 'helpfiles' is in DISTRO_FEATURES and
* PACKAGE_NO_HELP_SPLIT is not set to '1'

those help packages matching language selections in IMAGE_LINGUAS are added to
image automatically.

For more details see:

[1] https://github.com/openembedded/meta-openembedded/blob/master/meta-gnome/classes/gnome-help.bbclass
[2] https://github.com/openembedded/openembedded-core/commit/3a9e9585aeb67234901b2f842113dbe20c3801b3
---

v1 -> v2: Add IMAGE_LINGUAS_COMPLEMENTARY only if helpfiles is in DISTRO_FEATURES

 meta-gnome/conf/layer.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf
index 862d622ee..d381fdf07 100644
--- a/meta-gnome/conf/layer.conf
+++ b/meta-gnome/conf/layer.conf
@@ -8,6 +8,9 @@ BBFILE_COLLECTIONS += "gnome-layer"
 BBFILE_PATTERN_gnome-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_gnome-layer = "7"
 
+# auto-pack gnome help files
+IMAGE_LINGUAS_COMPLEMENTARY_append = " ${@bb.utils.contains('DISTRO_FEATURES','helpfiles','*-help-%s','',d)}"
+
 # This should only be incremented on significant changes that will
 # cause compatibility issues with other layers
 LAYERVERSION_gnome-layer = "1"
-- 
2.21.0

[PATCH 2/2] libpeas: upgrade 1.22.0 -> 1.24.1

[Andreas Müller]

* move to meson build
* remove intltool-native & gnome-common from DEPENDS - they are not needed
* with meson build gir is configurable -> gobject-introspection-data is not a
  required distro feature any more

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../{libpeas_1.22.0.bb => libpeas_1.24.1.bb}    | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)
 rename meta-oe/recipes-gnome/libpeas/{libpeas_1.22.0.bb => libpeas_1.24.1.bb} (41%)

diff --git a/meta-oe/recipes-gnome/libpeas/libpeas_1.22.0.bb b/meta-oe/recipes-gnome/libpeas/libpeas_1.24.1.bb
similarity index 41%
rename from meta-oe/recipes-gnome/libpeas/libpeas_1.22.0.bb
rename to meta-oe/recipes-gnome/libpeas/libpeas_1.24.1.bb
index dd1b53e39..6c8e0e0bf 100644
--- a/meta-oe/recipes-gnome/libpeas/libpeas_1.22.0.bb
+++ b/meta-oe/recipes-gnome/libpeas/libpeas_1.24.1.bb
@@ -3,20 +3,17 @@ HOMEPAGE = "https://wiki.gnome.org/Projects/Libpeas"
 LICENSE = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4b54a1fd55a448865a0b32d41598759d"
 
-DEPENDS = "gnome-common gtk+3 intltool-native"
+DEPENDS = "gtk+3"
 
-inherit gnomebase gobject-introspection gtk-doc gtk-icon-cache distro_features_check
+GNOMEBASEBUILDCLASS = "meson"
+GTKDOC_MESON_OPTION = "gtk_doc"
 
-# gobject-introspection is mandatory and cannot be configured
-REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
-UNKNOWN_CONFIGURE_WHITELIST_append = " --enable-introspection --disable-introspection"
+inherit gnomebase gobject-introspection gtk-doc gtk-icon-cache
 
-SRC_URI[archive.md5sum] = "a20dc55c3f88ad06da9491cfd7de7558"
-SRC_URI[archive.sha256sum] = "5b2fc0f53962b25bca131a5ec0139e6fef8e254481b6e777975f7a1d2702a962"
+SRC_URI[archive.md5sum] = "bbecf334a7333d0a5d4d655ba38be9b4"
+SRC_URI[archive.sha256sum] = "9c3acf7a567cbb4f8bf62b096e013f12c3911cc850c3fa9900cbd5aa4f6ec284"
 
-PACKAGECONFIG[python3] = "--enable-python3,--disable-python3,python3-pygobject"
-
-export GIR_EXTRA_LIBS_PATH = "${B}/libpeas/.libs"
+PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject"
 
 PACKAGES =+ "${PN}-demo ${PN}-python3"
 FILES_${PN}-demo = " \
-- 
2.21.0

Re: [PATCH v2 1/2] Add gnome help packages to image according to IMAGE_LINGUAS

[Andreas Müller]

On Wed, Nov 6, 2019 at 9:54 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> In case
>
> * 'helpfiles' is in DISTRO_FEATURES and
> * PACKAGE_NO_HELP_SPLIT is not set to '1'
>
> those help packages matching language selections in IMAGE_LINGUAS are added to
> image automatically.
>
> For more details see:
>
> [1] https://github.com/openembedded/meta-openembedded/blob/master/meta-gnome/classes/gnome-help.bbclass
> [2] https://github.com/openembedded/openembedded-core/commit/3a9e9585aeb67234901b2f842113dbe20c3801b3
> ---
>
> v1 -> v2: Add IMAGE_LINGUAS_COMPLEMENTARY only if helpfiles is in DISTRO_FEATURES
Ping?

Andreas

Re: [PATCH v2 1/2] Add gnome help packages to image according to IMAGE_LINGUAS

[Khem Raj]

On Wed, Nov 13, 2019 at 11:10:06PM +0100, Andreas Müller wrote:
> On Wed, Nov 6, 2019 at 9:54 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
> >
> > In case
> >
> > * 'helpfiles' is in DISTRO_FEATURES and
> > * PACKAGE_NO_HELP_SPLIT is not set to '1'
> >
> > those help packages matching language selections in IMAGE_LINGUAS are added to
> > image automatically.
> >
> > For more details see:
> >
> > [1] https://github.com/openembedded/meta-openembedded/blob/master/meta-gnome/classes/gnome-help.bbclass
> > [2] https://github.com/openembedded/openembedded-core/commit/3a9e9585aeb67234901b2f842113dbe20c3801b3
> > ---
> >
> > v1 -> v2: Add IMAGE_LINGUAS_COMPLEMENTARY only if helpfiles is in DISTRO_FEATURES
> Ping?

thanks for reminder, It did not appear on patchwork and slipped through
my email cracks. Staged into master-next now

> 
> Andreas
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel