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

[michael svn gnome org]

Author: michael
Date: Fri Oct 31 10:23:26 2008
New Revision: 14438
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14438&view=rev

Log:
2008-10-31  Michael Meeks  <michael meeks novell com>

        * patches/dev300/crash-gvfs.diff,
        * patches/dev300/apply: fix gvfs related crasher.



Added:
   trunk/patches/dev300/crash-gvfs.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Oct 31 10:23:26 2008
@@ -2809,9 +2809,16 @@
 # avoid annoying warning
 warning-spin-button.diff, i#95554, michael
 
+# disable gnome-vfs bits if we are not building with it enabled
+crash-gvfs.diff, i#95689, michael
+
+buildfix-openjdk-6-no-rhino.diff
+
 # stop font updatess crashing OO.o - to be merged up-stream
 # soon, hence < m28
 [ CairoFonts < dev300-m28 >= ooo300-m9 ]
 psprint.defconfig_changes.diff, n#436441, flr
 [ CairoFonts < dev300-m28 < ooo300-m9 ]
 psprint.defconfig_changes-m7.diff, n#436441, flr
+
+

Added: trunk/patches/dev300/crash-gvfs.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/crash-gvfs.diff	Fri Oct 31 10:23:26 2008
@@ -0,0 +1,43 @@
+Index: desktop/source/app/appinit.cxx
+===================================================================
+RCS file: /cvs/framework/desktop/source/app/appinit.cxx,v
+retrieving revision 1.29
+diff -u -p -r1.29 appinit.cxx
+--- desktop/source/app/appinit.cxx	11 Apr 2008 03:35:23 -0000	1.29
++++ desktop/source/app/appinit.cxx	31 Oct 2008 10:17:09 -0000
+@@ -133,7 +133,8 @@ static bool configureUcb(bool bServer, r
+ 
+     bool ret = 
+         ::ucbhelper::ContentBroker::initialize( xServiceFactory, aArgs ) != false;
+-    
++
++#ifdef GNOME_VFS_ENABLED
+     // register GnomeUCP if necessary
+     ::ucbhelper::ContentBroker* cb = ::ucbhelper::ContentBroker::get();
+     if(cb) {
+@@ -173,6 +173,7 @@ static bool configureUcb(bool bServer, r
+         } catch (RuntimeException e) {
+         }
+     }    
++#endif // GNOME_VFS_ENABLED
+     
+     return ret;;
+ }
+Index: desktop/source/app/makefile.mk
+===================================================================
+RCS file: /cvs/framework/desktop/source/app/makefile.mk,v
+retrieving revision 1.42
+diff -u -p -r1.42 makefile.mk
+--- desktop/source/app/makefile.mk	25 Jun 2008 11:10:06 -0000	1.42
++++ desktop/source/app/makefile.mk	31 Oct 2008 10:17:09 -0000
+@@ -40,6 +40,10 @@ ENABLE_EXCEPTIONS=TRUE
+ 
+ .INCLUDE :  settings.mk
+ 
++.IF "$(ENABLE_GNOMEVFS)"=="TRUE"
++CFLAGS+=-DGNOME_VFS_ENABLED
++.ENDIF
++
+ SHL1TARGET = sofficeapp
+ SHL1OBJS = \
+     $(SLO)$/app.obj \