Accepting request 448142 from home:marxin:branches:openSUSE:Factory:Rings:1-MinimalX
Fix warnings reported by GCC7. OBS-URL: https://build.opensuse.org/request/show/448142 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/aspell?expand=0&rev=32
This commit is contained in:
parent
a9061e0ad5
commit
8a2dfd42d8
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Dec 16 10:27:40 UTC 2016 - mliska@suse.cz
|
||||||
|
|
||||||
|
- gcc7-fix-warnings.patch - Fix warnings reported by GCC7.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Dec 2 08:28:55 UTC 2015 - mpluskal@suse.com
|
Wed Dec 2 08:28:55 UTC 2015 - mpluskal@suse.com
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package aspell
|
# spec file for package aspell
|
||||||
#
|
#
|
||||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -35,6 +35,7 @@ Patch1: aspell-quotes.patch
|
|||||||
Patch2: aspell-epmty_file.patch
|
Patch2: aspell-epmty_file.patch
|
||||||
# PATCH-FIX-UPSTREAM aspell-automake-1.13.patch pgajdos@suse.cz -- fix build with new automake
|
# PATCH-FIX-UPSTREAM aspell-automake-1.13.patch pgajdos@suse.cz -- fix build with new automake
|
||||||
Patch3: aspell-automake-1.13.patch
|
Patch3: aspell-automake-1.13.patch
|
||||||
|
Patch4: gcc7-fix-warnings.patch
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
@ -126,6 +127,7 @@ This package contains the pspell compatibility library.
|
|||||||
%patch1
|
%patch1
|
||||||
%patch2
|
%patch2
|
||||||
%patch3
|
%patch3
|
||||||
|
%patch4 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -fiv
|
autoreconf -fiv
|
||||||
|
24
gcc7-fix-warnings.patch
Normal file
24
gcc7-fix-warnings.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
diff -u -r aspell-0.60.6.1/modules/filter/tex.cpp /var/tmp/build-root/standard-x86_64/home/abuild/rpmbuild/BUILD/aspell-0.60.6.1/modules/filter/tex.cpp
|
||||||
|
--- aspell-0.60.6.1/modules/filter/tex.cpp 2011-07-02 23:09:09.000000000 +0200
|
||||||
|
+++ aspell-0.60.6.1/modules/filter/tex.cpp 2016-12-16 11:14:33.893176139 +0100
|
||||||
|
@@ -174,7 +174,7 @@
|
||||||
|
|
||||||
|
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 -u -r aspell-0.60.6.1/prog/check_funs.cpp /var/tmp/build-root/standard-x86_64/home/abuild/rpmbuild/BUILD/aspell-0.60.6.1/prog/check_funs.cpp
|
||||||
|
--- aspell-0.60.6.1/prog/check_funs.cpp 2011-07-04 11:17:27.000000000 +0200
|
||||||
|
+++ aspell-0.60.6.1/prog/check_funs.cpp 2016-12-16 11:15:23.294134519 +0100
|
||||||
|
@@ -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);
|
Loading…
x
Reference in New Issue
Block a user