summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/7_6.diff2
-rw-r--r--meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Unbolt-ubuntu-hack.patch2
2 files changed, 3 insertions, 1 deletions
diff --git a/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/7_6.diff b/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/7_6.diff
index 8ab5386dc1..cdb29f24dc 100644
--- a/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/7_6.diff
+++ b/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/7_6.diff
@@ -1,3 +1,5 @@
1Upstream-Status: Pending
2
1=== modified file 'openbox-xdgmenu.c' 3=== modified file 'openbox-xdgmenu.c'
2--- openbox-xdgmenu.c 2011-09-03 20:13:39 +0000 4--- openbox-xdgmenu.c 2011-09-03 20:13:39 +0000
3+++ openbox-xdgmenu.c 2013-12-28 17:41:04 +0000 5+++ openbox-xdgmenu.c 2013-12-28 17:41:04 +0000
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Unbolt-ubuntu-hack.patch b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Unbolt-ubuntu-hack.patch
index e58a93b6f6..73bacc9139 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Unbolt-ubuntu-hack.patch
+++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Unbolt-ubuntu-hack.patch
@@ -7,7 +7,7 @@ This bites during cross compiling where the target is different than
7build host and build host might be ubuntu but that does not matter in 7build host and build host might be ubuntu but that does not matter in
8cross compilation case. This fails builds when usrmerge feature is used 8cross compilation case. This fails builds when usrmerge feature is used
9 9
10Upstream-Status: Inappropriates [ Cross-compile specific ] 10Upstream-Status: Inappropriate [ Cross-compile specific ]
11Signed-off-by: Khem Raj <raj.khem@gmail.com> 11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12--- 12---
13 configure.ac | 2 +- 13 configure.ac | 2 +-