* [PATCH] gobject-introspection: Drop the recipe, it has never worked and if it does cross compile, we can add it back
@ 2012-07-27 11:43 Richard Purdie
2012-07-27 11:46 ` Martin Jansa
0 siblings, 1 reply; 6+ messages in thread
From: Richard Purdie @ 2012-07-27 11:43 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/meta/conf/distro/include/world-broken.inc b/meta/conf/distro/include/world-broken.inc
index f7c222e..ab0c2dc 100644
--- a/meta/conf/distro/include/world-broken.inc
+++ b/meta/conf/distro/include/world-broken.inc
@@ -1,5 +1,5 @@
#
# Exclude known broken packages
#
-EXCLUDE_FROM_WORLD_pn-gobject-introspection = "1"
+
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 1200589..6a3fa54 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -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}"
diff --git a/meta/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch b/meta/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch
deleted file mode 100644
index ea00157..0000000
--- a/meta/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch
+++ b/dev/null
@@ -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
diff --git a/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb b/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb
deleted file mode 100644
index 8f5ca56..0000000
--- a/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb
+++ b/dev/null
@@ -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"
diff --git a/meta/recipes-gnome/gnome/gobject-introspection_git.bb b/meta/recipes-gnome/gnome/gobject-introspection_git.bb
deleted file mode 100644
index 8a9aa14..0000000
--- a/meta/recipes-gnome/gnome/gobject-introspection_git.bb
+++ b/dev/null
@@ -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 \
-"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] gobject-introspection: Drop the recipe, it has never worked and if it does cross compile, we can add it back
2012-07-27 11:43 [PATCH] gobject-introspection: Drop the recipe, it has never worked and if it does cross compile, we can add it back Richard Purdie
@ 2012-07-27 11:46 ` Martin Jansa
2012-07-27 11:48 ` Burton, Ross
2012-07-27 12:18 ` Richard Purdie
0 siblings, 2 replies; 6+ messages in thread
From: Martin Jansa @ 2012-07-27 11:46 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1697 bytes --]
On Fri, Jul 27, 2012 at 12:43:14PM +0100, Richard Purdie wrote:
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> diff --git a/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb b/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb
> deleted file mode 100644
> index 8f5ca56..0000000
> --- a/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb
> +++ b/dev/null
> @@ -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"
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] gobject-introspection: Drop the recipe, it has never worked and if it does cross compile, we can add it back
2012-07-27 11:46 ` Martin Jansa
@ 2012-07-27 11:48 ` Burton, Ross
2012-07-27 12:18 ` Richard Purdie
1 sibling, 0 replies; 6+ messages in thread
From: Burton, Ross @ 2012-07-27 11:48 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 27 July 2012 12:46, Martin Jansa <martin.jansa@gmail.com> wrote:
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] gobject-introspection: Drop the recipe, it has never worked and if it does cross compile, we can add it back
2012-07-27 11:46 ` Martin Jansa
2012-07-27 11:48 ` Burton, Ross
@ 2012-07-27 12:18 ` Richard Purdie
2012-07-27 13:49 ` Colin Walters
1 sibling, 1 reply; 6+ messages in thread
From: Richard Purdie @ 2012-07-27 12:18 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, 2012-07-27 at 13:46 +0200, Martin Jansa wrote:
> On Fri, Jul 27, 2012 at 12:43:14PM +0100, Richard Purdie wrote:
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > ---
> > diff --git a/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb b/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb
> > deleted file mode 100644
> > index 8f5ca56..0000000
> > --- a/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb
> > +++ b/dev/null
> > @@ -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?
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] gobject-introspection: Drop the recipe, it has never worked and if it does cross compile, we can add it back
2012-07-27 12:18 ` Richard Purdie
@ 2012-07-27 13:49 ` Colin Walters
2012-07-27 14:10 ` Richard Purdie
0 siblings, 1 reply; 6+ messages in thread
From: Colin Walters @ 2012-07-27 13:49 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Hi Richard,
On Fri, 2012-07-27 at 13:18 +0100, Richard Purdie wrote:
> 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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] gobject-introspection: Drop the recipe, it has never worked and if it does cross compile, we can add it back
2012-07-27 13:49 ` Colin Walters
@ 2012-07-27 14:10 ` Richard Purdie
0 siblings, 0 replies; 6+ messages in thread
From: Richard Purdie @ 2012-07-27 14:10 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, 2012-07-27 at 09:49 -0400, Colin Walters wrote:
> Hi Richard,
>
> On Fri, 2012-07-27 at 13:18 +0100, Richard Purdie wrote:
>
> > 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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-07-27 14:22 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-27 11:43 [PATCH] gobject-introspection: Drop the recipe, it has never worked and if it does cross compile, we can add it back Richard Purdie
2012-07-27 11:46 ` Martin Jansa
2012-07-27 11:48 ` Burton, Ross
2012-07-27 12:18 ` Richard Purdie
2012-07-27 13:49 ` Colin Walters
2012-07-27 14:10 ` Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox