[Libreoffice-commits] .: Branch 'libreoffice-3-3' - patches/dev300 patches/mono

[Cédric Bosdonnat]

 patches/dev300/cli-mono-common.diff      |   12 ------------
 patches/dev300/fields-table-formula.diff |   10 +++++-----
 patches/mono/mono-build-keyfile.diff     |    2 +-
 patches/mono/mono-build.diff             |    3 +--
 4 files changed, 7 insertions(+), 20 deletions(-)

New commits:
commit c3c32fe04adec84842f00bb33b501679f6c7a6f8
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Mon Dec 6 16:34:50 2010 +0100

    Massaged the patches to make them apply

diff --git a/patches/dev300/cli-mono-common.diff b/patches/dev300/cli-mono-common.diff
index b50c001..f683244 100644
--- a/patches/dev300/cli-mono-common.diff
+++ b/patches/dev300/cli-mono-common.diff
@@ -482,15 +482,3 @@ index 9ae71d5..38d6a69 100644
                  }
              }
 
-diff --git cli_ure/prj/build.lst cli_ure/prj/build.lst
-index 268240c..bb595ae 100644
---- cli_ure/prj/build.lst
-+++ cli_ure/prj/build.lst
-@@ -6,7 +6,7 @@ ure	cli_ure\source				nmake   -   w,vc7   ure_source_source ure_inc NULL
- ure	cli_ure\source\basetypes	nmake	-	w,vc7	ure_source_basetypes ure_source_version ure_source_source.w ure_inc NULL
- ure	cli_ure\source\climaker		nmake	-	w,vc7	ure_source_climaker ure_source_basetypes.w ure_inc NULL
- ure	cli_ure\unotypes			nmake	-	w,vc7	ure_unotypes ure_source_version ure_source_source.w ure_source_climaker.w ure_inc NULL
--ure	cli_ure\source\ure			nmake	-	w,vc7	ure_source_ure ure_source_version ure_source_source.w ure_unotypes.w ure_inc NULL
-+ure	cli_ure\source\ure			nmake	-	w,vc7	ure_source_ure ure_source_version ure_source_source.w ure_source_basetypes.w ure_unotypes.w ure_inc NULL
- ure	cli_ure\source\uno_bridge	nmake	-	w,vc7	ure_source_uno_bridge ure_source_basetypes.w ure_unotypes.w ure_source_ure.w ure_inc NULL
- ure	cli_ure\source\native		nmake	-	w,vc7	ure_source_native ure_source_version ure_source_source.w ure_source_ure.w ure_unotypes.w ure_source_uno_bridge.w ure_inc NULL
diff --git a/patches/dev300/fields-table-formula.diff b/patches/dev300/fields-table-formula.diff
index e809488..6c3faf4 100644
--- a/patches/dev300/fields-table-formula.diff
+++ b/patches/dev300/fields-table-formula.diff
@@ -1063,19 +1063,19 @@ index 24ad295..7625b28 100644
 --- sw/util/makefile.mk
 +++ sw/util/makefile.mk
 @@ -120,7 +120,12 @@ SHL1STDLIBS+= \
+     $(SALHELPERLIB) \
      $(ICUUCLIB) \
-     $(I18NUTILLIB)
- SHL1STDLIBS+= \
+     $(I18NUTILLIB) \
 -    $(AVMEDIALIB)
 +    $(AVMEDIALIB) \
-+	$(IXIONLIB)
++    $(IXIONLIB)
 +.IF "$(GUI)"=="WNT"
 +SHL1STDLIBS+= \
 +    $(BOOSTTHREADLIB)
 +.ENDIF
  
- .IF "$(GUI)"=="WNT"
- SHL1STDLIBS+= $(ADVAPI32LIB)
+ .IF "$(DBG_LEVEL)">="2"
+ SHL1STDLIBS+= $(LIBXML2LIB)
 diff --git a/configure.in b/configure.in
 index 30f667a..4dd8d06 100644
 --- configure.in
diff --git a/patches/mono/mono-build-keyfile.diff b/patches/mono/mono-build-keyfile.diff
index e2694fe..29d40c5 100644
--- a/patches/mono/mono-build-keyfile.diff
+++ b/patches/mono/mono-build-keyfile.diff
@@ -76,7 +76,7 @@ index 2a3c16b..bc1b962 100644
  .ENDIF
  
 @@ -59,7 +59,7 @@ CSFILES = \
-     uno$/util$/WeakComponentBase.cs	\
+     uno$/util$/ManagedCodeLoader.cs	\
      $(ASSEMBLY_ATTRIBUTES)
  
 -.IF "$(CCNUMVER)" <= "001399999999"
diff --git a/patches/mono/mono-build.diff b/patches/mono/mono-build.diff
index 53d0684..f5db663 100644
--- a/patches/mono/mono-build.diff
+++ b/patches/mono/mono-build.diff
@@ -14,13 +14,12 @@ diff --git cli_ure/prj/build.lst cli_ure/prj/build.lst
 index ea7b486..00f7f53 100644
 --- cli_ure/prj/build.lst
 +++ cli_ure/prj/build.lst
-@@ -2,13 +2,13 @@
+@@ -2,12 +2,13 @@
  ure	cli_ure						usr1	-	all	ure_mkout NULL
  ure	cli_ure\inc					nmake   -   all   ure_inc NULL
  ure	cli_ure\version				nmake   -   all   ure_source_version ure_inc NULL
 -ure	cli_ure\source				nmake   -   w,vc7   ure_source_source ure_inc NULL
 -ure	cli_ure\source\basetypes	nmake	-	w,vc7	ure_source_basetypes ure_source_version ure_source_source.w ure_inc NULL
--ure	cli_ure\source\bootstrap        nmake   -       u       ure_source_bootstrap ure_source_source ure_source_basetypes ure_inc NULL
 -ure	cli_ure\source\climaker		nmake	-	w,vc7	ure_source_climaker ure_source_basetypes.w ure_inc NULL
 -ure	cli_ure\unotypes			nmake	-	w,vc7	ure_unotypes ure_source_version ure_source_source.w ure_source_climaker.w ure_inc NULL
 -ure	cli_ure\source\ure			nmake	-	w,vc7	ure_source_ure ure_source_version ure_source_source.w ure_source_basetypes.w ure_unotypes.w ure_inc NULL