Skip to contentSkip to conversation

libpeas: rework gobject-introspection handling

PATCH New Andreas Müller 1 participant 2 messages Apr 3, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 libpeas: rework gobject-introspection handling

gobject-introspection is mandatory for libpeas - there is no configure option to enable or disable it.

To handle properly, this patch does:

* Make 'gobject-introspection-data' a required distro feature
* To avoid trouble once pending patch removing
'UNKNOWN_CONFIGURE_WHITELIST_append = " --enable-introspection --disable-introspection"'
are in oe-core [1] - set in recipe to avoid
| libpeas-1.22.0-r0 do_configure: QA Issue: libpeas: configure was passed unrecognised options: --enable-introspection [unknown-configure-option]

This does not handle MACHINE_FEATURES / qemu-usermode case but there other issues of higher priority.

[1] http://lists.openembedded.org/pipermail/openembedded-core/2019-April/280711.html

---
 meta-oe/recipes-gnome/libpeas/libpeas_1.22.0.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
meta-oe/recipes-gnome/libpeas/libpeas_1.22.0.bb +5 -1
index c1ead0670..dd1b53e39 100644
@@ -5,7 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4b54a1fd55a448865a0b32d41598759d"
 
 DEPENDS = "gnome-common gtk+3 intltool-native"
 
-inherit gnomebase gobject-introspection gtk-doc gtk-icon-cache
+inherit gnomebase gobject-introspection gtk-doc gtk-icon-cache distro_features_check
+
+# gobject-introspection is mandatory and cannot be configured
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
+UNKNOWN_CONFIGURE_WHITELIST_append = " --enable-introspection --disable-introspection"
 
 SRC_URI[archive.md5sum] = "a20dc55c3f88ad06da9491cfd7de7558"
 SRC_URI[archive.sha256sum] = "5b2fc0f53962b25bca131a5ec0139e6fef8e254481b6e777975f7a1d2702a962"
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/2 gvfs: Fix missing executable permission flags for files in libexec

At least XFCE sessions turned into unusable state [1]

[1] http://lists.openembedded.org/pipermail/openembedded-devel/2019-April/199010.html

---
 meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb +9 -1
index 7b9a16e9e..df9fd50ea 100644
@@ -61,8 +61,16 @@ PACKAGECONFIG[fuse] = "-Dfuse=true, -Dfuse=false, fuse"
 # libcdio-paranoia recipe doesn't exist yet
 PACKAGECONFIG[cdda] = "-Dcdda=true, -Dcdda=false, libcdio-paranoia"
 
-# Fix up permissions on polkit rules.d to work with rpm4 constraints
 do_install_append() {
+    # Fix up permissions on polkit rules.d to work with rpm4 constraints
 	chmod 700 ${D}/${datadir}/polkit-1/rules.d
 	chown polkitd:root ${D}/${datadir}/polkit-1/rules.d
+
+    # After rebuilds (not from scracth) it can happen that the executables in
+    # libexec ar missing executable permission flag. Not sure but it came up
+    # during transition to meson. Looked into build files and logs but could
+    # not find suspicious
+    for exe in `find ${D}/${libexec}`; do
+       chmod +x $exe
+    done
 }
Signature · 1 line
2.20.1