diff options
| author | Zhai Edwin <edwin.zhai@intel.com> | 2010-07-06 17:52:27 +0800 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-13 15:21:43 +0100 |
| commit | 7a92d3208cd1091fdc93f2625a4cb205966eec83 (patch) | |
| tree | 665532c54b70d92818d28fb02fb736465260c20c /meta/packages | |
| parent | 14e900213c5c68402061f173dcb1a5b416bdbd61 (diff) | |
| download | openembedded-core-7a92d3208cd1091fdc93f2625a4cb205966eec83.tar.gz openembedded-core-7a92d3208cd1091fdc93f2625a4cb205966eec83.tar.bz2 openembedded-core-7a92d3208cd1091fdc93f2625a4cb205966eec83.zip | |
matchbox-panel-2: Update to 2109
Also add a patch to fix the upstream compile error caused by a typo.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Diffstat (limited to 'meta/packages')
| -rw-r--r-- | meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb | 6 | ||||
| -rw-r--r-- | meta/packages/matchbox-panel-2/startup_fix.diff | 17 |
2 files changed, 22 insertions, 1 deletions
diff --git a/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb b/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb index d75b9ef405..45998633f4 100644 --- a/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb +++ b/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb @@ -3,6 +3,9 @@ HOMEPAGE = "http://matchbox-project.org" BUGTRACKER = "http://bugzilla.openedhand.com/" LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://matchbox-panel/mb-panel.h;endline=10;md5=0b7db28f4b6863fb853d0467e590019a \ + file://applets/startup/startup.c;endline=22;md5=b0a64fbef3097d79f8264e6907a98f03" PRIORITY = "optional" DEPENDS = "gtk+ startup-notification dbus dbus-glib" @@ -16,7 +19,8 @@ RPROVIDES_${PN} = "matchbox-panel" RREPLACES_${PN} = "matchbox-panel" RCONFLICTS_${PN} = "matchbox-panel" -SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" +SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ + file://startup_fix.diff;patch=1" EXTRA_OECONF = "--enable-startup-notification --enable-dbus" EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" diff --git a/meta/packages/matchbox-panel-2/startup_fix.diff b/meta/packages/matchbox-panel-2/startup_fix.diff new file mode 100644 index 0000000000..9262d33eae --- /dev/null +++ b/meta/packages/matchbox-panel-2/startup_fix.diff @@ -0,0 +1,17 @@ +Fixed the compile error caused by typo, upstream also need this. + +Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> + +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 |