GNOME.org
 

ooo-build r12631 - in trunk: . patches/dev300 patches/vba

Author: rengelhard
Date: Thu May 22 15:35:21 2008
New Revision: 12631
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12631&view=rev

Log:
2008-05-22  Rene Engelhard  <rene debian org>

        * patches/dev300/default-no-registration-menu-m12.diff,
          patches/dev300/default-no-registration-menu.diff,
          patches/dev300/config_office-gnome-vfs-lock-m12.diff,
          patches/dev300/config_office-gnome-vfs-lock.diff,
          patches/dev300/gnome-vfs-late-init-m12.diff,
          patches/dev300/gnome-vfs-late-init.diff,
          patches/vba/vbaevents-services-sources-m12.diff,
          patches/vba/vbaevents-services-sources.diff,
          patches/dev300/apply: more dev300-m13


Added:
   trunk/patches/dev300/config_office-gnome-vfs-lock-m12.diff
      - copied unchanged from r12629, /trunk/patches/dev300/config_office-gnome-vfs-lock.diff
   trunk/patches/dev300/default-no-registration-menu-m12.diff
      - copied unchanged from r12629, /trunk/patches/dev300/default-no-registration-menu.diff
   trunk/patches/dev300/gnome-vfs-late-init-m12.diff
      - copied unchanged from r12629, /trunk/patches/dev300/gnome-vfs-late-init.diff
   trunk/patches/vba/vbaevents-services-sources-m12.diff
      - copied unchanged from r12629, /trunk/patches/vba/vbaevents-services-sources.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/config_office-gnome-vfs-lock.diff
   trunk/patches/dev300/default-no-registration-menu.diff
   trunk/patches/dev300/gnome-vfs-late-init.diff
   trunk/patches/vba/vbaevents-services-sources.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu May 22 15:35:21 2008
@@ -534,8 +534,13 @@
 # FIXME: file upstream when the correctness proven
 ucb-gnome-vfs-lock.diff, n#203737, jholesov
 sfx2-gnome-vfs-lock.diff, n#203737, jholesov
+
+[ GnomeVFS < dev300-m13 ]
+config_office-gnome-vfs-lock-m12.diff, n#203737, jholesov
+[ GnomeVFS >= dev300-m13 ]
 config_office-gnome-vfs-lock.diff, n#203737, jholesov
 
+[ GnomeVFS ]
 # Fix crash in reading the directories
 # FIXME: file upstream together with the above
 ucb-gnome-vfs-crashfix.diff, i#0, jholesov
@@ -608,6 +613,11 @@
 # unlock the stream on crash/terminate/...
 webdav-locking-unlock-on-crash.diff, i#29152, jholesov
 
+[ GnomeVFS < dev300-m13 ]
+# NOT LOCKING RELATED!
+# Move gnome-vfs out of the startup sequence, load it only when needed
+gnome-vfs-late-init-m12.diff, i#84137, jholesov
+[ GnomeVFS >= dev300-m13 ]
 # NOT LOCKING RELATED!
 # Move gnome-vfs out of the startup sequence, load it only when needed
 gnome-vfs-late-init.diff, i#84137, jholesov
@@ -1059,14 +1069,17 @@
 # pestering people serves no useful purpose
 default-no-registration.diff, michael
 
-# no Help->registration dialog by default
-default-no-registration-menu.diff, michael
-
 # The Industrial OOo icon theme is too old. The OOo Tango icon
 # theme is closer to the current GNOME Industrial theme rules.
 # => Tango should be preferred over Industrial.
 tango-prefer-over-industrial.diff, n#304615, pmladek
 
+[ Defaults < dev300-m13 ]
+# no Help->registration dialog by default
+default-no-registration-menu-m12.diff, michael
+[ Defaults >= dev300-m13 ]
+# no Help->registration dialog by default
+default-no-registration-menu.diff, michael
 
 [ DefaultSettings ]
 
@@ -1467,10 +1480,14 @@
 buildfix-climaker-disabled.diff
 mono-climaker-bridgetest.diff
 
+[ VBAObjects < dev300-m13 ]
+vbaevents-services-sources.m12.diff, i#68893
+[ VBAObjects >= dev300-m13 ]
+vbaevents-services-sources.diff, i#68893
+
 [ VBAObjects ]
 SectionOwner => noelpwer
 
-vbaevents-services-sources.diff, i#68893
 vba-window-service.diff, jianhua
 
 #FIXME: changed by kendy: Noel, please have a look

Modified: trunk/patches/dev300/config_office-gnome-vfs-lock.diff
==============================================================================
--- trunk/patches/dev300/config_office-gnome-vfs-lock.diff	(original)
+++ trunk/patches/dev300/config_office-gnome-vfs-lock.diff	Thu May 22 15:35:21 2008
@@ -35,6 +35,6 @@
  ToFile( "ENABLE_CAIRO",      "@ENABLE_CAIRO@",     "e" );
  ToFile( "ENABLE_GNOMEVFS",   "@ENABLE_GNOMEVFS@",  "e" );
 +ToFile( "GNOMEVFS_HAS_LOCKING","@GNOMEVFS_HAS_LOCKING@",  "e" );
+ ToFile( "ENABLE_GIO",        "@ENABLE_GIO@",       "e" );
  ToFile( "ENABLE_KDE",        "@ENABLE_KDE@",       "e" );
  ToFile( "KDE_CFLAGS",        "@KDE_CFLAGS@",       "e" );
- ToFile( "KDE_LIBS",          "@KDE_LIBS@",         "e" );

Modified: trunk/patches/dev300/default-no-registration-menu.diff
==============================================================================
--- trunk/patches/dev300/default-no-registration-menu.diff	(original)
+++ trunk/patches/dev300/default-no-registration-menu.diff	Thu May 22 15:35:21 2008
@@ -254,15 +254,16 @@
      BitmapEx aInfoImage( FwkResId( BMP_BACKING_INFO ) );
      String aInfoHelpText( FwkResId( STR_BACKING_INFOHELP ) );
      
-@@ -172,11 +172,6 @@
+@@ -173,12 +173,6 @@
      maToolbox.SetItemCommand( nItemId_Extensions, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Extensions" ) ) );
      maToolbox.ShowItem( nItemId_Extensions );
      
 -    maToolbox.InsertItem( nItemId_Reg, Image( aRegImage ) );
 -    maToolbox.SetQuickHelpText( nItemId_Reg, aRegHelpText );
+-    maToolbox.SetItemText( nItemId_Reg, aRegHelpText );
 -    maToolbox.SetItemCommand( nItemId_Reg, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Register" ) ) );
 -    maToolbox.ShowItem( nItemId_Reg );
 -    
      maToolbox.InsertItem( nItemId_Info, Image( aInfoImage ) );
+     maToolbox.SetItemText( nItemId_Info, aInfoHelpText );
      maToolbox.SetQuickHelpText( nItemId_Info, aInfoHelpText );
-     maToolbox.SetItemCommand( nItemId_Info, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Info" ) ) );

Modified: trunk/patches/dev300/gnome-vfs-late-init.diff
==============================================================================
--- trunk/patches/dev300/gnome-vfs-late-init.diff	(original)
+++ trunk/patches/dev300/gnome-vfs-late-init.diff	Thu May 22 15:35:21 2008
@@ -135,9 +135,9 @@
  		(reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
 --- ucb/prj/build.lst.old	2007-11-26 13:43:29.000000000 +0100
 +++ ucb/prj/build.lst	2008-03-06 15:06:44.000000000 +0100
-@@ -1,4 +1,4 @@
--uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper NULL
-+uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper vcl NULL
+@@ -1,4 +1,4 @
+-uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper tools NULL
++uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper tools vcl NULL
  uc	ucb							usr1	-	all	uc_mkout NULL
- uc	ucb\inc					    nmake	-	all	uc_inc NULL
- uc	ucb\source\regexp		    nmake	-	all	uc_regexp uc_inc NULL
+  uc	ucb\inc					    nmake	-	all	uc_inc NULL
+   uc	ucb\source\regexp		    nmake	-	all	uc_regexp uc_inc NULL

Modified: trunk/patches/vba/vbaevents-services-sources.diff
==============================================================================
--- trunk/patches/vba/vbaevents-services-sources.diff	(original)
+++ trunk/patches/vba/vbaevents-services-sources.diff	Thu May 22 15:35:21 2008
@@ -1950,14 +1950,14 @@
  				{
 --- comphelper.orig/source/misc/makefile.mk	2008-04-11 12:11:33.000000000 +0100
 +++ comphelper/source/misc/makefile.mk	2008-05-15 18:08:56.703125000 +0100
-@@ -84,6 +84,7 @@ SLOFILES=	\
+@@ -84,6 +84,7 @@
              $(SLO)$/logging.obj \
              $(SLO)$/documentinfo.obj \
              $(SLO)$/string.obj \
-+            $(SLO)$/evtmethodhelper.obj \
-             $(SLO)$/legacysingletonfactory.obj
++	    $(SLO)$/evtmethodhelper.obj \
+             $(SLO)$/legacysingletonfactory.obj \
+             $(SLO)$/synchronousdispatch.obj
  
- # --- Targets ----------------------------------
 --- /dev/null	2008-05-15 18:17:31.156250000 +0100
 +++ comphelper/inc/comphelper/evtmethodhelper.hxx	2008-05-15 18:07:14.781250000 +0100
 @@ -0,0 +1,41 @@
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]