aboutsummaryrefslogtreecommitdiffstats
path: root/meta-gnome
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-04-07 15:02:30 -0700
committerArmin Kuster <akuster808@gmail.com>2018-04-13 12:43:39 -0700
commiteda0d3ecb3cde4ac57d418622b26865eb364af0c (patch)
tree483a0ca0d8404488b28abdacc41e8a6bb6680217 /meta-gnome
parentb25363f0cd017d26df733f44849aacfb331e680d (diff)
downloadmeta-openembedded-contrib-eda0d3ecb3cde4ac57d418622b26865eb364af0c.tar.gz
meta-openembedded-contrib-eda0d3ecb3cde4ac57d418622b26865eb364af0c.tar.bz2
meta-openembedded-contrib-eda0d3ecb3cde4ac57d418622b26865eb364af0c.zip
obexd: refreah patches
WARNING: Some of the context lines in patches were ignored. This can lead to incorrectly applied patches. The context lines in the patches can be updated with devtool: devtool modify <recipe> devtool finish --force-patch-refresh <recipe> <layer_path> Then the updated patches and the source tree (in devtool's workspace) should be reviewed to make sure the patches apply in the correct place and don't introduce duplicate lines (which can, and does happen when some of the context is ignored). Further information: http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450 Details: patching file plugins/mas.c Hunk #1 succeeded at 30 with fuzz 2 (offset 1 line). Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r--meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch24
1 files changed, 16 insertions, 8 deletions
diff --git a/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch b/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch
index 2009dcd228..570cb9ef37 100644
--- a/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch
+++ b/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch
@@ -1,4 +1,7 @@
-include unistd.h to get ssize_t definitions
+From fb5056fea9559b3ec3bb61967a112b6c793b700d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 8 Jan 2013 21:33:34 -0800
+Subject: [PATCH] include unistd.h to get ssize_t definitions
Fixes errors like
@@ -18,15 +21,20 @@ Fixes errors like
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Index: obexd-0.44/plugins/mas.c
-===================================================================
---- obexd-0.44.orig/plugins/mas.c 2012-01-11 14:53:53.000000000 -0800
-+++ obexd-0.44/plugins/mas.c 2013-01-08 12:51:12.681882174 -0800
-@@ -29,6 +29,7 @@
+
+---
+ plugins/mas.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/plugins/mas.c b/plugins/mas.c
+index 1b18059..b519507 100644
+--- a/plugins/mas.c
++++ b/plugins/mas.c
+@@ -30,6 +30,7 @@
#include <glib.h>
#include <fcntl.h>
#include <inttypes.h>
+#include <unistd.h>
- #include "obexd.h"
- #include "plugin.h"
+ #include <gobex/gobex.h>
+ #include <gobex/gobex-apparam.h>