ooo-build r13320 - in trunk: . bin patches/dev300 patches/mono patches/vba

From: rengelhard svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13320 - in trunk: . bin patches/dev300 patches/mono patches/vba
Date: Mon, 21 Jul 2008 13:43:33 +0000 (UTC)
Author: rengelhard
Date: Mon Jul 21 13:43:33 2008
New Revision: 13320
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13320&view=rev

Log:
2008-07-21  Rene Engelhard  <rene debian org>

        * patches/dev300/build-java-target-m25.diff,
          patches/dev300/build-java-target.diff,
          patches/dev300/unxsplash-rework-m25.diff,
          patches/dev300/unxsplash-rework.diff,
          patches/dev300/uses-vfs-m25.diff,
          patches/dev300/uses-vfs.diff,
          patches/dev300/cws-layoutdialogs-svx-m25.diff,
          patches/dev300/cws-layoutdialogs-svx.diff,
          patches/mono/buildfix-use-climaker-in-unoil-m25.diff,
          patches/mono/buildfix-use-climaker-in-unoil.diff,
          patches/vba/vbaevents-services-sources-m25.diff,
          patches/vba/vbaevents-services-sources.diff,
          patches/dev300/apply: dev300-m26, 2 patches still to go



Added:
   trunk/patches/dev300/build-java-target-m25.diff
      - copied unchanged from r13314, /trunk/patches/dev300/build-java-target.diff
   trunk/patches/dev300/cws-layoutdialogs-svx-m25.diff   (props changed)
      - copied unchanged from r13314, /trunk/patches/dev300/cws-layoutdialogs-svx.diff
   trunk/patches/dev300/unxsplash-rework-m25.diff
      - copied unchanged from r13314, /trunk/patches/dev300/unxsplash-rework.diff
   trunk/patches/dev300/uses-vfs-m25.diff
      - copied unchanged from r13314, /trunk/patches/dev300/uses-vfs.diff
   trunk/patches/mono/buildfix-use-climaker-in-unoil-m25.diff   (props changed)
      - copied unchanged from r13314, /trunk/patches/mono/buildfix-use-climaker-in-unoil.diff
   trunk/patches/vba/vbaevents-services-sources-m25.diff   (props changed)
      - copied unchanged from r13314, /trunk/patches/vba/vbaevents-services-sources.diff
Modified:
   trunk/ChangeLog
   trunk/bin/unpack
   trunk/patches/dev300/apply
   trunk/patches/dev300/build-java-target.diff
   trunk/patches/dev300/cws-layoutdialogs-svx.diff
   trunk/patches/dev300/unxsplash-rework.diff
   trunk/patches/dev300/uses-vfs.diff
   trunk/patches/mono/buildfix-use-climaker-in-unoil.diff
   trunk/patches/vba/vbaevents-services-sources.diff

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Mon Jul 21 13:43:33 2008
@@ -196,7 +196,7 @@
    echo "Unpacking $OOO_LANG_TARBALL..."
     ($OOO_DECOMPRESS_CMD $SRCDIR/$OOO_LANG_TARBALL | $GNUTAR xpf - )
 fi
-if test "z$SPLIT" != "z"; then
+if test "z$SPLIT" = "z"; then
   # -sdk_oo source
   if test -f $SRCDIR/$OOO_SDK_OO_TARBALL; then
      echo "Unpacking $OOO_SDK_OO_TARBALL"

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul 21 13:43:33 2008
@@ -372,9 +372,14 @@
 # make menu layout prettier
 vcl-menu-fixes.diff, i#67123, michael
 
+[ FixesNotForUpstream < dev300-m26 ]
+# Tell the desktop we support the VFS
+uses-vfs-m25.diff, i#43504, michael
+[ FixesNotForUpstream >= dev300-m26 < beb300-m0 ]
 # Tell the desktop we support the VFS
 uses-vfs.diff, i#43504, michael
 
+[ FixesNotForUpstream ]
 # add mozilla certificate dir detection to soffice
 soffice-detect-mozilla-certificates.diff
 
@@ -602,9 +607,14 @@
 # fix the systray quickstarter
 sfx2-quickstarter-fix.diff, i#88382, michael
 
+[ QuickStarter >= dev300-m26 < beb300-m0 ]
 # External splash screen implementation / 2nd time accelerator
 unxsplash-rework.diff, i#60696, michael/jholesov
+[ QuickStarter < dev300-m26 ]
+# External splash screen implementation / 2nd time accelerator
+unxsplash-rework-m25.diff, i#60696, michael/jholesov
 
+[ QuickStarter ]
 # FIXME: unxsplash-rework needs this function which was removed in m13
 # due to being unused. fix properly.
 hack-readd-GetStringParam.diff
@@ -1012,7 +1022,12 @@
 # even when it is built with JDK 1.5
 #build-java-target-m21.diff, pmladek
 
-[ BuildBits >= dev300-m22 < beb300-m0 ]
+[ BuildBits >= dev300-m22 < dev300-m26 < beb300-m0 ]
+# allow to define java target, so the build is usable with the JVM 1.4
+# even when it is built with JDK 1.5
+build-java-target-m25.diff, pmladek
+
+[ BuildBits >= dev300-m26 < beb300-m0 ]
 # allow to define java target, so the build is usable with the JVM 1.4
 # even when it is built with JDK 1.5
 build-java-target.diff, pmladek
@@ -1491,6 +1506,10 @@
 mono-climaker.diff, rodo
 climaker-csharp-win.diff, rodo
 buildfix-climaker-disabled.diff, rodo
+
+[ Mono >= dev300-m22 < dev300-m26 < beb300-m0 ]
+buildfix-use-climaker-in-unoil-m25.diff, rodo
+[ Mono >= dev300-m26 < beb300-m0 ]
 buildfix-use-climaker-in-unoil.diff, rodo
 
 [ Mono < dev300-m22 >= beb300-m1 ]
@@ -1626,8 +1645,12 @@
 # another bug with event bindings for dialogs ( awaiting iz id from andreas )
 vba-dialogs-fixsmoketest.diff
 
-[ VBAObjects ]
+[ VBAObjects < dev300-m26 ]
+vbaevents-services-sources-m25.diff, i#68893
+[ VBAObjects >= dev300-m26 < beb300-m0 ]
 vbaevents-services-sources.diff, i#68893
+
+[ VBAObjects ]
 #merged into vba-workbook-worksheet-events-dev300.diff
 #vba-workbook-worksheet-events-buildfix.diff, 
 vba-workbook-worksheet-events.diff
@@ -2523,8 +2546,10 @@
 cairo-prj-build-lst-m21.diff
 cairo-prj-d-lst-m21.diff
 
-[ InternalCairo >= dev300-m22 < beb300-m0 ]
+[ InternalCairo >= dev300-m22 < dev300-m26 < beb300-m0 ]
 cairo-prj-build-lst.diff
+
+[ InternalCairo >= dev300-m22 < beb300-m0 ]
 cairo-prj-d-lst.diff
 
 [ InternalCairo ]

Modified: trunk/patches/dev300/build-java-target.diff
==============================================================================
--- trunk/patches/dev300/build-java-target.diff	(original)
+++ trunk/patches/dev300/build-java-target.diff	Mon Jul 21 13:43:33 2008
@@ -11,15 +11,6 @@
  .ENDIF # $(SOLAR_JAVA)!= ""
 --- apache-commons/java/httpclient/makefile.mk.javatarget~	2008-04-11 13:14:05.000000000 +0200
 +++ apache-commons/java/httpclient/makefile.mk	2008-07-07 20:04:44.671097733 +0200
-@@ -50,7 +50,7 @@ TARFILE_NAME=commons-httpclient-3.1-src
- 
- TARFILE_ROOTDIR=commons-httpclient-3.1
- 
--#PATCH_FILE_NAME=patches$/httpclient.patch
-+PATCH_FILE_NAME=patches$/httpclient.patch
- 
- #CONVERTFILES=build.xml
- 				
 @@ -64,7 +64,7 @@ JAVA_HOME=
  .EXPORT : JAVA_HOME
  BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -f $(ANT_BUILDFILE) dist

Modified: trunk/patches/dev300/cws-layoutdialogs-svx.diff
==============================================================================
--- trunk/patches/dev300/cws-layoutdialogs-svx.diff	(original)
+++ trunk/patches/dev300/cws-layoutdialogs-svx.diff	Mon Jul 21 13:43:33 2008
@@ -38,9 +38,9 @@
 --- svx/prj/d.lst	12 Mar 2008 09:35:06 -0000	1.136
 +++ svx/prj/d.lst	31 Mar 2008 14:52:10 -0000	1.136.18.2
 @@ -656,3 +656,5 @@ mkdir: %_DEST%\inc%_EXT%\svx\sdr\table
- ..\inc\svx\svdtext.hxx %_DEST%\inc%_EXT%\svx\svdtext.hxx
- ..\inc\svx\svdotable.hxx %_DEST%\inc%_EXT%\svx\svdotable.hxx
  ..\inc\svx\selectioncontroller.hxx %_DEST%\inc%_EXT%\svx\selectioncontroller.hxx
+ ..\inc\svx\optimprove.hxx %_DEST%\inc%_EXT%\svx\optimprove.hxx
+ 
 +
 +..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.*
 cvs diff: Diffing svx/qa

Modified: trunk/patches/dev300/unxsplash-rework.diff
==============================================================================
--- trunk/patches/dev300/unxsplash-rework.diff	(original)
+++ trunk/patches/dev300/unxsplash-rework.diff	Mon Jul 21 13:43:33 2008
@@ -228,19 +228,6 @@
  			CMD_STRINGPARAM_ACCEPT,
  			CMD_STRINGPARAM_UNACCEPT,
  			CMD_STRINGPARAM_USERDIR,
-diff --git a/desktop/source/splash/makefile.mk b/desktop/source/splash/makefile.mk
-index 36b7638..5be3d9d 100644
---- desktop/source/splash/makefile.mk
-+++ desktop/source/splash/makefile.mk
-@@ -86,7 +86,7 @@ $(SLO)$/splash.obj : $(INCCOM)$/introbmpnames.hxx
- 
- .INCLUDE .IGNORE : $(MISC)$/intro_bmp_names.mk
- 
--.IF "$(INTO_BITMAPS:f)"!="$(LASTTIME_INTRO_BITMAPS)"
-+.IF "$(INTRO_BITMAPS:f)"!="$(LASTTIME_INTRO_BITMAPS)"
- DO_PHONY=.PHONY
- .ENDIF			# "$(INTRO_BITMAPS:f)"!="$(LASTTIME_INTRO_BITMAPS)"
- 
 diff --git a/desktop/unx/source/makefile.mk b/desktop/unx/source/makefile.mk
 new file mode 100644
 index 0000000..e609303

Modified: trunk/patches/dev300/uses-vfs.diff
==============================================================================
--- trunk/patches/dev300/uses-vfs.diff	(original)
+++ trunk/patches/dev300/uses-vfs.diff	Mon Jul 21 13:43:33 2008
@@ -12,5 +12,5 @@
 +	uses_gnomevfs=true
  	requires_terminal=false
 -	supported_uri_schemes=file,http,https,smb
- 	mime_types=application/vnd.oasis.opendocument.text,application/vnd.oasis.opendocument.text-template,application/vnd.oasis.opendocument.text-web,application/vnd.oasis.opendocument.text-master,application/vnd.oasis.opendocument.graphics,application/vnd.oasis.opendocument.graphics-template,application/vnd.oasis.opendocument.presentation,application/vnd.oasis.opendocument.presentation-template,application/vnd.oasis.opendocument.spreadsheet,application/vnd.oasis.opendocument.spreadsheet-template,application/vnd.oasis.opendocument.formula,application/vnd.oasis.opendocument.database,application/vnd.ms-excel,application/rtf,application/msword,application/vnd.ms-powerpoint,application/vnd.stardivision.calc,application/vnd.stardivision.chart,application/vnd.stardivision.draw,application/vnd.stardivision.impress,application/vnd.stardivision.mail,application/vnd.stardivision.math,application/vnd.stardivision.writer,application/vnd.sun.xml.calc,application/vnd.sun.xml.calc.template,app
 lication/vnd.sun.xml.draw,application/vnd.sun.xml.draw.template,application/vnd.sun.xml.impress,application/vnd.sun.xml.impress.template,application/vnd.sun.xml.math,application/vnd.sun.xml.writer,application/vnd.sun.xml.writer.global,application/vnd.sun.xml.writer.template,application/vnd.sun.xml.base,image/x-emf,image/x-pcx,image/x-photo-cd,image/x-pict;application/vnd.wordperfect;application/vnd.openofficeorg.extension
+ 	mime_types=application/vnd.oasis.opendocument.text,application/vnd.oasis.opendocument.text-template,application/vnd.oasis.opendocument.text-web,application/vnd.oasis.opendocument.text-master,application/vnd.oasis.opendocument.graphics,application/vnd.oasis.opendocument.graphics-template,application/vnd.oasis.opendocument.presentation,application/vnd.oasis.opendocument.presentation-template,application/vnd.oasis.opendocument.spreadsheet,application/vnd.oasis.opendocument.spreadsheet-template,application/vnd.oasis.opendocument.formula,application/vnd.oasis.opendocument.database,application/vnd.ms-excel,application/rtf,application/msword,application/vnd.ms-powerpoint,application/vnd.stardivision.calc,application/vnd.stardivision.chart,application/vnd.stardivision.draw,application/vnd.stardivision.impress,application/vnd.stardivision.mail,application/vnd.stardivision.math,application/vnd.stardivision.writer,application/vnd.sun.xml.calc,application/vnd.sun.xml.calc.template,app
 lication/vnd.sun.xml.draw,application/vnd.sun.xml.draw.template,application/vnd.sun.xml.impress,application/vnd.sun.xml.impress.template,application/vnd.sun.xml.math,application/vnd.sun.xml.writer,application/vnd.sun.xml.writer.global,application/vnd.sun.xml.writer.template,application/vnd.sun.xml.base,image/x-emf,image/x-pcx,image/x-photo-cd,image/x-pict;application/vnd.wordperfect;application/vnd.openofficeorg.extension;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd
 .ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;
  

Modified: trunk/patches/mono/buildfix-use-climaker-in-unoil.diff
==============================================================================
--- trunk/patches/mono/buildfix-use-climaker-in-unoil.diff	(original)
+++ trunk/patches/mono/buildfix-use-climaker-in-unoil.diff	Mon Jul 21 13:43:33 2008
@@ -51,7 +51,7 @@
 @@ -69,7 +79,7 @@ RDB = $(SOLARBINDIR)$/offapi.rdb
  EXTRA_RDB = $(SOLARBINDIR)$/udkapi.rdb
  
- $(BIN)/cli_oootypes.dll : $(RDB) $(EXTRA_RDB) 
+ $(BIN)/cli_oootypes.dll : $(RDB) $(EXTRA_RDB) version.txt 
 -	$(WRAPCMD) $(SOLARBINDIR)$/climaker.exe $(CLIMAKERFLAGS) \
 +	$(CLIMAKER) $(CLIMAKERFLAGS) \
  		--out $@ \

Modified: trunk/patches/vba/vbaevents-services-sources.diff
==============================================================================
--- trunk/patches/vba/vbaevents-services-sources.diff	(original)
+++ trunk/patches/vba/vbaevents-services-sources.diff	Mon Jul 21 13:43:33 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 @@
-             $(SLO)$/logging.obj \
+@@ -58,6 +58,7 @@
+             $(SLO)$/componentmodule.obj \
+             $(SLO)$/configurationhelper.obj \
              $(SLO)$/documentinfo.obj \
-             $(SLO)$/string.obj \
 +	    $(SLO)$/evtmethodhelper.obj \
-             $(SLO)$/legacysingletonfactory.obj \
-             $(SLO)$/synchronousdispatch.obj
- 
+             $(SLO)$/evtlistenerhlp.obj \
+             $(SLO)$/facreg.obj \
+             $(SLO)$/ihwrapnofilter.obj \
 --- /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]