openkylin
/
enchant
mirror of https://gitee.com/openkylin/enchant.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

format patches

This commit is contained in:
openKylinBot 2022-05-14 03:25:04 +08:00
parent da06cdaff7
commit c45b7dd5f6
7 changed files with 89 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
debian/patches/01-fixminus.diff vendored
View File

@ -1,11 +1,18 @@
Description: Fix hyphen-used-as-minus-sign lintian message From: Fabrizio Regalli <fabreg@fabreg.it>
Author: Fabrizio Regalli <fabreg@fabreg.it> Date: Sat, 14 May 2022 03:25:03 +0800
Subject: Fix hyphen-used-as-minus-sign lintian message
Forwarded: http://bugzilla.abisource.com/show_bug.cgi?id=13163 Forwarded: http://bugzilla.abisource.com/show_bug.cgi?id=13163
Last-Update: 2011-08-25 Last-Update: 2011-08-25
---
doc/enchant.1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/enchant.1 b/doc/enchant.1
index 2b5bed7..597b80a 100644
--- a/doc/enchant.1 --- a/doc/enchant.1
+++ b/doc/enchant.1 +++ b/doc/enchant.1
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@ Enchant looks for Myspell dictionaries in \fI$(datadir)/enchant/myspell\fR and \
Enchant looks for Ispell dictionaries in \fI$(datadir)/enchant/ispell\fR and \fI~/.enchant/ispell\fR. Enchant looks for Ispell dictionaries in \fI$(datadir)/enchant/ispell\fR and \fI~/.enchant/ispell\fR.
Enchant looks for Uspell dictionaries in \fI$(datadir)/enchant/uspell\fR and \fI~/.enchant/uspell\fR. Enchant looks for Uspell dictionaries in \fI$(datadir)/enchant/uspell\fR and \fI~/.enchant/uspell\fR.
.PP .PP

19
debian/patches/02-new-ispell-format.diff vendored
View File

@ -1,13 +1,18 @@
Description: Use recent (>=3.3.02) ispell hash format From: Agustin Martin Domingo <agmartin@debian.org>
Author: Agustin Martin Domingo <agmartin@debian.org> Date: Sat, 14 May 2022 03:25:03 +0800
Subject: Use recent (>=3.3.02) ispell hash format
Forwarded: no Forwarded: no
Bug-Debian: http://bugs.debian.org/640788 Bug-Debian: http://bugs.debian.org/640788
---
src/ispell/ispell.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: enchant-1.6.0/src/ispell/ispell.h diff --git a/src/ispell/ispell.h b/src/ispell/ispell.h
=================================================================== index 13ae6d6..aea8ab0 100644
--- enchant-1.6.0.orig/src/ispell/ispell.h 2011-09-07 18:32:36.212371501 +0200 --- a/src/ispell/ispell.h
+++ enchant-1.6.0/src/ispell/ispell.h 2011-09-07 18:33:55.152091750 +0200 +++ b/src/ispell/ispell.h
@@ -297,7 +297,7 @@ @@ -297,7 +297,7 @@ extern int gnMaskBits;
** character counts as two! ** character counts as two!
*/ */
#ifndef MAXSTRINGCHARS #ifndef MAXSTRINGCHARS

20
debian/patches/02_Requires-Private.diff vendored
View File

@ -1,11 +1,19 @@
Description: Move glib-2.0 Requires in upstream enchant.pc.in to Requires.private. While enchant depends on glib-2.0, From: Prach Pongpanich <prach@debian.org>
Date: Sat, 14 May 2022 03:25:03 +0800
Subject: Move glib-2.0 Requires in upstream enchant.pc.in to
Requires.private. While enchant depends on glib-2.0,
API it exposes to other programs doesn't require glib. This makes life easier for packages depending on enchant API it exposes to other programs doesn't require glib. This makes life easier for packages depending on enchant
Author: Agustin Martin Domingo <agmartin@debian.org> Author: Agustin Martin Domingo <agmartin@debian.org>
Index: enchant/enchant.pc.in ---
=================================================================== enchant.pc.in | 2 +-
--- enchant.orig/enchant.pc.in 2011-12-14 15:36:23.000000000 +0100 1 file changed, 1 insertion(+), 1 deletion(-)
+++ enchant/enchant.pc.in 2011-12-20 17:11:31.434860468 +0100
@@ -6,6 +6,6 @@ diff --git a/enchant.pc.in b/enchant.pc.in
index 1699ce1..0526f8d 100644
--- a/enchant.pc.in
+++ b/enchant.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
Name: libenchant Name: libenchant
Description: A spell checking library Description: A spell checking library
Version: @VERSION@ Version: @VERSION@

33
debian/patches/03_improve-options-info.diff vendored
View File

@ -1,19 +1,24 @@
Description: Some improvements in options info From: Agustin Martin Domingo <agmartin@debian.org>
Author: Agustin Martin Domingo <agmartin@debian.org> Date: Sat, 14 May 2022 03:25:03 +0800
Subject: Some improvements in options info
Forwarded: http://bugzilla.abisource.com/show_bug.cgi?id=13163 Forwarded: http://bugzilla.abisource.com/show_bug.cgi?id=13163
Bug: http://bugzilla.abisource.com/show_bug.cgi?id=13163 Bug: http://bugzilla.abisource.com/show_bug.cgi?id=13163
Bug-Debian: http://bugs.debian.org/546418 Bug-Debian: http://bugs.debian.org/546418
Bug-Debian: http://bugs.debian.org/647281 Bug-Debian: http://bugs.debian.org/647281
* Improve wording for -a option. * Improve wording for -a option.
* Add info about -d option to man page. * Add info about -d option to man page.
* Add info about -h option to man page and usage. * Add info about -h option to man page and usage.
---
doc/enchant.1 | 10 ++++++++--
tests/enchant-ispell.c | 3 ++-
2 files changed, 10 insertions(+), 3 deletions(-)
Index: enchant/doc/enchant.1 diff --git a/doc/enchant.1 b/doc/enchant.1
=================================================================== index 597b80a..244d6ad 100644
--- enchant.orig/doc/enchant.1 2011-10-29 08:49:27.000000000 +0200 --- a/doc/enchant.1
+++ enchant/doc/enchant.1 2011-10-29 08:51:46.000000000 +0200 +++ b/doc/enchant.1
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@ Enchant \- a spellchecker
.SH SYNOPSIS .SH SYNOPSIS
.ll +8 .ll +8
.B enchant .B enchant
@ -22,7 +27,7 @@ Index: enchant/doc/enchant.1
.ll -8 .ll -8
.br .br
.SH DESCRIPTION .SH DESCRIPTION
@@ -14,7 +14,13 @@ @@ -14,7 +14,13 @@ is an ispell-compatible spellchecker.
.SS OPTIONS .SS OPTIONS
.TP .TP
.B "\-a" .B "\-a"
@ -37,11 +42,11 @@ Index: enchant/doc/enchant.1
.TP .TP
.B "\-l" .B "\-l"
List only the misspellings. List only the misspellings.
Index: enchant/tests/enchant-ispell.c diff --git a/tests/enchant-ispell.c b/tests/enchant-ispell.c
=================================================================== index 639d74b..a65c1bc 100644
--- enchant.orig/tests/enchant-ispell.c 2011-10-29 08:49:13.000000000 +0200 --- a/tests/enchant-ispell.c
+++ enchant/tests/enchant-ispell.c 2011-10-29 08:52:29.000000000 +0200 +++ b/tests/enchant-ispell.c
@@ -71,8 +71,9 @@ @@ -71,8 +71,9 @@ static void
print_help (FILE * to, const char * prog) print_help (FILE * to, const char * prog)
{ {
fprintf (to, "Usage: %s [options] -a|-d dict|-l|-L|-m|-v[v]|<file>\n", prog); fprintf (to, "Usage: %s [options] -a|-d dict|-l|-L|-m|-v[v]|<file>\n", prog);

20
debian/patches/10_enchant.1_remove-PU-macro.diff vendored
View File

@ -1,11 +1,17 @@
Description: Fix lintian manpage-has-errors-from-man: .../enchant.1.gz 1: warning: macro `PU' not defined From: Agustin Martin Domingo <agmartin@debian.org>
Author: Agustin Martin Domingo <agmartin@debian.org> Date: Sat, 14 May 2022 03:25:03 +0800
Forwarded: http://bugzilla.abisource.com/show_bug.cgi?id=13163 Subject: Fix lintian manpage-has-errors-from-man: .../enchant.1.gz 1:
warning: macro `PU' not defined
Index: enchant/doc/enchant.1 Forwarded: http://bugzilla.abisource.com/show_bug.cgi?id=13163
=================================================================== ---
--- enchant.orig/doc/enchant.1 2011-10-19 21:58:21.715302260 +0200 doc/enchant.1 | 1 -
+++ enchant/doc/enchant.1 2011-10-19 21:58:58.595483852 +0200 1 file changed, 1 deletion(-)
diff --git a/doc/enchant.1 b/doc/enchant.1
index 244d6ad..957cdd9 100644
--- a/doc/enchant.1
+++ b/doc/enchant.1
@@ -1,4 +1,3 @@ @@ -1,4 +1,3 @@
-.PU -.PU
.TH ENCHANT 1 "July 2006" enchant "Enchant Mini Help File" .TH ENCHANT 1 "July 2006" enchant "Enchant Mini Help File"

15
debian/patches/cross_build.diff vendored
View File

@ -1,5 +1,5 @@
From: Helmut Grohne <helmut@subdivi.de> From: Helmut Grohne <helmut@subdivi.de>
Last-Modified: 2016-09-03 Date: Sat, 14 May 2022 03:25:03 +0800
Subject: do not supply a bad default for the PKG_CONFIG check Subject: do not supply a bad default for the PKG_CONFIG check
PKG_CHECK_MODULES implicitly checks for a suitable cross pkg-config and uses PKG_CHECK_MODULES implicitly checks for a suitable cross pkg-config and uses
@ -7,12 +7,15 @@ $PKG_CONFIG as a default. The preceeding AC_PATH_PROG supplies that variables
with its default value "pkg-config" instead of the a value that carries the with its default value "pkg-config" instead of the a value that carries the
host architecture as a prefix. By removing the (otherwise unused AC_PATH_PROG), host architecture as a prefix. By removing the (otherwise unused AC_PATH_PROG),
the implicit check can do the right thing. the implicit check can do the right thing.
---
configure.in | 2 --
1 file changed, 2 deletions(-)
Index: enchant-1.6.0/configure.in diff --git a/configure.in b/configure.in
=================================================================== index 4e83ea7..00057bd 100644
--- enchant-1.6.0.orig/configure.in --- a/configure.in
+++ enchant-1.6.0/configure.in +++ b/configure.in
@@ -48,8 +48,6 @@ @@ -48,8 +48,6 @@ have_cxx=yes
AC_PROG_CXX(,have_cxx=no) AC_PROG_CXX(,have_cxx=no)
AM_CONDITIONAL(WITH_CXX, test "x$have_cxx" = "xyes") AM_CONDITIONAL(WITH_CXX, test "x$have_cxx" = "xyes")

18
debian/patches/fix_for_hunspell_1.4.diff vendored
View File

@ -1,13 +1,19 @@
Description: fix build with hunspell 1.4 From: Caolan McNamara <caolanm@redhat.com>
hunspell 1.4.0 doesn't expose MAXWORDLEN anymore. Date: Sat, 14 May 2022 03:25:03 +0800
Author: Caolan McNamara <caolanm@redhat.com> Subject: fix build with hunspell 1.4
hunspell 1.4.0 doesn't expose MAXWORDLEN anymore.
Origin: upstream bug Origin: upstream bug
Bug: http://bugzilla.abisource.com/show_bug.cgi?id=13772 Bug: http://bugzilla.abisource.com/show_bug.cgi?id=13772
Bug-Debian: https://bugs.debian.org/821464 Bug-Debian: https://bugs.debian.org/821464
---
src/myspell/myspell_checker.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff -ru enchant-1.6.0-orig/src/myspell/myspell_checker.cpp enchant-1.6.0/src/myspell/myspell_checker.cpp diff --git a/src/myspell/myspell_checker.cpp b/src/myspell/myspell_checker.cpp
--- enchant-1.6.0-orig/src/myspell/myspell_checker.cpp 2016-04-18 12:25:00.094614256 +0100 index abf0e9d..1886ba5 100644
+++ enchant-1.6.0/src/myspell/myspell_checker.cpp 2016-04-18 12:26:09.108569576 +0100 --- a/src/myspell/myspell_checker.cpp
+++ b/src/myspell/myspell_checker.cpp
@@ -148,6 +148,10 @@ MySpellChecker::~MySpellChecker() @@ -148,6 +148,10 @@ MySpellChecker::~MySpellChecker()
g_iconv_close(m_translate_out); g_iconv_close(m_translate_out);
} }