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

[Petr Mladek]

 patches/dev300/ppt-customshape-shading-fix.diff |    2 +-
 patches/dev300/solenv-dummy-localize-sdf.diff   |   14 +-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

New commits:
commit cf95bdfd6f6e61439c5244b4cb4cf049e586cbfe
Author: Petr Mladek <pmladek at walk.suse.cz>
Date:   Mon Jul 26 17:44:41 2010 +0200

    Really work with the dummy localize.sdf
    
    * patches/dev300/solenv-dummy-localize-sdf.diff: use the older and actually
      working version
    
    * patches/dev300/ppt-customshape-shading-fix.diff: was malformed; fix to apply

diff --git a/patches/dev300/ppt-customshape-shading-fix.diff b/patches/dev300/ppt-customshape-shading-fix.diff
index 49e0f19..74e6915 100644
--- a/patches/dev300/ppt-customshape-shading-fix.diff
+++ b/patches/dev300/ppt-customshape-shading-fix.diff
@@ -29,7 +29,7 @@ diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglay
 index ad9a235..b501515 100644
 --- drawinglayer/source/primitive2d/polygonprimitive2d.cxx
 +++ drawinglayer/source/primitive2d/polygonprimitive2d.cxx
-@@ -509,11 +509,11 @@ namespace drawinglayer
+@@ -509,10 +509,11 @@ namespace drawinglayer
          {
              // copy local polygon, it may be changed
              basegfx::B2DPolygon aLocalPolygon(getB2DPolygon());
diff --git a/patches/dev300/solenv-dummy-localize-sdf.diff b/patches/dev300/solenv-dummy-localize-sdf.diff
index dad8009..4c27060 100644
--- a/patches/dev300/solenv-dummy-localize-sdf.diff
+++ b/patches/dev300/solenv-dummy-localize-sdf.diff
@@ -1,15 +1,3 @@
---- solenv/inc/settings.mk.old	2010-07-21 19:58:19.000000000 +0200
-+++ solenv/inc/settings.mk	2010-07-23 16:03:29.000000000 +0200
-@@ -835,6 +835,9 @@ LOCALIZESDF:=$(strip $(shell @+$(IFEXIST
- # dummy target to keep the build happy.
- .IF  "$(LOCALIZESDF)"==""
- LOCALIZESDF:=$(COMMONMISC)$/$(PRJNAME)$/dummy$/localize.sdf
-+DUMMYLOCALIZESDF:="YES"
-+.ELSE
-+DUMMYLOCALIZESDF:="NO"
- .ENDIF			# "$(LOCALIZESDF)"==""
- .ENDIF			# "$(WITH_LANG)"!=""
- 
 --- solenv/inc/target.mk.old	2010-07-23 16:06:29.000000000 +0200
 +++ solenv/inc/target.mk	2010-07-23 16:06:04.000000000 +0200
 @@ -1390,7 +1390,7 @@ $(UNIXTEXT) : $(UNIXTEXT:f)
@@ -17,7 +5,7 @@
  
  .IF "$(LOCALIZATION_FOUND)"==""
 -.IF "$(LOCALSDFFILE)"!=""
-+.IF "$(LOCALSDFFILE)"!="" && "$(DUMMYLOCALIZESDF)"!="YES"
++.IF "$(LOCALSDFFILE)"!="" && "$(LOCALSDFFILE)"=="$(LOCALIZESDF)"
  "$(LOCALIZESDF)" : $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip
      @@-$(MKDIRHIER) $(@:d)
      @@-$(MKDIRHIER) $(COMMONMISC)/$(PRJNAME)_$(TARGET)