summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-11-15 16:47:41 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-07 06:34:50 -0800
commit25c3d4e31dabaed18fc2d8856979fcd0a2bfe15e (patch)
treec5c8d14565c7b67664163813f84bc28f030bf411 /meta
parentc141184cc7a6a1b432fc127873126aff116e56a9 (diff)
downloadpoky-25c3d4e31dabaed18fc2d8856979fcd0a2bfe15e.tar.gz
dbus-glib: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: 9f15e5256eb79c8cfc4b3a4e11617eeb5f38edea) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/dbus/dbus-glib/no-examples.patch10
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/recipes-core/dbus/dbus-glib/no-examples.patch b/meta/recipes-core/dbus/dbus-glib/no-examples.patch
index fbb4967828..32e7611718 100644
--- a/meta/recipes-core/dbus/dbus-glib/no-examples.patch
+++ b/meta/recipes-core/dbus/dbus-glib/no-examples.patch
@@ -5,11 +5,13 @@ Upstream-Status: Inappropriate [disable feature]
5Signed-off-by: Kevin Tian <kevin.tian@intel.com> 5Signed-off-by: Kevin Tian <kevin.tian@intel.com>
6Signed-off-by: Scott Garman <scott.a.garman@intel.com> 6Signed-off-by: Scott Garman <scott.a.garman@intel.com>
7 7
8--- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200 8Index: dbus-glib-0.108/dbus/Makefile.am
9+++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200 9===================================================================
10--- dbus-glib-0.108.orig/dbus/Makefile.am
11+++ dbus-glib-0.108/dbus/Makefile.am
10@@ -1,4 +1,4 @@ 12@@ -1,4 +1,4 @@
11-SUBDIRS = . examples 13-SUBDIRS = . examples
12+SUBDIRS = . 14+SUBDIRS = .
13 15
14 INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" 16 AM_CPPFLAGS = \
15 17 -I$(top_srcdir) \