From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
In-Reply-To: <20200726142436.3113607-1-r.schwebel@pengutronix.de>
MIME-Version: 1.0
Message-Id: <E1k2Tz4-0002Wz-Ew@dude02.hi.pengutronix.de>
From: Michael Olbrich <mol@pengutronix.de>
Date: Mon, 03 Aug 2020 08:30:06 +0200
Subject: Re: [ptxdist] [APPLIED] ncurses: version bump 6.1 -> 6.2
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ptxdist-bounces@pengutronix.de
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>

Thanks, applied as bd70980bdc8b561dd65aec54e62e39cdf79ec13a.

Michael

[sent from post-receive hook]

On Mon, 03 Aug 2020 08:30:06 +0200, Robert Schwebel <r.schwebel@pengutronix.de> wrote:
> Patches have been ported, one new configure option.
> 
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> Message-Id: <20200726142436.3113607-1-r.schwebel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> 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 64a0e960afc0..707b5a49c065 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 3d2e75ce9420..6a7a13ef19f9 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 \

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