summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-11-15 16:47:53 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-07 06:34:50 -0800
commit1ac7ffcbdf2e551f7264e5a2eb2cca88fe6ea3b2 (patch)
tree64ead788e5be8843e28a0eccd8711abb56f7fb21 /meta
parent25c3d4e31dabaed18fc2d8856979fcd0a2bfe15e (diff)
downloadpoky-1ac7ffcbdf2e551f7264e5a2eb2cca88fe6ea3b2.tar.gz
gobject-introspection: 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: 5a72d04296cc7aea5893cba29c6da1cf1469911b) 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-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch41
1 files changed, 19 insertions, 22 deletions
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
index 48a0c85f02..c682b42af6 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
@@ -32,10 +32,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
32 tests/Makefile.am | 5 ++++- 32 tests/Makefile.am | 5 ++++-
33 4 files changed, 87 insertions(+), 1 deletion(-) 33 4 files changed, 87 insertions(+), 1 deletion(-)
34 34
35diff --git a/Makefile.am b/Makefile.am 35Index: gobject-introspection-1.52.1/Makefile.am
36index b080a89..ce8d29b 100644 36===================================================================
37--- a/Makefile.am 37--- gobject-introspection-1.52.1.orig/Makefile.am
38+++ b/Makefile.am 38+++ gobject-introspection-1.52.1/Makefile.am
39@@ -21,7 +21,9 @@ include Makefile-cmph.am 39@@ -21,7 +21,9 @@ include Makefile-cmph.am
40 include Makefile-girepository.am 40 include Makefile-girepository.am
41 include Makefile-giscanner.am 41 include Makefile-giscanner.am
@@ -46,10 +46,10 @@ index b080a89..ce8d29b 100644
46 include Makefile-tools.am 46 include Makefile-tools.am
47 include Makefile-msvcproj.am 47 include Makefile-msvcproj.am
48 48
49diff --git a/common.mk b/common.mk 49Index: gobject-introspection-1.52.1/common.mk
50index e26c637..9f3a65f 100644 50===================================================================
51--- a/common.mk 51--- gobject-introspection-1.52.1.orig/common.mk
52+++ b/common.mk 52+++ gobject-introspection-1.52.1/common.mk
53@@ -6,6 +6,15 @@ 53@@ -6,6 +6,15 @@
54 # module itself. 54 # module itself.
55 # 55 #
@@ -130,13 +130,13 @@ index e26c637..9f3a65f 100644
130 130
131 INTROSPECTION_DOCTOOL_ARGS = \ 131 INTROSPECTION_DOCTOOL_ARGS = \
132 --add-include-path=$(srcdir) \ 132 --add-include-path=$(srcdir) \
133diff --git a/configure.ac b/configure.ac 133Index: gobject-introspection-1.52.1/configure.ac
134index 6c91fa5..21340a5 100644 134===================================================================
135--- a/configure.ac 135--- gobject-introspection-1.52.1.orig/configure.ac
136+++ b/configure.ac 136+++ gobject-introspection-1.52.1/configure.ac
137@@ -360,6 +360,48 @@ fi 137@@ -366,6 +366,48 @@ dnl
138 138 AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x])
139 AC_SUBST(EXTRA_LINK_FLAGS) 139 AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x])
140 140
141+AC_ARG_ENABLE([host-gi], 141+AC_ARG_ENABLE([host-gi],
142+[AS_HELP_STRING([--enable-host-gi],[Use gobject introspection tools installed in the host system (useful when cross-compiling)])], 142+[AS_HELP_STRING([--enable-host-gi],[Use gobject introspection tools installed in the host system (useful when cross-compiling)])],
@@ -183,10 +183,10 @@ index 6c91fa5..21340a5 100644
183 AC_CONFIG_FILES([ 183 AC_CONFIG_FILES([
184 Makefile 184 Makefile
185 tests/Makefile 185 tests/Makefile
186diff --git a/tests/Makefile.am b/tests/Makefile.am 186Index: gobject-introspection-1.52.1/tests/Makefile.am
187index bdd0fa7..75dd3c9 100644 187===================================================================
188--- a/tests/Makefile.am 188--- gobject-introspection-1.52.1.orig/tests/Makefile.am
189+++ b/tests/Makefile.am 189+++ gobject-introspection-1.52.1/tests/Makefile.am
190@@ -1,6 +1,9 @@ 190@@ -1,6 +1,9 @@
191 include $(top_srcdir)/common.mk 191 include $(top_srcdir)/common.mk
192 192
@@ -198,6 +198,3 @@ index bdd0fa7..75dd3c9 100644
198 198
199 EXTRA_DIST= 199 EXTRA_DIST=
200 BUILT_SOURCES= 200 BUILT_SOURCES=
201--
2022.7.0
203