From 6136b9f7544319b107b599fcb5ec8bea4fa08dca Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 2 Jun 2011 15:46:03 +0200 Subject: gobject-introspection: move to recipes-gnome to match oe-core structure Signed-off-by: Martin Jansa --- .../use-usr-bin-env-for-python.patch | 20 ------------- .../gobject-introspection_0.9.10.bb | 32 --------------------- .../gobject-introspection_git.bb | 33 ---------------------- .../use-usr-bin-env-for-python.patch | 20 +++++++++++++ .../gnome/gobject-introspection_0.9.10.bb | 32 +++++++++++++++++++++ .../gnome/gobject-introspection_git.bb | 33 ++++++++++++++++++++++ 6 files changed, 85 insertions(+), 85 deletions(-) delete mode 100644 meta-oe/recipes-devtools/gobject-introspection/gobject-introspection/use-usr-bin-env-for-python.patch delete mode 100644 meta-oe/recipes-devtools/gobject-introspection/gobject-introspection_0.9.10.bb delete mode 100644 meta-oe/recipes-devtools/gobject-introspection/gobject-introspection_git.bb create mode 100644 meta-oe/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch create mode 100644 meta-oe/recipes-gnome/gnome/gobject-introspection_0.9.10.bb create mode 100644 meta-oe/recipes-gnome/gnome/gobject-introspection_git.bb (limited to 'meta-oe') diff --git a/meta-oe/recipes-devtools/gobject-introspection/gobject-introspection/use-usr-bin-env-for-python.patch b/meta-oe/recipes-devtools/gobject-introspection/gobject-introspection/use-usr-bin-env-for-python.patch deleted file mode 100644 index 67b85470d3..0000000000 --- a/meta-oe/recipes-devtools/gobject-introspection/gobject-introspection/use-usr-bin-env-for-python.patch +++ /dev/null @@ -1,20 +0,0 @@ -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-oe/recipes-devtools/gobject-introspection/gobject-introspection_0.9.10.bb b/meta-oe/recipes-devtools/gobject-introspection/gobject-introspection_0.9.10.bb deleted file mode 100644 index f1a46a10b2..0000000000 --- a/meta-oe/recipes-devtools/gobject-introspection/gobject-introspection_0.9.10.bb +++ /dev/null @@ -1,32 +0,0 @@ -# NOTE: WIP! This recipe does not cross-compile atm., only -native -SECTION = "libs" -DEPENDS = "glib-2.0 libffi bison-native" -BBCLASSEXTEND = "native" -PR = "r1" - -LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=90d577535a3898e1ae5dbf0ae3509a8c \ - file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7" - -SRC_URI[md5sum] = "e5cd63d6bcc5c105e898e7c33cf42175" -SRC_URI[sha256sum] = "4bf244db75df04499dea704e7734376c0fc5a3a17fb59be2123c8d76111e6fb8" - -SRC_URI = "\ - ${GNOME_MIRROR}/gobject-introspection/0.9/${BPN}-${PV}.tar.bz2 \ - file://use-usr-bin-env-for-python.patch \ -" -S = "${WORKDIR}/${BPN}-${PV}" - -inherit autotools - -do_configure_prepend() { - touch -f gtk-doc.make -} - -EXTRA_OECONF = "\ - --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-gtk-doc-pdf \ - --disable-tests \ -" diff --git a/meta-oe/recipes-devtools/gobject-introspection/gobject-introspection_git.bb b/meta-oe/recipes-devtools/gobject-introspection/gobject-introspection_git.bb deleted file mode 100644 index 2a7f30c11c..0000000000 --- a/meta-oe/recipes-devtools/gobject-introspection/gobject-introspection_git.bb +++ /dev/null @@ -1,33 +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 = "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}" -DEFAULT_PREFERENCE = "-1" - -S = "${WORKDIR}/git" - -inherit autotools - -BBCLASSEXTEND = "native" - -do_configure_prepend () { - echo "EXTRA_DIST = " > ${S}/gtk-doc.make -} - -EXTRA_OECONF = "\ - --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-gtk-doc-pdf \ - --disable-tests \ -" diff --git a/meta-oe/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch b/meta-oe/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch new file mode 100644 index 0000000000..67b85470d3 --- /dev/null +++ b/meta-oe/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch @@ -0,0 +1,20 @@ +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-oe/recipes-gnome/gnome/gobject-introspection_0.9.10.bb b/meta-oe/recipes-gnome/gnome/gobject-introspection_0.9.10.bb new file mode 100644 index 0000000000..f1a46a10b2 --- /dev/null +++ b/meta-oe/recipes-gnome/gnome/gobject-introspection_0.9.10.bb @@ -0,0 +1,32 @@ +# NOTE: WIP! This recipe does not cross-compile atm., only -native +SECTION = "libs" +DEPENDS = "glib-2.0 libffi bison-native" +BBCLASSEXTEND = "native" +PR = "r1" + +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=90d577535a3898e1ae5dbf0ae3509a8c \ + file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7" + +SRC_URI[md5sum] = "e5cd63d6bcc5c105e898e7c33cf42175" +SRC_URI[sha256sum] = "4bf244db75df04499dea704e7734376c0fc5a3a17fb59be2123c8d76111e6fb8" + +SRC_URI = "\ + ${GNOME_MIRROR}/gobject-introspection/0.9/${BPN}-${PV}.tar.bz2 \ + file://use-usr-bin-env-for-python.patch \ +" +S = "${WORKDIR}/${BPN}-${PV}" + +inherit autotools + +do_configure_prepend() { + touch -f gtk-doc.make +} + +EXTRA_OECONF = "\ + --disable-gtk-doc \ + --disable-gtk-doc-html \ + --disable-gtk-doc-pdf \ + --disable-tests \ +" diff --git a/meta-oe/recipes-gnome/gnome/gobject-introspection_git.bb b/meta-oe/recipes-gnome/gnome/gobject-introspection_git.bb new file mode 100644 index 0000000000..2a7f30c11c --- /dev/null +++ b/meta-oe/recipes-gnome/gnome/gobject-introspection_git.bb @@ -0,0 +1,33 @@ +# NOTE: WIP! This recipe does not cross-compile atm., only -native +DEPENDS = "glib-2.0 libffi python-native gobject-introspection-native" +DEPENDS_virtclass-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}" +DEFAULT_PREFERENCE = "-1" + +S = "${WORKDIR}/git" + +inherit autotools + +BBCLASSEXTEND = "native" + +do_configure_prepend () { + echo "EXTRA_DIST = " > ${S}/gtk-doc.make +} + +EXTRA_OECONF = "\ + --disable-gtk-doc \ + --disable-gtk-doc-html \ + --disable-gtk-doc-pdf \ + --disable-tests \ +" -- cgit v1.2.3-54-g00ecf