Skip to contentSkip to conversation

gobject-introspection: Drop the recipe, it has never worked and if it does cross compile, we can add it back

PATCH In review Richard Purdie 4 participants 6 messages Jul 27, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gobject-introspection: Drop the recipe, it has never worked and if it does cross compile, we can add it back

---

meta/conf/distro/include/world-broken.inc +1 -1
index f7c222e..ab0c2dc 100644
@@ -1,5 +1,5 @@
 #
 # Exclude known broken packages
 #
-EXCLUDE_FROM_WORLD_pn-gobject-introspection = "1"
+
 
meta/conf/multilib.conf +0 -1
index 1200589..6a3fa54 100644
@@ -198,7 +198,6 @@ BBCLASSEXTEND_append_pn-gnome-terminal = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-gnu-config = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-gnupg = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-gnutls = " ${MULTILIBS}"
-BBCLASSEXTEND_append_pn-gobject-introspection = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-gperf = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-gpgme = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-grep = " ${MULTILIBS}"
dev/null renamed from meta/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch +0 -22
deleted file mode 100644
index ea00157..0000000
@@ -1,22 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: gobject-introspection-0.9.10/tools/g-ir-annotation-tool.in
-===================================================================
---- gobject-introspection-0.9.10.orig/tools/g-ir-annotation-tool.in
-+++ gobject-introspection-0.9.10/tools/g-ir-annotation-tool.in
-@@ -1,4 +1,4 @@
--#!@PYTHON@
-+#!/usr/bin/env python
- # -*- Mode: Python -*-
- # GObject-Introspection - a framework for introspecting GObject libraries
- # Copyright (C) 2008  Johan Dahlin
-Index: gobject-introspection-0.9.10/tools/g-ir-scanner.in
-===================================================================
---- gobject-introspection-0.9.10.orig/tools/g-ir-scanner.in
-+++ gobject-introspection-0.9.10/tools/g-ir-scanner.in
-@@ -1,4 +1,4 @@
--#!@PYTHON@
-+#!/usr/bin/env python
- # -*- Mode: Python -*-
- # GObject-Introspection - a framework for introspecting GObject libraries
- # Copyright (C) 2008  Johan Dahlin
dev/null renamed from meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb +0 -28
deleted file mode 100644
index 8f5ca56..0000000
@@ -1,28 +0,0 @@
-# NOTE: WIP! This recipe does not cross-compile atm., only -native
-DEPENDS = "glib-2.0 libffi python-native gobject-introspection-native"
-DEPENDS_virtclass-native = "glib-2.0-native libffi-native python-native bison-native flex-native"
-BBCLASSEXTEND = "native"
-
-PR = "r1"
-
-SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
-SRC_URI = "\
-  ${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BP}.tar.xz \
-  file://use-usr-bin-env-for-python.patch \
-"
-
-SRC_URI[md5sum] = "7bbdb696c37bb98aef5af02c4b8975e3"
-SRC_URI[sha256sum] = "44f3fb933f76e4728818cc360cb5f9e2edcbdf9bc8a8f9aded99b3e3ef5cb858"
-
-LICENSE = "GPLv2+ & LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=90d577535a3898e1ae5dbf0ae3509a8c \
-                    file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
-                    file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7"
-
-inherit autotools gtk-doc pythonnative
-
-do_configure_prepend () {
-        echo "EXTRA_DIST = " > ${S}/gtk-doc.make
-}
-
-EXTRA_OECONF = "--disable-tests"
dev/null renamed from meta/recipes-gnome/gnome/gobject-introspection_git.bb +0 -28
deleted file mode 100644
index 8a9aa14..0000000
@@ -1,28 +0,0 @@
-# NOTE: WIP! This recipe does not cross-compile atm., only -native
-DEPENDS = "glib-2.0 libffi python-native gobject-introspection-native"
-DEPENDS_virtclass-native = "glib-2.0-native libffi-native python-native bison-native flex-native"
-BBCLASSEXTEND = "native"
-
-SRC_URI = "git://git.gnome.org/gobject-introspection;protocol=git \
-  file://use-usr-bin-env-for-python.patch \
-"
-
-LICENSE = "GPLv2+ & LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING.tools;md5=94d55d512a9ba36caa9b7df079bae19f \
-		    file://COPYING.lib;md5=3bf50002aefd002f49e7bb854063f7e7"
-
-SRCREV = "8d64bc23d2b837421ecf9c7b0e4b8d5d95ca0d21"
-PV = "1.29.0+gitr${SRCPV}"
-PR = "r1"
-
-DEFAULT_PREFERENCE = "-1"
-
-S = "${WORKDIR}/git"
-
-inherit autotools gtk-doc pythonnative
-
-BBCLASSEXTEND = "native"
-
-EXTRA_OECONF = "\
-  --disable-tests \
-"
#1 lore raw

dev/null line 4

Quoted 12 lines · Richard Purdie

---

dev/null renamed from meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb +0 -4
deleted file mode 100644
index 8f5ca56..0000000
@@ -1,28 +0,0 @@
-# NOTE: WIP! This recipe does not cross-compile atm., only -native
-DEPENDS = "glib-2.0 libffi python-native gobject-introspection-native"
-DEPENDS_virtclass-native = "glib-2.0-native libffi-native python-native bison-native flex-native"
-BBCLASSEXTEND = "native"

what will provide gobject-introspection-native for meta-oe and meta-gnome now?

Or should we add this recipe back in meta-oe?

Cheers,

meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb:DEPENDS = "gobject-introspection-native gtk+3 gdk-pixbuf-native"
meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb:DEPENDS = "gobject-introspection-native gtk+ gdk-pixbuf-native"
meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb:#autoreconf needs introspection.m4 (staged by gobject-introspection-native) after http://git.gnome.org/browse/libgee/commit/?id=d026a29b38ca1a3388981c6e75a92602212373d8
meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb:DEPENDS += "gobject-introspection-native"
meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb:DEPENDS_virtclass-native += "gobject-introspection-native"
meta-oe/recipes-support/upower/upower_0.9.14.bb:DEPENDS = "libusb1 udev glib-2.0 dbus-glib polkit gobject-introspection-native"

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#2 lore raw
Quoted 3 lines · Martin Jansa

what will provide gobject-introspection-native for meta-oe and meta-gnome now?

Or should we add this recipe back in meta-oe?

gtk-doc-stub has stub machinery for gobject-introspection too. Expect a follow-up patch.

Ross

#3 lore raw
In reply to Martin Jansa
Quoted 17 lines · Martin Jansa

dev/null line 4

Quoted 12 lines · Richard Purdie

---

dev/null renamed from meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb +0 -4
deleted file mode 100644
index 8f5ca56..0000000
@@ -1,28 +0,0 @@
-# NOTE: WIP! This recipe does not cross-compile atm., only -native
-DEPENDS = "glib-2.0 libffi python-native gobject-introspection-native"
-DEPENDS_virtclass-native = "glib-2.0-native libffi-native python-native bison-native flex-native"
-BBCLASSEXTEND = "native"

what will provide gobject-introspection-native for meta-oe and meta-gnome now?

Quoted 1 line

Or should we add this recipe back in meta-oe?

Is introspection being used there of do they just want the .m4 file and disable it?

If the latter, add "gobject-introspection-stub" to DEPENDS and this should resolve it. See the patches I just sent doing this for OE-Core.

Cheers,

Richard

#4 lore raw

Hi Richard,

Quoted 2 lines · Richard Purdie

If the latter, add "gobject-introspection-stub" to DEPENDS and this should resolve it. See the patches I just sent doing this for OE-Core.

Just want to say thanks for picking this up and running with it; it'll reduce the delta between how we currently build GNOME components and what OE needs, which is a big win.

#5 lore raw
Quoted 10 lines · Colin Walters

Hi Richard,

Quoted 2 lines · Richard Purdie

If the latter, add "gobject-introspection-stub" to DEPENDS and this should resolve it. See the patches I just sent doing this for OE-Core.

Just want to say thanks for picking this up and running with it; it'll reduce the delta between how we currently build GNOME components and what OE needs, which is a big win.

Thanks for writing the stubs! :)

I've been wanting this for a while. Since Ross had sorted out gtk-doc, this seemed like the next logical step and I think things look much better in general!

Cheers,

Richard