diff options
Diffstat (limited to 'meta/recipes-sato/matchbox-panel-2')
-rw-r--r-- | meta/recipes-sato/matchbox-panel-2/gcc-4.6.0-compile.patch | 2 | ||||
-rw-r--r-- | meta/recipes-sato/matchbox-panel-2/startup_fix.diff | 2 |
2 files changed, 4 insertions, 0 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 index 54ca74d8ce..71a4727391 100644 --- 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 | |||
@@ -1,3 +1,5 @@ | |||
1 | Upstream-Status: Inappropriate [other] - need clean up | ||
2 | |||
1 | diff -ur git.ORIG/applets/startup/startup.c git/applets/startup/startup.c | 3 | diff -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 | 4 | --- 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 | 5 | +++ git/applets/startup/startup.c 2011-04-28 09:36:48.521990746 -0600 |
diff --git a/meta/recipes-sato/matchbox-panel-2/startup_fix.diff b/meta/recipes-sato/matchbox-panel-2/startup_fix.diff index 9262d33eae..d9a0876296 100644 --- a/meta/recipes-sato/matchbox-panel-2/startup_fix.diff +++ b/meta/recipes-sato/matchbox-panel-2/startup_fix.diff | |||
@@ -2,6 +2,8 @@ Fixed the compile error caused by typo, upstream also need this. | |||
2 | 2 | ||
3 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | 3 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> |
4 | 4 | ||
5 | Upstream-Status: Pending | ||
6 | |||
5 | Index: matchbox-panel-2/applets/startup/startup.c | 7 | Index: matchbox-panel-2/applets/startup/startup.c |
6 | =================================================================== | 8 | =================================================================== |
7 | --- matchbox-panel-2/applets/startup/startup.c (revision 2109) | 9 | --- matchbox-panel-2/applets/startup/startup.c (revision 2109) |