helium-3rd-party/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky synced 2026-04-02 02:49:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

gobject-introspection: refresh patches

Browse Source 
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>
This commit is contained in:
Ross Burton 2017-11-15 16:47:53 +00:00 committed by Richard Purdie
parent 25c3d4e31d
commit 1ac7ffcbdf
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
View File

@ -32,10 +32,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
tests/Makefile.am | 5 ++++-
4 files changed, 87 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index b080a89..ce8d29b 100644
--- a/Makefile.am
+++ b/Makefile.am
Index: gobject-introspection-1.52.1/Makefile.am
===================================================================
--- gobject-introspection-1.52.1.orig/Makefile.am
+++ gobject-introspection-1.52.1/Makefile.am
@@ -21,7 +21,9 @@ include Makefile-cmph.am
include Makefile-girepository.am
include Makefile-giscanner.am
@ -46,10 +46,10 @@ index b080a89..ce8d29b 100644
include Makefile-tools.am
include Makefile-msvcproj.am
diff --git a/common.mk b/common.mk
index e26c637..9f3a65f 100644
--- a/common.mk
+++ b/common.mk
Index: gobject-introspection-1.52.1/common.mk
===================================================================
--- gobject-introspection-1.52.1.orig/common.mk
+++ gobject-introspection-1.52.1/common.mk
@@ -6,6 +6,15 @@
# module itself.
#
@ -130,13 +130,13 @@ index e26c637..9f3a65f 100644
INTROSPECTION_DOCTOOL_ARGS = \
--add-include-path=$(srcdir) \
diff --git a/configure.ac b/configure.ac
index 6c91fa5..21340a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -360,6 +360,48 @@ fi
AC_SUBST(EXTRA_LINK_FLAGS)
Index: gobject-introspection-1.52.1/configure.ac
===================================================================
--- gobject-introspection-1.52.1.orig/configure.ac
+++ gobject-introspection-1.52.1/configure.ac
@@ -366,6 +366,48 @@ dnl
AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x])
AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x])
+AC_ARG_ENABLE([host-gi],
+[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
AC_CONFIG_FILES([
Makefile
tests/Makefile
diff --git a/tests/Makefile.am b/tests/Makefile.am
index bdd0fa7..75dd3c9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
Index: gobject-introspection-1.52.1/tests/Makefile.am
===================================================================
--- gobject-introspection-1.52.1.orig/tests/Makefile.am
+++ gobject-introspection-1.52.1/tests/Makefile.am
@@ -1,6 +1,9 @@
include $(top_srcdir)/common.mk
@ -198,6 +198,3 @@ index bdd0fa7..75dd3c9 100644
EXTRA_DIST=
BUILT_SOURCES=
--
2.7.0