[ooo-build-commit] .: patches/dev300
Andras Timar
timar at kemper.freedesktop.org
Tue Oct 5 11:16:41 PDT 2010
patches/dev300/apply | 4
patches/dev300/hyphen-2.4.patch.diff | 171 -----------------------------------
2 files changed, 175 deletions(-)
New commits:
commit 2872ff1b0f51c0949e2913c579f2b6d2ea84b1a7
Author: Andras Timar <timar at fsf.hu>
Date: Tue Oct 5 20:15:28 2010 +0200
removed; it did not apply and better fix is being prepared
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 35cab86..739789c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2725,10 +2725,6 @@ sfx2-add-to-recently-used-after-save.diff, rodo
svtools-wmf-clipperf.diff, n#535304, thorsten
[ Fixes ]
-# Fix for UTF-8 encoded hyphen dictionaries (e.g. Hungarian)
-# Hyphen-2.5 will obsolete this patch, i#109543
-# FIXME dev300-m77 hyphen-2.4.patch.diff, timar
-
# In some cases when exporting a PDF from a presentation, we are asked
# to export an empty "link annotation", which gets turned into a
# rather bogus file: link to the directory the presentadion document
diff --git a/patches/dev300/hyphen-2.4.patch.diff b/patches/dev300/hyphen-2.4.patch.diff
deleted file mode 100644
index 17aa934..0000000
--- a/patches/dev300/hyphen-2.4.patch.diff
+++ /dev/null
@@ -1,171 +0,0 @@
-From c397d790a9ed8ee1299ffeaee8774d84e51b7fa9 Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky <kendy at suse.cz>
-Date: Mon, 17 May 2010 00:54:08 +0200
-Subject: [PATCH 747/768] hyphen-2.4.patch.diff
-
----
- hyphen/hyphen-2.4.patch | 94 ++++++++++++++++++++++++++++++++++++++--------
- 1 files changed, 77 insertions(+), 17 deletions(-)
-
-diff --git hyphen/hyphen-2.4.patch hyphen/hyphen-2.4.patch
-index 33947f5..37abbf1 100644
---- hyphen/hyphen-2.4.patch
-+++ hyphen/hyphen-2.4.patch
-@@ -1,6 +1,6 @@
--diff -u misc/hyphen-2.4/csutil.c misc/build/hyphen-2.4/csutil.c
-+diff -r -u misc/hyphen-2.4/csutil.c misc/build/hyphen-2.4/csutil.c
- --- misc/hyphen-2.4/csutil.c 2003-06-01 02:04:00.000000000 +0200
--+++ misc/build/hyphen-2.4/csutil.c 2008-06-04 10:03:40.000000000 +0200
-++++ misc/build/hyphen-2.4/csutil.c 2010-02-12 04:35:45.000000000 +0100
- @@ -3493,7 +3493,7 @@
- };
-
-@@ -10,10 +10,9 @@ diff -u misc/hyphen-2.4/csutil.c misc/build/hyphen-2.4/csutil.c
- {"ISO8859-1",iso1_tbl},
- {"ISO8859-2",iso2_tbl},
- {"ISO8859-3",iso3_tbl},
--Common subdirectories: misc/hyphen-2.4/doc and misc/build/hyphen-2.4/doc
--diff -u misc/hyphen-2.4/hyphen.c misc/build/hyphen-2.4/hyphen.c
-+diff -r -u misc/hyphen-2.4/hyphen.c misc/build/hyphen-2.4/hyphen.c
- --- misc/hyphen-2.4/hyphen.c 2008-05-01 02:18:15.000000000 +0200
--+++ misc/build/hyphen-2.4/hyphen.c 2008-06-04 10:06:57.000000000 +0200
-++++ misc/build/hyphen-2.4/hyphen.c 2010-02-12 04:38:54.000000000 +0100
- @@ -326,7 +326,7 @@
- } else {
- hnj_strchomp(repl + 1);
-@@ -45,7 +44,69 @@ diff -u misc/hyphen-2.4/hyphen.c misc/build/hyphen-2.4/hyphen.c
- } else {
- dict[k]->states[state_num].replcut = replcut;
- }
--@@ -702,7 +702,7 @@
-+@@ -599,6 +599,19 @@
-+ return 0;
-+ }
-+
-++/* Unicode ligature length */
-++int hnj_ligature(unsigned char c) {
-++ switch (c) {
-++ case 0x81: /* ff */
-++ case 0x82: return 1; /* fi */
-++ case 0x83: /* ffi */
-++ case 0x84: return 2; /* ffl */
-++ case 0x85: /* long st */
-++ case 0x86: return 1; /* st */
-++ }
-++ return 0;
-++}
-++
-+ /* character length of the first n byte of the input word */
-+ int hnj_hyphen_strnlen(const char * word, int n, int utf8)
-+ {
-+@@ -606,6 +619,10 @@
-+ int j = 0;
-+ while (j < n && word[j] != '\0') {
-+ i++;
-++ // Unicode ligature support
-++ if (utf8 && ((unsigned char) word[j] == 0xEF) && ((unsigned char) word[j + 1] == 0xAC)) {
-++ i += hnj_ligature(word[j + 2]);
-++ }
-+ for (j++; utf8 && (word[j] & 0xc0) == 0x80; j++);
-+ }
-+ return i;
-+@@ -614,8 +631,14 @@
-+ int hnj_hyphen_lhmin(int utf8, const char *word, int word_size, char * hyphens,
-+ char *** rep, int ** pos, int ** cut, int lhmin)
-+ {
-+- int i, j;
-+- for (i = 1, j = 0; i < lhmin && word[j] != '\0'; i++) do {
-++ int i = 1, j = 0;
-++
-++ // Unicode ligature support
-++ if (utf8 && ((unsigned char) word[j] == 0xEF) && ((unsigned char) word[j + 1] == 0xAC)) {
-++ i += hnj_ligature(word[j + 2]);
-++ }
-++
-++ for (j = 0; i < lhmin && word[j] != '\0'; i++) do {
-+ // check length of the non-standard part
-+ if (*rep && *pos && *cut && (*rep)[j]) {
-+ char * rh = strchr((*rep)[j], '=');
-+@@ -629,7 +652,12 @@
-+ hyphens[j] = '0';
-+ }
-+ j++;
-+- } while (utf8 && (word[j + 1] & 0xc0) == 0xc0);
-++
-++ // Unicode ligature support
-++ if (utf8 && ((unsigned char) word[j] == 0xEF) && ((unsigned char) word[j + 1] == 0xAC)) {
-++ i += hnj_ligature(word[j + 2]);
-++ }
-++ } while (utf8 && (word[j] & 0xc0) == 0x80);
-+ return 0;
-+ }
-+
-+@@ -702,7 +730,7 @@
- prep_word[j++] = '.';
- prep_word[j] = '\0';
-
-@@ -54,7 +115,7 @@ diff -u misc/hyphen-2.4/hyphen.c misc/build/hyphen-2.4/hyphen.c
- hyphens[i] = '0';
-
- #ifdef VERBOSE
--@@ -941,13 +941,13 @@
-+@@ -941,13 +969,13 @@
- int hnj_hyphen_norm(const char *word, int word_size, char * hyphens,
- char *** rep, int ** pos, int ** cut)
- {
-@@ -69,9 +130,9 @@ diff -u misc/hyphen-2.4/hyphen.c misc/build/hyphen-2.4/hyphen.c
- for (i = 0, j = -1; i < word_size; i++) {
- /* beginning of an UTF-8 character (not '10' start bits) */
- if ((((unsigned char) word[i]) >> 6) != 2) j++;
--diff -u misc/hyphen-2.4/Makefile.am misc/build/hyphen-2.4/Makefile.am
-+diff -r -u misc/hyphen-2.4/Makefile.am misc/build/hyphen-2.4/Makefile.am
- --- misc/hyphen-2.4/Makefile.am 2008-04-30 12:33:44.000000000 +0200
--+++ misc/build/hyphen-2.4/Makefile.am 2008-06-04 11:33:23.000000000 +0200
-++++ misc/build/hyphen-2.4/Makefile.am 2010-02-12 04:35:45.000000000 +0100
- @@ -24,12 +24,12 @@
-
- hyphen.us3:
-@@ -88,9 +149,9 @@ diff -u misc/hyphen-2.4/Makefile.am misc/build/hyphen-2.4/Makefile.am
-
- clean-local:
- rm -rf hyphen.us* hyph_en_US.dic
--diff -u misc/hyphen-2.4/Makefile.in misc/build/hyphen-2.4/Makefile.in
-+diff -r -u misc/hyphen-2.4/Makefile.in misc/build/hyphen-2.4/Makefile.in
- --- misc/hyphen-2.4/Makefile.in 2008-04-30 14:29:57.000000000 +0200
--+++ misc/build/hyphen-2.4/Makefile.in 2008-06-04 11:33:44.000000000 +0200
-++++ misc/build/hyphen-2.4/Makefile.in 2010-02-12 04:35:45.000000000 +0100
- @@ -795,12 +795,12 @@
-
- hyphen.us3:
-@@ -107,10 +168,10 @@ diff -u misc/hyphen-2.4/Makefile.in misc/build/hyphen-2.4/Makefile.in
-
- clean-local:
- rm -rf hyphen.us* hyph_en_US.dic
--diff -u misc/hyphen-2.4/makefile.mk misc/build/hyphen-2.4/makefile.mk
----- misc/hyphen-2.4/makefile.mk 2008-06-04 10:43:21.000000000 +0200
--+++ misc/build/hyphen-2.4/makefile.mk 2008-06-04 12:40:46.000000000 +0200
--@@ -1 +1,54 @@
-+diff -r -u misc/hyphen-2.4/makefile.mk misc/build/hyphen-2.4/makefile.mk
-+--- misc/hyphen-2.4/makefile.mk 2010-02-12 04:34:27.000000000 +0100
-++++ misc/build/hyphen-2.4/makefile.mk 2010-02-12 04:35:45.000000000 +0100
-+@@ -1 +1,57 @@
- -dummy
- +#*************************************************************************
- +#
-@@ -147,7 +208,7 @@ diff -u misc/hyphen-2.4/makefile.mk misc/build/hyphen-2.4/makefile.mk
- +
- +USE_DEFFILE=TRUE
- +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
--+UWINAPILIB=
-++UWINAPILIB=
- +
- +.INCLUDE : settings.mk
- +
-@@ -166,4 +227,3 @@ diff -u misc/hyphen-2.4/makefile.mk misc/build/hyphen-2.4/makefile.mk
- +ALL: ALLTAR
- +
- +.INCLUDE : target.mk
--Common subdirectories: misc/hyphen-2.4/tests and misc/build/hyphen-2.4/tests
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list