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

[Jan Holesovsky]

 patches/dev300/document-password-change-sfx2.diff     |    2 +-
 patches/dev300/mail-document-subject.diff             |    7 ++-----
 patches/dev300/win32-gw-send-mail.diff                |    9 ++++-----
 patches/postgresql/sdbc-postgresql-config_office.diff |    2 +-
 4 files changed, 8 insertions(+), 12 deletions(-)

New commits:
commit eacd7823a81da44a5a2b2b816adc40e22412f112
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Oct 6 10:58:18 2010 +0200

    Fix several patches to apply again.
    
    After the removal of the commented out includes...

diff --git a/patches/dev300/document-password-change-sfx2.diff b/patches/dev300/document-password-change-sfx2.diff
index c714da8..77b523d 100644
--- a/patches/dev300/document-password-change-sfx2.diff
+++ b/patches/dev300/document-password-change-sfx2.diff
@@ -36,9 +36,9 @@ index 409e29c..eba398b 100644
  #include <sfx2/viewfrm.hxx>
  #include <sfx2/request.hxx>
 +#include <sfx2/passwd.hxx>
- //#include "exptypes.hxx"
  #include "helper.hxx"
  #include <sfx2/objsh.hxx>
+ #include <sfx2/docfile.hxx>
 @@ -788,6 +789,7 @@ SfxDocumentPage::SfxDocumentPage( Window* pParent, const SfxItemSet& rItemSet )
  
      aBmp1           ( this, SfxResId( BMP_FILE_1 ) ),
diff --git a/patches/dev300/mail-document-subject.diff b/patches/dev300/mail-document-subject.diff
index fd4a0ab..e9df65c 100644
--- a/patches/dev300/mail-document-subject.diff
+++ b/patches/dev300/mail-document-subject.diff
@@ -28,19 +28,16 @@ diff --git shell/source/win32/simplemail/senddoc.cxx shell/source/win32/simplema
 index 0b51c58..9338669 100644
 --- shell/source/win32/simplemail/senddoc.cxx
 +++ shell/source/win32/simplemail/senddoc.cxx
-@@ -29,9 +29,10 @@
+@@ -29,6 +29,9 @@
  #include "precompiled_shell.hxx"
  #include <osl/diagnose.h>
- 
--#ifndef _RTL_STRING_HXX_
  #include <rtl/string.hxx>
--#endif
 +#include <rtl/ustring.hxx>
 +#include <rtl/uri.hxx>
 +#include <osl/thread.hxx>
+ 
  #include "simplemapi.hxx"
  
- #define WIN32_LEAN_AND_MEAN
 @@ -167,7 +168,17 @@ void initMapiMessage(
  {
      ZeroMemory(pMapiMessage, sizeof(MapiMessage));
diff --git a/patches/dev300/win32-gw-send-mail.diff b/patches/dev300/win32-gw-send-mail.diff
index a9b1c52..2f3981c 100644
--- a/patches/dev300/win32-gw-send-mail.diff
+++ b/patches/dev300/win32-gw-send-mail.diff
@@ -7,13 +7,12 @@ diff --git shell/source/win32/simplemail/senddoc.cxx shell/source/win32/simplema
 index 42f5b9e..0b51c58 100644
 --- shell/source/win32/simplemail/senddoc.cxx
 +++ shell/source/win32/simplemail/senddoc.cxx
-@@ -30,7 +30,7 @@
+@@ -30,6 +30,7 @@
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_shell.hxx"
  #include <osl/diagnose.h>
- 
- #ifndef _RTL_STRING_HXX_
--//#include <rtl/string.hxx>
 +#include <rtl/string.hxx>
- #endif
+ 
  #include "simplemapi.hxx"
  
 @@ -299,6 +299,9 @@ int main(int argc, char* argv[])
diff --git a/patches/postgresql/sdbc-postgresql-config_office.diff b/patches/postgresql/sdbc-postgresql-config_office.diff
index 062a36e..74e8046 100644
--- a/patches/postgresql/sdbc-postgresql-config_office.diff
+++ b/patches/postgresql/sdbc-postgresql-config_office.diff
@@ -36,8 +36,8 @@ index d36115a..ababa63 100644
 --- set_soenv.in
 +++ set_soenv.in
 @@ -1935,6 +1935,7 @@ ToFile( "USE_XINERAMA",      "@USE_XINERAMA@",     "e" );
- ToFile( "XINERAMA_LINK",     "@XINERAMA_LINK@",    "e" );
  ToFile( "SYSTEM_REDLAND",    "@SYSTEM_REDLAND@",   "e" );
+ ToFile( "REDLAND_CFLAGS",    "@REDLAND_CFLAGS@",   "e" );
  ToFile( "REDLAND_LIBS",      "@REDLAND_LIBS@",     "e" );
 +ToFile( "SYSTEM_POSTGRESQL",  "@SYSTEM_POSTGRESQL@", "e" );
  ToFile( "SYSTEM_HUNSPELL",   "@SYSTEM_HUNSPELL@",  "e" );