ooo-build r11384 - in trunk: . patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Jan 23 20:26:37 2008
New Revision: 11384
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11384&view=rev

Log:
2008-01-23  Rene Engelhard  <rene debian org>

        * patches/src680/apply,
          patches/src680/build-java-target-m3.diff,
          patches/src680/build-java-target.diff,
          patches/src680/sc-export-shape-macro-bindings-m3.diff,
          patches/src680/sc-export-shape-macro-bindings.diff: ooh680-m4


Added:
   trunk/patches/src680/build-java-target-m3.diff
      - copied unchanged from r11383, /trunk/patches/src680/build-java-target.diff
   trunk/patches/src680/sc-export-shape-macro-bindings-m3.diff
      - copied unchanged from r11375, /trunk/patches/src680/sc-export-shape-macro-bindings.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply
   trunk/patches/src680/build-java-target.diff
   trunk/patches/src680/sc-export-shape-macro-bindings.diff

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Wed Jan 23 20:26:37 2008
@@ -448,7 +448,7 @@
 # allow dmake create_patch produce diffable patches
 solenv-dmake-create_patch.diff, i#68917, fridrich
 
-[ Fixes < ooh680-m4 ]
+[ Fixes < ooh680-m4 ] 
 # fix visibility for controls
 svx-sdr-contact-visibility.diff, i#83611. noelpwer
 
@@ -544,7 +544,7 @@
 
 # WebDAV locking
 # It is in this section because it needs part of the gvfs-related patches
-webdav-locking.diff, n#346711, i#29152, jholesov
+#FIXME#webdav-locking.diff, n#346711, i#29152, jholesov
 
 
 [ QuickStarter < ooh680-m2 ]
@@ -890,6 +890,12 @@
 [ BuildBits ]
 novell-win32-agfa-monotype-fonts.diff, tml
 
+[ BuildBits < ooh680-m4 ]
+# 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-m3.diff, pmladek
+
+[ BuildBits >= ooh680-m4 ]
 # 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
@@ -1365,8 +1371,15 @@
 # core changes not yet upstream
 sc-source-ui-vba-makefile-mk.diff
 
+[ VBAObjects < ooh680-m4 ]
+# export of macro bindings for shapes
+sc-export-shape-macro-bindings-m3.diff, n#304739, noelpwer
+
+[ VBAObjects >= ooh680-m4 ]
 # export of macro bindings for shapes
 sc-export-shape-macro-bindings.diff, n#304739, noelpwer
+
+[ VBAObjects ]
 # export of hlink bindings for shapes
 sc-export-shape-hlink-bindings.diff, n#304739, noelpwer
 
@@ -1489,7 +1502,7 @@
 
 
 [ OOXML ]
-cws-xmlfilter02-sc.diff
+#FIXME#cws-xmlfilter02-sc.diff
 cws-xmlfilter02-config_office.diff
 cws-xmlfilter02-filter.diff
 cws-xmlfilter02-goodies.diff
@@ -1779,7 +1792,7 @@
 
 
 [ WMF ]
-wmf-pattern-brush.diff, n#232232, rodo
+#FIXME#wmf-pattern-brush.diff, n#232232, rodo
 
 
 [ Layout < ooh680-m2]

Modified: trunk/patches/src680/build-java-target.diff
==============================================================================
--- trunk/patches/src680/build-java-target.diff	(original)
+++ trunk/patches/src680/build-java-target.diff	Wed Jan 23 20:26:37 2008
@@ -221,12 +221,9 @@
  # --- Files --------------------------------------------------------
  
  TARFILE_NAME=hsqldb_$(HSQLDB_VERSION)
-@@ -57,30 +55,25 @@
+@@ -60,28 +60,24 @@
  
- #CONVERTFILES=build$/build.xml
- 
--#PATCH_FILE_NAME=hsqldb_1_8_0
-+PATCH_FILE_NAME=hsqldb_1_8_0
+ PATCH_FILE_NAME=patches$/accumulated_patches.patch
  
 +ADDITIONAL_FILES=makefile.mk
 +
@@ -251,19 +248,22 @@
  
  .INCLUDE : set_ext.mk
  .INCLUDE : target.mk
--
+ 
 -.IF "$(SOLAR_JAVA)" != ""
  .INCLUDE : tg_ext.mk
 -.ENDIF
  
 +.ELSE
-+all:
-+        @echo java disabled
++ all:
++	@echo java disabled
 +.ENDIF
 dummy line to avoid confusing diff-mode
---- /dev/null   2007-04-19 15:48:30.000000000 +0200
-+++ hsqldb/hsqldb_1_8_0	2007-11-04 00:49:18.000000000 +0100
-@@ -0,0 +1,173 @@
+--- hsqldb/patches/accumulated_patches.patch	18 Jan 2008 12:52:49 -0000	1.1.6.2
++++ hsqldb/patches/accumulated_patches.patch	23 Jan 2008 20:16:11 -0000
+@@ -55,3 +55,176 @@
+           }
+   
+           statement = expandedStatement.toString();
 +diff -crN misc/hsqldb/makefile.mk misc/build/hsqldb/makefile.mk
 +*** misc/hsqldb/makefile.mk	2006-11-28 12:45:49.000000000 +0100
 +--- misc/build/hsqldb/makefile.mk	2006-11-28 12:31:12.000000000 +0100
@@ -1081,21 +1081,3 @@
              <classpath refid="classpath"/>
              <include name="XmlDiff.java"/>
          </javac>
---- xt/xt-20051206.patch.old	2006-11-22 16:33:12.000000000 +0100
-+++ xt/xt-20051206.patch	2007-06-12 12:08:42.000000000 +0200
-@@ -207,3 +207,15 @@
-           
-           RootNodeImpl(String systemId, int documentIndex, NamespacePrefixMap nsMap) {
-               super(nsMap);
-+diff -rc misc/xt-20051206/build.xml misc/build/xt-20051206/build.xml
-+*** misc/xt-20051206/build.xml.old	2007-06-12 11:49:24.000000000 +0200
-+--- misc/build/xt-20051206/build.xml	2007-06-12 12:04:51.000000000 +0200
-+@@ -301,6 +301,8 @@
-+ 
-+     <!-- compile java code -->
-+     <javac debug="on"
-++           source="${java.source.ver}"
-++           target="${java.target.ver}"
-+            srcdir="${xtJsrc}"
-+            destdir="${stage}/xt" >
-+       

Modified: trunk/patches/src680/sc-export-shape-macro-bindings.diff
==============================================================================
--- trunk/patches/src680/sc-export-shape-macro-bindings.diff	(original)
+++ trunk/patches/src680/sc-export-shape-macro-bindings.diff	Wed Jan 23 20:26:37 2008
@@ -20,7 +20,7 @@
 +    bool                SetMacroLink( const ::com::sun::star::script::ScriptEventDescriptor& rEvent, sal_uInt16 nObjType );
 +
 +    /** Sets the name of a macro 
-+        @return  true = The passed macro name has been found. */
++        @return  true = The passed macro name has been found. /
 +    bool                SetMacroLink( const String& rMacro );
 +};
 +
@@ -104,9 +104,9 @@
 --- sc/source/filter/excel/xeescher.cxx	2007-08-02 14:30:41.000000000 +0100
 +++ sc/source/filter/excel/xeescher.cxx	2007-08-29 14:24:09.000000000 +0100
 @@ -106,7 +106,8 @@
- #ifndef SC_XESTYLE_HXX
+ #include "xelink.hxx"
+ #include "xename.hxx"
  #include "xestyle.hxx"
- #endif
 -
 +#include "userdat.hxx"
 +#include "drwlayer.hxx"