From 3b504460b9d09239ceac71909e5f1870ed4d9ba9 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon, 19 Nov 2012 21:52:41 +0000
Subject: matchbox-panel-2: Use a more standard layout for patch files

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../matchbox-panel-2/gcc-4.6.0-compile.patch       | 53 ----------------------
 .../matchbox-panel-2/gcc-4.6.0-compile.patch       | 53 ++++++++++++++++++++++
 2 files changed, 53 insertions(+), 53 deletions(-)
 delete mode 100644 meta/recipes-sato/matchbox-panel-2/gcc-4.6.0-compile.patch
 create mode 100644 meta/recipes-sato/matchbox-panel-2/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
deleted file mode 100644
index 71a4727391..0000000000
--- a/meta/recipes-sato/matchbox-panel-2/gcc-4.6.0-compile.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Upstream-Status: Inappropriate [other] - need clean up
-
-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/gcc-4.6.0-compile.patch b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2/gcc-4.6.0-compile.patch
new file mode 100644
index 0000000000..71a4727391
--- /dev/null
+++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2/gcc-4.6.0-compile.patch
@@ -0,0 +1,53 @@
+Upstream-Status: Inappropriate [other] - need clean up
+
+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);
-- 
cgit 1.2.3-korg