[ooo-build-commit] 2 commits - patches/dev300 patches/mono

[Tor Lillqvist]

 patches/dev300/default-no-registration-menu-sd.diff |   28 ++++++++++----------
 patches/mono/mono-build.diff                        |    2 -
 2 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 33d5cc6bddde5fceddf2ebd6fc16c14a7b4c9542
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 21 15:15:30 2009 +0300

    Adapt mono-build.diff for dev300-m54
    
    * patches/mono/mono-build.diff: Adapt for dev300-m54.

diff --git a/patches/mono/mono-build.diff b/patches/mono/mono-build.diff
index 51f2757..da6f439 100644
--- a/patches/mono/mono-build.diff
+++ b/patches/mono/mono-build.diff
@@ -138,7 +138,7 @@ index 8cca6e6..70df4eb 100644
  dnl  .NET needs special treatment
  dnl ===================================================================
 -if test "$_os" = "WINNT"; then
- if test "$COMEX" -ge "10"; then
+ if test "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then
  	dnl Check midl.exe
  	AC_PATH_PROG(MIDL_PATH, midl.exe)
 @@ -1873,6 +1875,8 @@ if test "$COMEX" -ge "10"; then
commit c38bfe45143ea6ea852564259e5ca2bb87031c3e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 21 15:12:36 2009 +0300

    dos2unix default-no-registration-menu-sd.diff

diff --git a/patches/dev300/default-no-registration-menu-sd.diff b/patches/dev300/default-no-registration-menu-sd.diff
index efd5d5b..a7351b3 100644
--- a/patches/dev300/default-no-registration-menu-sd.diff
+++ b/patches/dev300/default-no-registration-menu-sd.diff
@@ -3,22 +3,22 @@ index 6d62634..f53c293 100644
 --- sd/uiconfig/sdraw/menubar/menubar.xml
 +++ sd/uiconfig/sdraw/menubar/menubar.xml
 @@ -319,7 +319,6 @@
- 			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
- 			<menu:menuseparator/>
- 			<menu:menuitem menu:id=".uno:HelpSupport"/>
--			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
- 			<menu:menuseparator/>
- 			<menu:menuitem menu:id=".uno:About"/>
- 		</menu:menupopup>
+ 			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ 			<menu:menuseparator/>
+ 			<menu:menuitem menu:id=".uno:HelpSupport"/>
+-			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
+ 			<menu:menuseparator/>
+ 			<menu:menuitem menu:id=".uno:About"/>
+ 		</menu:menupopup>
 diff --git sd/uiconfig/simpress/menubar/menubar.xml sd/uiconfig/simpress/menubar/menubar.xml
 index b01d431..8e6fd46 100644
 --- sd/uiconfig/simpress/menubar/menubar.xml
 +++ sd/uiconfig/simpress/menubar/menubar.xml
 @@ -294,7 +294,6 @@
- 			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
- 			<menu:menuseparator/>
- 			<menu:menuitem menu:id=".uno:HelpSupport"/>
--			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
- 			<menu:menuseparator/>
- 			<menu:menuitem menu:id=".uno:About"/>
- 		</menu:menupopup>
+ 			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ 			<menu:menuseparator/>
+ 			<menu:menuitem menu:id=".uno:HelpSupport"/>
+-			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
+ 			<menu:menuseparator/>
+ 			<menu:menuitem menu:id=".uno:About"/>
+ 		</menu:menupopup>