summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato
diff options
context:
space:
mode:
authorGary Thomas <gary@mlbassoc.com>2011-04-28 17:05:26 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-03 23:54:36 (GMT)
commit8e551931feb7ca1baf0f376a956ec6157e5f2890 (patch)
tree7a05cdb1ff4b626ee1bab39f1626c85a9740879e /meta/recipes-sato
parent5d737849bb79d6f00efb23392312052d2bf4b86b (diff)
downloadpoky-8e551931feb7ca1baf0f376a956ec6157e5f2890.tar.gz
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 <gary@mlbassoc.com> 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 <gary@mlbassoc.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r--meta/recipes-sato/matchbox-panel-2/gcc-4.6.0-compile.patch51
-rw-r--r--meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb5
2 files changed, 54 insertions, 2 deletions
diff --git a/meta/recipes-sato/matchbox-panel-2/gcc-4.6.0-compile.patch b/meta/recipes-sato/matchbox-panel-2/gcc-4.6.0-compile.patch
new file mode 100644
index 0000000..54ca74d
--- /dev/null
+++ b/meta/recipes-sato/matchbox-panel-2/gcc-4.6.0-compile.patch
@@ -0,0 +1,51 @@
1diff -ur git.ORIG/applets/startup/startup.c git/applets/startup/startup.c
2--- git.ORIG/applets/startup/startup.c 2011-04-28 08:13:25.000000000 -0600
3+++ git/applets/startup/startup.c 2011-04-28 09:36:48.521990746 -0600
4@@ -210,9 +210,8 @@
5 {
6 XEvent *xevent;
7 xevent = (XEvent *) gdk_xevent;
8- gboolean ret;
9
10- ret = sn_display_process_event (applet->sn_display, xevent);
11+ sn_display_process_event (applet->sn_display, xevent);
12
13 return GDK_FILTER_CONTINUE;
14 }
15@@ -223,7 +222,6 @@
16 {
17 StartupApplet *applet;
18 Display *xdisplay;
19- SnMonitorContext *context;
20
21 /* Create applet data structure */
22 applet = g_slice_new0 (StartupApplet);
23@@ -248,7 +246,7 @@
24
25 applet->sn_display = sn_display_new (xdisplay, NULL, NULL);
26
27- context = sn_monitor_context_new (applet->sn_display,
28+ sn_monitor_context_new (applet->sn_display,
29 DefaultScreen(xdisplay),
30 monitor_event_func,
31 (void *) applet,
32diff -ur git.ORIG/applets/startup-notify/startup.c git/applets/startup-notify/startup.c
33--- git.ORIG/applets/startup-notify/startup.c 2011-04-28 08:05:46.000000000 -0600
34+++ git/applets/startup-notify/startup.c 2011-04-28 09:42:17.793864786 -0600
35@@ -305,7 +305,6 @@
36 StartupApplet *applet;
37 GtkWidget *widget;
38 Display *xdisplay;
39- SnMonitorContext *context;
40
41 applet = g_slice_new0 (StartupApplet);
42
43@@ -317,7 +316,7 @@
44
45 applet->sn_display = sn_display_new (xdisplay, NULL, NULL);
46
47- context = sn_monitor_context_new (applet->sn_display,
48+ sn_monitor_context_new (applet->sn_display,
49 DefaultScreen (xdisplay),
50 monitor_event_func,
51 applet, NULL);
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 9e1a297..9c1aa01 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)}"
13DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" 13DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
14 14
15PV = "0.0+git${SRCPV}" 15PV = "0.0+git${SRCPV}"
16PR = "r0" 16PR = "r1"
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://startup_fix.diff;patch=1" 24 file://startup_fix.diff;patch=1"
24 25
25EXTRA_OECONF = "--enable-startup-notification --enable-dbus" 26EXTRA_OECONF = "--enable-startup-notification --enable-dbus"