diff options
author | Xisco Fauli <anistenis@gmail.com> | 2011-08-21 21:50:13 +0200 |
---|---|---|
committer | Xisco Fauli <anistenis@gmail.com> | 2011-08-21 21:50:13 +0200 |
commit | 6c76e4db034fd2c43884698b1a30225fd00b3bfd (patch) | |
tree | 1937cb9be81cd2b9f3d0ad27adcc7a7531b8f29d /hunspell | |
parent | Implement partly the 5th step (diff) | |
parent | unusedcode: CollatorWrapper (diff) | |
download | core-6c76e4db034fd2c43884698b1a30225fd00b3bfd.tar.gz core-6c76e4db034fd2c43884698b1a30225fd00b3bfd.zip |
Merge branch 'master' into feature/gsoc2011_wizards
Conflicts:
automation/source/inc/cmdbasestream.hxx
automation/source/server/cmdbasestream.cxx
automation/source/server/retstrm.hxx
automation/source/testtool/cmdstrm.cxx
automation/source/testtool/cmdstrm.hxx
automation/source/testtool/tcommuni.cxx
basctl/prj/d.lst
basctl/uiconfig/basicide/toolbar/findbar.xml
cui/source/dialogs/about.cxx
cui/source/dialogs/about.src
cui/source/inc/about.hxx
extensions/source/abpilot/abpservices.cxx
extensions/source/dbpilots/dbpservices.cxx
extensions/source/propctrlr/pcrservices.cxx
extensions/source/svg/makefile.mk
forms/Library_frm.mk
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
package/prj/d.lst
package/source/zipapi/XMemoryStream.cxx
package/source/zipapi/XMemoryStream.hxx
setup_native/prj/d.lst
setup_native/source/win32/customactions/relnotes/makefile.mk
tools/test/export.map
wizards/com/sun/star/wizards/common/ConfigGroup.py
wizards/com/sun/star/wizards/common/ConfigNode.py
wizards/com/sun/star/wizards/common/Configuration.py
wizards/com/sun/star/wizards/common/Desktop.py
wizards/com/sun/star/wizards/common/FileAccess.py
wizards/com/sun/star/wizards/common/Helper.py
wizards/com/sun/star/wizards/common/SystemDialog.py
wizards/com/sun/star/wizards/document/OfficeDocument.py
wizards/com/sun/star/wizards/fax/FaxDocument.py
wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
wizards/com/sun/star/wizards/letter/LetterDocument.py
wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
wizards/com/sun/star/wizards/text/TextDocument.py
wizards/com/sun/star/wizards/text/TextFieldHandler.py
wizards/com/sun/star/wizards/text/TextSectionHandler.py
wizards/com/sun/star/wizards/text/ViewHandler.py
wizards/com/sun/star/wizards/ui/UnoDialog.py
wizards/com/sun/star/wizards/ui/UnoDialog2.py
wizards/com/sun/star/wizards/ui/WizardDialog.py
wizards/com/sun/star/wizards/ui/event/CommonListener.py
wizards/com/sun/star/wizards/ui/event/DataAware.py
wizards/com/sun/star/wizards/ui/event/RadioDataAware.py
wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
wizards/util/helpids.h
wizards/util/hidother.src
xmlsecurity/prj/build.lst
xmlsecurity/prj/d.lst
xmlsecurity/qa/certext/SanCertExt.cxx
Diffstat (limited to 'hunspell')
-rw-r--r-- | hunspell/hunspell-android.patch | 33 | ||||
-rw-r--r-- | hunspell/hunspell-solaris.patch | 12 | ||||
-rw-r--r-- | hunspell/hunspell-static.patch | 11 | ||||
-rw-r--r-- | hunspell/hunspell-wntconfig.patch | 4 | ||||
-rw-r--r-- | hunspell/makefile.mk | 107 | ||||
-rw-r--r-- | hunspell/prj/build.lst | 3 | ||||
-rw-r--r-- | hunspell/prj/d.lst | 6 |
7 files changed, 176 insertions, 0 deletions
diff --git a/hunspell/hunspell-android.patch b/hunspell/hunspell-android.patch new file mode 100644 index 000000000000..7daef8c3ed79 --- /dev/null +++ b/hunspell/hunspell-android.patch @@ -0,0 +1,33 @@ +--- misc/hunspell-1.3.2/config.sub ++++ misc/build/hunspell-1.3.2/config.sub +@@ -1272,7 +1272,7 @@ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ +- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ++ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ +--- misc/hunspell-1.3.2/src/tools/munch.c ++++ misc/build/hunspell-1.3.2/src/tools/munch.c +@@ -8,7 +8,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> +-#ifdef __linux__ ++#if defined(__linux__) && !defined(__ANDROID__) + #include <error.h> + #include <errno.h> + #include <sys/mman.h> +--- misc/hunspell-1.3.2/src/tools/unmunch.c ++++ misc/build/hunspell-1.3.2/src/tools/unmunch.c +@@ -8,7 +8,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> +-#ifdef __linux__ ++#if defined(__linux__) && !defined(__ANDROID__) + #include <error.h> + #include <errno.h> + #include <sys/mman.h> diff --git a/hunspell/hunspell-solaris.patch b/hunspell/hunspell-solaris.patch new file mode 100644 index 000000000000..b07bbb254c3f --- /dev/null +++ b/hunspell/hunspell-solaris.patch @@ -0,0 +1,12 @@ +--- misc/hunspell-1.3.2.orig/src/tools/hunspell.cxx 2010-02-27 23:42:05.000000000 +0000 ++++ misc/build/hunspell-1.3.2/src/tools/hunspell.cxx 2010-02-27 23:43:02.000000000 +0000 +@@ -10,6 +10,9 @@ + #include "hunspell.hxx" + #include "csutil.hxx" + ++// switch off iconv support for tests (fixing Solaris problems) ++#undef HAVE_ICONV ++ + #ifndef HUNSPELL_EXTRA + #define suggest_auto suggest + #endif diff --git a/hunspell/hunspell-static.patch b/hunspell/hunspell-static.patch new file mode 100644 index 000000000000..daab90ce9a75 --- /dev/null +++ b/hunspell/hunspell-static.patch @@ -0,0 +1,11 @@ +--- misc/hunspell-1.3.2/src/hunspell/makefile.mk 2010-06-17 15:56:41.000000000 +0200 ++++ misc/build/hunspell-1.3.2/src/hunspell/makefile.mk 2011-02-10 20:47:22.000000000 +0100 +@@ -39,7 +39,7 @@ + + # --- Files -------------------------------------------------------- + +-CFLAGS+=-I..$/..$/ ++CFLAGS+=-I..$/..$/ -DHUNSPELL_STATIC + CDEFS+=-DOPENOFFICEORG + + SLOFILES= \ diff --git a/hunspell/hunspell-wntconfig.patch b/hunspell/hunspell-wntconfig.patch new file mode 100644 index 000000000000..cc353b1a2118 --- /dev/null +++ b/hunspell/hunspell-wntconfig.patch @@ -0,0 +1,4 @@ +--- misc/hunspell-1.3.2/config.h 2010-02-25 14:38:38.000000000 +0000 ++++ misc/build/hunspell-1.3.2/config.h 2010-02-25 14:38:42.000000000 +0000 +@@ -1 +0,0 @@ +-dummy diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk new file mode 100644 index 000000000000..bf6f0b9f9acd --- /dev/null +++ b/hunspell/makefile.mk @@ -0,0 +1,107 @@ +#************************************************************************* +# +# 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=hunspell +TARGET=hunspell + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +# --- Files -------------------------------------------------------- + +TARFILE_NAME=hunspell-1.3.2 +TARFILE_MD5=3121aaf3e13e5d88dfff13fb4a5f1ab8 +ADDITIONAL_FILES+=config.h + +PATCH_FILES=\ + hunspell-static.patch \ + hunspell-wntconfig.patch \ + hunspell-solaris.patch \ + hunspell-android.patch + +.IF "$(GUI)"=="UNX" + +#relative to CONFIGURE_DIR +CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) configure +CONFIGURE_FLAGS= --disable-shared --disable-nls --with-pic +.IF "$(COMNAME)"=="sunpro5" +CONFIGURE_FLAGS+= CFLAGS=-xc99=none +.ENDIF # "$(COMNAME)"=="sunpro5" + +.IF "$(OS)"=="AIX" +CONFIGURE_FLAGS+= CFLAGS=-D_LINUX_SOURCE_COMPAT +.ENDIF + +.IF "$(SYSBASE)"!="" +.IF "$(EXTRA_CFLAGS)"!="" +CONFIGURE_FLAGS+= CFLAGS="$(EXTRA_CFLAGS)" CXXFLAGS="$(EXTRA_CFLAGS)" +.ENDIF # "$(EXTRA_CFLAGS)"!="" +.ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!="" +CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" +.ENDIF + +.IF "$(CROSS_COMPILING)"=="YES" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) +.ENDIF + +BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) + +OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.libs$/libhunspell-1.3.a + +.ENDIF # "$(GUI)"=="UNX" + + +.IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" +CONFIGURE_ACTION=configure + +CONFIGURE_FLAGS= --disable-shared --disable-nls --with-pic LDFLAGS=-Wl,--enable-runtime-pseudo-reloc-v2 + +.IF "$(CROSS_COMPILING)"=="YES" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) +.ENDIF + +BUILD_ACTION=make +OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.libs$/libhunspell-1.3.a +.ELSE +BUILD_ACTION=cd src/hunspell && dmake +.ENDIF +.ENDIF # "$(GUI)"=="WNT" + +OUT2INC= \ + $(BUILD_DIR)$/src$/hunspell$/*.hxx \ + $(BUILD_DIR)$/src$/hunspell$/*.h + +# --- Targets ------------------------------------------------------ + +.INCLUDE : set_ext.mk +.INCLUDE : target.mk +.INCLUDE : tg_ext.mk + diff --git a/hunspell/prj/build.lst b/hunspell/prj/build.lst new file mode 100644 index 000000000000..ea87500d1d6d --- /dev/null +++ b/hunspell/prj/build.lst @@ -0,0 +1,3 @@ +hun hunspell : solenv ICU:icu NULL +hun hunspell usr1 - all hun_mkout NULL +hun hunspell nmake - all hun_hunspell NULL diff --git a/hunspell/prj/d.lst b/hunspell/prj/d.lst new file mode 100644 index 000000000000..da3b58c94567 --- /dev/null +++ b/hunspell/prj/d.lst @@ -0,0 +1,6 @@ +..\%__SRC%\lib\lib*.* %_DEST%\lib\lib*.* +..\%__SRC%\slb\libhunspell.lib %_DEST%\lib\libhunspell.lib + +mkdir: %_DEST%\inc\hunspell +..\%__SRC%\inc\*.hxx %_DEST%\inc\hunspell\*.hxx +..\%__SRC%\inc\*.h %_DEST%\inc\hunspell\*.h |