Skip to content

Commit 9a118c7

Browse files
passgatjacmet
authored andcommitted
package/gpm: update the patches to be applied with fuzz 0
Commit 8f88a64 ("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. While we're at it, change to use a proper Upstream: tag and remove from .checkpackageignore. Fixes: 8f88a64 Signed-off-by: Dario Binacchi <[email protected]> Signed-off-by: Arnout Vandecappelle <[email protected]> (cherry picked from commit d47ae17) Signed-off-by: Peter Korsgaard <[email protected]>
1 parent 50b13c9 commit 9a118c7

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.checkpackageignore

-1
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,6 @@ package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch lib_patch.
699699
package/gobject-introspection/0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch lib_patch.Upstream
700700
package/gpm/0001-Added-musl-support-to-libgpm-and-the-daemon.patch lib_patch.Upstream
701701
package/gpm/0002-Install-unversioned-solibrary.patch lib_patch.Upstream
702-
package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch lib_patch.Upstream
703702
package/gpm/0004-Use-sigemptyset-API-instead-of-__sigemptyset.patch lib_patch.Upstream
704703
package/gpm/0005-fix-building-w-newer-glibc.patch lib_patch.Upstream
705704
package/gpm/0006-src-headers-daemon.h-avoid-redefinition-of-last_sele.patch lib_patch.Upstream
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 445be05fba32c512fd87a0c98b4e9936629ef95e Mon Sep 17 00:00:00 2001
1+
From 5b83edaa20f6ecf97d16e323be1ed555d8fa2c01 Mon Sep 17 00:00:00 2001
22
From: Bernd Kuhls <[email protected]>
33
Date: Sat, 20 Feb 2016 17:59:52 +0100
44
Subject: [PATCH] src/Makefile.in: Really install unversioned solibrary
@@ -7,25 +7,27 @@ This commit is a follow-up to
77
https://github.com/telmich/gpm/commit/06b00d53d8bd513ad5d262dc94a016c6fbf2d3aa
88
which created libgpm.so but failed to include it in the install target.
99

10-
Patch sent upstream: https://github.com/telmich/gpm/pull/11
10+
Upstream: https://github.com/telmich/gpm/pull/11
1111

1212
Signed-off-by: Bernd Kuhls <[email protected]>
13+
[Dario: make the patch to be applied with fuzz factor 0]
14+
Signed-off-by: Dario Binacchi <[email protected]>
1315
---
1416
src/Makefile.in | 1 +
1517
1 file changed, 1 insertion(+)
1618

1719
diff --git a/src/Makefile.in b/src/Makefile.in
18-
index 7e9e2ef..bca226f 100644
20+
index b63e4f4489bd..a1838c300312 100644
1921
--- a/src/Makefile.in
2022
+++ b/src/Makefile.in
2123
@@ -115,6 +115,7 @@ install: check
2224
if test "x@SHLIB@" != "x" ; then \
23-
$(INSTALL_DATA) -m 755 lib/libgpm.so.@abi_full@ $(libdir)/libgpm.so.@abi_full@ ; \
25+
$(INSTALL_DATA) -m 644 lib/libgpm.so.@abi_full@ $(libdir)/libgpm.so.@abi_full@ ; \
2426
cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so.@abi_lev@ ; \
2527
+ cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so ; \
2628
echo "WARNING: We installed a lib, you should now call ldconfig" ; \
2729
echo "f.i.: ldconfig -n -l $(libdir)/libgpm.so.@abi_full@" ; \
2830
echo "Or to update everything just type ldconfig" ; \
2931
--
30-
2.7.0
32+
2.43.0
3133

0 commit comments

Comments
 (0)