ooo-build r15305 - in branches/ooo-build-3-0-1: . patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Fri Feb  6 19:27:56 2009
New Revision: 15305
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15305&view=rev

Log:
2009-02-06  Rafael Cabral  <cabral mandriva com>

	* patches/dev300/mdv-sysui-disableslack.diff, patches/dev300/apply:
	  (MandrivaOnly) disable slackware desktop things that are braking our
	  build (do_inst.sh script).
	* patches/dev300/mdv-xdgmailasmailer.diff, patches/dev300/apply:
	  (MandrivaOnly) change default email app to xdg-email



Added:
   branches/ooo-build-3-0-1/patches/dev300/mdv-sysui-disableslack.diff
   branches/ooo-build-3-0-1/patches/dev300/mdv-xdgmailasmailer.diff
Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/patches/dev300/apply

Modified: branches/ooo-build-3-0-1/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/apply	Fri Feb  6 19:27:56 2009
@@ -1002,6 +1002,10 @@
 wizards-path.diff, mrl
 mdv-toolbariconstosmall.diff, cabral
 mdv-exceptcxx-include-string.diff, cabral
+# disable slackware desktop things that are braking our build (do_inst.sh script)
+mdv-sysui-disableslack.diff, cabral
+# change default email app to xdg-email
+mdv-xdgmailasmailer.diff, cabral
 
 [ MandrivaOnlyUnix ]
 

Added: branches/ooo-build-3-0-1/patches/dev300/mdv-sysui-disableslack.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0-1/patches/dev300/mdv-sysui-disableslack.diff	Fri Feb  6 19:27:56 2009
@@ -0,0 +1,12 @@
+diff -p -up sysui/prj/build.lst.orig0 sysui/prj/build.lst
+--- sysui/prj/build.lst.orig0	2009-01-21 15:46:28.000000000 -0500
++++ sysui/prj/build.lst	2009-01-21 15:47:20.000000000 -0500
+@@ -13,7 +13,6 @@ su  sysui\desktop\suse                  
+ su  sysui\desktop\mandriva              nmake   -   u   su_dtmdk su_dtshare.u NULL
+ su  sysui\desktop\freedesktop           nmake   -   u   su_dtfreedesktop su_dtredhat.u NULL
+ su  sysui\desktop\debian                nmake   -   u   su_dtdebian su_dtshare.u NULL
+-su  sysui\desktop\slackware             nmake   -   u   su_dtslackware su_dtshare.u NULL
+ su  sysui\desktop\solaris               nmake   -   u   su_dtsolaris su_dtshare.u NULL
+-su  sysui\desktop\util                  nmake   -   u   su_desktop su_dtredhat.u su_dtsuse.u su_dtmdk.u su_dtfreedesktop.u su_dtdebian.u su_dtslackware.u NULL
++su  sysui\desktop\util                  nmake   -   u   su_desktop su_dtredhat.u su_dtsuse.u su_dtmdk.u su_dtfreedesktop.u su_dtdebian.u NULL
+ su  sysui\util		                    nmake   -   all su_util su_dtsolaris.u su_desktop.u su_win32_quickstart_so.w su_iconsw.w NULL

Added: branches/ooo-build-3-0-1/patches/dev300/mdv-xdgmailasmailer.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0-1/patches/dev300/mdv-xdgmailasmailer.diff	Fri Feb  6 19:27:56 2009
@@ -0,0 +1,14 @@
+diff -p -up officecfg/registry/data/org/openoffice/Office/Common.xcu.orig.2 officecfg/registry/data/org/openoffice/Office/Common.xcu
+--- officecfg/registry/data/org/openoffice/Office/Common.xcu.orig.2	2008-11-17 07:03:40.000000000 -0500
++++ officecfg/registry/data/org/openoffice/Office/Common.xcu	2008-11-19 08:53:56.000000000 -0500
+@@ -576,4 +576,10 @@
+       </prop>
+     </node>
+   </node>
++  <!-- Freedesktop as default mailer -->
++  <node oor:name="ExternalMailer">
++   <prop oor:name="Program" oor:type="xs:string">
++      <value>xdg-mail</value>
++   </prop>
++ </node>
+ </oor:component-data>