ooo-build r12674 - in trunk: . bin patches/dev300

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Mon May 26 17:31:56 2008
New Revision: 12674
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12674&view=rev

Log:
2008-05-26  Jan Holesovsky  <kendy suse cz>

        * patches/dev300/size-sal-textenc.diff: Fix patch.unapply.

        * bin/build-galleries: Modify to the latest 3 layer updates.


Modified:
   trunk/ChangeLog
   trunk/bin/build-galleries
   trunk/patches/dev300/size-sal-textenc.diff

Modified: trunk/bin/build-galleries
==============================================================================
--- trunk/bin/build-galleries	(original)
+++ trunk/bin/build-galleries	Mon May 26 17:31:56 2008
@@ -15,8 +15,8 @@
 fi
 
 # source ooenv if it exists
-if [ -f "$OOINSTDIR/openoffice.org3/program/ooenv" ] ; then
-    pushd "$OOINSTDIR/openoffice.org3/program" > /dev/null
+if [ -f "$OOINSTDIR/program/ooenv" ] ; then
+    pushd "$OOINSTDIR/program" > /dev/null
     . ooenv
     popd > /dev/null
 fi
@@ -40,10 +40,10 @@
 fi
 
 # where are installed the OOo-related files (thumbnails & points at the files, ...)
-GAL_DIR=$OOINSTDIR/openoffice.org/basis3.0/share/gallery
+GAL_DIR=$OOINSTDIR/basis-link/share/gallery
 # It requires the gengal binary
 # The binary is actually available in OOo only when built with ooo-build
-GAL_BIN=$OOINSTDIR/openoffice.org/basis3.0/program/gengal
+GAL_BIN=$OOINSTDIR/basis-link/program/gengal
 # start number for the new galleries
 GAL_NUMBER_FROM=70
 

Modified: trunk/patches/dev300/size-sal-textenc.diff
==============================================================================
--- trunk/patches/dev300/size-sal-textenc.diff	(original)
+++ trunk/patches/dev300/size-sal-textenc.diff	Mon May 26 17:31:56 2008
@@ -443,29 +443,15 @@
 +}
 --- sal/textenc/textenc.cxx	2007-07-27 10:17:47.000000000 +0200
 +++ sal/textenc/textenc.cxx	2007-07-27 10:36:15.000000000 +0200
-@@ -52,6 +52,14 @@
+@@ -37,6 +37,8 @@
+ #include "gettextencodingdata.h"
+ #include "tenchelp.h"
  #include "rtl/textenc.h"
- #endif
- 
-+#ifndef _RTL_USTRING_HXX_
 +#include "rtl/ustring.hxx"
-+#endif
-+
-+#ifndef _OSL_MODULE_H_
 +#include "osl/module.h"
-+#endif
-+
+ 
  #ifndef INCLUDED_STDDEF_H
  #include <stddef.h>
- #define INCLUDED_STDDEF_H
-@@ -63,6 +71,7 @@
- #define NOTABCHAR_START 0xFFFF
- #define NOTABCHAR_END 0x0000
- 
-+
- #define SAME8090UNI_START 0x80
- #define SAME8090UNI_END 0x9F
- static sal_uInt16 const aImpl8090SameToUniTab[SAME8090UNI_END
 @@ -103,140 +112,69 @@ static sal_uChar const aImplA0FFSameToCh
  
  static sal_uInt16 const aImplDoubleByteIdentifierTab[1] = { 0 };
@@ -703,8 +689,8 @@
 +};
 --- scp2/source/ooo/file_library_ooo.scp	2007-07-27 10:17:53.000000000 +0200
 +++ scp2/source/ooo/file_library_ooo.scp	2007-07-27 10:20:23.000000000 +0200
-@@ -2265,6 +2265,17 @@ SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH( gi
- SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH( gid_File_Lib_Wininetbe, wininetbe1.uno )
+@@ -1820,6 +1820,17 @@ SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH( gi
+ SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1.uno )
  #endif
  
 +File gid_File_Lib_Sal_TextEnc
@@ -719,5 +705,5 @@
 +End
 +
  #ifdef MACOSX
- SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH( gid_File_Lib_Macbe, macbe1.uno )
+ SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Macbe, macbe1.uno )
  #endif