[PATCH 0/2] Fixes for world build failures

[PATCH 0/2] Fixes for world build failures

[Paul Eggleton]

A couple of fixes for the recent world build failures.


The following changes since commit f7278f7900b98497bb900b004d727efba06773c1:

  packagekit: Fix build with new glib-2.0, v2 (2013-06-20 12:44:53 +0200)

are available in the git repository at:

  git://git.openembedded.org/meta-openembedded-contrib paule/fixes
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/fixes

Paul Eggleton (2):
  pinpoint: fix and update
  clutter-box2d: fix for recent clutter changes in OE-Core

 meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb      | 8 ++++----
 meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

-- 
1.8.1.2

[PATCH 1/2] pinpoint: fix and update

[Paul Eggleton]

* Fix for update and PN change of clutter in OE-Core
* Fix SRC_URI
* Use +git instead of +gitr in PV
* Update to latest upstream git revision

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb b/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb
index 4949570..7cb40c3 100644
--- a/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb
+++ b/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb
@@ -7,14 +7,14 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \
                     file://pinpoint.c;beginline=6;endline=17;md5=201d438283607da393fae6aca085454c"
 
-DEPENDS = "gnome-common glib-2.0 gdk-pixbuf clutter-1.8 clutter-gst-1.8"
+DEPENDS = "gnome-common glib-2.0 gdk-pixbuf clutter-1.0 clutter-gst-1.0"
 
 inherit autotools gettext
 
-SRC_URI = "git://git.gnome.org/browse/pinpoint;protocol=http"
+SRC_URI = "git://git.gnome.org/pinpoint"
 
-SRCREV = "5b22660f5b247023ca409403f1c2cc834d8ce632"
-PV = "0.1.4+gitr${SRCPV}"
+SRCREV = "80a056c57e819d0b75035424638813b0670830e1"
+PV = "0.1.4+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
-- 
1.8.1.2

[PATCH 2/2] clutter-box2d: fix for recent clutter changes in OE-Core

[Paul Eggleton]

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb b/meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb
index d256a28..4bac59b 100644
--- a/meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb
+++ b/meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb
@@ -10,5 +10,5 @@ SRC_URI = "git://git.gnome.org/clutter-box2d.git"
 
 S = "${WORKDIR}/git"
 
-DEPENDS += "clutter-1.8"
+DEPENDS += "clutter-1.0"
 PROVIDES = "clutter-box2d-1.6"
-- 
1.8.1.2

Re: [PATCH 1/2] pinpoint: fix and update

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1993 bytes --]

On Sun, Jun 23, 2013 at 11:49:00AM +0100, Paul Eggleton wrote:
> * Fix for update and PN change of clutter in OE-Core
> * Fix SRC_URI
> * Use +git instead of +gitr in PV

isn't version going backwards because of that? I think so, you should
bump PE if you really hate +gitr so much.

We still have more +gitr then +git:
OE @ ~/meta-openembedded $ git grep 'gitr${SRCPV}' | wc -l
24
OE @ ~/meta-openembedded $ git grep 'git${SRCPV}' | wc -l
21

> * Update to latest upstream git revision
> 
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
>  meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb b/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb
> index 4949570..7cb40c3 100644
> --- a/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb
> +++ b/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb
> @@ -7,14 +7,14 @@ LICENSE = "LGPLv2.1"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \
>                      file://pinpoint.c;beginline=6;endline=17;md5=201d438283607da393fae6aca085454c"
>  
> -DEPENDS = "gnome-common glib-2.0 gdk-pixbuf clutter-1.8 clutter-gst-1.8"
> +DEPENDS = "gnome-common glib-2.0 gdk-pixbuf clutter-1.0 clutter-gst-1.0"
>  
>  inherit autotools gettext
>  
> -SRC_URI = "git://git.gnome.org/browse/pinpoint;protocol=http"
> +SRC_URI = "git://git.gnome.org/pinpoint"
>  
> -SRCREV = "5b22660f5b247023ca409403f1c2cc834d8ce632"
> -PV = "0.1.4+gitr${SRCPV}"
> +SRCREV = "80a056c57e819d0b75035424638813b0670830e1"
> +PV = "0.1.4+git${SRCPV}"
>  
>  S = "${WORKDIR}/git"
>  
> -- 
> 1.8.1.2
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 1/2] pinpoint: fix and update

[Paul Eggleton]

On Monday 24 June 2013 10:17:00 Martin Jansa wrote:
> On Sun, Jun 23, 2013 at 11:49:00AM +0100, Paul Eggleton wrote:
> > * Fix for update and PN change of clutter in OE-Core
> > * Fix SRC_URI
> > * Use +git instead of +gitr in PV
> 
> isn't version going backwards because of that? I think so, you should
> bump PE if you really hate +gitr so much.
> 
> We still have more +gitr then +git:
> OE @ ~/meta-openembedded $ git grep 'gitr${SRCPV}' | wc -l
> 24
> OE @ ~/meta-openembedded $ git grep 'git${SRCPV}' | wc -l
> 21

Alright then, I'll leave it as is. v2 coming.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre