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

[René Engelhard]

 patches/dev300/apply                            |    6 +++---
 patches/dev300/soltools-fix-system-stlport.diff |   14 ++++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

New commits:
commit 29c64b8aa9276bf22727f2e01c1311434a3dbffa
Author: Rene Engelhard <rene at debian.org>
Date:   Tue May 25 11:59:06 2010 +0200

    unoxml-reset-secprefs.diff is in m79
    
    * patches/dev300/apply:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index e6c0515..cc6012d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1409,10 +1409,10 @@ vcl-bitmap2-negative-height.diff
 [ SystemBits < dev300-m78 ]
 # remove redland patches; work around librdf/libraptor
 redland-remove-patches.diff, #i108911
-
-[ SystemBits ]
+[ SystemBits < dev300-m79 ]
 unoxml-reset-secprefs.diff, i#110523
 
+[ SystemBits ]
 fix-system-mythes-for-mythes-1.2.diff
 
 [ SystemBits and not Win32Only ]
commit fe94057bc76f0c5fbd926c7e843d4c59628d171c
Author: Rene Engelhard <rene at debian.org>
Date:   Tue May 25 10:33:22 2010 +0200

    fix system-stlport build in soltools (issue 110479)
    
    * patches/dev300/apply:
    * patches/dev300/soltools-fix-system-stlport.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 405c388..e6c0515 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1352,7 +1352,7 @@ warning-uninitialized-variables-tools-2.diff, i#58984, pmladek
 #fix a build issue on solaris with sunpro 5.9 aka Sun Studio 12
 stlport-solaris-fileno.diff, fridrich
 
-
+soltools-fix-system-stlport.diff, i#110479, rengelha
 
 [ BFBuildBits ]
 SectionOwner => pmladek
diff --git a/patches/dev300/soltools-fix-system-stlport.diff b/patches/dev300/soltools-fix-system-stlport.diff
new file mode 100644
index 0000000..022d941
--- /dev/null
+++ b/patches/dev300/soltools-fix-system-stlport.diff
@@ -0,0 +1,14 @@
+diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk
+--- soltools/util/makefile.pmk
++++ soltools/util/makefile.pmk
+@@ -34,6 +34,10 @@
+ # avoid STLPort
+ NO_DEFAULT_STL=TRUE
+ SOLARINC!:=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(SOLARINC))
++.IF "$(STLPORT4)" != ""
++SOLARINC!:=$(subst,$(STLPORT4)/include/stlport,dont_use_stl$(SPACECHAR) $(SOLARINC))
++SOLARINC!:=$(subst,$(STLPORT4)/stlport,dont_use_stl$(SPACECHAR) $(SOLARINC))
++.ENDIF
+ 
+ .IF "$(OS)"=="SOLARIS"
+ # hack due to #i53089#