Browse Source

update for GCC 7 and new EN dict

master
parent
commit
1e05ad1d1e
  1. 51
      aspell/aspell.patch
  2. 4
      aspell/aspell.spec

51
aspell/aspell.patch

@ -1,7 +1,7 @@
Index: Makefile.in
--- Makefile.in.orig 2008-04-07 06:56:53 +0200
+++ Makefile.in 2010-01-29 20:12:00 +0100
@@ -481,7 +481,7 @@
--- Makefile.in.orig 2011-07-04 10:58:49.000000000 +0200
+++ Makefile.in 2017-09-01 12:40:24.483635000 +0200
@@ -482,7 +482,7 @@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign subdir-objects
SUBDIRS = . po manual
@ -11,8 +11,8 @@ Index: Makefile.in
optdir = ${pkgdatadir}
Index: aspell6-de-20030222-1/configure
--- aspell6-de-20030222-1/configure.orig 2004-11-04 03:46:10 +0100
+++ aspell6-de-20030222-1/configure 2010-01-29 20:12:00 +0100
--- aspell6-de-20030222-1/configure.orig 2004-11-04 03:46:10.000000000 +0100
+++ aspell6-de-20030222-1/configure 2017-09-01 12:40:24.483774000 +0200
@@ -66,9 +66,9 @@
#echo $ASPELL
@ -38,8 +38,8 @@ Index: aspell6-de-20030222-1/configure
echo "dictdir = $dictdir" >> Makefile
echo "datadir = $datadir" >> Makefile
Index: aspell6-de-alt-2.1-1/configure
--- aspell6-de-alt-2.1-1/configure.orig 2004-11-04 03:48:55 +0100
+++ aspell6-de-alt-2.1-1/configure 2010-01-29 20:12:00 +0100
--- aspell6-de-alt-2.1-1/configure.orig 2004-11-04 03:48:55.000000000 +0100
+++ aspell6-de-alt-2.1-1/configure 2017-09-01 12:40:24.483890000 +0200
@@ -66,9 +66,9 @@
#echo $ASPELL
@ -64,9 +64,9 @@ Index: aspell6-de-alt-2.1-1/configure
echo "DESTDIR = $DESTDIR" >> Makefile
echo "dictdir = $dictdir" >> Makefile
echo "datadir = $datadir" >> Makefile
Index: aspell6-en-2017.01.22-0/configure
--- aspell6-en-2017.01.22-0/configure.orig 2004-08-10 11:01:33 +0200
+++ aspell6-en-2017.01.22-0/configure 2010-01-29 20:12:00 +0100
Index: aspell6-en-2017.08.24-0/configure
--- aspell6-en-2017.08.24-0/configure.orig 2017-08-24 20:39:19.000000000 +0200
+++ aspell6-en-2017.08.24-0/configure 2017-09-01 12:40:24.484006000 +0200
@@ -66,9 +66,9 @@
#echo $ASPELL
@ -91,14 +91,27 @@ Index: aspell6-en-2017.01.22-0/configure
echo "DESTDIR = $DESTDIR" >> Makefile
echo "dictdir = $dictdir" >> Makefile
echo "datadir = $datadir" >> Makefile
Index: prog/checker_string.cpp
--- prog/checker_string.cpp.orig 2006-11-25 16:07:15 +0100
+++ prog/checker_string.cpp 2010-01-29 20:12:00 +0100
@@ -6,6 +6,7 @@
Index: modules/filter/tex.cpp
--- modules/filter/tex.cpp.orig 2011-07-02 23:09:09.000000000 +0200
+++ modules/filter/tex.cpp 2017-09-01 12:40:45.762168000 +0200
@@ -174,7 +174,7 @@
#include <assert.h>
if (c == '{') {
+#include <assert.h>
#include "checker_string.hpp"
#include "speller.hpp"
#include "document_checker.hpp"
- 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;
Index: prog/check_funs.cpp
--- prog/check_funs.cpp.orig 2011-07-04 11:17:27.000000000 +0200
+++ prog/check_funs.cpp 2017-09-01 12:40:57.799208000 +0200
@@ -647,7 +647,7 @@
}
}
if (i == width-1) {
- if (word == '\0')
+ if (*word == '\0')
put(out,' ');
else if (word[len] == '\0')
put(out, word, len);

4
aspell/aspell.spec

@ -23,7 +23,7 @@
# package version
%define V_aspell 0.60.6.1
%define V_aspell_en 2017.01.22-0
%define V_aspell_en 2017.08.24-0
%define V_aspell_de_new 20030222-1
%define V_aspell_de_old 2.1-1
%define V_aspell_perl 0.09
@ -39,7 +39,7 @@ Class: BASE
Group: Writing
License: GPL
Version: %{V_aspell}
Release: 20170123
Release: 20170901
# package options
%option with_perl no

Loading…
Cancel
Save