[OE-core] [PATCH v2 1/1] atk: add native / disable introspection / merge atk.inc->recipe / change license

[Andreas Müller]

On Mon, Jan 30, 2012 at 6:01 PM, Saul Wold <sgw at linux.intel.com> wrote:
> On 01/28/2012 04:00 PM, 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 at 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..74e7288 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 = "GPLv2+&  LGPLv2+"
>
> Not sure what you changed here, but you did not fix this as Khem suggested.

After Khem's comment I checked the files mentioned in LIC_FILES_CHKSUM
and changed
from

LICENSE = "LGPLv2&  LGPLv2+"

to

LICENSE = "GPLv2+&  LGPLv2+"

and mentioned this for information in cover-letter for everybody to
cross-check. Since my initial patch did not touch license and I don't
exactly know how to handle this case what shall I do for V3:

1. Keep LICENSE and move the cover letter explanations to commit message - or
2. Set LGPLv2.1+ as Khem mentioned

>  Also, if you are making LICENSE changes the note you included in your 00
> Patch email should really be in the Commit message instead.
>
> Thanks
>        Sau!

Andreas