[Libreoffice-commits] .: openssl/UnpackedTarball_openssl.mk postgresql/postgresql-9.2.1-libreoffice.patch

[Libreoffice Gerrit user]

 openssl/UnpackedTarball_openssl.mk            |    2 ++
 postgresql/postgresql-9.2.1-libreoffice.patch |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit c97a46ad210c4747af2309d0c75d9a0bdb642ed4
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Mon Dec 31 17:03:07 2012 -0500

    fix postgresql on win
    
    Change-Id: I2c43441563cfb1237e6b2eaafe0acfaa5e952cde

diff --git a/openssl/UnpackedTarball_openssl.mk b/openssl/UnpackedTarball_openssl.mk
index 86ba3e4..bb5e771 100644
--- a/openssl/UnpackedTarball_openssl.mk
+++ b/openssl/UnpackedTarball_openssl.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,openssl,\
 	include/openssl/ec.h \
 	include/openssl/ecdh.h \
 	include/openssl/ecdsa.h \
+	include/openssl/engine.h \
 	include/openssl/err.h \
 	include/openssl/evp.h \
 	include/openssl/hmac.h \
@@ -57,6 +58,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,openssl,\
 	include/openssl/ssl23.h \
 	include/openssl/ssl3.h \
 	include/openssl/stack.h \
+	include/openssl/store.h \
 	include/openssl/symhacks.h \
 	include/openssl/tls1.h \
 	include/openssl/ui.h \
diff --git a/postgresql/postgresql-9.2.1-libreoffice.patch b/postgresql/postgresql-9.2.1-libreoffice.patch
index e1f1308..87d3da7 100644
--- a/postgresql/postgresql-9.2.1-libreoffice.patch
+++ b/postgresql/postgresql-9.2.1-libreoffice.patch
@@ -84,7 +84,7 @@
      if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
  
 -CPP_PROJ=/nologo /W3 /EHsc $(OPT) /I "..\..\include" /I "..\..\include\port\win32" /I "..\..\include\port\win32_msvc" /I "..\..\port" /I. /I "$(SSL_INC)" \
-+CPP_PROJ=/nologo /W3 /EHsc $(OPT) /I "..\..\include" /I "..\..\include\port\win32" /I "..\..\include\port\win32_msvc" /I "..\..\port" /I. $(SOLARINC) \
++CPP_PROJ=/nologo /W3 /EHsc $(OPT) /I "..\..\include" /I "..\..\include\port\win32" /I "..\..\include\port\win32_msvc" /I "..\..\port" /I. $(SOLARINC) /I $(WORKDIR)/UnpackedTarball/openssl/include \
   /D "FRONTEND" $(DEBUGDEF) \
   /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\libpq.pch" \
   /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c  \