ooo-build r13417 - in trunk: . patches/mono

[rengelhard svn gnome org]

Author: rengelhard
Date: Mon Jul 28 16:21:45 2008
New Revision: 13417
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13417&view=rev

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

        * patches/mono/mono-scp2{,-25}.diff: add our extra pieces from pre-m22
          mono-scp2.diff, thanks michael. Leave libuno_cli.so out because
          upstream installs that already for us. Add gid_File_Lib_Cli_Uno_Glue
          to gid_Module_Ure_Hidden since cppuhelper is there and needs this
          library


Modified:
   trunk/ChangeLog
   trunk/patches/mono/mono-scp2-m25.diff
   trunk/patches/mono/mono-scp2.diff

Modified: trunk/patches/mono/mono-scp2-m25.diff
==============================================================================
--- trunk/patches/mono/mono-scp2-m25.diff	(original)
+++ trunk/patches/mono/mono-scp2-m25.diff	Mon Jul 28 16:21:45 2008
@@ -175,3 +175,45 @@
  
  File gid_File_Lib_Policy_Cli_Cppuhelper_Config
      TXT_FILE_BODY;
+@@ -619,6 +619,33 @@ End
+ 
+ #endif
+ 
++#ifdef ENABLE_MONO
++
++File gid_File_Lib_Cli_Uno_Glue
++    TXT_FILE_BODY;
++    Styles = (PACKED);
++    Dir = SCP2_URE_DL_DIR;
++  #ifdef UNX
++    Name = STRING(CONCAT2(libcli_uno_glue,UNXSUFFIX));
++  #else
++    Name = "cli_uno_glue.dll";
++  #endif
++End
++
++File gid_File_Lib_Cli_Uno_Bridge_Assembly
++    TXT_FILE_BODY;
++    Styles = (PACKED, ASSEMBLY);
++    Name = "cli_uno_bridge.dll";
++    Dir = SCP2_URE_DL_DIR;
++    Assemblyname = "cli_uno_bridge";
++    PublicKeyToken = "ce2cb7e279207b9e";
++    Version = "1.0.0.0";
++    Culture = "neutral";
++    Attributes = "0";
++End
++
++#endif
++
+ #if defined SOLAR_JAVA
+ File gid_File_Dl_Jpipe
+     TXT_FILE_BODY;
+@@ -1124,6 +1124,7 @@
+            	gid_File_Lib_Cli_Cppuhelper_Assembly,
+             gid_File_Lib_Policy_Cli_Cppuhelper_Assembly,
+ 	        gid_File_Lib_Policy_Cli_Cppuhelper_Config,
++	    gid_File_Lib_Cli_Uno_Glue,
+             gid_File_Dl_Cppu,
+             gid_File_Dl_Cppuhelper,
+             gid_File_Dl_PurpEnvHelper,

Modified: trunk/patches/mono/mono-scp2.diff
==============================================================================
--- trunk/patches/mono/mono-scp2.diff	(original)
+++ trunk/patches/mono/mono-scp2.diff	Mon Jul 28 16:21:45 2008
@@ -175,3 +175,45 @@
  
  File gid_File_Lib_Policy_Cli_Cppuhelper_Config
      TXT_FILE_BODY;
+@@ -619,6 +619,33 @@ End
+ 
+ #endif
+ 
++#ifdef ENABLE_MONO
++
++File gid_File_Lib_Cli_Uno_Glue
++    TXT_FILE_BODY;
++    Styles = (PACKED);
++    Dir = SCP2_URE_DL_DIR;
++  #ifdef UNX
++    Name = STRING(CONCAT2(libcli_uno_glue,UNXSUFFIX));
++  #else
++    Name = "cli_uno_glue.dll";
++  #endif
++End
++
++File gid_File_Lib_Cli_Uno_Bridge_Assembly
++    TXT_FILE_BODY;
++    Styles = (PACKED, ASSEMBLY);
++    Name = "cli_uno_bridge.dll";
++    Dir = SCP2_URE_DL_DIR;
++    Assemblyname = "cli_uno_bridge";
++    PublicKeyToken = "ce2cb7e279207b9e";
++    Version = "1.0.0.0";
++    Culture = "neutral";
++    Attributes = "0";
++End
++
++#endif
++
+ #if defined SOLAR_JAVA
+ File gid_File_Dl_Jpipe
+     TXT_FILE_BODY;
+@@ -1124,6 +1124,7 @@
+            	gid_File_Lib_Cli_Cppuhelper_Assembly,
+             gid_File_Lib_Policy_Cli_Cppuhelper_Assembly,
+ 	        gid_File_Lib_Policy_Cli_Cppuhelper_Config,
++	    gid_File_Lib_Cli_Uno_Glue,
+             gid_File_Dl_Cppu,
+             gid_File_Dl_Cppuhelper,
+             gid_File_Dl_PurpEnvHelper,