mirror of https://gitee.com/openkylin/enchant.git
changed debian/source/format to native
This commit is contained in:
openKylinBot
parent
74fd0819b7
commit
a3ee81f08c
|
|
@ -1,23 +0,0 @@
|
|||
From: 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
|
||||
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
|
||||
+++ b/doc/enchant.1
|
||||
@@ -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 Uspell dictionaries in \fI$(datadir)/enchant/uspell\fR and \fI~/.enchant/uspell\fR.
|
||||
.PP
|
||||
-Packagers and users may wish to make symbolic links to the system-wide dictionary directories. Or, preferably, use the --with-myspell-dir, --with-ispell-dir, and --with-uspell-dir 'configure' arguments.
|
||||
+Packagers and users may wish to make symbolic links to the system\-wide dictionary directories. Or, preferably, use the \-\-with-myspell-dir, \-\-with\-ispell\-dir, and \-\-with\-uspell\-dir 'configure' arguments.
|
||||
.SH MORE INFORMATION
|
||||
http://www.abisource.com/enchant/
|
||||
.SH "SEE ALSO"
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
From: 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
|
||||
Bug-Debian: http://bugs.debian.org/640788
|
||||
---
|
||||
src/ispell/ispell.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/ispell/ispell.h b/src/ispell/ispell.h
|
||||
index 13ae6d6..aea8ab0 100644
|
||||
--- a/src/ispell/ispell.h
|
||||
+++ b/src/ispell/ispell.h
|
||||
@@ -297,7 +297,7 @@ extern int gnMaskBits;
|
||||
** character counts as two!
|
||||
*/
|
||||
#ifndef MAXSTRINGCHARS
|
||||
-#define MAXSTRINGCHARS 128
|
||||
+#define MAXSTRINGCHARS 512
|
||||
#endif /* MAXSTRINGCHARS */
|
||||
|
||||
/*
|
||||
|
|
@ -1,23 +0,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
|
||||
Author: Agustin Martin Domingo <agmartin@debian.org>
|
||||
---
|
||||
enchant.pc.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
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
|
||||
Description: A spell checking library
|
||||
Version: @VERSION@
|
||||
-Requires: glib-2.0 gmodule-no-export-2.0
|
||||
+Requires.private: glib-2.0 gmodule-no-export-2.0
|
||||
Libs: -L${libdir} -lenchant
|
||||
Cflags: -I${includedir}/enchant
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
From: 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
|
||||
Bug: http://bugzilla.abisource.com/show_bug.cgi?id=13163
|
||||
Bug-Debian: http://bugs.debian.org/546418
|
||||
Bug-Debian: http://bugs.debian.org/647281
|
||||
* Improve wording for -a option.
|
||||
* Add info about -d option to man page.
|
||||
* 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(-)
|
||||
|
||||
diff --git a/doc/enchant.1 b/doc/enchant.1
|
||||
index 597b80a..244d6ad 100644
|
||||
--- a/doc/enchant.1
|
||||
+++ b/doc/enchant.1
|
||||
@@ -5,7 +5,7 @@ Enchant \- a spellchecker
|
||||
.SH SYNOPSIS
|
||||
.ll +8
|
||||
.B enchant
|
||||
-[\fB\-a\fR] [\fB\-l\fR] [\fB\-L\fR] [\fB\-v\fR]
|
||||
+[\fB\-a\fR] [\fB\-d dict\fR] [\fB\-h\fR] [\fB\-l\fR] [\fB\-L\fR] [\fB\-v\fR]
|
||||
.ll -8
|
||||
.br
|
||||
.SH DESCRIPTION
|
||||
@@ -14,7 +14,13 @@ is an ispell-compatible spellchecker.
|
||||
.SS OPTIONS
|
||||
.TP
|
||||
.B "\-a"
|
||||
-List alternatives.
|
||||
+List suggestions in ispell pipe mode format.
|
||||
+.TP
|
||||
+.B "\-d dict"
|
||||
+Use dictionary <dict>.
|
||||
+.TP
|
||||
+.B "\-h"
|
||||
+Show short help.
|
||||
.TP
|
||||
.B "\-l"
|
||||
List only the misspellings.
|
||||
diff --git a/tests/enchant-ispell.c b/tests/enchant-ispell.c
|
||||
index 639d74b..a65c1bc 100644
|
||||
--- a/tests/enchant-ispell.c
|
||||
+++ b/tests/enchant-ispell.c
|
||||
@@ -71,8 +71,9 @@ static void
|
||||
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, "\t-a lists alternatives.\n");
|
||||
+ fprintf (to, "\t-a lists suggestions in ispell pipe mode format.\n");
|
||||
fprintf (to, "\t-d dict uses dictionary <dict>.\n");
|
||||
+ fprintf (to, "\t-h Show this help message.\n");
|
||||
fprintf (to, "\t-l lists misspellings.\n");
|
||||
fprintf (to, "\t-m is ignored.\n");
|
||||
fprintf (to, "\t-L displays line numbers.\n");
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
From: Agustin Martin Domingo <agmartin@debian.org>
|
||||
Date: Sat, 14 May 2022 03:25:03 +0800
|
||||
Subject: Fix lintian manpage-has-errors-from-man: .../enchant.1.gz 1:
|
||||
warning: macro `PU' not defined
|
||||
|
||||
Forwarded: http://bugzilla.abisource.com/show_bug.cgi?id=13163
|
||||
---
|
||||
doc/enchant.1 | 1 -
|
||||
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 @@
|
||||
-.PU
|
||||
.TH ENCHANT 1 "July 2006" enchant "Enchant Mini Help File"
|
||||
.SH NAME
|
||||
Enchant \- a spellchecker
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
From: Helmut Grohne <helmut@subdivi.de>
|
||||
Date: Sat, 14 May 2022 03:25:03 +0800
|
||||
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_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
|
||||
host architecture as a prefix. By removing the (otherwise unused AC_PATH_PROG),
|
||||
the implicit check can do the right thing.
|
||||
---
|
||||
configure.in | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 4e83ea7..00057bd 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -48,8 +48,6 @@ have_cxx=yes
|
||||
AC_PROG_CXX(,have_cxx=no)
|
||||
AM_CONDITIONAL(WITH_CXX, test "x$have_cxx" = "xyes")
|
||||
|
||||
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
||||
-
|
||||
PKG_CHECK_MODULES(ENCHANT, [glib-2.0 >= 2.6 gmodule-2.0])
|
||||
|
||||
dnl ===========================================================================
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
From: Caolan McNamara <caolanm@redhat.com>
|
||||
Date: Sat, 14 May 2022 03:25:03 +0800
|
||||
Subject: fix build with hunspell 1.4
|
||||
|
||||
hunspell 1.4.0 doesn't expose MAXWORDLEN anymore.
|
||||
Origin: upstream bug
|
||||
Bug: http://bugzilla.abisource.com/show_bug.cgi?id=13772
|
||||
Bug-Debian: https://bugs.debian.org/821464
|
||||
---
|
||||
src/myspell/myspell_checker.cpp | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/myspell/myspell_checker.cpp b/src/myspell/myspell_checker.cpp
|
||||
index abf0e9d..1886ba5 100644
|
||||
--- a/src/myspell/myspell_checker.cpp
|
||||
+++ b/src/myspell/myspell_checker.cpp
|
||||
@@ -148,6 +148,10 @@ MySpellChecker::~MySpellChecker()
|
||||
g_iconv_close(m_translate_out);
|
||||
}
|
||||
|
||||
+#ifndef MAXWORDLEN
|
||||
+# define MAXWORDLEN 100
|
||||
+#endif
|
||||
+
|
||||
bool
|
||||
MySpellChecker::checkWord(const char *utf8Word, size_t len)
|
||||
{
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
01-fixminus.diff
|
||||
03_improve-options-info.diff
|
||||
10_enchant.1_remove-PU-macro.diff
|
||||
02-new-ispell-format.diff
|
||||
02_Requires-Private.diff
|
||||
fix_for_hunspell_1.4.diff
|
||||
cross_build.diff
|
||||
|
|
@ -1 +1 @@
|
|||
3.0 (quilt)
|
||||
3.0 (native)
|
||||
|
|
|
|||
Loading…
Reference in New Issue