[ooo-build-commit] .: 6 commits - bin/fixguard.py bin/.gitignore patches/dev300 patches/vba src/Makefile.am

Petr Mladek pmladek at kemper.freedesktop.org
Tue Oct 5 10:11:44 PDT 2010


 bin/.gitignore                                         |    1 
 bin/fixguard.py                                        |    2 
 patches/dev300/border-types-dotted-dashed.diff         |    8 
 patches/dev300/calc-xls-import-slanted-border-oox.diff |    8 
 patches/dev300/dbaccess-default-varchar-lenght.diff    |    2 
 patches/dev300/docx-vml-import.diff                    |    2 
 patches/dev300/impressmedia-features.diff              |   26 --
 patches/dev300/optional-outplace-ole.diff              |    4 
 patches/dev300/piece-connectivity.diff                 |    2 
 patches/dev300/piece-cui.diff                          |    2 
 patches/dev300/piece-icons.diff                        |  176 ++++++++---------
 patches/dev300/piece-nlpsolver.diff                    |   28 +-
 patches/dev300/piece-odk.diff                          |   11 -
 patches/dev300/sd-ruler-fix.diff                       |    4 
 patches/dev300/sfx2-check-existing-template-dirs.diff  |    4 
 patches/dev300/system-cppunit-with-stlport-ooo.diff    |    4 
 patches/dev300/xmlhelp-work-with-symlinks.diff         |    6 
 patches/vba/cws-vbasupportdev300.diff                  |   16 -
 patches/vba/vba-container-controls.diff                |    9 
 src/Makefile.am                                        |    1 
 20 files changed, 133 insertions(+), 183 deletions(-)

New commits:
commit 73bb8ed0b174ec39ee442f4db0444db5dc900d7f
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Oct 5 19:09:00 2010 +0200

    Fix patches to apply with the ported calc-distributed-cell-text-*.diff

diff --git a/patches/dev300/calc-xls-import-slanted-border-oox.diff b/patches/dev300/calc-xls-import-slanted-border-oox.diff
index 6f9b552..fdb7fb5 100644
--- a/patches/dev300/calc-xls-import-slanted-border-oox.diff
+++ b/patches/dev300/calc-xls-import-slanted-border-oox.diff
@@ -28,14 +28,6 @@ diff --git oox/source/xls/stylesbuffer.cxx oox/source/xls/stylesbuffer.cxx
 index d8d52f2..c682ea6 100644
 --- oox/source/xls/stylesbuffer.cxx
 +++ oox/source/xls/stylesbuffer.cxx
-@@ -41,6 +41,7 @@
- #include <com/sun/star/style/XStyle.hpp>
- #include <com/sun/star/text/WritingMode2.hpp>
- #include <com/sun/star/text/XText.hpp>
-+#include <com/sun/star/table/CellVertJustify.hpp>
- #include <rtl/tencinfo.h>
- #include <rtl/ustrbuf.hxx>
- #include "properties.hxx"
 @@ -1773,6 +1774,34 @@ void Border::writeToPropertyMap( PropertyMap& rPropMap ) const
      }
  }
diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff
index 9697382..2d48556 100644
--- a/patches/vba/cws-vbasupportdev300.diff
+++ b/patches/vba/cws-vbasupportdev300.diff
@@ -43309,7 +43309,7 @@ index 1451cde..33de6ea 100644
  // experimental namespaces
  XML_NAMESPACE( FIELD,			100U )
 +XML_NAMESPACE( FORMX,           101U )      // form interop extensions
- 
+ XML_NAMESPACE( CSS3TEXT,        103U )      // CSS Text Level 3
  
  #endif	//  _XMLOFF_XMLNMSPE_HXX
 diff --git xmloff/inc/xmloff/shapeexport.hxx xmloff/inc/xmloff/shapeexport.hxx
@@ -43332,7 +43332,7 @@ diff --git xmloff/inc/xmloff/xmltoken.hxx xmloff/inc/xmloff/xmltoken.hxx
 index 3ea86c2..f174cbf 100644
 --- xmloff/inc/xmloff/xmltoken.hxx
 +++ xmloff/inc/xmloff/xmltoken.hxx
-@@ -145,9 +145,13 @@ namespace xmloff { namespace token {
+@@ -145,6 +145,10 @@ namespace xmloff { namespace token {
          XML_NP_OFFICE_EXT,
          XML_N_OFFICE_EXT,
  
@@ -43342,10 +43342,6 @@ index 3ea86c2..f174cbf 100644
 +
          XML_NP_TABLE_EXT,
          XML_N_TABLE_EXT,
--
-+        
-         XML_NP_DRAW_EXT,
-         XML_N_DRAW_EXT,
  
 diff --git xmloff/source/core/xmlexp.cxx xmloff/source/core/xmlexp.cxx
 index 9b1ddcb..e8a2c22 100644
commit 75dec86439bebd6467e292be665dc39e10ce481d
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Oct 5 17:57:42 2010 +0200

    gitignore add_acor.py

diff --git a/bin/.gitignore b/bin/.gitignore
index 3a8cb7a..0f9cee4 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -1,3 +1,4 @@
+add_acor.py
 fixguard.py
 font-munge
 gob
commit 9940895d352a3e07937ae98ff704c6196cd83f0d
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Oct 5 17:17:51 2010 +0200

    fix piece-*.diff to apply

diff --git a/patches/dev300/piece-connectivity.diff b/patches/dev300/piece-connectivity.diff
index ddb129c..2829816 100644
--- a/patches/dev300/piece-connectivity.diff
+++ b/patches/dev300/piece-connectivity.diff
@@ -4,7 +4,7 @@
  	$(SRS)$/$(TARGET).srs
  
  RESLIB1NAME=$(TARGET)
--RESLIB1IMAGES=$(SOLARSRC)$/$(RSCDEFIMG)$/database
+-RESLIB1IMAGES=$(SOLARDEFIMG)$/database
 +RESLIB1IMAGES=$(IMGSRC)$/$(RSCDEFIMG)$/database
  RESLIB1SRSFILES=$(RES1FILELIST)
  
diff --git a/patches/dev300/piece-cui.diff b/patches/dev300/piece-cui.diff
index 4ab4f03..36a800a 100644
--- a/patches/dev300/piece-cui.diff
+++ b/patches/dev300/piece-cui.diff
@@ -4,7 +4,7 @@
  
  
  RESLIB1NAME=cui
--RESLIB1IMAGES=$(SOLARSRC)/$(RSCDEFIMG)/svx/res
+-RESLIB1IMAGES=$(SOLARDEFIMG)/svx/res
 +RESLIB1IMAGES=$(SOLARVER)/$(RSCDEFIMG)/svx/res
  RESLIB1SRSFILES= $(SRSFILELIST)
  
diff --git a/patches/dev300/piece-icons.diff b/patches/dev300/piece-icons.diff
index 5f009fe..f9e235a 100644
--- a/patches/dev300/piece-icons.diff
+++ b/patches/dev300/piece-icons.diff
@@ -14,12 +14,12 @@
  	$(foreach,i,$(alllangiso) -lg$i \
  	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
  	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB$(TNR)NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
 +    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
      -lip={$j} ) \
--    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
--	-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
--	-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+-    -subMODULE=$(SOLARDEFIMG) \
+-    -subGLOBALRES=$(SOLARDEFIMG)/res \
 +    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
 +    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
 +    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
@@ -30,12 +30,12 @@
  	$(foreach,i,$(alllangiso) -lg$i \
  	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
  	-fs={$(BIN)/$(RESLIB$(TNR)NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
 +    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
      -lip={$j} ) \
--    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
--	-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
--	-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+-	-subMODULE=$(SOLARDEFIMG) \
+-	-subGLOBALRES=$(SOLARDEFIMG)/res \
 +    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
 +    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
 +    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
@@ -48,12 +48,12 @@
  	$(foreach,i,$(alllangiso) -lg$i \
  	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
  	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB1NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
 +    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
      -lip={$j} ) \
--    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
--	-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
--	-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+-	-subMODULE=$(SOLARDEFIMG) \
+-	-subGLOBALRES=$(SOLARDEFIMG)/res \
 +    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
 +    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
 +    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
@@ -64,12 +64,12 @@
  	$(foreach,i,$(alllangiso) -lg$i \
  	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
  	-fs={$(BIN)/$(RESLIB1NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
 +    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
      -lip={$j} ) \
--    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
--	-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
--	-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+-	-subMODULE=$(SOLARDEFIMG) \
+-	-subGLOBALRES=$(SOLARDEFIMG)/res \
 +    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
 +    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
 +    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
@@ -80,12 +80,12 @@
  	$(foreach,i,$(alllangiso) -lg$i \
  	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
  	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB2NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
 +    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
      -lip={$j} ) \
--    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
--	-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
--	-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+-	-subMODULE=$(SOLARDEFIMG) \
+-	-subGLOBALRES=$(SOLARDEFIMG)/res \
 +    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
 +    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
 +    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
@@ -96,12 +96,12 @@
  	$(foreach,i,$(alllangiso) -lg$i \
  	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
  	-fs={$(BIN)/$(RESLIB2NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
 +    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
      -lip={$j} ) \
--    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
--	-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
--	-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+-	-subMODULE=$(SOLARDEFIMG) \
+-	-subGLOBALRES=$(SOLARDEFIMG)/res \
 +    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
 +    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
 +    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
@@ -112,12 +112,12 @@
  	$(foreach,i,$(alllangiso) -lg$i \
  	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
  	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB3NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
 +    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
      -lip={$j} ) \
--    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
--	-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
--	-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+-	-subMODULE=$(SOLARDEFIMG) \
+-	-subGLOBALRES=$(SOLARDEFIMG)/res \
 +    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
 +    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
 +    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
@@ -128,12 +128,12 @@
  	$(foreach,i,$(alllangiso) -lg$i \
  	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
  	-fs={$(BIN)/$(RESLIB3NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
 +    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
      -lip={$j} ) \
--    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
--	-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
--	-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+-	-subMODULE=$(SOLARDEFIMG) \
+-	-subGLOBALRES=$(SOLARDEFIMG)/res \
 +    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
 +    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
 +    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
@@ -144,12 +144,12 @@
  	$(foreach,i,$(alllangiso) -lg$i \
  	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
  	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB4NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
 +    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
      -lip={$j} ) \
--    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
--	-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
--	-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+-	-subMODULE=$(SOLARDEFIMG) \
+-	-subGLOBALRES=$(SOLARDEFIMG)/res \
 +    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
 +    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
 +    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
@@ -160,12 +160,12 @@
  	$(foreach,i,$(alllangiso) -lg$i \
  	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
  	-fs={$(BIN)/$(RESLIB4NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
 +    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
      -lip={$j} ) \
--    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
--	-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
--	-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+-	-subMODULE=$(SOLARDEFIMG) \
+-	-subGLOBALRES=$(SOLARDEFIMG)/res \
 +    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
 +    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
 +    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
@@ -176,12 +176,12 @@
  	$(foreach,i,$(alllangiso) -lg$i \
  	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
  	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB5NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
 +    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
      -lip={$j} ) \
--    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
--	-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
--	-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+-	-subMODULE=$(SOLARDEFIMG) \
+-	-subGLOBALRES=$(SOLARDEFIMG)/res \
 +    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
 +    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
 +    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
@@ -192,12 +192,12 @@
  	$(foreach,i,$(alllangiso) -lg$i \
  	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
  	-fs={$(BIN)/$(RESLIB5NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
 +    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
      -lip={$j} ) \
--    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
--	-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
--	-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+-	-subMODULE=$(SOLARDEFIMG) \
+-	-subGLOBALRES=$(SOLARDEFIMG)/res \
 +    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
 +    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
 +    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
@@ -208,12 +208,12 @@
  	$(foreach,i,$(alllangiso) -lg$i \
  	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
  	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB6NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
 +    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
      -lip={$j} ) \
--    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
--	-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
--	-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+-	-subMODULE=$(SOLARDEFIMG) \
+-	-subGLOBALRES=$(SOLARDEFIMG)/res \
 +    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
 +    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
 +    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
@@ -224,12 +224,12 @@
  	$(foreach,i,$(alllangiso) -lg$i \
  	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
  	-fs={$(BIN)/$(RESLIB6NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
 +    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
      -lip={$j} ) \
--    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
--	-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
--	-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+-	-subMODULE=$(SOLARDEFIMG) \
+-	-subGLOBALRES=$(SOLARDEFIMG)/res \
 +    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
 +    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
 +    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
@@ -240,12 +240,12 @@
  	$(foreach,i,$(alllangiso) -lg$i \
  	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
  	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB7NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
 +    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
      -lip={$j} ) \
--    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
--	-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
--	-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+-	-subMODULE=$(SOLARDEFIMG) \
+-	-subGLOBALRES=$(SOLARDEFIMG)/res \
 +    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
 +    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
 +    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
@@ -256,12 +256,12 @@
  	$(foreach,i,$(alllangiso) -lg$i \
  	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
  	-fs={$(BIN)/$(RESLIB7NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
 +    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
      -lip={$j} ) \
--    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
--	-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
--	-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+-	-subMODULE=$(SOLARDEFIMG) \
+-	-subGLOBALRES=$(SOLARDEFIMG)/res \
 +    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
 +    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
 +    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
@@ -272,12 +272,12 @@
  	$(foreach,i,$(alllangiso) -lg$i \
  	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
  	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB8NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
 +    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
      -lip={$j} ) \
--    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
--	-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
--	-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+-	-subMODULE=$(SOLARDEFIMG) \
+-	-subGLOBALRES=$(SOLARDEFIMG)/res \
 +    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
 +    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
 +    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
@@ -288,12 +288,12 @@
  	$(foreach,i,$(alllangiso) -lg$i \
  	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
  	-fs={$(BIN)/$(RESLIB8NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
 +    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
      -lip={$j} ) \
--    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
--	-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
--	-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+-	-subMODULE=$(SOLARDEFIMG) \
+-	-subGLOBALRES=$(SOLARDEFIMG)/res \
 +    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
 +    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
 +    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
@@ -304,12 +304,12 @@
  	$(foreach,i,$(alllangiso) -lg$i \
  	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
  	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB9NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
 +    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
      -lip={$j} ) \
--    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
--	-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
--	-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+-	-subMODULE=$(SOLARDEFIMG) \
+-	-subGLOBALRES=$(SOLARDEFIMG)/res \
 +    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
 +    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
 +    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
@@ -320,12 +320,12 @@
  	$(foreach,i,$(alllangiso) -lg$i \
  	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
  	-fs={$(BIN)/$(RESLIB9NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
 +    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
      -lip={$j} ) \
--    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
--	-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
--	-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+-	-subMODULE=$(SOLARDEFIMG) \
+-	-subGLOBALRES=$(SOLARDEFIMG)/res \
 +    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
 +    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
 +    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
@@ -336,12 +336,12 @@
  	$(foreach,i,$(alllangiso) -lg$i \
  	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
  	-fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB10NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
 +    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
      -lip={$j} ) \
--    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
--	-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
--	-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+-	-subMODULE=$(SOLARDEFIMG) \
+-	-subGLOBALRES=$(SOLARDEFIMG)/res \
 +    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
 +    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
 +    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
@@ -352,12 +352,12 @@
  	$(foreach,i,$(alllangiso) -lg$i \
  	$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
  	-fs={$(BIN)/$(RESLIB10NAME)$i.res} \
--    $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
+-    $(foreach,j,$(subst,$(PRJ),$(SOLARDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
 +    $(foreach,j,$(subst,$(PRJ),$(IMGSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
      -lip={$j} ) \
--    -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \
--	-subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \
--	-subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \
+-    -lip=$(SOLARDEFIMG)/res/$i -lip=$(SOLARDEFIMG)/res ) \
+-	-subMODULE=$(SOLARDEFIMG) \
+-	-subGLOBALRES=$(SOLARDEFIMG)/res \
 +    -lip=$(IMGSRC)/$(RSCDEFIMG)/res/$i -lip=$(IMGSRC)/$(RSCDEFIMG)/res ) \
 +    -subMODULE=$(IMGSRC)/$(RSCDEFIMG) \
 +    -subGLOBALRES=$(IMGSRC)/$(RSCDEFIMG)/res \
diff --git a/patches/dev300/piece-nlpsolver.diff b/patches/dev300/piece-nlpsolver.diff
index ff7904d..f3e6885 100644
--- a/patches/dev300/piece-nlpsolver.diff
+++ b/patches/dev300/piece-nlpsolver.diff
@@ -12,17 +12,17 @@
 --- nlpsolver/nlpsolver-0.9.patch.old	2009-10-26 22:32:49.000000000 +0100
 +++ nlpsolver/nlpsolver-0.9.patch	2009-10-26 22:03:52.000000000 +0100
 @@ -17,10 +17,10 @@
-  javac.classpath=\
- -    ${libs.StarOffice 9.classpath}:\
- -    ${libs.OpenOffice.org 3.0.classpath}:\
--+    ${solar.jar}/juh.jar:\
--+    ${solar.jar}/jurt.jar:\
--+    ${solar.jar}/ridl.jar:\
--+    ${solar.jar}/unoil.jar:\
-++    ${split.ure}/share/java/juh.jar:\
-++    ${split.ure}/share/java/jurt.jar:\
-++    ${split.ure}/share/java/ridl.jar:\
-++    ${split.install}/classes/unoil.jar:\
-      ${reference.EvolutionarySolver.jar}
-  # Space-separated list of extra javac options
-  javac.compilerargs=
+  javac.classpath=\
+ -    ${libs.StarOffice 9.classpath}:\
+ -    ${libs.OpenOffice.org 3.0.classpath}:\
+-+    ${solar.jar}/juh.jar:\
+-+    ${solar.jar}/jurt.jar:\
+-+    ${solar.jar}/ridl.jar:\
+-+    ${solar.jar}/unoil.jar:\
+++    ${split.ure}/share/java/juh.jar:\
+++    ${split.ure}/share/java/jurt.jar:\
+++    ${split.ure}/share/java/ridl.jar:\
+++    ${split.install}/classes/unoil.jar:\
+      ${reference.EvolutionarySolver.jar}
+  # Space-separated list of extra javac options
+  javac.compilerargs=
diff --git a/patches/dev300/piece-odk.diff b/patches/dev300/piece-odk.diff
index 0986bfa..ae6c104 100644
--- a/patches/dev300/piece-odk.diff
+++ b/patches/dev300/piece-odk.diff
@@ -9,17 +9,6 @@
  
  JAVADOCLOG = $(MISC)$/javadoc_log.txt
  
---- odk/source/unowinreg/win/makefile.mk.old	2009-04-02 12:54:49.000000000 +0200
-+++ odk/source/unowinreg/win/makefile.mk	2009-04-14 17:19:37.000000000 +0200
-@@ -77,7 +77,7 @@ $(BIN)$/unowinreg.dll : unowinreg.cxx
- 
- .ELSE
- 
--$(BIN)$/unowinreg.dll : $(SOLARVERSION)$/$(INPATH)$/bin$(UPDMINOREXT)$/unowinreg.dll
-+$(BIN)$/unowinreg.dll : unowinreg.dll
- 	@@-rm -f $@
- 	$(GNUCOPY) $< $@
- 
 --- odk/util/makefile.pmk.old	2009-04-02 12:54:49.000000000 +0200
 +++ odk/util/makefile.pmk	2009-04-14 17:35:01.000000000 +0200
 @@ -68,7 +68,7 @@ CONVERTTAGSCRIPT=$(SOLARENV)/bin/convert
commit a65202315702d549b61a2308781e54790d50dfdc
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Oct 5 16:29:35 2010 +0200

    fix to apply with more removed include guards

diff --git a/patches/dev300/docx-vml-import.diff b/patches/dev300/docx-vml-import.diff
index d1663dc..cae4e7c 100644
--- a/patches/dev300/docx-vml-import.diff
+++ b/patches/dev300/docx-vml-import.diff
@@ -295,7 +295,7 @@
 --- writerfilter/inc/ooxml/OOXMLDocument.hxx.old	2010-07-22 13:12:44.000000000 +0200
 +++ writerfilter/inc/ooxml/OOXMLDocument.hxx	2010-07-29 21:03:38.000000000 +0200
 @@ -41,6 +41,7 @@
- #endif
+ #include <com/sun/star/xml/sax/XParser.hpp>
  #include <com/sun/star/xml/sax/XFastParser.hpp>
  #include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
 +#include <com/sun/star/xml/sax/XFastShapeContextHandler.hpp>
diff --git a/patches/dev300/impressmedia-features.diff b/patches/dev300/impressmedia-features.diff
index e662cd7..679a634 100644
--- a/patches/dev300/impressmedia-features.diff
+++ b/patches/dev300/impressmedia-features.diff
@@ -4099,9 +4099,9 @@ index af921ac..203b233 100644
 -#include <cppuhelper/implbase5.hxx>
 +#include <com/sun/star/lang/XInitialization.hpp>
 +#include <cppuhelper/implbase6.hxx>
- #ifndef _CPPUHELPER_PROPERTYSETMIXIN_HXX_
  #include <cppuhelper/propertysetmixin.hxx>
- #endif
+ #include <osl/mutex.hxx>
+ 
 @@ -45,11 +46,12 @@
  class SvStream;
  namespace utl { class TempFile; }
diff --git a/patches/dev300/system-cppunit-with-stlport-ooo.diff b/patches/dev300/system-cppunit-with-stlport-ooo.diff
index 8f038df..a6b8b17 100644
--- a/patches/dev300/system-cppunit-with-stlport-ooo.diff
+++ b/patches/dev300/system-cppunit-with-stlport-ooo.diff
@@ -340,8 +340,8 @@ diff -r a1a3b75faa8a -r a6913c9677c2 mysqlc/source/mysqlc_databasemetadata.hxx
 --- mysqlc/source/mysqlc_databasemetadata.hxx	Fri Jul 30 12:58:40 2010 +0100
 +++ mysqlc/source/mysqlc_databasemetadata.hxx	Tue Aug 03 10:01:07 2010 +0100
 @@ -39,9 +39,9 @@
+ #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
  #include <cppuhelper/implbase1.hxx>
- #endif
  
 -#include <tools/preextstl.h>
 +#include <preextstl.h>
@@ -404,8 +404,8 @@ diff -r a1a3b75faa8a -r a6913c9677c2 mysqlc/source/mysqlc_preparedstatement.hxx
 --- mysqlc/source/mysqlc_preparedstatement.hxx	Fri Jul 30 12:58:40 2010 +0100
 +++ mysqlc/source/mysqlc_preparedstatement.hxx	Tue Aug 03 10:01:07 2010 +0100
 @@ -48,9 +48,9 @@
+ #include <com/sun/star/sdbc/XPreparedBatchExecution.hpp>
  #include <com/sun/star/io/XInputStream.hpp>
- #endif
  
 -#include <tools/preextstl.h>
 +#include <preextstl.h>
diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff
index ff1c834..9697382 100644
--- a/patches/vba/cws-vbasupportdev300.diff
+++ b/patches/vba/cws-vbasupportdev300.diff
@@ -43765,9 +43765,9 @@ index 2fe6f35..987a8c3 100644
  
 +#include <com/sun/star/frame/XModel.hpp>
 +
- #ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HXX_
  #include <com/sun/star/container/XNameContainer.hpp>
- #endif
+ #include <com/sun/star/io/XInputStreamProvider.hpp>
+ #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
 @@ -51,7 +53,9 @@ void SAL_CALL exportDialogModel(
      ::com::sun::star::uno::Reference<
      ::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut,
diff --git a/patches/vba/vba-container-controls.diff b/patches/vba/vba-container-controls.diff
index a05e388..7d3de1c 100644
--- a/patches/vba/vba-container-controls.diff
+++ b/patches/vba/vba-container-controls.diff
@@ -5304,19 +5304,16 @@ diff --git xmlscript/inc/xmlscript/xmldlg_imexp.hxx xmlscript/inc/xmlscript/xmld
 index 987a8c3..9a91e24 100644
 --- xmlscript/inc/xmlscript/xmldlg_imexp.hxx
 +++ xmlscript/inc/xmlscript/xmldlg_imexp.hxx
-@@ -27,8 +27,6 @@
+@@ -27,12 +27,11 @@
  #ifndef _XMLSCRIPT_XMLDLG_IMEXP_HXX_
  #define _XMLSCRIPT_XMLDLG_IMEXP_HXX_
  
 -#include <com/sun/star/frame/XModel.hpp>
 -
- #ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HXX_
  #include <com/sun/star/container/XNameContainer.hpp>
- #endif
-@@ -41,6 +39,7 @@
- #ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HXX_
+ #include <com/sun/star/io/XInputStreamProvider.hpp>
+ #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
  #include <com/sun/star/uno/XComponentContext.hpp>
- #endif
 +#include <com/sun/star/frame/XModel.hpp>
  
  #include "xmlscript/xmlns.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index 9d93bdd..0d537ed 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,7 +30,6 @@ EXTRA_DIST=\
 	openabout_translateorgza.png \
 	openintro_pld.bmp \
 	openabout_pld.bmp \
-	patchability-extras.zip \
 	sg3.sdg sg3.sdv sg3.thm \
 	sofficerc-upstream \
 	tango_mainapp_16.png \
commit f4e13af1ba7a374df4e501e38c7e04d92dd76920
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Oct 5 16:28:14 2010 +0200

    improve fixguard.py to accept #ifndef and #endif with comments

diff --git a/bin/fixguard.py b/bin/fixguard.py
index 5381132..843d85b 100755
--- a/bin/fixguard.py
+++ b/bin/fixguard.py
@@ -5,7 +5,7 @@ import os
 import shutil
 import tempfile
 
-exp = '#ifndef.*_(?:H|HXX|HRC|HPP)_*\s*\n(#include.*\n)#endif.*\n'
+exp = '#ifndef.*_(?:H|HXX|HRC|HPP)_*[ \t]*\/*.*\n(#include.*\n)#endif[ \t]*\/*.*\n'
 
 filename = sys.argv[1]
 if not os.path.isfile(filename):
commit 04536b6ff2dd63fee810ec448db8487cfd64c8a1
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Oct 4 17:42:50 2010 +0200

    Fix patches to apply with the removed include guards

diff --git a/patches/dev300/border-types-dotted-dashed.diff b/patches/dev300/border-types-dotted-dashed.diff
index 70bb101..ebd8f7c 100644
--- a/patches/dev300/border-types-dotted-dashed.diff
+++ b/patches/dev300/border-types-dotted-dashed.diff
@@ -4056,9 +4056,9 @@ index 781e46b..a23fe1b 100644
  #include <comphelper/types.hxx>
 -#include <com/sun/star/table/BorderLine.hpp>
 +#include <com/sun/star/table/BorderLine2.hpp>
- #ifndef _XMLOFF_PAGEMASTERSTYLEMAP_HXX
  #include <xmloff/PageMasterStyleMap.hxx>
- #endif
+ #include <tools/debug.hxx>
+ #include <rtl/ustrbuf.hxx>
 @@ -54,10 +54,11 @@ inline sal_Bool lcl_HasSameLineWidth( const table::BorderLine& rLine1, const tab
              (rLine1.LineDistance == rLine2.LineDistance);
  }
@@ -4096,8 +4096,8 @@ index 76eab35..61a5736 100644
 --- xmloff/source/style/PageMasterImportPropMapper.cxx
 +++ xmloff/source/style/PageMasterImportPropMapper.cxx
 @@ -37,7 +37,7 @@
+ #include "PageMasterPropMapper.hxx"
  #include <xmloff/PageMasterStyleMap.hxx>
- #endif
  #include <xmloff/maptype.hxx>
 -#include <com/sun/star/table/BorderLine.hpp>
 +#include <com/sun/star/table/BorderLine2.hpp>
@@ -4298,7 +4298,7 @@ index 17f3ccf..099eb32 100644
 +#include <com/sun/star/table/BorderLine2.hpp>
  #include <com/sun/star/text/SizeType.hpp>
  #include <com/sun/star/text/WrapTextMode.hpp>
- #ifndef _COM_SUN_STAR_TEXT_TEXTCONTENTANCHORTYPE_HPP
+ #include <com/sun/star/text/TextContentAnchorType.hpp>
 @@ -700,7 +700,7 @@ void XMLTextExportPropertySetMapper::ContextFilter(
      {
          if( pLeftBorderWidthState && pRightBorderWidthState && pTopBorderWidthState && pBottomBorderWidthState )
diff --git a/patches/dev300/dbaccess-default-varchar-lenght.diff b/patches/dev300/dbaccess-default-varchar-lenght.diff
index f251ee1..4d1e530 100644
--- a/patches/dev300/dbaccess-default-varchar-lenght.diff
+++ b/patches/dev300/dbaccess-default-varchar-lenght.diff
@@ -7,8 +7,8 @@ index 77d7ccf..785769f 100644
 --- dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
 +++ dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
 @@ -58,7 +58,7 @@
+ #include "UITools.hxx"
  #include <com/sun/star/util/NumberFormat.hpp>
- #endif
  
 -#define DEFAULT_VARCHAR_PRECSION	50
 +#define DEFAULT_VARCHAR_PRECSION	100
diff --git a/patches/dev300/impressmedia-features.diff b/patches/dev300/impressmedia-features.diff
index f51c903..e662cd7 100644
--- a/patches/dev300/impressmedia-features.diff
+++ b/patches/dev300/impressmedia-features.diff
@@ -165,20 +165,6 @@ diff --git avmedia/source/framework/soundhandler.cxx avmedia/source/framework/so
 index 1e2a1f9..1349443 100644
 --- avmedia/source/framework/soundhandler.cxx
 +++ avmedia/source/framework/soundhandler.cxx
-@@ -29,13 +29,8 @@
- //	my own includes
- //_________________________________________________________________________________________________________________
- 
--#ifndef __FRAMEWORK_DISPATCH_SOUNDHANDLER_HXX_
- #include "soundhandler.hxx"
--#endif
--
--#ifndef __COMPHELPER_MEDIADESCRIPTOR_HXX_
- #include <comphelper/mediadescriptor.hxx>
--#endif
- 
- //_________________________________________________________________________________________________________________
- //	interface includes
 @@ -59,207 +54,23 @@
  namespace avmedia{
  
@@ -4145,16 +4131,10 @@ diff --git unotools/source/ucbhelper/xtempfile.cxx unotools/source/ucbhelper/xte
 index 36a848b..0ee05d7 100644
 --- unotools/source/ucbhelper/xtempfile.cxx
 +++ unotools/source/ucbhelper/xtempfile.cxx
-@@ -28,12 +28,9 @@
- #include <XTempFile.hxx>
- #include <cppuhelper/factory.hxx>
+@@ -28,6 +28,7 @@
  #include <cppuhelper/typeprovider.hxx>
--#ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HPP
  #include <com/sun/star/registry/XRegistryKey.hpp>
--#endif
--#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP
  #include <com/sun/star/beans/PropertyAttribute.hpp>
--#endif
 +#include <com/sun/star/beans/NamedValue.hpp>
  #include <unotools/tempfile.hxx>
  #include <osl/file.hxx>
diff --git a/patches/dev300/optional-outplace-ole.diff b/patches/dev300/optional-outplace-ole.diff
index 25458ed..5bbdd78 100644
--- a/patches/dev300/optional-outplace-ole.diff
+++ b/patches/dev300/optional-outplace-ole.diff
@@ -507,8 +507,8 @@ index 7bfafc3..951661b 100755
  #include <com/sun/star/container/XChild.hpp>
 +#include <com/sun/star/embed/EmbedVerbs.hpp>
  
- #ifndef SD_FRAMW_VIEW_HXX
  #include "FrameView.hxx"
+ #include "app.hrc"
 @@ -327,8 +328,12 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
  
                      if( pObj && pObj->ISA( SdrOle2Obj ) && !mpDocSh->IsUIActive() )
@@ -534,8 +534,8 @@ index 4c8cbd3..559c581 100755
  #include <svx/xfillit0.hxx>
 +#include <svx/svdoole2.hxx>
  
- #ifndef _SDOUTL_HXX //autogen
  #include <svx/svdoutl.hxx>
+ #include <svx/xlnwtit.hxx>
 @@ -95,6 +96,7 @@
  #include "sdabstdlg.hxx"
  #include <com/sun/star/drawing/XMasterPagesSupplier.hpp>
diff --git a/patches/dev300/sd-ruler-fix.diff b/patches/dev300/sd-ruler-fix.diff
index 70f930d..28a31a1 100644
--- a/patches/dev300/sd-ruler-fix.diff
+++ b/patches/dev300/sd-ruler-fix.diff
@@ -27,9 +27,9 @@ index 9f79617..ede4d76 100755
  #include <editeng/frmdiritem.hxx>
  #include <svx/ruler.hxx>
 +#include <editeng/numitem.hxx>
- #ifndef _SVX_RULERITEM_HXX
  #include <svx/rulritem.hxx>
- #endif
+ #include <svx/zoomitem.hxx>
+ #include <svx/svxids.hrc>
 @@ -689,14 +690,75 @@ void  DrawViewShell::ExecRuler(SfxRequest& rReq)
                  const SvxLRSpaceItem& rItem = (const SvxLRSpaceItem&)
                              pArgs->Get( nId );
diff --git a/patches/dev300/sfx2-check-existing-template-dirs.diff b/patches/dev300/sfx2-check-existing-template-dirs.diff
index d0180b5..72f0432 100644
--- a/patches/dev300/sfx2-check-existing-template-dirs.diff
+++ b/patches/dev300/sfx2-check-existing-template-dirs.diff
@@ -11,9 +11,9 @@ index 72fe259..f33d3dd 100644
  #include <rtl/ustring.hxx>
  #include <rtl/ustrbuf.hxx>
 +#include <osl/file.hxx>
- #ifndef _SV_RESARY_HXX
  #include <tools/resary.hxx>
- #endif
+ #include <vcl/svapp.hxx>
+ #include <vcl/wrkwin.hxx>
 @@ -1226,11 +1227,16 @@ void SfxDocTplService_Impl::doUpdate()
      while ( nCountDir )
      {
diff --git a/patches/dev300/xmlhelp-work-with-symlinks.diff b/patches/dev300/xmlhelp-work-with-symlinks.diff
index 63500d4..e89f6c5 100644
--- a/patches/dev300/xmlhelp-work-with-symlinks.diff
+++ b/patches/dev300/xmlhelp-work-with-symlinks.diff
@@ -7,13 +7,9 @@ diff --git xmlhelp/source/cxxhelp/provider/databases.cxx xmlhelp/source/cxxhelp/
 index 6693d69..0b0dd48 100644
 --- xmlhelp/source/cxxhelp/provider/databases.cxx
 +++ xmlhelp/source/cxxhelp/provider/databases.cxx
-@@ -28,10 +28,9 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_xmlhelp.hxx"
+@@ -28,6 +28,7 @@
  #include "db.hxx"
--#ifndef _VOS_DIAGNOSE_HXX_
  #include <vos/diagnose.hxx>
--#endif
  #include <osl/thread.h>
 +#include <osl/process.h>
  #include <rtl/uri.hxx>
diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff
index 71cc821..ff1c834 100644
--- a/patches/vba/cws-vbasupportdev300.diff
+++ b/patches/vba/cws-vbasupportdev300.diff
@@ -7952,8 +7952,8 @@ index 27ae8cd..05e9bb6 100644
  #include "RadioButton.hxx"
 +#include "GroupManager.hxx"
  #include "property.hxx"
- #ifndef _FRM_PROPERTY_HRC_
  #include "property.hrc"
+ #include "services.hxx"
 @@ -119,6 +120,7 @@ ORadioButtonModel::ORadioButtonModel(const Reference<XMultiServiceFactory>& _rxF
      m_nClassId = FormComponentType::RADIOBUTTON;
      m_aLabelServiceName = FRM_SUN_COMPONENT_GROUPBOX;
@@ -43198,7 +43198,7 @@ index cfa9e4c..1997455 100644
 --- vcl/source/gdi/bitmapex.cxx
 +++ vcl/source/gdi/bitmapex.cxx
 @@ -45,6 +45,7 @@
- #endif
+ #include <tools/rc.h>
  #include <vcl/svapp.hxx>
  #include <vcl/bmpacc.hxx>
 +#include <vcl/virdev.hxx>


More information about the ooo-build-commit mailing list