[ooo-build-commit] Branch 'ooo/master' - 2 commits - np_sdk/mozsrc openssl/makefile.mk openssl/openssl.patch

[Jan Holesovsky]

 np_sdk/mozsrc/makefile.mk |    2 +-
 np_sdk/mozsrc/npwin.cpp   |    6 ++++++
 openssl/makefile.mk       |    2 +-
 openssl/openssl.patch     |   14 +++++++++++++-
 4 files changed, 21 insertions(+), 3 deletions(-)

New commits:
commit 4ba64b5aee9c847b095938d09b06e41b8a7380d2
Author: Kurt Zenker <kz at openoffice.org>
Date:   Thu Sep 10 22:44:47 2009 +0000

    CWS-TOOLING: integrate CWS os2port06dev300
    2009-09-05 22:49:00 +0200 ydario  r275858 : #i99588# applied os2port06 diff to DEV300 tree.

diff --git a/np_sdk/mozsrc/makefile.mk b/np_sdk/mozsrc/makefile.mk
index 15e14a8..e6dd7fe 100644
--- a/np_sdk/mozsrc/makefile.mk
+++ b/np_sdk/mozsrc/makefile.mk
@@ -43,7 +43,7 @@ JDKINCS=
 
 # --- Files --------------------------------------------------------
 
-.IF "$(GUI)" == "WNT"
+.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
 MOZFILES = $(SLO)$/npwin.obj
 .ELSE
 MOZFILES = $(SLO)$/npunix.obj
diff --git a/np_sdk/mozsrc/npwin.cpp b/np_sdk/mozsrc/npwin.cpp
index 3c893b2..1fb4d3e 100644
--- a/np_sdk/mozsrc/npwin.cpp
+++ b/np_sdk/mozsrc/npwin.cpp
@@ -45,6 +45,12 @@
 //\\// DEFINE
 #define NP_EXPORT
 
+#ifdef OS2
+#define WINAPI _System
+#define HIBYTE(a) (a>>8)
+#define LOBYTE(a) (a&0xFF)
+#endif
+
 //\\// GLOBAL DATA
 NPNetscapeFuncs* g_pNavigatorFuncs = 0;
 
commit 60f2d0bf543b096d828d50d4b24378df9159db86
Author: Kurt Zenker <kz at openoffice.org>
Date:   Thu Sep 10 22:33:17 2009 +0000

    CWS-TOOLING: integrate CWS mh232
    2009-08-26 03:52:57 +0200 mh  r275385 : #i102182# FreeBSD patch
    2009-08-26 03:43:20 +0200 mh  r275384 : #i101333# patch for FreeBSD
    2009-08-26 03:11:20 +0200 mh  r275383 : #i39230
    2009-08-26 03:07:51 +0200 mh  r275382 : #i39230# more space for initials field
    2009-08-26 02:41:19 +0200 mh  r275380 : #i39230# use vos::osecurity for reading the user name
    2009-08-18 22:06:00 +0200 mh  r275130 : #i104243#, line ending problem with newer perl
    2009-08-18 21:53:21 +0200 mh  r275129 : #i39230# read initials via getpwnam
    2009-08-18 21:34:05 +0200 mh  r275128 : enable CAIROCANVAS for Linux and Mac, #i88613#
    2009-08-17 18:02:59 +0200 mh  r275067 : #i95498# make compile with gcc3

diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index 22920c2..10f7206 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -65,7 +65,7 @@ OUT2LIB = libssl.*
 OUT2LIB += libcrypto.*
 OUT2INC += include/openssl/*
 
-.IF "$(OS)" == "LINUX"
+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
     PATCH_FILES=openssllnx.patch
     ADDITIONAL_FILES:= \
         libcrypto_OOo_0_9_8k.map \
diff --git a/openssl/openssl.patch b/openssl/openssl.patch
index ed47540..90e9db0 100644
--- a/openssl/openssl.patch
+++ b/openssl/openssl.patch
@@ -50,7 +50,19 @@
  $mkdir="-mkdir" unless defined $mkdir;
  
  ($ssl,$crypto)=("ssl","crypto");
-@@ -570,7 +570,7 @@
+@@ -277,6 +277,11 @@
+	chop;
+
+	($key,$val)=/^([^=]+)=(.*)/;
++
++	# On some Windows machines, $val has linefeeds at the end, which confuses
++	# subsequent code in this file. So we strip all whitespace at the end.
++	$val =~ s/\s+$//;
++
+	if ($key eq "RELATIVE_DIRECTORY")
+		{
+		if ($lib ne "")
+@@ -570,7 +575,7 @@
  printf OUT <<EOF;
  #ifdef $platform_cpp_symbol
    /* auto-generated/updated by util/mk1mf.pl for crypto/cversion.c */