gtk+: 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: 7ac8688c9fce49a005cbe9afe028453f6fea4e79)

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 1ac7ffcbdf
commit 4a566242ab

View File

@@ -3,19 +3,20 @@ Upstream-Status: Inappropriate [embedded specific]
Updated to apply to gtk+-2.24.15
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
diff -Nurd gtk+-2.24.15/configure.ac gtk+-2.24.15/configure.ac
--- gtk+-2.24.15/configure.ac 2013-01-12 20:52:54.000000000 +0200
+++ gtk+-2.24.15/configure.ac 2013-02-12 21:33:30.689925967 +0200
@@ -415,7 +415,7 @@
Index: gtk+-2.24.31/configure.ac
===================================================================
--- gtk+-2.24.31.orig/configure.ac
+++ gtk+-2.24.31/configure.ac
@@ -415,7 +415,7 @@ AC_MSG_CHECKING([Whether to write depend
case $enable_explicit_deps in
auto)
export SED
- deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
+ deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
enable_explicit_deps=yes
enable_explicit_deps=yes
else
@@ -774,7 +774,7 @@
@@ -772,7 +772,7 @@ else
dnl Now we check to see if our libtool supports shared lib deps
dnl (in a rather ugly way even)
if $dynworks; then
@@ -24,7 +25,7 @@ diff -Nurd gtk+-2.24.15/configure.ac gtk+-2.24.15/configure.ac
module_deplibs_check=`$module_libtool_config | \
grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
@@ -1574,7 +1574,7 @@
@@ -1579,7 +1579,7 @@ fi
# We are using gmodule-no-export now, but I'm leaving the stripping
# code in place for now, since pango and atk still require gmodule.
export SED