Patchwork atk: add native support / disable introspection / merge atk.inc -> recipe

login
mail settings
Submitter Andreas Müller
Date Jan. 27, 2012, 12:33 a.m.
Message ID <1327624433-27864-1-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/20205/
State New
Headers show

Comments

Andreas Müller - Jan. 27, 2012, 12:33 a.m.
Native support currently is appended in meta-oe. Native build failed with:

| /usr/share/gir-1.0/GLib-2.0.gir:9:1: error: Unsupported version '1.1'
| /usr/share/gir-1.0/GLib-2.0.gir:9:39: error: Unsupported version '1.1'
| error parsing file Atk-1.0.gir: Failed to parse included gir GLib-2.0
| make[3]: *** [Atk-1.0.typelib] Error 1

build tested in meta-oe / angstrom environment

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta/recipes-support/atk/atk.inc      |   13 -------------
 meta/recipes-support/atk/atk_2.2.0.bb |   17 +++++++++++++----
 2 files changed, 13 insertions(+), 17 deletions(-)
 delete mode 100644 meta/recipes-support/atk/atk.inc
Khem Raj - Jan. 28, 2012, 8:18 p.m.
On (27/01/12 01:33), Andreas Müller wrote:
> Native support currently is appended in meta-oe. Native build failed with:
> 
> | /usr/share/gir-1.0/GLib-2.0.gir:9:1: error: Unsupported version '1.1'
> | /usr/share/gir-1.0/GLib-2.0.gir:9:39: error: Unsupported version '1.1'
> | error parsing file Atk-1.0.gir: Failed to parse included gir GLib-2.0
> | make[3]: *** [Atk-1.0.typelib] Error 1
> 
> build tested in meta-oe / angstrom environment
> 
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  meta/recipes-support/atk/atk.inc      |   13 -------------
>  meta/recipes-support/atk/atk_2.2.0.bb |   17 +++++++++++++----
>  2 files changed, 13 insertions(+), 17 deletions(-)
>  delete mode 100644 meta/recipes-support/atk/atk.inc
> 
> diff --git a/meta/recipes-support/atk/atk.inc b/meta/recipes-support/atk/atk.inc
> deleted file mode 100644
> index 6a4fef6..0000000
> --- a/meta/recipes-support/atk/atk.inc
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -DESCRIPTION = "An accessibility toolkit for GNOME."
> -HOMEPAGE = "http://live.gnome.org/GAP/"
> -BUGTRACKER = "https://bugzilla.gnome.org/"
> -
> -LICENSE = "LGPLv2 & LGPLv2+"
> -
> -SECTION = "x11/libs"
> -
> -DEPENDS = "glib-2.0 gtk-doc-native"
> -
> -inherit autotools pkgconfig
> -
> -EXTRA_OECONF = "--disable-glibtest"
> diff --git a/meta/recipes-support/atk/atk_2.2.0.bb b/meta/recipes-support/atk/atk_2.2.0.bb
> index 0d657b5..daa7931 100644
> --- a/meta/recipes-support/atk/atk_2.2.0.bb
> +++ b/meta/recipes-support/atk/atk_2.2.0.bb
> @@ -1,14 +1,23 @@
> -require atk.inc
> +DESCRIPTION = "An accessibility toolkit for GNOME."
> +HOMEPAGE = "http://live.gnome.org/GAP/"
> +BUGTRACKER = "https://bugzilla.gnome.org/"
> +SECTION = "x11/libs"
>  
> -PR = "r1"
> +LICENSE = "LGPLv2 & LGPLv2+"

there was no LGPLv2 only LGPLv2.1 so something like LGPLv2.1+ would be
ok here

>  LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
>                      file://atk/atkutil.c;endline=20;md5=db21b0bdbef9da4dc6eb122debc9f9bc \
>                      file://atk/atk.h;endline=20;md5=c58238d688c24387376d6c69d06248a7"
> +PR = "r2"
>  
> -SRC_URI = "http://download.gnome.org/sources/atk/2.2/${BPN}-${PV}.tar.bz2"
> +DEPENDS = "glib-2.0 gtk-doc-native"
> +
> +inherit autotools pkgconfig
>  
> +SRC_URI = "http://download.gnome.org/sources/atk/2.2/${BPN}-${PV}.tar.bz2"
>  SRC_URI[md5sum] = "4894e9b04f0a9f1c37a624a1e8d6d73f"
>  SRC_URI[sha256sum] = "d201e3f5808aef0b1aec2277bfa61074f68863e405428adb57a73aab5c838450"
>  
> +BBCLASSEXTEND = "native"
>  
> -
> +EXTRA_OECONF = "--disable-glibtest \
> +                --disable-introspection"
> -- 
> 1.7.4.4
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-support/atk/atk.inc b/meta/recipes-support/atk/atk.inc
deleted file mode 100644
index 6a4fef6..0000000
--- a/meta/recipes-support/atk/atk.inc
+++ /dev/null
@@ -1,13 +0,0 @@ 
-DESCRIPTION = "An accessibility toolkit for GNOME."
-HOMEPAGE = "http://live.gnome.org/GAP/"
-BUGTRACKER = "https://bugzilla.gnome.org/"
-
-LICENSE = "LGPLv2 & LGPLv2+"
-
-SECTION = "x11/libs"
-
-DEPENDS = "glib-2.0 gtk-doc-native"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-glibtest"
diff --git a/meta/recipes-support/atk/atk_2.2.0.bb b/meta/recipes-support/atk/atk_2.2.0.bb
index 0d657b5..daa7931 100644
--- a/meta/recipes-support/atk/atk_2.2.0.bb
+++ b/meta/recipes-support/atk/atk_2.2.0.bb
@@ -1,14 +1,23 @@ 
-require atk.inc
+DESCRIPTION = "An accessibility toolkit for GNOME."
+HOMEPAGE = "http://live.gnome.org/GAP/"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+SECTION = "x11/libs"
 
-PR = "r1"
+LICENSE = "LGPLv2 & LGPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
                     file://atk/atkutil.c;endline=20;md5=db21b0bdbef9da4dc6eb122debc9f9bc \
                     file://atk/atk.h;endline=20;md5=c58238d688c24387376d6c69d06248a7"
+PR = "r2"
 
-SRC_URI = "http://download.gnome.org/sources/atk/2.2/${BPN}-${PV}.tar.bz2"
+DEPENDS = "glib-2.0 gtk-doc-native"
+
+inherit autotools pkgconfig
 
+SRC_URI = "http://download.gnome.org/sources/atk/2.2/${BPN}-${PV}.tar.bz2"
 SRC_URI[md5sum] = "4894e9b04f0a9f1c37a624a1e8d6d73f"
 SRC_URI[sha256sum] = "d201e3f5808aef0b1aec2277bfa61074f68863e405428adb57a73aab5c838450"
 
+BBCLASSEXTEND = "native"
 
-
+EXTRA_OECONF = "--disable-glibtest \
+                --disable-introspection"