forked from pool/hunspell
Accepting request 33102 from devel:libraries:c_c++
Copy from devel:libraries:c_c++/hunspell based on submit request 33102 from user msmeissn OBS-URL: https://build.opensuse.org/request/show/33102 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hunspell?expand=0&rev=15
This commit is contained in:
parent
773725a1c2
commit
c9c9732505
7
hunspell-disable-fortify.patch
Normal file
7
hunspell-disable-fortify.patch
Normal file
@ -0,0 +1,7 @@
|
||||
--- src/hunspell/hashmgr.cxx
|
||||
+++ src/hunspell/hashmgr.cxx
|
||||
@@ -1,3 +1,4 @@
|
||||
+#undef _FORTIFY_SOURCE /* bad use of char word; at the end of struct hentry -Marcus */
|
||||
#include "license.hunspell"
|
||||
#include "license.myspell"
|
||||
|
20
hunspell-fix-format.patch
Normal file
20
hunspell-fix-format.patch
Normal file
@ -0,0 +1,20 @@
|
||||
--- src/hunspell/affixmgr.cxx
|
||||
+++ src/hunspell/affixmgr.cxx
|
||||
@@ -4276,7 +4276,7 @@
|
||||
if (strip[i] == cond[j]) in = 1;
|
||||
} while ((j < (condl - 1)) && (cond[j] != ']'));
|
||||
if (j == (condl - 1) && (cond[j] != ']')) {
|
||||
- HUNSPELL_WARNING(stderr, "error: line %d: missing ] in condition:\n%s\n", linenum);
|
||||
+ HUNSPELL_WARNING(stderr, "error: line %d: missing ] in condition:\n%s\n", linenum, cond);
|
||||
return 0;
|
||||
}
|
||||
if ((!neg && !in) || (neg && in)) {
|
||||
@@ -4304,7 +4304,7 @@
|
||||
if (strip[i] == cond[j]) in = 1;
|
||||
} while ((j > 0) && (cond[j] != '['));
|
||||
if ((j == 0) && (cond[j] != '[')) {
|
||||
- HUNSPELL_WARNING(stderr, "error: error: %d: missing ] in condition:\n%s\n", linenum);
|
||||
+ HUNSPELL_WARNING(stderr, "error: error: %d: missing ] in condition:\n%s\n", linenum, cond);
|
||||
return 0;
|
||||
}
|
||||
neg = (cond[j+1] == '^') ? 1 : 0;
|
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 22 14:02:48 CET 2010 - meissner@suse.de
|
||||
|
||||
- disable FORTIFY_SOURCE, as HashMgr::add_word() and struct hentry
|
||||
with "char word;" at the end is not going to work out.
|
||||
- run "make check" to spot such problems earlier
|
||||
- added missing format arguments
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 17 21:03:18 CET 2009 - jengelh@medozas.de
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package hunspell (Version 1.2.8)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -20,11 +20,13 @@ Summary: Hunspell - a spell checker and morphological analyzer library
|
||||
|
||||
Name: hunspell
|
||||
Version: 1.2.8
|
||||
Release: 2
|
||||
Release: 3
|
||||
License: GPLv2+ ; LGPLv2.1+ ; MPL ..
|
||||
Group: System/Libraries
|
||||
Source0: %{name}-%{version}.tar.bz2
|
||||
Source1: baselibs.conf
|
||||
Patch0: %name-fix-format.patch
|
||||
Patch1: %name-disable-fortify.patch
|
||||
Url: http://hunspell.sourceforge.net/
|
||||
BuildRequires: autoconf >= 2.59
|
||||
BuildRequires: ncurses-devel >= 5.0
|
||||
@ -93,7 +95,8 @@ Authors:
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
#%patch1
|
||||
%patch0 -p0
|
||||
%patch1 -p0
|
||||
|
||||
%build
|
||||
cp /usr/share/gettext/config.rpath .
|
||||
@ -109,6 +112,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
||||
rm -f $RPM_BUILD_ROOT%{_bindir}/example
|
||||
%find_lang %{name}
|
||||
|
||||
%check
|
||||
make check
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user