From: Gary Thomas <gary@mlbassoc.com>
To: Poky Project <poky@yoctoproject.org>
Subject: [PATCH] Fix matchbox-panel-2 compile error
Date: Thu, 28 Apr 2011 11:05:26 -0600 [thread overview]
Message-ID: <4DB99E56.80209@mlbassoc.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 282 bytes --]
This patch is needed when building with GCC-4.6.0
--
------------------------------------------------------------
Gary Thomas | Consulting for the
MLB Associates | Embedded world
------------------------------------------------------------
[-- Attachment #2: 0001-matchbox-panel-fix-compile-error-with-GCC-4.6.0.patch --]
[-- Type: text/x-patch, Size: 3784 bytes --]
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
Signed-off-by: Gary Thomas <gary@mlbassoc.com>
---
.../matchbox-panel-2/gcc-4.6.0-compile.patch | 51 ++++++++++++++++++++
.../matchbox-panel-2/matchbox-panel-2_git.bb | 5 +-
2 files changed, 54 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-sato/matchbox-panel-2/gcc-4.6.0-compile.patch
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 @@
+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);
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)}"
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"
--
1.7.3.4
next reply other threads:[~2011-04-28 17:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-28 17:05 Gary Thomas [this message]
2011-05-08 0:46 ` [PATCH] Fix matchbox-panel-2 compile error Khem Raj
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4DB99E56.80209@mlbassoc.com \
--to=gary@mlbassoc.com \
--cc=poky@yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.