From 8e551931feb7ca1baf0f376a956ec6157e5f2890 Mon Sep 17 00:00:00 2001 From: Gary Thomas Date: Thu, 28 Apr 2011 11:05:26 -0600 Subject: Fix matchbox-panel-2 compile error This patch is needed when building with GCC-4.6.0 -- ------------------------------------------------------------ Gary Thomas | Consulting for the MLB Associates | Embedded world ------------------------------------------------------------ >From 7337ecd4970f7d94080ad70b912bdb2742d2d7aa Mon Sep 17 00:00:00 2001 From: Gary Thomas Date: Thu, 28 Apr 2011 11:03:44 -0600 Subject: [PATCH] matchbox-panel: fix compile error with GCC-4.6.0 Upstream-Status: Pending [sgw: added Upstream-Status] (From OE-Core rev: ace616b362bbcba9d9c78a2814a9cb943ac3f4a2) Signed-off-by: Gary Thomas Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb') diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb index 9e1a29700b..9c1aa010c3 100644 --- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb +++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb @@ -13,13 +13,14 @@ DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}" DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" PV = "0.0+git${SRCPV}" -PR = "r0" +PR = "r1" RPROVIDES_${PN} = "matchbox-panel" RREPLACES_${PN} = "matchbox-panel" RCONFLICTS_${PN} = "matchbox-panel" -SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ +SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ + file://gcc-4.6.0-compile.patch \ file://startup_fix.diff;patch=1" EXTRA_OECONF = "--enable-startup-notification --enable-dbus" -- cgit v1.2.3-54-g00ecf