[ptxdist] [PATCH 01/13] ncurses: version bump 6.1 -> 6.2

[Robert Schwebel <r.schwebel@pengutronix.de>]

Patches have been ported, one new configure option.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 ...1-teach-ncurses-config-about-sysroot.patch | 28 ++++++-------------
 patches/{ncurses-6.1 => ncurses-6.2}/series   |  0
 rules/ncurses.make                            |  7 +++--
 3 files changed, 12 insertions(+), 23 deletions(-)
 rename patches/{ncurses-6.1 => ncurses-6.2}/0001-teach-ncurses-config-about-sysroot.patch (54%)
 rename patches/{ncurses-6.1 => ncurses-6.2}/series (100%)

diff --git a/patches/ncurses-6.1/0001-teach-ncurses-config-about-sysroot.patch b/patches/ncurses-6.2/0001-teach-ncurses-config-about-sysroot.patch
similarity index 54%
rename from patches/ncurses-6.1/0001-teach-ncurses-config-about-sysroot.patch
rename to patches/ncurses-6.2/0001-teach-ncurses-config-about-sysroot.patch
index 64a0e960a..707b5a49c 100644
--- a/patches/ncurses-6.1/0001-teach-ncurses-config-about-sysroot.patch
+++ b/patches/ncurses-6.2/0001-teach-ncurses-config-about-sysroot.patch
@@ -5,40 +5,28 @@ Subject: [PATCH] teach ncurses-config about sysroot
 This patch teaches ncurses-config about sysroot
 
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+[ported from ncurses 6.1 to 6.2]
+Signed-off-by: Robert Schwebel <rsc@pengutronix.de>
 ---
  misc/ncurses-config.in |   12 ++++++------
  1 files changed, 6 insertions(+), 6 deletions(-)
 
---- ncurses-6.1/misc/ncurses-config.in	2017-12-09 23:45:44.000000000 +0100
-+++ ncurses-6.1/misc/ncurses-config.in	2018-02-08 13:50:07.365266351 +0100
-@@ -101,21 +101,21 @@
+--- ncurses-6.2/misc/ncurses-config.in	2020-02-03 00:34:34.000000000 +0100
++++ ncurses-6.2-ptx/misc/ncurses-config.in	2020-07-25 23:28:48.123350040 +0200
+@@ -149,10 +149,10 @@
  	--cflags)
  		INCS="@PKG_CFLAGS@"
- 		if test "x@WITH_OVERWRITE@" = xno ; then
+ 		if [ "x@WITH_OVERWRITE@" = xno ]; then
 -			INCS="$INCS -I${includesubdir}"
 +			INCS="$INCS -I${SYSROOT}${includesubdir}"
  		fi
--		if test "${includedir}" != /usr/include ; then
+ 		if [ "${includedir}" != /usr/include ]; then
 -			INCS="$INCS -I${includedir}"
-+		if test "${SYSROOT}${includedir}" != /usr/include ; then
 +			INCS="$INCS -I${SYSROOT}${includedir}"
  		fi
  		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
  			$INCS
- ENDECHO
- 		;;
- 	--libs)
--		if test "$libdir" = /usr/lib
-+		if test "${SYSROOT}$libdir" = /usr/lib
- 		then
- 			LIBDIR=
- 		else
--			LIBDIR=-L$libdir
-+			LIBDIR=-L${SYSROOT}$libdir
- 		fi
- 		if test @TINFO_NAME@ = @LIB_NAME@ ; then
- 		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
-@@ -154,7 +154,7 @@
+@@ -235,7 +235,7 @@
  		echo $INCS
  		;;
  	--libdir)
diff --git a/patches/ncurses-6.1/series b/patches/ncurses-6.2/series
similarity index 100%
rename from patches/ncurses-6.1/series
rename to patches/ncurses-6.2/series
diff --git a/rules/ncurses.make b/rules/ncurses.make
index 3d2e75ce9..6a7a13ef1 100644
--- a/rules/ncurses.make
+++ b/rules/ncurses.make
@@ -13,16 +13,16 @@ PACKAGES-$(PTXCONF_NCURSES) += ncurses
 #
 # Paths and names
 #
-NCURSES_VERSION	:= 6.1
+NCURSES_VERSION	:= 6.2
 NCURSES_MAJOR	:= $(word 1,$(subst ., ,$(NCURSES_VERSION)))
-NCURSES_MD5	:= 98c889aaf8d23910d2b92d65be2e737a
+NCURSES_MD5	:= e812da327b1c2214ac1aed440ea3ae8d
 NCURSES		:= ncurses-$(NCURSES_VERSION)
 NCURSES_SUFFIX	:= tar.gz
 NCURSES_URL	:= $(call ptx/mirror, GNU, ncurses/$(NCURSES).$(NCURSES_SUFFIX))
 NCURSES_SOURCE	:= $(SRCDIR)/$(NCURSES).$(NCURSES_SUFFIX)
 NCURSES_DIR	:= $(BUILDDIR)/$(NCURSES)
 NCURSES_LICENSE	:= MIT
-NCURSES_LICENSE_FILES := file://COPYING;md5=8a241caac0fd66225f7ac2d1b2ef76ac
+NCURSES_LICENSE_FILES := file://COPYING;md5=910e05334f7e0b7631da6b4ebb1e1aab
 
 # ----------------------------------------------------------------------------
 # Prepare
@@ -61,6 +61,7 @@ NCURSES_AUTOCONF_SHARED = \
 	--without-ticlib \
 	--without-gpm \
 	--without-dlsym \
+	--without-pcre2 \
 	--without-sysmouse \
 	--disable-rpath \
 	--disable-relink \
-- 
2.27.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de