[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
26/29: gnu: aspell: Fix FTBFS with GCC7.
From: |
guix-commits |
Subject: |
26/29: gnu: aspell: Fix FTBFS with GCC7. |
Date: |
Sat, 9 Feb 2019 15:55:26 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 8771fc1715b400ead16f97683c67ad336b485750
Author: Marius Bakke <address@hidden>
Date: Sun Oct 7 14:38:25 2018 +0200
gnu: aspell: Fix FTBFS with GCC7.
* gnu/packages/patches/aspell-gcc-compat.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/aspell.scm (aspell)[source](patches): Use it.
---
gnu/local.mk | 1 +
gnu/packages/aspell.scm | 3 ++-
gnu/packages/patches/aspell-gcc-compat.patch | 31 ++++++++++++++++++++++++++++
3 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 9df65b9..d16b9e8 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -643,6 +643,7 @@ dist_patch_DATA =
\
%D%/packages/patches/apr-skip-getservbyname-test.patch \
%D%/packages/patches/aria2-CVE-2019-3500.patch \
%D%/packages/patches/aspell-default-dict-dir.patch \
+ %D%/packages/patches/aspell-gcc-compat.patch \
%D%/packages/patches/ath9k-htc-firmware-binutils.patch \
%D%/packages/patches/ath9k-htc-firmware-gcc.patch \
%D%/packages/patches/ath9k-htc-firmware-objcopy.patch \
diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm
index ca9fc8e..0113315 100644
--- a/gnu/packages/aspell.scm
+++ b/gnu/packages/aspell.scm
@@ -45,7 +45,8 @@
(sha256
(base32
"1qgn5psfyhbrnap275xjfrzppf5a83fb67gpql0kfqv37al869gm"))
- (patches (search-patches "aspell-default-dict-dir.patch"))))
+ (patches (search-patches "aspell-default-dict-dir.patch"
+ "aspell-gcc-compat.patch"))))
(build-system gnu-build-system)
(arguments
`(#:phases
diff --git a/gnu/packages/patches/aspell-gcc-compat.patch
b/gnu/packages/patches/aspell-gcc-compat.patch
new file mode 100644
index 0000000..94c44f8
--- /dev/null
+++ b/gnu/packages/patches/aspell-gcc-compat.patch
@@ -0,0 +1,31 @@
+Fix GCC7 warnings.
+
+Taken from upstream:
+https://git.savannah.gnu.org/cgit/aspell.git/commit/?id=8089fa02122fed0a6394eba14bbedcb1d18e2384
+
+diff --git a/modules/filter/tex.cpp b/modules/filter/tex.cpp
+index a979539..19ab63c 100644
+--- a/modules/filter/tex.cpp
++++ b/modules/filter/tex.cpp
+@@ -174,7 +174,7 @@ namespace {
+
+ if (c == '{') {
+
+- if (top.in_what == Parm || top.in_what == Opt || top.do_check == '\0')
++ if (top.in_what == Parm || top.in_what == Opt || *top.do_check == '\0')
+ push_command(Parm);
+
+ top.in_what = Parm;
+diff --git a/prog/check_funs.cpp b/prog/check_funs.cpp
+index db54f3d..89ee09d 100644
+--- a/prog/check_funs.cpp
++++ b/prog/check_funs.cpp
+@@ -647,7 +647,7 @@ static void print_truncate(FILE * out, const char * word,
int width) {
+ }
+ }
+ if (i == width-1) {
+- if (word == '\0')
++ if (*word == '\0')
+ put(out,' ');
+ else if (word[len] == '\0')
+ put(out, word, len);
- 23/29: gnu: cmake: Try CPATH and C_INCLUDE_PATH when finding system libraries., (continued)
- 23/29: gnu: cmake: Try CPATH and C_INCLUDE_PATH when finding system libraries., guix-commits, 2019/02/09
- 21/29: gnu: glibc-final-with-bootstrap-bash: Don't enable obsolete rpc., guix-commits, 2019/02/09
- 24/29: gnu: cppunit: Update to 1.14.0., guix-commits, 2019/02/09
- 07/29: gnu: Remove address@hidden, guix-commits, 2019/02/09
- 08/29: gnu: python-pycodestyle: Update to 2.5.0., guix-commits, 2019/02/09
- 13/29: gnu: python-configparser: Update to 3.7.1., guix-commits, 2019/02/09
- 19/29: gnu: python-dateutil: Update to 2.8.0., guix-commits, 2019/02/09
- 22/29: gnu: python: Fix FTBFS with GCC >= 6., guix-commits, 2019/02/09
- 25/29: gnu: swig: Fix FTBFS with GCC >= 6., guix-commits, 2019/02/09
- 27/29: gnu: libevdev: Fix FTBFS with GCC7., guix-commits, 2019/02/09
- 26/29: gnu: aspell: Fix FTBFS with GCC7.,
guix-commits <=
- 20/29: gnu: Use GCC 7 as the default compiler., guix-commits, 2019/02/09
- 29/29: gnu: inkscape: Fix FTBFS with GCC >= 6., guix-commits, 2019/02/09
- 28/29: gnu: hyperrogue: Fix FTBFS with GCC7., guix-commits, 2019/02/09