summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/matchbox-panel-2
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2011-09-26 11:55:47 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-26 16:56:42 (GMT)
commitd39c6738df4b7e8ef22f2a7154274c1d08b1d51f (patch)
tree04515a719d958cedc30cfb8cf488b5049ca68d06 /meta/recipes-sato/matchbox-panel-2
parent114ade8b143e697f09a0672093fe64205eac6209 (diff)
downloadpoky-d39c6738df4b7e8ef22f2a7154274c1d08b1d51f.tar.gz
matchbox: Upgrade SRCREV to reflect recent accpeted patches by upstream
(From OE-Core rev: 33a1a05ef988c69f8ff8e38c6723922082e5d1aa) 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.bb7
-rw-r--r--meta/recipes-sato/matchbox-panel-2/startup_fix.diff19
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 98b3447..c1da0cf 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"
11DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}" 11DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}"
12DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" 12DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
13 13
14SRCREV = "982d9ea173dc87a84db2303d1a6a12607fc4d539" 14SRCREV = "cdf7a22716b87468f10573f622d5c7a58a684e35"
15PV = "0.0+git${SRCPV}" 15PV = "0.0+git${SRCPV}"
16PR = "r1" 16PR = "r0"
17 17
18RPROVIDES_${PN} = "matchbox-panel" 18RPROVIDES_${PN} = "matchbox-panel"
19RREPLACES_${PN} = "matchbox-panel" 19RREPLACES_${PN} = "matchbox-panel"
20RCONFLICTS_${PN} = "matchbox-panel" 20RCONFLICTS_${PN} = "matchbox-panel"
21 21
22SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ 22SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
23 file://gcc-4.6.0-compile.patch \ 23 file://gcc-4.6.0-compile.patch"
24 file://startup_fix.diff"
25 24
26EXTRA_OECONF = "--enable-startup-notification --enable-dbus" 25EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
27EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" 26EXTRA_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 d9a0876..0000000
--- a/meta/recipes-sato/matchbox-panel-2/startup_fix.diff
+++ /dev/null
@@ -1,19 +0,0 @@
1Fixed the compile error caused by typo, upstream also need this.
2
3Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
4
5Upstream-Status: Pending
6
7Index: matchbox-panel-2/applets/startup/startup.c
8===================================================================
9--- matchbox-panel-2/applets/startup/startup.c (revision 2109)
10+++ matchbox-panel-2/applets/startup/startup.c (working copy)
11@@ -229,7 +229,7 @@
12 applet = g_slice_new0 (StartupApplet);
13
14 applet->launch_list = NULL;
15- applet->hourglass_show = FALSE;
16+ applet->hourglass_shown = FALSE;
17
18 /* Create image */
19 applet->image = MB_PANEL_SCALING_IMAGE