Skip to contentSkip to conversation

package/gdk-pixbuf: add gobject-introspection support

PATCH New Fabrice Fontaine 3 participants 5 messages Jun 6, 2020 – Jul 5, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/gdk-pixbuf: add gobject-introspection support

This will fix the following build failure when enabling introspection on libgtk2:

Couldn't find include 'GdkPixbuf-2.0.gir' (search path: '['/tmp/instance-0/output-1/host/bin/../mipsel-buildroot-linux-gnu/sysroot/usr/bin/../share/gir-1.0', '../gdk', '/tmp/instance-0/output-1/host/share', 'gir-1.0', '/tmp/instance-0/output-1/host/share/gir-1.0', '/usr/share/gir-1.0']')

Fixes:
- http://autobuild.buildroot.org/results//86c6f55e0bd1a0fe3b70c9e97193aaad94d72a7f

---
 package/gdk-pixbuf/gdk-pixbuf.mk | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
package/gdk-pixbuf/gdk-pixbuf.mk +8 -3
index 59e0d5f454..b7937a48e9 100644
@@ -23,11 +23,16 @@ GDK_PIXBUF_CONF_ENV = \
 HOST_GDK_PIXBUF_CONF_ENV = \
 	gio_can_sniff=no
 
-GDK_PIXBUF_CONF_OPTS = \
-	--disable-glibtest \
-	--disable-introspection
+GDK_PIXBUF_CONF_OPTS = --disable-glibtest
 HOST_GDK_PIXBUF_CONF_OPTS = --disable-introspection
 
+ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
+GDK_PIXBUF_CONF_OPTS += --enable-introspection
+GDK_PIXBUF_DEPENDENCIES += gobject-introspection
+else
+GDK_PIXBUF_CONF_OPTS += --disable-introspection
+endif
+
 ifneq ($(BR2_PACKAGE_LIBPNG),y)
 GDK_PIXBUF_CONF_OPTS += --without-libpng
 else
Signature · 1 line
2.26.2
#1 lore raw

PATCH 2/2 package/pango: add gobject-introspection support

This will fix the following build failure when enabling introspection on libgtk2:

Couldn't find include 'Pango-1.0.gir' (search path: '['/home/fabrice/buildroot/output/host/bin/../mipsel-buildroot-linux-gnu/sysroot/usr/bin/../share/gir-1.0', '../gdk', '/home/fabrice/buildroot/output/host/share', '/usr/share/gnome/gir-1.0', '/usr/local/share/gir-1.0', '/usr/share/gir-1.0', '/home/fabrice/buildroot/output/host/share/gir-1.0', '/usr/share/gir-1.0']')

Fixes:
- http://autobuild.buildroot.org/results//86c6f55e0bd1a0fe3b70c9e97193aaad94d72a7f

---
 package/pango/pango.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
package/pango/pango.mk +8 -1
index 48edd18b05..1b12c09b22 100644
@@ -12,7 +12,7 @@ PANGO_INSTALL_STAGING = YES
 PANGO_LICENSE = LGPL-2.0+
 PANGO_LICENSE_FILES = COPYING
 
-PANGO_CONF_OPTS = -Duse_fontconfig=true -Dintrospection=false
+PANGO_CONF_OPTS = -Duse_fontconfig=true
 HOST_PANGO_CONF_OPTS = -Duse_fontconfig=true -Dintrospection=false
 
 PANGO_DEPENDENCIES = \
@@ -33,6 +33,13 @@ HOST_PANGO_DEPENDENCIES = \
 	host-fontconfig \
 	host-freetype
 
+ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
+PANGO_CONF_OPTS += -Dintrospection=true
+PANGO_DEPENDENCIES += gobject-introspection
+else
+PANGO_CONF_OPTS += -Dintrospection=false
+endif
+
 ifeq ($(BR2_PACKAGE_XORG7),y)
 PANGO_DEPENDENCIES += xlib_libX11
 endif
Signature · 1 line
2.26.2
#2 lore raw

PATCH 2/2 package/pango: add gobject-introspection support

Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

This will fix the following build failure when enabling introspection on libgtk2:

Couldn't find include 'Pango-1.0.gir' (search path: '['/home/fabrice/buildroot/output/host/bin/../mipsel-buildroot-linux-gnu/sysroot/usr/bin/../share/gir-1.0', '../gdk', '/home/fabrice/buildroot/output/host/share', '/usr/share/gnome/gir-1.0', '/usr/local/share/gir-1.0', '/usr/share/gir-1.0', '/home/fabrice/buildroot/output/host/share/gir-1.0', '/usr/share/gir-1.0']')

Fixes:
- http://autobuild.buildroot.org/results//86c6f55e0bd1a0fe3b70c9e97193aaad94d72a7f

Committed to 2020.05.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/2 package/gdk-pixbuf: add gobject-introspection support

In reply to Fabrice Fontaine
Quoted 5 lines · On Sat, 6 Jun 2020 10:34:37 +0200 Fabrice Fontaine…

This will fix the following build failure when enabling introspection on libgtk2:

Couldn't find include 'GdkPixbuf-2.0.gir' (search path: '['/tmp/instance-0/output-1/host/bin/../mipsel-buildroot-linux-gnu/sysroot/usr/bin/../share/gir-1.0', '../gdk', '/tmp/instance-0/output-1/host/share', 'gir-1.0', '/tmp/instance-0/output-1/host/share/gir-1.0', '/usr/share/gir-1.0']')

Quoted 7 lines

Fixes:
- http://autobuild.buildroot.org/results//86c6f55e0bd1a0fe3b70c9e97193aaad94d72a7f

---
 package/gdk-pixbuf/gdk-pixbuf.mk | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Both applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#4 lore raw

PATCH 1/2 package/gdk-pixbuf: add gobject-introspection support

In reply to Fabrice Fontaine
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

This will fix the following build failure when enabling introspection on libgtk2:

Couldn't find include 'GdkPixbuf-2.0.gir' (search path: '['/tmp/instance-0/output-1/host/bin/../mipsel-buildroot-linux-gnu/sysroot/usr/bin/../share/gir-1.0', '../gdk', '/tmp/instance-0/output-1/host/share', 'gir-1.0', '/tmp/instance-0/output-1/host/share/gir-1.0', '/usr/share/gir-1.0']')

Fixes:
- http://autobuild.buildroot.org/results//86c6f55e0bd1a0fe3b70c9e97193aaad94d72a7f

Committed to 2020.05.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard