From: David-John Willis <John.Willis@Distant-earth.com>
Date: Thu, 22 Apr 2010 11:10:17 +0000 (+0100)
Subject: xfce4-panel: Add 4.6.3 and support new style checksums in xfce46.bbclass.
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a02a41fa2f1245bcaa6c96874a82d4b3967d755b;p=openembedded.git

xfce4-panel: Add 4.6.3 and support new style checksums in xfce46.bbclass.
---

diff --git a/classes/xfce46.bbclass b/classes/xfce46.bbclass
index 9f59d4fc98..db13f69f84 100644
--- a/classes/xfce46.bbclass
+++ b/classes/xfce46.bbclass
@@ -11,7 +11,7 @@ SECTION ?= "x11/xfce"
 
 XFCE_VERSION = ${PV}
 
-SRC_URI = "http://mocha.xfce.org/archive/src/xfce/${PN}/${@'${PV}'[0:3]}/${PN}-${PV}.tar.bz2"
+SRC_URI = "http://mocha.xfce.org/archive/src/xfce/${PN}/${@'${PV}'[0:3]}/${PN}-${PV}.tar.bz2;name=archive"
 
 inherit autotools gtk-icon-cache pkgconfig
 
diff --git a/recipes/xfce-base/xfce4-panel_4.6.3.bb b/recipes/xfce-base/xfce4-panel_4.6.3.bb
index a592efe1c5..0642663f53 100644
--- a/recipes/xfce-base/xfce4-panel_4.6.3.bb
+++ b/recipes/xfce-base/xfce4-panel_4.6.3.bb
@@ -3,6 +3,7 @@
 DESCRIPTION = "Xfce4 Panel"
 DEPENDS = "virtual/libx11 startup-notification libxfcegui4 libxml2 exo libwnck"
 SECTION = "x11"
+<<<<<<< HEAD
 PR = "r2"
 
 inherit xfce46
@@ -12,6 +13,10 @@ SRC_URI[sha256sum] = "4f5e19187ddf9f812303b77479124562079d25c6263674040aba4395c6
 
 EXTRA_OECONF += " --enable-startup-notification"
 
+do_stage() {
+    autotools_stage_all
+}
+
 do_install() {
     oe_runmake DESTDIR=${D} install
 }