On Sun, Jul 26, 2020 at 04:24:31PM +0200, Robert Schwebel wrote: > There is one new configure option; the patche have been forward-ported > and are still valid. > > Signed-off-by: Robert Schwebel <[email protected]> > --- > .../0001-rl-attribute.patch | 10 +++++++--- > .../0002-rl-header.patch | 10 +++++++--- > .../0003-rl-no-rpath.patch | 8 ++++++-- > .../0004-rlfe-history.patch | 6 +++++- > ...005-always-link-against-our-termcap-libraries.patch | 6 +++++- > patches/{readline-7.0 => readline-8.0}/series | 3 --- > rules/readline.make | 5 +++-- > 7 files changed, 33 insertions(+), 15 deletions(-) > rename patches/{readline-7.0 => readline-8.0}/0001-rl-attribute.patch (84%) > rename patches/{readline-7.0 => readline-8.0}/0002-rl-header.patch (81%) > rename patches/{readline-7.0 => readline-8.0}/0003-rl-no-rpath.patch (83%) > rename patches/{readline-7.0 => readline-8.0}/0004-rlfe-history.patch (92%) > rename patches/{readline-7.0 => > readline-8.0}/0005-always-link-against-our-termcap-libraries.patch (89%) > rename patches/{readline-7.0 => readline-8.0}/series (55%) > > diff --git a/patches/readline-7.0/0001-rl-attribute.patch > b/patches/readline-8.0/0001-rl-attribute.patch > similarity index 84% > rename from patches/readline-7.0/0001-rl-attribute.patch > rename to patches/readline-8.0/0001-rl-attribute.patch > index ac9bd84e8..a4fe2d9cd 100644 > --- a/patches/readline-7.0/0001-rl-attribute.patch > +++ b/patches/readline-8.0/0001-rl-attribute.patch > @@ -1,6 +1,7 @@ > +From dbf7a7e80d4abfd38999a64f8e0bb00367db7203 Mon Sep 17 00:00:00 2001 > From: "[email protected]" <[email protected]> > Date: Sun, 24 Jan 2010 00:31:09 +0100 > -Subject: [PATCH] rl-attribute. > +Subject: [PATCH 1/5] rl-attribute. > > rl-attribute.dpatch by <[email protected]> > > @@ -14,10 +15,10 @@ Signed-off-by: Marc Kleine-Budde <[email protected]> > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/readline.h b/readline.h > -index 924bbfb0f213..b1a177a577d5 100644 > +index da782716af2a..5858147b2e8d 100644 > --- a/readline.h > +++ b/readline.h > -@@ -385,7 +385,7 @@ extern int rl_reset_line_state PARAMS((void)); > +@@ -393,7 +393,7 @@ extern int rl_reset_line_state PARAMS((void)); > extern int rl_crlf PARAMS((void)); > > #if defined (USE_VARARGS) && defined (PREFER_STDARG) > @@ -45,3 +46,6 @@ index 2aaa30babfbd..82b607cb35df 100644 > #endif > > /* Moved from config.h.in because readline.h:rl_message depends on these > +-- > +2.27.0 > + > diff --git a/patches/readline-7.0/0002-rl-header.patch > b/patches/readline-8.0/0002-rl-header.patch > similarity index 81% > rename from patches/readline-7.0/0002-rl-header.patch > rename to patches/readline-8.0/0002-rl-header.patch > index 94a7f616e..04135a956 100644 > --- a/patches/readline-7.0/0002-rl-header.patch > +++ b/patches/readline-8.0/0002-rl-header.patch > @@ -1,6 +1,7 @@ > +From fb98ee08894cbb46e0a5ea9a6ca5e77ab2adfbb4 Mon Sep 17 00:00:00 2001 > From: "[email protected]" <[email protected]> > Date: Sun, 24 Jan 2010 00:31:22 +0100 > -Subject: [PATCH] rl-header. > +Subject: [PATCH 2/5] rl-header. > > rl-header.dpatch by <[email protected]> > > @@ -14,7 +15,7 @@ Signed-off-by: Marc Kleine-Budde <[email protected]> > 2 files changed, 2 insertions(+) > > diff --git a/history.h b/history.h > -index 8ce7c805d168..8d568a79fa29 100644 > +index cc3de29a6423..24cd63ce111c 100644 > --- a/history.h > +++ b/history.h > @@ -32,6 +32,7 @@ extern "C" { > @@ -26,7 +27,7 @@ index 8ce7c805d168..8d568a79fa29 100644 > # include <readline/rltypedefs.h> > #endif > diff --git a/readline.h b/readline.h > -index b1a177a577d5..06c2abe61736 100644 > +index 5858147b2e8d..7d4ecd2346fa 100644 > --- a/readline.h > +++ b/readline.h > @@ -32,6 +32,7 @@ extern "C" { > @@ -37,3 +38,6 @@ index b1a177a577d5..06c2abe61736 100644 > # include <readline/rlstdc.h> > # include <readline/rltypedefs.h> > # include <readline/keymaps.h> > +-- > +2.27.0 > + > diff --git a/patches/readline-7.0/0003-rl-no-rpath.patch > b/patches/readline-8.0/0003-rl-no-rpath.patch > similarity index 83% > rename from patches/readline-7.0/0003-rl-no-rpath.patch > rename to patches/readline-8.0/0003-rl-no-rpath.patch > index 5a97e715e..2ca05de1c 100644 > --- a/patches/readline-7.0/0003-rl-no-rpath.patch > +++ b/patches/readline-8.0/0003-rl-no-rpath.patch > @@ -1,6 +1,7 @@ > +From fc7215492dc479db9b01cc4ef6eb288c3a06bbee Mon Sep 17 00:00:00 2001 > From: "[email protected]" <[email protected]> > Date: Sun, 24 Jan 2010 00:31:36 +0100 > -Subject: [PATCH] rl-no-rpath. > +Subject: [PATCH 3/5] rl-no-rpath. > > rl-no-rpath.dpatch by <[email protected]> > > @@ -13,7 +14,7 @@ Signed-off-by: Marc Kleine-Budde <[email protected]> > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/support/shobj-conf b/support/shobj-conf > -index 1f64433dea83..ce435d7db254 100644 > +index 7920f1b5cb90..7ac9c9fb311d 100644 > --- a/support/shobj-conf > +++ b/support/shobj-conf > @@ -128,7 +128,7 @@ linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo) > @@ -25,3 +26,6 @@ index 1f64433dea83..ce435d7db254 100644 > SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' > ;; > > +-- > +2.27.0 > + > diff --git a/patches/readline-7.0/0004-rlfe-history.patch > b/patches/readline-8.0/0004-rlfe-history.patch > similarity index 92% > rename from patches/readline-7.0/0004-rlfe-history.patch > rename to patches/readline-8.0/0004-rlfe-history.patch > index 1bd44d33f..b78bab45e 100644 > --- a/patches/readline-7.0/0004-rlfe-history.patch > +++ b/patches/readline-8.0/0004-rlfe-history.patch > @@ -1,6 +1,7 @@ > +From 0d58b129904d451ca3d3b5aee041f576c29906ad Mon Sep 17 00:00:00 2001 > From: "[email protected]" <[email protected]> > Date: Sun, 24 Jan 2010 00:31:48 +0100 > -Subject: [PATCH] rlfe-history. > +Subject: [PATCH 4/5] rlfe-history. > > rlfe-history.dpatch by <[email protected]> > > @@ -58,3 +59,6 @@ index f40b2ddaf00f..89bb17e462db 100644 > } > old_count = buf_count; > > +-- > +2.27.0 > + > diff --git > a/patches/readline-7.0/0005-always-link-against-our-termcap-libraries.patch > b/patches/readline-8.0/0005-always-link-against-our-termcap-libraries.patch > similarity index 89% > rename from > patches/readline-7.0/0005-always-link-against-our-termcap-libraries.patch > rename to > patches/readline-8.0/0005-always-link-against-our-termcap-libraries.patch > index 20cac9fe5..3a817f423 100644 > --- > a/patches/readline-7.0/0005-always-link-against-our-termcap-libraries.patch > +++ > b/patches/readline-8.0/0005-always-link-against-our-termcap-libraries.patch > @@ -1,6 +1,7 @@ > +From 10e1cac0a0ab576338ce8e5978f7140bec2c9e72 Mon Sep 17 00:00:00 2001 > From: Marc Kleine-Budde <[email protected]> > Date: Sun, 24 Jan 2010 00:32:08 +0100 > -Subject: [PATCH] always link against our $termcap libraries > +Subject: [PATCH 5/5] always link against our $termcap libraries > > This way our $user doesn't need to know wich $termcap library > we linked against. > @@ -31,3 +32,6 @@ index f2ec3e46b7ba..3298008abec4 100644 > > # Since tilde.c is shared between readline and bash, make sure we compile > # it with the right flags when it's built as part of readline > +-- > +2.27.0 > + > diff --git a/patches/readline-7.0/series b/patches/readline-8.0/series > similarity index 55% > rename from patches/readline-7.0/series > rename to patches/readline-8.0/series > index 5b5cd2fea..0eb1c742a 100644 > --- a/patches/readline-7.0/series > +++ b/patches/readline-8.0/series > @@ -1,8 +1,5 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > 0001-rl-attribute.patch > 0002-rl-header.patch > 0003-rl-no-rpath.patch > 0004-rlfe-history.patch > 0005-always-link-against-our-termcap-libraries.patch > -# 7b8eea3fcea421a1233d1d9232c74be5 - git-ptx-patches magic
Hmm, the patches look like you used git to apply them, but git-ptx-patches should then also update these lines instead of removing them. What went wrong here? Note that for PTXdist patch series, we want to use git-ptx-patches in all cases now to prevent unnecessary patches to the series file. - Roland > diff --git a/rules/readline.make b/rules/readline.make > index 4cb9663f2..14b89cfb9 100644 > --- a/rules/readline.make > +++ b/rules/readline.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_READLINE) += readline > # > # Paths and names > # > -READLINE_VERSION := 7.0 > -READLINE_MD5 := 205b03a87fc83dab653b628c59b9fc91 > +READLINE_VERSION := 8.0 > +READLINE_MD5 := 7e6c1f16aee3244a69aba6e438295ca3 > READLINE := readline-$(READLINE_VERSION) > READLINE_SUFFIX := tar.gz > READLINE_URL := $(call ptx/mirror, GNU, > readline/$(READLINE).$(READLINE_SUFFIX)) > @@ -34,6 +34,7 @@ READLINE_AUTOCONF := \ > --disable-multibyte \ > --enable-shared \ > --disable-static\ > + --disable-install-examples \ > $(GLOBAL_LARGE_FILE_OPTION) \ > --$(call ptx/wwo,PTXCONF_READLINE_NCURSES)-curses > > -- > 2.27.0 > > > _______________________________________________ > ptxdist mailing list > [email protected] > To unsubscribe, send a mail with subject "unsubscribe" to > [email protected] > -- Roland Hieber, Pengutronix e.K. | [email protected] | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
