ooo-build r12382 - in trunk: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue Apr 29 15:38:44 2008
New Revision: 12382
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12382&view=rev

Log:
2008-04-29  Rene Engelhard  <rene debian org>

        * patches/dev300/fix-system-hunspell.diff,
          patches/dev300/apply: add fix for system-hunspell from cws
          hunspellexternal


Added:
   trunk/patches/dev300/fix-system-hunspell.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Apr 29 15:38:44 2008
@@ -901,6 +901,9 @@
 # double qulification
 buildfix-sdext-double-qualification.diff, i#88584
 
+# fix build with system-hunspell
+fix-system-hunspell.diff, i#87604
+
 [ NovellOnlyWin32 ]
 SectionOwner => tml
 

Added: trunk/patches/dev300/fix-system-hunspell.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/fix-system-hunspell.diff	Tue Apr 29 15:38:44 2008
@@ -0,0 +1,154 @@
+Index: source/hyphenator/altlinuxhyph/hyphen/makefile.mk
+===================================================================
+RCS file: /cvs/whiteboard/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk,v
+retrieving revision 1.18
+diff -u -r1.18 makefile.mk
+--- lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk	25 Mar 2008 16:49:16 -0000	1.18
++++ lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk	30 Mar 2008 11:13:00 -0000
+@@ -104,16 +104,13 @@
+ 		$(UCBHELPERLIB)	\
+ 		$(UNOTOOLSLIB)	\
+ 		$(LNGLIB) \
+-		$(HNJLIB)
++		$(HNJLIB) \
++		$(ULINGULIB)
+ 
+-.IF "$(SYSTEM_HUNSPELL)" != "YES"
+-SHL1STDLIBS+=   $(ULINGULIB)
+-.ELSE
++.IF "$(SYSTEM_HUNSPELL)" == "YES"
+ SHL1STDLIBS+=   $(HUNSPELL_LIBS)
+ .ENDIF
+ 
+-
+-
+ # build DLL
+ SHL1LIBS=		$(SLB)$/$(TARGET).lib
+ SHL1IMPLIB=		i$(TARGET)
+Index: source/lingutil/makefile.mk
+===================================================================
+RCS file: /cvs/whiteboard/lingucomponent/source/lingutil/makefile.mk,v
+retrieving revision 1.8
+diff -u -r1.8 makefile.mk
+--- lingucomponent/source/lingutil/makefile.mk	25 Mar 2008 16:50:17 -0000	1.8
++++ lingucomponent/source/lingutil/makefile.mk	30 Mar 2008 11:13:00 -0000
+@@ -45,14 +45,11 @@
+ 
+ .INCLUDE : settings.mk
+ 
+-.IF "$(SYSTEM_HUNSPELL)" == "YES"
+- all:
+-	@echo "Nothing to do here; using system hunspell..."
+-.ENDIF
++SLOFILES=$(SLO)$/lingutil.obj
+ 
+-SLOFILES=	\
+-        $(SLO)$/dictmgr.obj \
+-        $(SLO)$/lingutil.obj
++.IF "$(SYSTEM_HUNSPELL)" != "YES"
++SLOFILES+=$(SLO)$/dictmgr.obj
++.ENDIF
+ 
+ 
+ LIB1TARGET= $(SLB)$/lib$(TARGET).lib
+Index: source/spellcheck/spell/makefile.mk
+===================================================================
+RCS file: /cvs/whiteboard/lingucomponent/source/spellcheck/spell/makefile.mk,v
+retrieving revision 1.19
+diff -u -r1.19 makefile.mk
+--- lingucomponent/source/spellcheck/spell/makefile.mk	25 Mar 2008 16:50:55 -0000	1.19
++++ lingucomponent/source/spellcheck/spell/makefile.mk	30 Mar 2008 11:13:00 -0000
+@@ -66,15 +66,19 @@
+ # --- Files --------------------------------------------------------
+ 
+ .IF "$(SYSTEM_HUNSPELL)" != "YES"
+-CXXFLAGS += -I..$/hunspell -I..$/..$/lingutil
+-CFLAGSCXX += -I..$/hunspell -I..$/..$/lingutil
+-CFLAGSCC += -I..$/hunspell  -I..$/..$/lingutil
++CXXFLAGS += -I..$/hunspell
++CFLAGSCXX += -I..$/hunspell
++CFLAGSCC += -I..$/hunspell
+ .ELSE
+ CXXFLAGS += $(HUNSPELL_CFLAGS)
+ CFLAGSCXX += $(HUNSPELL_CFLAGS)
+ CFLAGSCC += $(HUNSPELL_CFLAGS)
+ .ENDIF
+ 
++CXXFLAGS += -I..$/..$/lingutil
++CFLAGSCXX += -I..$/..$/lingutil
++CFLAGSCC += -I..$/..$/lingutil
++
+ EXCEPTIONSFILES=	\
+ 		$(SLO)$/sprophelp.obj\
+ 		$(SLO)$/sspellimp.obj
+@@ -99,13 +103,9 @@
+ 		$(SALLIB)		\
+ 		$(UCBHELPERLIB)	\
+ 		$(UNOTOOLSLIB)	\
+-		$(LNGLIB)
+-
+-.IF "$(SYSTEM_HUNSPELL)" != "YES"
+-SHL1STDLIBS+=   $(ULINGULIB) $(HUNSPELLLIB)
+-.ELSE
+-SHL1STDLIBS+=   $(HUNSPELLLIB)
+-.ENDIF
++		$(LNGLIB) \
++		$(ULINGULIB) \
++		$(HUNSPELLLIB)
+ 
+ # build DLL
+ SHL1LIBS=		$(SLB)$/$(TARGET).lib
+Index: source/thesaurus/libnth/makefile.mk
+===================================================================
+RCS file: /cvs/whiteboard/lingucomponent/source/thesaurus/libnth/makefile.mk,v
+retrieving revision 1.13
+diff -u -r1.13 makefile.mk
+--- lingucomponent/source/thesaurus/libnth/makefile.mk	25 Mar 2008 16:51:49 -0000	1.13
++++ lingucomponent/source/thesaurus/libnth/makefile.mk	30 Mar 2008 11:13:00 -0000
+@@ -72,26 +72,19 @@
+ 
+ # --- Files --------------------------------------------------------
+ 
+-.IF "$(SYSTEM_HUNSPELL)" == "YES" && "$(SYSTEM_MYTHES)" == "YES"
++.IF "$(SYSTEM_HUNSPELL)" == "YES"
+ CXXFLAGS += $(HUNSPELL_CFLAGS)
+ CFLAGSCXX += $(HUNSPELL_CFLAGS)
+ CFLAGSCC += $(HUNSPELL_CFLAGS)
+ .ENDIF
+-.IF "$(SYSTEM_HUNSPELL)" == "YES" && "$(SYSTEM_MYTHES)" != "YES"
+-CXXFLAGS += -I..$/mythes $(HUNSPELL_CFLAGS)
+-CFLAGSCXX += -I..$/mythes $(HUNSPELL_CFLAGS)
+-CFLAGSCC += -I..$/mythes $(HUNSPELL_CFLAGS)
++.IF "$(SYSTEM_MYTHES)" != "YES"
++CXXFLAGS += -I..$/mythes
++CFLAGSCXX += -I..$/mythes
++CFLAGSCC += -I..$/mythes
+ .ENDIF
+-.IF "$(SYSTEM_HUNSPELL)" != "YES" && "$(SYSTEM_MYTHES)" == "YES"
+ CXXFLAGS += -I..$/..$/lingutil
+ CFLAGSCXX += -I..$/..$/lingutil
+ CFLAGSCC += -I..$/..$/lingutil
+-.ENDIF
+-.IF "$(SYSTEM_HUNSPELL)" != "YES" && "$(SYSTEM_MYTHES)" != "YES"
+-CXXFLAGS += -I..$/mythes -I..$/..$/lingutil
+-CFLAGSCXX += -I..$/mythes -I..$/..$/lingutil
+-CFLAGSCC += -I..$/mythes -I..$/..$/lingutil
+-.ENDIF
+ 
+ EXCEPTIONSFILES=	\
+ 		$(SLO)$/ntprophelp.obj\
+@@ -119,11 +112,10 @@
+ 		$(UCBHELPERLIB)	\
+ 		$(UNOTOOLSLIB)	\
+ 		$(LNGLIB) \
+-                $(MYTHESLIB)
++                $(MYTHESLIB) \
++		$(ULINGULIB)
+ 
+-.IF "$(SYSTEM_HUNSPELL)" != "YES"
+-SHL1STDLIBS+=   $(ULINGULIB)
+-.ELSE
++.IF "$(SYSTEM_HUNSPELL)" == "YES"
+ SHL1STDLIBS+=   $(HUNSPELL_LIBS)
+ .ENDIF
+ # build DLL