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

[rengelhard svn gnome org]

Author: rengelhard
Date: Fri Dec 26 16:51:57 2008
New Revision: 14943
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14943&view=rev

Log:
        * patches/dev300/apply, patches/dev300/fix-mozbootstrap.diff: fix
          mozbootstrap build/install


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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Dec 26 16:51:57 2008
@@ -1185,6 +1185,9 @@
 # avoid crash when using GIO in non-GNOME Window manager
 ucb-gio-gnome-init.diff, i#96170, n#442678, mmeeks
 
+[ BuildBits ]
+fix-mozbootstrap.diff, i#97010, jholesov
+
 [ Java14 ]
 
 # enable build with Java 1.4; can't go upstream

Added: trunk/patches/dev300/fix-mozbootstrap.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/fix-mozbootstrap.diff	Fri Dec 26 16:51:57 2008
@@ -0,0 +1,35 @@
+--- connectivity/source/drivers/mozab/bootstrap/makefile.mk	2008-12-08 11:18:53.481875000 +0100
++++ connectivity/source/drivers/mozab/bootstrap/makefile.mk	2008-12-08 11:33:38.028750000 +0100
+@@ -40,13 +40,6 @@
+ PRJNAME=connectivity
+ TARGET=mozbootstrap
+ 
+-.IF ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO"
+-all: 
+-	@echo "		Not building the mozabsrc stuff in OpenOffice.org build"
+-	@echo "		dependency to Mozilla developer snapshots not feasable at the moment"
+-	@echo "         see http://bugzilla.mozilla.org/show_bug.cgi?id=135137";
+-.ENDIF
+-
+ USE_DEFFILE=TRUE
+ ENABLE_EXCEPTIONS=TRUE
+ 
+--- scp2/source/ooo/file_library_ooo.scp     (Revision 264861)
++++ scp2/source/ooo/file_library_ooo.scp     (Arbeitskopie)
+ 
+ #else
+ 
+-#ifndef WITHOUT_MOZILLA
+-
+ File gid_File_Lib_Mozbootstrap
+     TXT_FILE_BODY;
+     Styles = (PACKED,UNO_COMPONENT,PATCH);
+@@ -956,8 +954,6 @@
+ 
+ #endif
+ 
+-#endif
+-
+ STD_UNO_LIB_FILE(gid_File_Lib_Wpft,wpft)
+ 
+ STD_UNO_LIB_FILE(gid_File_Lib_Msworks,msworks)