diff options
| author | Zhai Edwin <edwin.zhai@intel.com> | 2011-09-26 19:55:47 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-26 17:53:42 +0100 |
| commit | 33a1a05ef988c69f8ff8e38c6723922082e5d1aa (patch) | |
| tree | ded5d7c7db49d62a7b625aeb384d4e9a9bdf7bbb /meta/recipes-sato/matchbox-panel-2 | |
| parent | 7c503d056d15e376243928ffb815296e9c711658 (diff) | |
| download | openembedded-core-33a1a05ef988c69f8ff8e38c6723922082e5d1aa.tar.gz openembedded-core-33a1a05ef988c69f8ff8e38c6723922082e5d1aa.tar.bz2 openembedded-core-33a1a05ef988c69f8ff8e38c6723922082e5d1aa.zip | |
matchbox: Upgrade SRCREV to reflect recent accpeted patches by upstream
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/matchbox-panel-2')
| -rw-r--r-- | meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb | 7 | ||||
| -rw-r--r-- | meta/recipes-sato/matchbox-panel-2/startup_fix.diff | 19 |
2 files changed, 3 insertions, 23 deletions
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 98b3447a71..c1da0cf62a 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 @@ -11,17 +11,16 @@ DEPENDS = "gtk+ startup-notification dbus dbus-glib" DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}" DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" -SRCREV = "982d9ea173dc87a84db2303d1a6a12607fc4d539" +SRCREV = "cdf7a22716b87468f10573f622d5c7a58a684e35" PV = "0.0+git${SRCPV}" -PR = "r1" +PR = "r0" RPROVIDES_${PN} = "matchbox-panel" RREPLACES_${PN} = "matchbox-panel" RCONFLICTS_${PN} = "matchbox-panel" SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ - file://gcc-4.6.0-compile.patch \ - file://startup_fix.diff" + file://gcc-4.6.0-compile.patch" EXTRA_OECONF = "--enable-startup-notification --enable-dbus" EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" diff --git a/meta/recipes-sato/matchbox-panel-2/startup_fix.diff b/meta/recipes-sato/matchbox-panel-2/startup_fix.diff deleted file mode 100644 index d9a0876296..0000000000 --- a/meta/recipes-sato/matchbox-panel-2/startup_fix.diff +++ /dev/null @@ -1,19 +0,0 @@ -Fixed the compile error caused by typo, upstream also need this. - -Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> - -Upstream-Status: Pending - -Index: matchbox-panel-2/applets/startup/startup.c -=================================================================== ---- matchbox-panel-2/applets/startup/startup.c (revision 2109) -+++ matchbox-panel-2/applets/startup/startup.c (working copy) -@@ -229,7 +229,7 @@ - applet = g_slice_new0 (StartupApplet); - - applet->launch_list = NULL; -- applet->hourglass_show = FALSE; -+ applet->hourglass_shown = FALSE; - - /* Create image */ - applet->image = MB_PANEL_SCALING_IMAGE |