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

[rengelhard svn gnome org]

Author: rengelhard
Date: Thu Mar 20 13:44:03 2008
New Revision: 11960
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11960&view=rev

Log:
2008-03-20  Rene Engelhard  <rene debian org>

        * patches/dev300/apply,
          patches/dev300/buildfix-xmlhelp-system-expat.diff: fix DEV300 build
          with system expat


Added:
   trunk/patches/dev300/buildfix-xmlhelp-system-expat.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Mar 20 13:44:03 2008
@@ -844,6 +844,7 @@
 # fix build with gcc-4.2.1 and -fvisibility-hidden
 buildfix-xmloff-exportxforms.diff, i#84965
 
+buildfix-xmlhelp-system-expat.diff, i#86979
 
 [ NovellOnlyWin32 ]
 SectionOwner => tml
@@ -1028,7 +1029,7 @@
 SectionOwner => fridrich
 
 # Mozilla build-bits to not break on Solaris 11
-moz-solaris11-makefiles.diff, fridrich
+#FIXME#moz-solaris11-makefiles.diff, fridrich
 
 [ VCL ]
 

Added: trunk/patches/dev300/buildfix-xmlhelp-system-expat.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/buildfix-xmlhelp-system-expat.diff	Thu Mar 20 13:44:03 2008
@@ -0,0 +1,13 @@
+--- xmlhelp/source/com/sun/star/help/makefile.mk-old	2008-03-17 11:55:37.000000000 +0100
++++ xmlhelp/source/com/sun/star/help/makefile.mk	2008-03-17 11:56:05.000000000 +0100
+@@ -51,6 +51,10 @@
+ CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR)
+ .ENDIF
+ 
++.IF "$(SYSTEM_EXPAT)" == "YES"
++CFLAGS+=-DSYSTEM_EXPAT
++.ENDIF
++
+ .IF "$(SYSTEM_DB)" == "YES"
+ CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
+ .ENDIF