[PATCH] python-pycairo: convert to new style staging and bump PR

[PATCH] python-pycairo: convert to new style staging and bump PR

[Simon Busch]

Signed-off-by: Simon Busch <morphis@gravedo.de>
---
 recipes/python/python-pycairo_1.4.0.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/python/python-pycairo_1.4.0.bb b/recipes/python/python-pycairo_1.4.0.bb
index 94bb338..b0cbf95 100644
--- a/recipes/python/python-pycairo_1.4.0.bb
+++ b/recipes/python/python-pycairo_1.4.0.bb
@@ -3,7 +3,7 @@ SECTION = "devel/python"
 HOMEPAGE = "http://cairographics.org/pycairo"
 LICENSE = "LGPL MPL"
 DEPENDS = "cairo"
-PR = "ml3"
+PR = "ml4"
 
 SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.gz \
            file://fix-setup-py.patch"
@@ -15,7 +15,7 @@ do_configure_append() {
 	sed -e 's:@prefix@:${prefix}:' -e 's:@includedir@:\$\{prefix\}/include:' -e 's:@VERSION@:${PV}:' pycairo.pc.in > pycairo.pc
 }
 
-do_stage() {
+do_install_append() {
 	install -d ${STAGING_INCDIR}
 	install -m 0644 cairo/pycairo.h ${STAGING_INCDIR}
 }
-- 
1.7.1

Re: [PATCH] python-pycairo: convert to new style staging and bump PR

[Frans Meulenbroeks]

2010/10/15 Simon Busch <morphis@gravedo.de>:
> Signed-off-by: Simon Busch <morphis@gravedo.de>
> ---
>  recipes/python/python-pycairo_1.4.0.bb |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/recipes/python/python-pycairo_1.4.0.bb b/recipes/python/python-pycairo_1.4.0.bb
> index 94bb338..b0cbf95 100644
> --- a/recipes/python/python-pycairo_1.4.0.bb
> +++ b/recipes/python/python-pycairo_1.4.0.bb
> @@ -3,7 +3,7 @@ SECTION = "devel/python"
>  HOMEPAGE = "http://cairographics.org/pycairo"
>  LICENSE = "LGPL MPL"
>  DEPENDS = "cairo"
> -PR = "ml3"
> +PR = "ml4"
>
>  SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.gz \
>            file://fix-setup-py.patch"
> @@ -15,7 +15,7 @@ do_configure_append() {
>        sed -e 's:@prefix@:${prefix}:' -e 's:@includedir@:\$\{prefix\}/include:' -e 's:@VERSION@:${PV}:' pycairo.pc.in > pycairo.pc
>  }
>
> -do_stage() {
> +do_install_append() {
>        install -d ${STAGING_INCDIR}
>        install -m 0644 cairo/pycairo.h ${STAGING_INCDIR}
>  }


Some concerns:
I don't think STAGING_INCDIR should be used; guess it should go to
${D}/${includedir} (just like the 1.8.0 version does).
You might also peek at the do_install_append of the 1.8.0 recipe as it
does different/more things. I don't know too much about pycairo, but I
can imagine these make sense for 1.4.0 too.

Then again perhaps it is time to move to 1.8.0; this version has a
DEFAULT_PREFERENCE of -1, but angstrom 2008 and 2010 and kaeilos
already have 1.8.0 as preferred version (and the 1.8.0 version is
around for 1.5 year or so).

BTW the latest version of cairo is 1.8.10 so we might consider moving
to that version too.

Enjoy, Frans

Re: [PATCH] python-pycairo: convert to new style staging and bump PR

[Simon Busch]

On 15.10.2010 09:07, Frans Meulenbroeks wrote:
> Some concerns:
> I don't think STAGING_INCDIR should be used; guess it should go to
> ${D}/${includedir} (just like the 1.8.0 version does).
> You might also peek at the do_install_append of the 1.8.0 recipe as it
> does different/more things. I don't know too much about pycairo, but I
> can imagine these make sense for 1.4.0 too.

I even don't know much about pycairo in detail I just noted that it does
not compile in its current state and changed it to new style staging.
But I will check if it makes more sense to change the staging path to
${D}/${includedir} as I just copied what was already there in do_stage().

> Then again perhaps it is time to move to 1.8.0; this version has a
> DEFAULT_PREFERENCE of -1, but angstrom 2008 and 2010 and kaeilos
> already have 1.8.0 as preferred version (and the 1.8.0 version is
> around for 1.5 year or so).

For me it should be ok to drop 1.4.0 and use 1.8.0 if nobody else uses
it. Btw. there is already a newer version of pycairo available. It's
1.8.10 but they changed it's name to py2cairo. pycairo is now the name
for the version with python 3.x support.

> BTW the latest version of cairo is 1.8.10 so we might consider moving
> to that version too.

No, it's not. The latest version of cairo is 1.10.0 :) SHR is already
using this version ...

regards,
morphis

Re: [PATCH] python-pycairo: convert to new style staging and bump PR

[Simon Busch]

On 15.10.2010 18:46, Simon Busch wrote:
> On 15.10.2010 09:07, Frans Meulenbroeks wrote:
>> Some concerns:
>> I don't think STAGING_INCDIR should be used; guess it should go to
>> ${D}/${includedir} (just like the 1.8.0 version does).
>> You might also peek at the do_install_append of the 1.8.0 recipe as it
>> does different/more things. I don't know too much about pycairo, but I
>> can imagine these make sense for 1.4.0 too.
> 
> I even don't know much about pycairo in detail I just noted that it does
> not compile in its current state and changed it to new style staging.
> But I will check if it makes more sense to change the staging path to
> ${D}/${includedir} as I just copied what was already there in do_stage().
> 
>> Then again perhaps it is time to move to 1.8.0; this version has a
>> DEFAULT_PREFERENCE of -1, but angstrom 2008 and 2010 and kaeilos
>> already have 1.8.0 as preferred version (and the 1.8.0 version is
>> around for 1.5 year or so).
> 
> For me it should be ok to drop 1.4.0 and use 1.8.0 if nobody else uses
> it. Btw. there is already a newer version of pycairo available. It's
> 1.8.10 but they changed it's name to py2cairo. pycairo is now the name
> for the version with python 3.x support.

As SHR is now using 1.8.0 as default python-pycairo version I am fine
with dropping version 1.4.0.

regards,
morphis