diff options
Diffstat (limited to 'hyphen')
| -rw-r--r-- | hyphen/hyphen-2.7.1-read-charset.patch | 20 | ||||
| -rw-r--r-- | hyphen/hyphen-2.7.1.patch | 72 | ||||
| -rw-r--r-- | hyphen/makefile.mk | 109 | ||||
| -rw-r--r-- | hyphen/prj/build.lst | 3 | ||||
| -rw-r--r-- | hyphen/prj/d.lst | 5 |
5 files changed, 209 insertions, 0 deletions
diff --git a/hyphen/hyphen-2.7.1-read-charset.patch b/hyphen/hyphen-2.7.1-read-charset.patch new file mode 100644 index 000000000000..e846955517bc --- /dev/null +++ b/hyphen/hyphen-2.7.1-read-charset.patch @@ -0,0 +1,20 @@ +--- misc/hyphen-2.7.1/hyphen.c 2010-12-01 01:47:22.000000000 +0100 ++++ misc/build/hyphen-2.7.1/hyphen.c 2011-01-18 16:26:50.953125000 +0100 +@@ -291,13 +291,10 @@ + /* read in character set info */ + if (k == 0) { + for (i=0;i<MAX_NAME;i++) dict[k]->cset[i]= 0; +- if (fgets(dict[k]->cset, sizeof(dict[k]->cset),f) != NULL) { +- for (i=0;i<MAX_NAME;i++) +- if ((dict[k]->cset[i] == '\r') || (dict[k]->cset[i] == '\n')) +- dict[k]->cset[i] = 0; +- } else { +- dict[k]->cset[0] = 0; +- } ++ fgets(dict[k]->cset, sizeof(dict[k]->cset),f); ++ for (i=0;i<MAX_NAME;i++) ++ if ((dict[k]->cset[i] == '\r') || (dict[k]->cset[i] == '\n')) ++ dict[k]->cset[i] = 0; + dict[k]->utf8 = (strcmp(dict[k]->cset, "UTF-8") == 0); + } else { + strcpy(dict[k]->cset, dict[0]->cset); diff --git a/hyphen/hyphen-2.7.1.patch b/hyphen/hyphen-2.7.1.patch new file mode 100644 index 000000000000..0e8eafa8f9c2 --- /dev/null +++ b/hyphen/hyphen-2.7.1.patch @@ -0,0 +1,72 @@ +--- misc/hyphen-2.7.1/Makefile.am 2010-07-19 11:23:17.000000000 +0200 ++++ misc/build/hyphen-2.7.1/Makefile.am 2010-12-02 10:15:44.390625000 +0100 +@@ -25,14 +25,13 @@ + + hyphen.us3: + cp -f $(srcdir)/hyphen.tex hyphen.us +- patch < $(srcdir)/hyphen.patch ++ $(GNUPATCH) < $(srcdir)/hyphen.patch + $(srcdir)/tbhyphext.sh <$(srcdir)/tbhyphext.tex >hyphen.us2 + cat hyphen.us hyphen.us2 | $(AWK) -f $(srcdir)/lig.awk >hyphen.us3 + cat $(srcdir)/ligpatch.txt >>hyphen.us3 + +-hyph_en_US.dic: hyphen.us3 +- perl $(srcdir)/substrings.pl hyphen.us3 hyphen.us4 UTF-8 2 3 >/dev/null +- cat hyphen.us4 | $(SED) -f $(srcdir)/ooopatch.sed >hyph_en_US.dic ++hyph_en_US.dic: ++ @echo "hyph_en_US.txt distributed with Hyphen library" + + clean-local: + rm -rf hyphen.us* hyph_en_US.dic +--- misc/hyphen-2.7.1/Makefile.in 2010-12-01 02:31:29.000000000 +0100 ++++ misc/build/hyphen-2.7.1/Makefile.in 2010-12-02 10:17:16.546875000 +0100 +@@ -940,14 +940,13 @@ + + hyphen.us3: + cp -f $(srcdir)/hyphen.tex hyphen.us +- patch < $(srcdir)/hyphen.patch ++ $(GNUPATCH) < $(srcdir)/hyphen.patch + $(srcdir)/tbhyphext.sh <$(srcdir)/tbhyphext.tex >hyphen.us2 + cat hyphen.us hyphen.us2 | $(AWK) -f $(srcdir)/lig.awk >hyphen.us3 + cat $(srcdir)/ligpatch.txt >>hyphen.us3 + +-hyph_en_US.dic: hyphen.us3 +- perl $(srcdir)/substrings.pl hyphen.us3 hyphen.us4 UTF-8 2 3 >/dev/null +- cat hyphen.us4 | $(SED) -f $(srcdir)/ooopatch.sed >hyph_en_US.dic ++hyph_en_US.dic: ++ @echo "hyph_en_US.txt distributed with Hyphen library" + + clean-local: + rm -rf hyphen.us* hyph_en_US.dic +--- misc/hyphen-2.7.1/makefile.mk 2010-12-02 10:35:40.265625000 +0100 ++++ misc/build/hyphen-2.7.1/makefile.mk 2010-12-02 10:25:45.750000000 +0100 +@@ -1 +1,28 @@ +-dummy ++PRJ = ..$/..$/..$/.. ++ ++PRJNAME = hyphen ++TARGET = hyphen ++CFLAGSCALL=gsd ++ ++USE_DEFFILE=TRUE ++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++UWINAPILIB= ++ ++.INCLUDE : settings.mk ++ ++# --- Files -------------------------------------------------------- ++ ++# !! not to be compiled because those belong to a stand alone programs: !! ++# $(SLO)$/createfp.obj\ ++# $(SLO)$/testtextcat.obj ++ ++SLOFILES= \ ++ $(SLO)$/hyphen.obj\ ++ $(SLO)$/hnjalloc.obj ++ ++# --- Targets ------------------------------------------------------ ++ ++ALL: ALLTAR ++ ++.INCLUDE : target.mk ++ diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk new file mode 100644 index 000000000000..94c1592df21e --- /dev/null +++ b/hyphen/makefile.mk @@ -0,0 +1,109 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=. + +PRJNAME=hyphen +TARGET=hyphen + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +# --- Files -------------------------------------------------------- + +TARFILE_NAME=hyphen-2.7.1 +TARFILE_MD5=48a9f787f43a09c0a9b7b00cd1fddbbf + +ADDITIONAL_FILES += makefile.mk + +PATCH_FILES= \ + hyphen-2.7.1.patch \ + hyphen-2.7.1-read-charset.patch + +.IF "$(GUI)"=="UNX" +CONFIGURE_DIR=$(BUILD_DIR) + +#relative to CONFIGURE_DIR +# still needed also in system-hyphen case as it creates the makefile +CONFIGURE_ACTION=configure +CONFIGURE_FLAGS= --disable-shared --with-pic + +.IF "$(COM)"=="C52" && "$(CPU)"=="U" +LCL_CONFIGURE_CFLAGS+=-m64 +.ENDIF + +.IF "$(SYSBASE)"!="" +.IF "$(EXTRA_CFLAGS)"!="" +LCL_CONFIGURE_CFLAGS+=$(EXTRA_CFLAGS) +CONFIGURE_FLAGS+=CXXFLAGS="$(EXTRA_CFLAGS)" +.ENDIF # "$(EXTRA_CFLAGS)"!="" +.ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!="" +CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" +.ENDIF + +.IF "$(LCL_CONFIGURE_CFLAGS)"!="" +CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGURE_CFLAGS)' +.ENDIF + +.IF "$(SYSTEM_HYPH)" == "YES" && "$(WITH_MYSPELL_DICTS)" == "YES" +BUILD_ACTION=make hyph_en_US.dic +.ELIF "$(SYSTEM_HYPH)" == "YES" && "$(WITH_MYSPELL_DICTS)" != "YES" +@all: + echo "Nothing to do here." +.ELSE +BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) +OUT2INC += hyphen.h +.ENDIF + +.ENDIF # "$(GUI)"=="UNX" + + +.IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" +CONFIGURE_ACTION=configure +CONFIGURE_FLAGS= --disable-shared --with-pic + +BUILD_ACTION=make + +.ELSE +BUILD_ACTION=dmake +.ENDIF # "$(COM)"=="GCC" +OUT2INC += hyphen.h +.ENDIF # "$(GUI)"=="WNT" + +.IF "$(GUI)"=="OS2" +BUILD_ACTION=dmake +OUT2INC += hyphen.h +.ENDIF # "$(GUI)"=="OS2" + +# --- Targets ------------------------------------------------------ + +.INCLUDE : set_ext.mk +.INCLUDE : target.mk +.INCLUDE : tg_ext.mk + diff --git a/hyphen/prj/build.lst b/hyphen/prj/build.lst new file mode 100644 index 000000000000..c953a5725f70 --- /dev/null +++ b/hyphen/prj/build.lst @@ -0,0 +1,3 @@ +hyp hyphen : soltools solenv NULL +hyp hyphen usr1 - all hyp_mkout NULL +hyp hyphen nmake - all hyp_hyphen NULL diff --git a/hyphen/prj/d.lst b/hyphen/prj/d.lst new file mode 100644 index 000000000000..4b7ff0b35e2e --- /dev/null +++ b/hyphen/prj/d.lst @@ -0,0 +1,5 @@ +..\%__SRC%\slb\hyphen.lib %_DEST%\lib%_EXT%\hyphen.lib + +..\%__SRC%\inc\hyphen.h %_DEST%\inc%_EXT%\hyphen.h +..\%__SRC%\misc\build\hyphen-2.7.1\.libs\libhyphen.a %_DEST%\lib%_EXT%\libhyphen.a +..\%__SRC%\misc\build\hyphen-2.7.1\hyph_en_US.dic %_DEST%\bin%_EXT%\hyph_en_US.dic |