ooo-build r13325 - in trunk: . patches/dev300 patches/mono

[rengelhard svn gnome org]

Author: rengelhard
Date: Mon Jul 21 15:23:39 2008
New Revision: 13325
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13325&view=rev

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

        * patches/dev300/mono-scp2.diff: fix to actually contain scp2 stuff
        * patches/dev300/mono-scp2-m25.diff,
          patches/dev300/apply: add m25 version of the above


Added:
   trunk/patches/mono/mono-scp2-m25.diff   (contents, props changed)
      - copied, changed from r13321, /trunk/patches/mono/mono-scp2.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/mono/mono-scp2.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul 21 15:23:39 2008
@@ -1503,8 +1503,12 @@
 mono-testtools-m21.diff
 
 # The build
-[ Mono >= dev300-m22 < beb300-m0 ]
+[ Mono >= dev300-m22 < dev300-m26 < beb300-m0 ]
+mono-scp2-m25.diff, rodo
+[ Mono >= dev300-m26 < beb300-m0 ]
 mono-scp2.diff, rodo
+
+[ Mono >= dev300-m22 < beb300-m0 ]
 cli_ure-source-bootstrap-makefile-mk.diff, rodo
 cli_ure-mono-bridge.diff, rodo
 mono-build.diff, rodo
@@ -1751,7 +1755,7 @@
 
 # added the OOXML-related MIME types to the upstream desktop files
 # needed for the universal GO-OO build
-sysui-desktop-ooxml.diff, pmladek
+#sysui-desktop-ooxml.diff, pmladek
 
 # fix build dependencies
 #FIXME still necessary? oox-token-deps.diff, pmladek
@@ -2555,7 +2559,7 @@
 
 [ Lockdown ]
 # Disable UI [toolbars, menus] customization
-ui-desktop-integration.diff, michael
+#ui-desktop-integration.diff, michael
 
 
 [ InternalCairo <= dev300-m21 ]

Copied: trunk/patches/mono/mono-scp2-m25.diff (from r13321, /trunk/patches/mono/mono-scp2.diff)
==============================================================================
--- /trunk/patches/mono/mono-scp2.diff	(original)
+++ trunk/patches/mono/mono-scp2-m25.diff	Mon Jul 21 15:23:39 2008
@@ -17,3 +17,161 @@
  SCPDEFS+=-DSYSTEM_SNDFILE
  .ENDIF
 
+Index: file_library_ooo.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
+retrieving revision 1.299
+diff -u -r1.299 file_library_ooo.scp
+--- scp2/source/ooo/file_library_ooo.scp	11 Jul 2008 10:32:04 -0000	1.299
++++ scp2/source/ooo/file_library_ooo.scp	20 Jul 2008 01:13:29 -0000
+@@ -137,7 +137,7 @@
+ STD_UNO_LIB_FILE(gid_File_Lib_Chartview, chartview)
+ 
+ 
+-#if defined WNT
++#if defined WNT || defined ENABLE_MONO
+ 
+ File gid_File_Lib_Cli_Oootypes_Assembly
+     TXT_FILE_BODY;
+@@ -155,7 +155,7 @@
+ End
+ 
+ #endif
+-#if defined WNT 
++#if defined WNT || defined ENABLE_MONO 
+ File gid_File_Lib_Policy_Cli_Oootypes_Assembly
+     TXT_FILE_BODY;
+     Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
+@@ -173,7 +173,7 @@
+ 
+ #endif
+ 
+-#if defined WNT
++#if defined WNT || defined ENABLE_MONO
+ 
+ File gid_File_Lib_Policy_Cli_Oootypes_Config
+     TXT_FILE_BODY;
+Index: ure.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ooo/ure.scp,v
+retrieving revision 1.10
+diff -u -r1.10 ure.scp
+--- scp2/source/ooo/ure.scp	30 Jun 2008 15:25:02 -0000	1.10
++++ scp2/source/ooo/ure.scp	20 Jul 2008 01:13:40 -0000
+@@ -410,7 +410,7 @@
+     // CompID = "CF542EC3-7A51-4EAA-8480-65D5E8906D05";
+ End
+ 
+-#if defined WNT
++#if defined WNT || defined ENABLE_MONO
+ File gid_File_Dl_Cli_Uno
+     TXT_FILE_BODY;
+     Dir = SCP2_URE_DL_DIR;
+@@ -420,7 +420,7 @@
+ End
+ #endif
+ 
+-#if defined WNT
++#if defined WNT || defined ENABLE_MONO
+ 
+ File gid_File_Dl_Cli_Ure_Assembly
+     TXT_FILE_BODY;
+@@ -439,7 +439,7 @@
+ 
+ #endif
+ 
+-#if defined WNT
++#if defined WNT || defined ENABLE_MONO
+ 
+ File gid_File_Dl_Policy_Cli_Ure_Assembly
+     TXT_FILE_BODY;
+@@ -458,7 +458,7 @@
+ 
+ #endif
+ 
+-#if defined WNT 
++#if defined WNT || defined ENABLE_MONO
+ 
+ File gid_File_Dl_Policy_Cli_Ure_Config
+     TXT_FILE_BODY;
+@@ -470,7 +470,7 @@
+ 
+ #endif
+ 
+-#if defined WNT 
++#if defined WNT || defined ENABLE_MONO
+ 
+ File gid_File_Dl_Cli_Basetypes_Assembly
+     TXT_FILE_BODY;
+@@ -489,7 +489,7 @@
+ 
+ #endif
+ 
+-#if defined WNT 
++#if defined WNT || defined ENABLE_MONO
+ 
+ File gid_File_Dl_Policy_Cli_Basetypes_Assembly
+     TXT_FILE_BODY;
+@@ -507,7 +507,7 @@
+ End
+ 
+ #endif
+-#if defined WNT 
++#if defined WNT || defined ENABLE_MONO
+ 
+ File gid_File_Dl_Policy_Cli_Basetypes_Config
+     TXT_FILE_BODY;
+@@ -520,7 +520,7 @@
+ #endif
+ 
+ 
+-#if defined WNT 
++#if defined WNT || defined ENABLE_MONO
+ 
+ File gid_File_Dl_Cli_Uretypes_Assembly
+     TXT_FILE_BODY;
+@@ -539,7 +539,7 @@
+ 
+ #endif
+ 
+-#if defined WNT 
++#if defined WNT || defined ENABLE_MONO
+ 
+ File gid_File_Dl_Policy_Cli_Uretypes_Assembly
+     TXT_FILE_BODY;
+@@ -558,7 +558,7 @@
+ 
+ #endif
+ 
+-#if defined WNT 
++#if defined WNT || defined ENABLE_MONO
+ 
+ File gid_File_Dl_Policy_Cli_Uretypes_Config
+     TXT_FILE_BODY;
+@@ -570,7 +570,7 @@
+ 
+ #endif
+ 
+-#if defined WNT 
++#if defined WNT || defined ENABLE_MONO
+ 
+ File gid_File_Lib_Cli_Cppuhelper_Assembly
+     TXT_FILE_BODY;
+@@ -588,7 +588,7 @@
+ End
+ 
+ #endif
+-#if defined WNT
++#if defined WNT || defined ENABLE_MONO
+ 
+ File gid_File_Lib_Policy_Cli_Cppuhelper_Assembly
+     TXT_FILE_BODY;
+@@ -607,7 +607,7 @@
+ 
+ #endif
+ 
+-#if defined WNT
++#if defined WNT || defined ENABLE_MONO
+ 
+ File gid_File_Lib_Policy_Cli_Cppuhelper_Config
+     TXT_FILE_BODY;

Modified: trunk/patches/mono/mono-scp2.diff
==============================================================================
--- trunk/patches/mono/mono-scp2.diff	(original)
+++ trunk/patches/mono/mono-scp2.diff	Mon Jul 21 15:23:39 2008
@@ -17,3 +17,161 @@
  SCPDEFS+=-DSYSTEM_SNDFILE
  .ENDIF
 
+Index: file_library_ooo.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
+retrieving revision 1.299
+diff -u -r1.299 file_library_ooo.scp
+--- scp2/source/ooo/file_library_ooo.scp	11 Jul 2008 10:32:04 -0000	1.299
++++ scp2/source/ooo/file_library_ooo.scp	20 Jul 2008 01:13:29 -0000
+@@ -137,7 +137,7 @@
+ STD_UNO_LIB_FILE(gid_File_Lib_Chartview, chartview)
+ 
+ 
+-#if defined WNT && defined MSC
++#if (defined WNT && defined MSC) || defined ENABLE_MONO
+ 
+ File gid_File_Lib_Cli_Oootypes_Assembly
+     TXT_FILE_BODY;
+@@ -156,7 +156,7 @@
+ 
+ #endif
+ 
+-#if defined WNT && defined MSC
++#if (defined WNT && defined MSC) || defined ENABLE_MONO
+ File gid_File_Lib_Policy_Cli_Oootypes_Assembly
+     TXT_FILE_BODY;
+     Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
+@@ -173,7 +173,7 @@
+ 
+ #endif
+ 
+-#if defined WNT && defined MSC
++#if (defined WNT && defined MSC) || defined ENABLE_MONO
+ 
+ File gid_File_Lib_Policy_Cli_Oootypes_Config
+     TXT_FILE_BODY;
+Index: ure.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ooo/ure.scp,v
+retrieving revision 1.10
+diff -u -r1.10 ure.scp
+--- scp2/source/ooo/ure.scp	30 Jun 2008 15:25:02 -0000	1.10
++++ scp2/source/ooo/ure.scp	20 Jul 2008 01:13:40 -0000
+@@ -410,7 +410,7 @@
+     // CompID = "CF542EC3-7A51-4EAA-8480-65D5E8906D05";
+ End
+ 
+-#if defined WNT && defined MSC
++#if (defined WNT && defined MSC) || defined ENABLE_MONO
+ File gid_File_Dl_Cli_Uno
+     TXT_FILE_BODY;
+     Dir = SCP2_URE_DL_DIR;
+@@ -420,7 +420,7 @@
+ End
+ #endif
+ 
+-#if defined WNT && defined MSC
++#if (defined WNT && defined MSC) || defined ENABLE_MONO
+ 
+ File gid_File_Dl_Cli_Ure_Assembly
+     TXT_FILE_BODY;
+@@ -439,7 +439,7 @@
+ 
+ #endif
+ 
+-#if defined WNT && defined MSC
++#if (defined WNT && defined MSC) || defined ENABLE_MONO
+ 
+ File gid_File_Dl_Policy_Cli_Ure_Assembly
+     TXT_FILE_BODY;
+@@ -458,7 +458,7 @@
+ 
+ #endif
+ 
+-#if defined WNT && defined MSC
++#if (defined WNT && defined MSC) || defined ENABLE_MONO
+ 
+ File gid_File_Dl_Policy_Cli_Ure_Config
+     TXT_FILE_BODY;
+@@ -470,7 +470,7 @@
+ 
+ #endif
+ 
+-#if defined WNT && defined MSC
++#if (defined WNT && defined MSC) || defined ENABLE_MONO
+ 
+ File gid_File_Dl_Cli_Basetypes_Assembly
+     TXT_FILE_BODY;
+@@ -489,7 +489,7 @@
+ 
+ #endif
+ 
+-#if defined WNT && defined MSC
++#if (defined WNT && defined MSC) || defined ENABLE_MONO
+ 
+ File gid_File_Dl_Policy_Cli_Basetypes_Assembly
+     TXT_FILE_BODY;
+@@ -507,7 +507,7 @@
+ End
+ 
+ #endif
+-#if defined WNT && defined MSC
++#if (defined WNT && defined MSC) || defined ENABLE_MONO
+ 
+ File gid_File_Dl_Policy_Cli_Basetypes_Config
+     TXT_FILE_BODY;
+@@ -520,7 +520,7 @@
+ #endif
+ 
+ 
+-#if defined WNT && defined MSC
++#if (defined WNT && defined MSC) || defined ENABLE_MONO
+ 
+ File gid_File_Dl_Cli_Uretypes_Assembly
+     TXT_FILE_BODY;
+@@ -539,7 +539,7 @@
+ 
+ #endif
+ 
+-#if defined WNT && defined MSC
++#if (defined WNT || defined MSC) defined ENABLE_MONO
+ 
+ File gid_File_Dl_Policy_Cli_Uretypes_Assembly
+     TXT_FILE_BODY;
+@@ -558,7 +558,7 @@
+ 
+ #endif
+ 
+-#if defined WNT && defined MSC
++#if (defined WNT && defined MSC) || defined ENABLE_MONO
+ 
+ File gid_File_Dl_Policy_Cli_Uretypes_Config
+     TXT_FILE_BODY;
+@@ -570,7 +570,7 @@
+ 
+ #endif
+ 
+-#if defined WNT && defined MSC
++#if (defined WNT && defined MSC) || defined ENABLE_MONO
+ 
+ File gid_File_Lib_Cli_Cppuhelper_Assembly
+     TXT_FILE_BODY;
+@@ -589,7 +589,7 @@
+ 
+ #endif
+ 
+-#if defined WNT && defined MSC
++#if (defined WNT && defined MSC) || defined ENABLE_MONO
+ 
+ File gid_File_Lib_Policy_Cli_Cppuhelper_Assembly
+     TXT_FILE_BODY;
+@@ -607,7 +607,7 @@
+ 
+ #endif
+ 
+-#if defined WNT && defined MSC
++#if (defined WNT && defined MSC) || defined ENABLE_MONO
+ 
+ File gid_File_Lib_Policy_Cli_Cppuhelper_Config
+     TXT_FILE_BODY;