[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7263/8267] ncurses: 6.0+20161126 -> 6.0+20170715

[Emmanuele Bassi <ebassi src gnome org>]

commit 624801e0b72d8d5ef1b34b003783234fa6fc89fc
Author: Hongxu Jia <hongxu jia windriver com>
Date:   Wed Aug 16 04:31:22 2017 -0400

    ncurses: 6.0+20161126 -> 6.0+20170715
    
    Rebase patches:
    - tic-hang.patch -> 0001
    - configure-reproducible.patch -> 0002
    
    Drop fix-cflags-mangle.patch, which accepted by upstream
    ...
    commit 1b74f120ab7be89011408a6ad0f1c748a314bae8
    Author: Sven Joachim <svenjoac gmx de>
    Date:   Sun Feb 26 09:01:34 2017 +0100
    
        Import upstream patch 20170225
    
        20170225
            + fixes for CF_CC_ENV_FLAGS (report by Ross Burton).
    ...
    
    (From OE-Core rev: a4ad0703e1209fee6cd89bf74088931785c4d8c7)
    
    Signed-off-by: Hongxu Jia <hongxu jia windriver com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../files/{tic-hang.patch => 0001-tic-hang.patch}  |   26 ++++++++++++---
 .../files/0002-configure-reproducible.patch        |   35 ++++++++++++++++++++
 .../ncurses/files/configure-reproducible.patch     |   20 -----------
 .../ncurses/files/fix-cflags-mangle.patch          |   18 ----------
 ...ses_6.0+20161126.bb => ncurses_6.0+20170715.bb} |    7 ++--
 5 files changed, 59 insertions(+), 47 deletions(-)
---
diff --git a/meta/recipes-core/ncurses/files/tic-hang.patch 
b/meta/recipes-core/ncurses/files/0001-tic-hang.patch
similarity index 63%
rename from meta/recipes-core/ncurses/files/tic-hang.patch
rename to meta/recipes-core/ncurses/files/0001-tic-hang.patch
index cba89d2..4a97056 100644
--- a/meta/recipes-core/ncurses/files/tic-hang.patch
+++ b/meta/recipes-core/ncurses/files/0001-tic-hang.patch
@@ -1,13 +1,26 @@
+From a95590f676209832fe0b27226e6de3cb50e2b97c Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu jia windriver com>
+Date: Wed, 16 Aug 2017 14:31:51 +0800
+Subject: [PATCH 1/2] tic hang
+
 Upstream-Status: Inappropriate [configuration]
 
 'tic' of some linux distributions (e.g. fedora 11) hang in an infinite
 loop when processing the original file.
 
-Index: ncurses-5.7/misc/terminfo.src
-===================================================================
---- ncurses-5.7.orig/misc/terminfo.src
-+++ ncurses-5.7/misc/terminfo.src
-@@ -3706,12 +3706,11 @@ konsole-xf3x|KDE console window with key
+Signed-off-by: anonymous
+
+Rebase to 6.0+20170715
+Signed-off-by: Hongxu Jia <hongxu jia windriver com>
+---
+ misc/terminfo.src | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/misc/terminfo.src b/misc/terminfo.src
+index ee3fab3..176d593 100644
+--- a/misc/terminfo.src
++++ b/misc/terminfo.src
+@@ -5177,12 +5177,11 @@ konsole-xf3x|KDE console window with keyboard for XFree86 3.x xterm,
  # The value for kbs reflects local customization rather than the settings used
  # for XFree86 xterm.
  konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm,
@@ -25,3 +38,6 @@ Index: ncurses-5.7/misc/terminfo.src
  # KDE's "vt100" keyboard has no relationship to any terminal that DEC made, but
  # it is still useful for deriving the other entries.
  konsole-vt100|KDE console window with vt100 (sic) keyboard,
+-- 
+1.8.3.1
+
diff --git a/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch 
b/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch
new file mode 100644
index 0000000..c47ce6a
--- /dev/null
+++ b/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch
@@ -0,0 +1,35 @@
+From 939c994f3756c2d6d3cab2e6a04d05fa7c2b1d56 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu jia windriver com>
+Date: Wed, 16 Aug 2017 14:45:27 +0800
+Subject: [PATCH 2/2] configure: reproducible
+
+"configure" enforces -U for ar flags, breaking deterministic builds.
+The flag was added to fix some vaguely specified "recent POSIX binutil
+build problems" in 2015.
+
+Upstream-Status: Pending
+Signed-off-by: Juro Bystricky <juro bystricky intel com>
+
+Rebase to Rebase to 6.0+20170715
+
+Signed-off-by: Hongxu Jia <hongxu jia windriver com>
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 7d7d2c1..f444354 100755
+--- a/configure
++++ b/configure
+@@ -4458,7 +4458,7 @@ if test "${cf_cv_ar_flags+set}" = set; then
+ else
+ 
+       cf_cv_ar_flags=unknown
+-      for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv
++      for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
+       do
+ 
+               # check if $ARFLAGS already contains this choice
+-- 
+1.8.3.1
+
diff --git a/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb 
b/meta/recipes-core/ncurses/ncurses_6.0+20170715.bb
similarity index 56%
rename from meta/recipes-core/ncurses/ncurses_6.0+20161126.bb
rename to meta/recipes-core/ncurses/ncurses_6.0+20170715.bb
index ace3108..127394c 100644
--- a/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb
+++ b/meta/recipes-core/ncurses/ncurses_6.0+20170715.bb
@@ -1,12 +1,11 @@
 require ncurses.inc
 
-SRC_URI += "file://tic-hang.patch \
-            file://fix-cflags-mangle.patch \
+SRC_URI += "file://0001-tic-hang.patch \
+            file://0002-configure-reproducible.patch \
             file://config.cache \
-            file://configure-reproducible.patch \
 "
 # commit id corresponds to the revision in package version
-SRCREV = "3db0bd19cb50e3d9b4f2cf15b7a102fe11302068"
+SRCREV = "52681a6a1a18b4d6eb1a716512d0dd827bd71c87"
 S = "${WORKDIR}/git"
 EXTRA_OECONF += "--with-abi-version=5"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)"