[ooo-build-commit] .: patches/dev300

[Jan Holesovsky]

 patches/dev300/apply                                 |    4 ++++
 patches/dev300/disable-checkdeliver.diff             |   12 ++++++++++++
 patches/dev300/novell-win32-agfa-monotype-fonts.diff |    2 +-
 patches/dev300/postprocess-extra-extensions.diff     |    2 +-
 4 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 9c8553445d27b1553e3e2a98a93fc96961dc9785
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue May 25 10:02:15 2010 +0200

    Disable checkheliver, no idea why we would want that.
    
    [And additionally it breaks our build ;-)]
    
    * patches/dev300/apply: Apply it, and update the depending patches.
    * patches/dev300/disable-checkdeliver.diff:
    * patches/dev300/novell-win32-agfa-monotype-fonts.diff:
    * patches/dev300/postprocess-extra-extensions.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 61e27c2..27109ea 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1211,6 +1211,10 @@ default-no-registration-menu-sd.diff, michael/kohei
 # flatten the structure of the 3 layer OOo a bit
 scp2-3layer-nicer-paths.diff, i#90430, jholesov
 
+# disable checkdeliver, no point in doing that, especially when we
+# hardlink to solver instead of copying :-)
+disable-checkdeliver.diff, jholesov
+
 [ DefaultSettings ]
 
 # default to anti-alias at point size of 1 point
diff --git a/patches/dev300/disable-checkdeliver.diff b/patches/dev300/disable-checkdeliver.diff
new file mode 100644
index 0000000..45aa4b5
--- /dev/null
+++ b/patches/dev300/disable-checkdeliver.diff
@@ -0,0 +1,12 @@
+diff --git postprocess/prj/build.lst postprocess/prj/build.lst
+index 99209e8..c920752 100644
+--- postprocess/prj/build.lst
++++ postprocess/prj/build.lst
+@@ -1,7 +1,6 @@
+ po      postprocess     ::      accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
+ po	postprocess			    	usr1	-	all	po_mkout NULL
+ po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
+-po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL
+ po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL
+ po      postprocess\packregistry        nmake   -       all     po_packregistry NULL
+ po	postprocess\rebase	    	nmake	-	w	po_rebase NULL
diff --git a/patches/dev300/novell-win32-agfa-monotype-fonts.diff b/patches/dev300/novell-win32-agfa-monotype-fonts.diff
index 46adba1..40816c3 100644
--- a/patches/dev300/novell-win32-agfa-monotype-fonts.diff
+++ b/patches/dev300/novell-win32-agfa-monotype-fonts.diff
@@ -163,7 +163,7 @@ index 28b3dcd..76809cc 100644
 +po      postprocess     ::      accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts AGFA_MONOTYPE_FONTS:agfa_monotype_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
  po	postprocess			    	usr1	-	all	po_mkout NULL
  po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
- po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL
+ po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL
 diff --git scp2/source/ooo/file_font_ooo.scp scp2/source/ooo/file_font_ooo.scp
 index f26339f..0bba5bc 100644
 --- scp2/source/ooo/file_font_ooo.scp
diff --git a/patches/dev300/postprocess-extra-extensions.diff b/patches/dev300/postprocess-extra-extensions.diff
index d55bcbb..0bb4864 100644
--- a/patches/dev300/postprocess-extra-extensions.diff
+++ b/patches/dev300/postprocess-extra-extensions.diff
@@ -16,7 +16,7 @@ index 76809cc..99209e8 100644
 +po      postprocess     ::      accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts AGFA_MONOTYPE_FONTS:agfa_monotype_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign CT2N:ct2n NLPSOLVER:nlpsolver SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
  po	postprocess			    	usr1	-	all	po_mkout NULL
  po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
- po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL
+ po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL
 -- 
 1.7.0.1