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

[René Engelhard]

 patches/dev300/apply                         |   15 ++++++++++++---
 patches/dev300/scp2_add_additional_dirs.diff |   23 -----------------------
 patches/mono/mono-build.diff                 |    6 +++---
 3 files changed, 15 insertions(+), 29 deletions(-)

New commits:
commit 0cbdd87aa05b522277c51a88d92e75f537e4edec
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Nov 30 18:13:51 2010 +0100

    make patches apply again
    
    update patches/mono/mono-build.diff for configure.in changes
    and remove apparently migrated scp2_add_additional_dirs.diff

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 329b880..9b9753e 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -235,6 +235,10 @@ buildfix-instsetoo_native-no-PKGFORMAT.diff, i#112761, rengelha
 # configmgr paths are not yet existing then
 speed-sal-fewer-lstats.diff, i#89730, jholesov
 
+# set unomaxservices and javamaxservices to 1
+[ TemporaryHacks and DebianOnly ]
+installer-globals-max-1-regcomp.diff
+
 [ OOo4KidsPatches ]
 
 # TODO: updated icons missing, updated sdf files missing
@@ -564,6 +568,10 @@ SectionOwner => Slackware
 pushfont-psstream.diff
 scp2-user-config-ooo3.diff
 
+[ DebianBaseOnly ]
+# fix the splash progressbar colors
+debian-splash.diff
+
 [ DroplineGNOMEOnly ]
 SectionOwner => DropLine
 
@@ -762,8 +770,6 @@ office-cfg-linux-common-template-dir.diff, pmladek
 # add new category "Labels" for blank Labels, calling cards, CD labels, etc.
 # will not push it upstream because it will be obsoleted by upcomming kendy's work
 sfx2-template-category-labels.diff, pmladek
-# add labels folder to scp2 module too
-scp2_add_additional_dirs.diff, kami
 
 [ DebianBaseOnly ]
 sensible-ooomua.diff
@@ -1887,7 +1893,7 @@ win32-restore-associations.diff, n#530872, tml
 [ Fixes ]
 fix-ppt-linespacing-import-export.diff, n#355302, rodo
 
-fields-table-formula.diff, n#631912, cbosdo
+#fields-table-formula.diff, n#631912, cbosdo
 
 # Backport from cbosdo06 CWS
 sw-table-frame-uno-fix.diff, i#112564, cbosdo
@@ -2365,3 +2371,6 @@ sc-single-right.diff, td123
 sd_effects_styles.diff, pixie
 symbols-20-august.diff, i#11167, jopsen
 vEdit-13-August.diff, jopsen
+
+[ TemporaryHacks ]
+hack-no-rm-fr-of-smoketest-userconfig.diff
diff --git a/patches/dev300/scp2_add_additional_dirs.diff b/patches/dev300/scp2_add_additional_dirs.diff
deleted file mode 100644
index a240037..0000000
--- a/patches/dev300/scp2_add_additional_dirs.diff
+++ /dev/null
@@ -1,23 +0,0 @@
----
- scp2/source/ooo/directory_ooo.scp |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git scp2/source/ooo/directory_ooo.scp scp2/source/ooo/directory_ooo.scp
-index 6b53469..4724f90 100644
---- scp2/source/ooo/directory_ooo.scp
-+++ scp2/source/ooo/directory_ooo.scp
-@@ -995,6 +995,11 @@ Directory gid_Dir_Template_Forms
-     DIR_IDENT_ALL_LANG(forms);
- End
- 
-+Directory gid_Dir_Template_Labels
-+    ParentID = gid_Dir_Template_Language;
-+    DIR_IDENT_ALL_LANG(labels);
-+End
-+
- Directory gid_Dir_Template_Layout
-     ParentID = gid_Dir_Template_Language;
-     DIR_IDENT_ALL_LANG(layout);
--- 
-1.7.0.1
-
diff --git a/patches/mono/mono-build.diff b/patches/mono/mono-build.diff
index 8fcd7fa..0d3b4cd 100644
--- a/patches/mono/mono-build.diff
+++ b/patches/mono/mono-build.diff
@@ -127,9 +127,9 @@ diff --git configure.in configure.in
 index 12fbec8..9c8aa00 100644
 --- configure.in
 +++ configure.in
-@@ -373,6 +373,10 @@
-                           build.
- ],,)
+@@ -456,6 +456,10 @@
+     fi ,
+ )
 
 +AC_ARG_ENABLE(mono,
 +[  --enable-mono           Enables the compilation of the Mono bindings