| Message ID | 20240702070232.2373630-1-dario.binacchi@amarulasolutions.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
On 02/07/2024 09:02, Dario Binacchi wrote: > Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum > fuzz factor to 0") reduced the fuzz factor. > > Due to this change, gpm fails to build with output: > > Applying 0003-src-Makefile.in-Really-install-unversioned-solibrary.patch using patch: > patching file src/Makefile.in > Hunk #1 FAILED at 115. > 1 out of 1 hunk FAILED -- saving rejects to file src/Makefile.in.rej > > This commit refreshes the package patch on the current package version. > > Fixes: 8f88a644ed7d6c9ea55fd4fbe9d7f37055920016 > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> > --- > ...efile.in-Really-install-unversioned-solibrary.patch | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch b/package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch > index 259180197696..2105bbbf6a0c 100644 > --- a/package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch > +++ b/package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch > @@ -1,4 +1,4 @@ > -From 445be05fba32c512fd87a0c98b4e9936629ef95e Mon Sep 17 00:00:00 2001 > +From 5b83edaa20f6ecf97d16e323be1ed555d8fa2c01 Mon Sep 17 00:00:00 2001 > From: Bernd Kuhls <bernd.kuhls@t-online.de> > Date: Sat, 20 Feb 2016 17:59:52 +0100 > Subject: [PATCH] src/Makefile.in: Really install unversioned solibrary > @@ -10,22 +10,24 @@ which created libgpm.so but failed to include it in the install target. > Patch sent upstream: https://github.com/telmich/gpm/pull/11 I've also changed this to a proper Upstream: tag, updated .checkpackageignore accordingly. Applied to master, thanks. Regards, Arnout > > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > +[Dario: make the patch to be applied with fuzz factor 0] > +Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> > --- > src/Makefile.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/src/Makefile.in b/src/Makefile.in > -index 7e9e2ef..bca226f 100644 > +index b63e4f4489bd..a1838c300312 100644 > --- a/src/Makefile.in > +++ b/src/Makefile.in > @@ -115,6 +115,7 @@ install: check > if test "x@SHLIB@" != "x" ; then \ > - $(INSTALL_DATA) -m 755 lib/libgpm.so.@abi_full@ $(libdir)/libgpm.so.@abi_full@ ; \ > + $(INSTALL_DATA) -m 644 lib/libgpm.so.@abi_full@ $(libdir)/libgpm.so.@abi_full@ ; \ > cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so.@abi_lev@ ; \ > + cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so ; \ > echo "WARNING: We installed a lib, you should now call ldconfig" ; \ > echo "f.i.: ldconfig -n -l $(libdir)/libgpm.so.@abi_full@" ; \ > echo "Or to update everything just type ldconfig" ; \ > -- > -2.7.0 > +2.43.0 > To unsubscribe from this group and stop receiving emails from it, send an email to linux-amarula+unsubscribe@amarulasolutions.com.
diff --git a/package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch b/package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch index 259180197696..2105bbbf6a0c 100644 --- a/package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch +++ b/package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch @@ -1,4 +1,4 @@ -From 445be05fba32c512fd87a0c98b4e9936629ef95e Mon Sep 17 00:00:00 2001 +From 5b83edaa20f6ecf97d16e323be1ed555d8fa2c01 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls <bernd.kuhls@t-online.de> Date: Sat, 20 Feb 2016 17:59:52 +0100 Subject: [PATCH] src/Makefile.in: Really install unversioned solibrary @@ -10,22 +10,24 @@ which created libgpm.so but failed to include it in the install target. Patch sent upstream: https://github.com/telmich/gpm/pull/11 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> --- src/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile.in b/src/Makefile.in -index 7e9e2ef..bca226f 100644 +index b63e4f4489bd..a1838c300312 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -115,6 +115,7 @@ install: check if test "x@SHLIB@" != "x" ; then \ - $(INSTALL_DATA) -m 755 lib/libgpm.so.@abi_full@ $(libdir)/libgpm.so.@abi_full@ ; \ + $(INSTALL_DATA) -m 644 lib/libgpm.so.@abi_full@ $(libdir)/libgpm.so.@abi_full@ ; \ cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so.@abi_lev@ ; \ + cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so ; \ echo "WARNING: We installed a lib, you should now call ldconfig" ; \ echo "f.i.: ldconfig -n -l $(libdir)/libgpm.so.@abi_full@" ; \ echo "Or to update everything just type ldconfig" ; \ -- -2.7.0 +2.43.0
Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, gpm fails to build with output: Applying 0003-src-Makefile.in-Really-install-unversioned-solibrary.patch using patch: patching file src/Makefile.in Hunk #1 FAILED at 115. 1 out of 1 hunk FAILED -- saving rejects to file src/Makefile.in.rej This commit refreshes the package patch on the current package version. Fixes: 8f88a644ed7d6c9ea55fd4fbe9d7f37055920016 Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> --- ...efile.in-Really-install-unversioned-solibrary.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)