Skip to contentSkip to conversation

Fixes for world build failures

PATCH Superseded Paul Eggleton 2 participants 5 messages Jun 23, 2013 – Jun 24, 2013

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover Fixes for world build failures

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(-)
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/2 pinpoint: fix and update

* 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

---
 meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb +4 -4
index 4949570..7cb40c3 100644
@@ -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"
 
Signature · 1 line
1.8.1.2
#4 lore raw

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

In reply to Paul Eggleton
---
 meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb +1 -1
index d256a28..4bac59b 100644
@@ -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"
Signature · 1 line
1.8.1.2
#2 lore raw

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

In reply to Paul Eggleton
Quoted 3 lines · Paul Eggleton

* 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

Quoted 37 lines

* Update to latest upstream git revision

---
 meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb +4 -4
index 4949570..7cb40c3 100644
@@ -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"
 
Signature · 6 lines
1.8.1.2

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#3 lore raw

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

Quoted 5 lines · On Monday 24 June 2013 10:17:00 Martin Jansa wrote:
Quoted 3 lines · Paul Eggleton

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

Quoted 8 lines

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

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre