quilt-native_0.48: Patch to properly detect newer versions of GNU patch is added.

New versions of GNU patch present themselves as "GNU patch" instead
of just "patch".
NOTE1: both configure.ac and configure are patched because we have
no native autotools at that stage.
NOTE2: encountered on ALT Linux Sisyphus (testing branch).

diff --git a/recipes/quilt/quilt-0.48/fix_new_GNU_patch_detection.patch b/recipes/quilt/quilt-0.48/fix_new_GNU_patch_detection.patch
new file mode 100644 (file)
index 0000000..f790f76
--- /dev/null
+++ b/recipes/quilt/quilt-0.48/fix_new_GNU_patch_detection.patch
@@ -0,0 +1,36 @@
+# origin: http://git.savannah.gnu.org/cgit/quilt.git/commit/?id=38df0b210c3df67f3e784af92232ae1946b98ecd
+# Properly detect newer versions of GNU patch
+# New versions of GNU patch present themselves as "GNU patch" instead of just "patch".
+
+diff --git a/configure.ac b/configure.ac
+index 9d4a62e..cc850fa 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -262,7 +262,11 @@ fi
+ AC_MSG_CHECKING([the version of $PATCH])
+ if $PATCH --version 2> /dev/null | grep GNU >/dev/null; then
+   set -- `$PATCH --version 2> /dev/null`
+-  patch_version=$2
++  if test x$1 = xGNU ; then
++    patch_version=$3
++  else
++    patch_version=$2
++  fi
+   AC_MSG_RESULT($patch_version)
+   saved_IFS=$IFS; IFS='.'
+   set -- $patch_version
+--- a/configure
++++ b/configure
+@@ -5896,7 +5896,11 @@
+ echo $ECHO_N "checking the version of $PATCH... $ECHO_C" >&6; }
+ if $PATCH --version 2> /dev/null | grep GNU >/dev/null; then
+   set -- `$PATCH --version 2> /dev/null`
+-  patch_version=$2
++  if test x$1 = xGNU ; then
++    patch_version=$3
++  else
++    patch_version=$2
++  fi
+   { echo "$as_me:$LINENO: result: $patch_version" >&5
+ echo "${ECHO_T}$patch_version" >&6; }
+   saved_IFS=$IFS; IFS='.'

diff --git a/recipes/quilt/quilt-native_0.48.bb b/recipes/quilt/quilt-native_0.48.bb
index e3e6cda..5b4449b 100644 (file)
--- a/recipes/quilt/quilt-native_0.48.bb
+++ b/recipes/quilt/quilt-native_0.48.bb
@@ -1,6 +1,8 @@
 require quilt-native.inc
 
-PR="r2"
+PR="r3"
+
+SRC_URI_append = "file://fix_new_GNU_patch_detection.patch"
 
 SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
 SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc"