Skip to content

Commit 15e5c51

Browse files
jolivainyann-morin-1998
authored andcommitted
package/libgsm: update 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, libgsm fails to build with output: Applying 0001-misc-fixes-from-archlinux.patch using patch: patching file Makefile Hunk #2 FAILED at 96. Hunk #7 FAILED at 424. 2 out of 8 hunks FAILED -- saving rejects to file Makefile.rej This commit refreshes the package patch on the current package version. Fixes: - http://autobuild.buildroot.org/results/b27/b271ade6069fd25c1877e1e74648d92e88c459c4 Signed-off-by: Julien Olivain <ju.o@free.fr> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
1 parent a6fabd9 commit 15e5c51

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

.checkpackageignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,7 @@ package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch lib_pat
834834
package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch lib_patch.Upstream
835835
package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch lib_patch.Upstream
836836
package/libgpiod/0001-build-add-a-configure-switch-for-building-examples.patch lib_patch.Upstream
837-
package/libgsm/0001-misc-fixes-from-archlinux.patch lib_patch.Upstream
837+
package/libgsm/0001-Misc-fixes-from-Archlinux.patch lib_patch.Upstream
838838
package/libgtk2/0001-reduce-dependencies.patch lib_patch.Upstream
839839
package/libgtk3/0001-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch lib_patch.Upstream
840840
package/libhdhomerun/0001-dont-strip.patch lib_patch.Upstream

package/libgsm/0001-misc-fixes-from-archlinux.patch renamed to package/libgsm/0001-Misc-fixes-from-Archlinux.patch

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From e8f43832d401ad1e071e6860b2bf4a1e796d4356 Mon Sep 17 00:00:00 2001
1+
From ef88ee98855008cd8c8de807a12917a556e2ce7d Mon Sep 17 00:00:00 2001
22
From: Adam Duskett <aduskett@gmail.com>
33
Date: Fri, 28 Jul 2017 08:18:22 -0400
44
Subject: [PATCH] Misc fixes from Archlinux
@@ -11,12 +11,15 @@ Signed-off-by: Adam Duskett <aduskett@gmail.com>
1111
Refresh for 1.0.17
1212
[Fabrice: refresh for 1.0.22]
1313
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
14+
Signed-off-by: Julien Olivain <ju.o@free.fr>
15+
[Julien: regenerate with git format-patch for 1.0.22,
16+
as Fabrice refresh is incomplete for applying with fuzz 0]
1417
---
15-
Makefile | 84 ++++++++++++++++++++++++++++++++--------------------------------
16-
1 file changed, 42 insertions(+), 42 deletions(-)
18+
Makefile | 49 ++++++++++++++++++++++++-------------------------
19+
1 file changed, 24 insertions(+), 25 deletions(-)
1720

1821
diff --git a/Makefile b/Makefile
19-
index d5c0c90..ef61bd5 100644
22+
index 2ad5e5d..2cb0b06 100644
2023
--- a/Makefile
2124
+++ b/Makefile
2225
@@ -44,7 +44,7 @@ WAV49 = -DWAV49
@@ -36,7 +39,7 @@ index d5c0c90..ef61bd5 100644
3639
+LN = ln -s -f
3740
BASENAME = basename
3841
AR = ar
39-
ARFLAGS = cr
42+
ARFLAGS = cr
4043
@@ -139,7 +139,7 @@ LFLAGS = $(LDFLAGS) $(LDINC)
4144

4245
# Targets
@@ -97,16 +100,16 @@ index d5c0c90..ef61bd5 100644
97100

98101

99102
# The local bin and lib directories
100-
@@ -425,7 +425,7 @@ semi-clean:
103+
@@ -425,7 +424,7 @@ semi-clean:
101104
-print | xargs rm $(RMFLAGS)
102105

103106
clean: semi-clean
104107
- -rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \
105108
+ -rm $(RMFLAGS) $(LIBGSMSO)* $(ADDTST)/add \
106109
$(TOAST) $(TCAT) $(UNTOAST) \
107-
$(ROOT)/gsm-1.0.tar.Z
110+
$(ROOT)/gsm-1.0.tar.gz
108111

109-
@@ -473,22 +473,22 @@ $(ADDTST)/add: $(ADDTST)/add_test.o
112+
@@ -473,22 +472,22 @@ $(ADDTST)/add: $(ADDTST)/add_test.o
110113
$(TST)/test-result: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/run
111114
( cd $(TST); ./run )
112115

@@ -140,5 +143,5 @@ index d5c0c90..ef61bd5 100644
140143
- $(TST)/cod2lin.o $(LIBGSM) $(LDLIB)
141144
+ $(TST)/cod2lin.o $(LIBGSMSO) $(LDLIB)
142145
--
143-
2.13.3
146+
2.45.2
144147

0 commit comments

Comments
 (0)