sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Gary Thomas 2011-04-28 11:05:26 -06:00 committed by Richard Purdie
parent 5d737849bb
commit 8e551931fe
2 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
meta/recipes-sato/matchbox-panel-2/gcc-4.6.0-compile.patch Normal file
View File

@ -0,0 +1,51 @@
diff -ur git.ORIG/applets/startup/startup.c git/applets/startup/startup.c
--- git.ORIG/applets/startup/startup.c 2011-04-28 08:13:25.000000000 -0600
+++ git/applets/startup/startup.c 2011-04-28 09:36:48.521990746 -0600
@@ -210,9 +210,8 @@
{
XEvent *xevent;
xevent = (XEvent *) gdk_xevent;
- gboolean ret;
- ret = sn_display_process_event (applet->sn_display, xevent);
+ sn_display_process_event (applet->sn_display, xevent);
return GDK_FILTER_CONTINUE;
}
@@ -223,7 +222,6 @@
{
StartupApplet *applet;
Display *xdisplay;
- SnMonitorContext *context;
/* Create applet data structure */
applet = g_slice_new0 (StartupApplet);
@@ -248,7 +246,7 @@
applet->sn_display = sn_display_new (xdisplay, NULL, NULL);
- context = sn_monitor_context_new (applet->sn_display,
+ sn_monitor_context_new (applet->sn_display,
DefaultScreen(xdisplay),
monitor_event_func,
(void *) applet,
diff -ur git.ORIG/applets/startup-notify/startup.c git/applets/startup-notify/startup.c
--- git.ORIG/applets/startup-notify/startup.c 2011-04-28 08:05:46.000000000 -0600
+++ git/applets/startup-notify/startup.c 2011-04-28 09:42:17.793864786 -0600
@@ -305,7 +305,6 @@
StartupApplet *applet;
GtkWidget *widget;
Display *xdisplay;
- SnMonitorContext *context;
applet = g_slice_new0 (StartupApplet);
@@ -317,7 +316,7 @@
applet->sn_display = sn_display_new (xdisplay, NULL, NULL);
- context = sn_monitor_context_new (applet->sn_display,
+ sn_monitor_context_new (applet->sn_display,
DefaultScreen (xdisplay),
monitor_event_func,
applet, NULL);

5
meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
View File

@ -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"