You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2024/03/10 08:41:20 UTC
(openoffice) branch AOO42X updated (aabbbfeec0 -> 868749956f)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a change to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
from aabbbfeec0 Ad test files to rat excludes
new da7ca839af Build nss with OS_TARGET=WINNT (#199)
new 83ee71a430 Update xmlsec1-configure.patch
new 868749956f Adjustment for nss libs on Windows
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
main/nss/makefile.mk | 12 ++++++------
main/postprocess/rebase/coffbase.txt | 6 +++---
main/scp2/source/ooo/file_library_ooo.scp | 21 +++++++++++++--------
main/solenv/inc/libs.mk | 12 ++++++------
main/xmlsecurity/tools/standalone/csfit/makefile.mk | 12 +++++-------
5 files changed, 33 insertions(+), 30 deletions(-)
(openoffice) 01/03: Build nss with OS_TARGET=WINNT (#199)
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit da7ca839af89fdeebe5681cf3aa7b47e898fb2fd
Author: Matthias Seidel <ms...@apache.org>
AuthorDate: Thu Mar 7 21:11:06 2024 +0100
Build nss with OS_TARGET=WINNT (#199)
* Build nss with OS_TARGET=WINNT
* Additional files
* Fixed typo
(cherry picked from commit 2266b4fa0238f0c5a48b9498d39acc0cf27669cb)
---
main/libxmlsec/xmlsec1-configure.patch | 2 +-
main/nss/makefile.mk | 12 ++++++------
main/postprocess/rebase/coffbase.txt | 6 +++---
main/scp2/source/ooo/file_library_ooo.scp | 15 +++++++--------
main/solenv/inc/libs.mk | 12 ++++++------
main/xmlsecurity/tools/standalone/csfit/makefile.mk | 12 +++++-------
6 files changed, 28 insertions(+), 31 deletions(-)
diff --git a/main/libxmlsec/xmlsec1-configure.patch b/main/libxmlsec/xmlsec1-configure.patch
index f2f5f4e8f6..b261fbd2cb 100644
--- a/main/libxmlsec/xmlsec1-configure.patch
+++ b/main/libxmlsec/xmlsec1-configure.patch
@@ -759,7 +759,7 @@
XMLSEC_OPENSSL_ALIBS = libeay32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib
-XMLSEC_NSS_SOLIBS = smime3.lib ssl3.lib nss3.lib libnspr4.lib libplds4.lib libplc4.lib kernel32.lib user32.lib gdi32.lib
-+XMLSEC_NSS_SOLIBS = smime3.lib nss3.lib nspr4.lib kernel32.lib user32.lib gdi32.lib
++XMLSEC_NSS_SOLIBS = smime3.lib nss3.lib libnspr4.lib libplds4.lib libplc4.lib kernel32.lib user32.lib gdi32.lib
XMLSEC_NSS_ALIBS = smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib
XMLSEC_MSCRYPTO_SOLIBS = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib
diff --git a/main/nss/makefile.mk b/main/nss/makefile.mk
index 9c3705d72a..fdf9c162da 100644
--- a/main/nss/makefile.mk
+++ b/main/nss/makefile.mk
@@ -99,7 +99,7 @@ nss_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
BUILD_DIR=nss
-BUILD_ACTION= NSS_DISABLE_GTESTS=1 NS_USE_GCC=1 CC="$(nss_CC)" CXX="$(nss_CXX)" OS_LIBS="$(nss_LIBS)" OS_TARGET=WIN95 _WIN32_IE=0x500 PATH="$(PATH)" DEFINES=-D_WIN32_IE=0x500 $(GNUMAKE) nss_build_all
+BUILD_ACTION= NSS_DISABLE_GTESTS=1 NS_USE_GCC=1 CC="$(nss_CC)" CXX="$(nss_CXX)" OS_LIBS="$(nss_LIBS)" OS_TARGET=WINNT _WIN32_IE=0x500 PATH="$(PATH)" DEFINES=-D_WIN32_IE=0x500 $(GNUMAKE) nss_build_all
OUT2LIB= \
dist$/*.OBJ$/lib$/libnspr4.a \
@@ -122,8 +122,8 @@ moz_build:=$(shell cygpath -p $(MOZILLABUILD))
# Using WINNT will cause at least that nspr4.dll, plc4.dll, plds4.dll
# become libnspr4.dll, libplc4.dll, libplds4.dll
# WINNT causes the use of Microsoft fibers (specific to Windows NT and Windows 2000).
-#OS_TARGET= WINNT
-OS_TARGET=WIN95
+OS_TARGET=WINNT
+#OS_TARGET=WIN95
.EXPORT : OS_TARGET
# make use of stlport headerfiles
@@ -135,12 +135,12 @@ BUILD_ACTION= PATH="$(PATH):$(moz_build)/msys/bin:$(moz_build)/bin:$(moz_build)/
-c "cd $(NSS_BUILD_DIR) && make nss_build_all NSS_DISABLE_GTESTS=1"
OUT2LIB= \
- dist$/*.OBJ$/lib$/nspr4.lib \
+ dist$/*.OBJ$/lib$/libnspr4.lib \
dist$/*.OBJ$/lib$/nss3.lib \
dist$/*.OBJ$/lib$/nssdbm3.lib \
dist$/*.OBJ$/lib$/nssutil3.lib \
- dist$/*.OBJ$/lib$/plc4.lib \
- dist$/*.OBJ$/lib$/plds4.lib \
+ dist$/*.OBJ$/lib$/libplc4.lib \
+ dist$/*.OBJ$/lib$/libplds4.lib \
dist$/*.OBJ$/lib$/smime3.lib \
dist$/*.OBJ$/lib$/softokn3.lib \
dist$/*.OBJ$/lib$/sqlite3.lib \
diff --git a/main/postprocess/rebase/coffbase.txt b/main/postprocess/rebase/coffbase.txt
index 44ce0c8e00..9cc20dcc86 100644
--- a/main/postprocess/rebase/coffbase.txt
+++ b/main/postprocess/rebase/coffbase.txt
@@ -336,7 +336,7 @@ mswordmi.dll 0x0000000059560000 0x00110000
mysqlcppconn.dll 0x00000000594c0000 0x00090000
mysqlmi.dll 0x0000000059480000 0x00030000
neon.dll 0x0000000059450000 0x00020000
-nspr4.dll 0x0000000059410000 0x00030000
+libnspr4.dll 0x0000000059410000 0x00030000
nss3.dll 0x0000000059330000 0x000d0000
nssckbi.dll 0x00000000592c0000 0x00060000
nssdbm3.dll 0x0000000059290000 0x00020000
@@ -345,8 +345,8 @@ odbcbasemi.dll 0x00000000591f0000 0x00060000
odbcmi.dll 0x00000000591d0000 0x00010000
ooofilt_x64.dll 0x0000000059130000 0x00090000
oooimprovementmi.dll 0x0000000059100000 0x00020000
-plc4.dll 0x00000000590e0000 0x00010000
-plds4.dll 0x00000000590c0000 0x00010000
+libplc4.dll 0x00000000590e0000 0x00010000
+libplds4.dll 0x00000000590c0000 0x00010000
propertyhdl.dll 0x0000000059070000 0x00040000
propertyhdl_x64.dll 0x0000000058fe0000 0x00080000
python26.dll 0x0000000058da0000 0x00230000
diff --git a/main/scp2/source/ooo/file_library_ooo.scp b/main/scp2/source/ooo/file_library_ooo.scp
index d8eda0b4ba..4b9dcdc39d 100644
--- a/main/scp2/source/ooo/file_library_ooo.scp
+++ b/main/scp2/source/ooo/file_library_ooo.scp
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,19 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
#include "macros.inc"
// IAccessible2 implementation
@@ -1627,13 +1626,13 @@ STD_LIB_FILE( gid_File_Lib_Freebl3, freebl3)
#ifdef LINUX
STD_LIB_FILE( gid_File_Lib_Freeblpriv3, freeblpriv3)
#endif
-STD_LIB_FILE( gid_File_Lib_Nspr4, nspr4)
+STD_LIB_FILE( gid_File_Lib_Nspr4, libnspr4)
STD_LIB_FILE( gid_File_Lib_Nss3, nss3)
STD_LIB_FILE( gid_File_Lib_Nsckbi, nssckbi)
STD_LIB_FILE( gid_File_Lib_Nssdbm3, nssdbm3)
STD_LIB_FILE( gid_File_Lib_Nssutil3, nssutil3)
-STD_LIB_FILE( gid_File_Lib_Plc4, plc4)
-STD_LIB_FILE( gid_File_Lib_Plds4, plds4)
+STD_LIB_FILE( gid_File_Lib_Plc4, libplc4)
+STD_LIB_FILE( gid_File_Lib_Plds4, libplds4)
STD_LIB_FILE( gid_File_Lib_Smime3, smime3)
STD_LIB_FILE( gid_File_Lib_Softokn3, softokn3)
STD_LIB_FILE( gid_File_Lib_Ssl3, ssl3)
diff --git a/main/solenv/inc/libs.mk b/main/solenv/inc/libs.mk
index dc448566a8..f5112b0b8b 100644
--- a/main/solenv/inc/libs.mk
+++ b/main/solenv/inc/libs.mk
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,16 +7,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
LIBSMKREV!:="$$Revision$$"
@@ -383,7 +383,7 @@ REGLIB=ireg.lib
EXTLIB=iext.lib
SOTLIB=isot.lib
MOZBASELIBST=nspr4_s.lib xpcombase_s.lib
-MOZBASELIB=nspr4.lib xpcom.lib
+MOZBASELIB=libnspr4.lib xpcom.lib
LDAPSDKLIB=nsldap32v50.lib
PAPILIB=ipap.lib
SFX2LIB=sfx.lib
@@ -400,7 +400,7 @@ XMLSECLIB-MS=libxmlsec-mscrypto.lib
XMLSECLIB-NSS=libxmlsec-nss.lib
LIBXML2LIB=libxml2.lib
NSS3LIB=nss3.lib
-NSPR4LIB=nspr4.lib
+NSPR4LIB=libnspr4.lib
PLC4LIB=plc4.lib
NSSCRYPTOLIBS=$(XMLSECLIB-NSS) $(XMLSECLIB) $(LIBXML2LIB) $(NSS3LIB) $(NSPR4LIB) $(PLC4LIB)
MSCRYPTOLIBS=$(XMLSECLIB-MS) $(XMLSECLIB) $(LIBXML2LIB) crypt32.lib advapi32.lib
diff --git a/main/xmlsecurity/tools/standalone/csfit/makefile.mk b/main/xmlsecurity/tools/standalone/csfit/makefile.mk
index 1a3bb1e099..4b8d1993e5 100644
--- a/main/xmlsecurity/tools/standalone/csfit/makefile.mk
+++ b/main/xmlsecurity/tools/standalone/csfit/makefile.mk
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,20 +7,18 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
-
-
PRJ=..$/..$/..
PRJNAME=xmlsecurity
@@ -59,7 +57,7 @@ SHARE_LIBS = \
$(SALLIB)
.IF "$(GUI)"=="WNT"
-SHARE_LIBS+= "ixml2.lib" "nss3.lib" "nspr4.lib" "libxmlsec.lib" "libxmlsec-nss.lib" "xsec_xmlsec.lib"
+SHARE_LIBS+= "ixml2.lib" "nss3.lib" "libnspr4.lib" "libxmlsec.lib" "libxmlsec-nss.lib" "xsec_xmlsec.lib"
.ELSE
SHARE_LIBS+= "-lxml2" "-lnss3" "-lnspr4" "-lxmlsec1" "-lxmlsec1-nss" "-lxsec_xmlsec"
.ENDIF
(openoffice) 02/03: Update xmlsec1-configure.patch
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 83ee71a430dd166606c97595ee505feed769088d
Author: Matthias Seidel <ms...@apache.org>
AuthorDate: Fri Mar 8 18:13:52 2024 +0100
Update xmlsec1-configure.patch
(cherry picked from commit 1b3a943e75479fde108c3a705d028333eb387205)
---
main/libxmlsec/xmlsec1-configure.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main/libxmlsec/xmlsec1-configure.patch b/main/libxmlsec/xmlsec1-configure.patch
index b261fbd2cb..f2f5f4e8f6 100644
--- a/main/libxmlsec/xmlsec1-configure.patch
+++ b/main/libxmlsec/xmlsec1-configure.patch
@@ -759,7 +759,7 @@
XMLSEC_OPENSSL_ALIBS = libeay32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib
-XMLSEC_NSS_SOLIBS = smime3.lib ssl3.lib nss3.lib libnspr4.lib libplds4.lib libplc4.lib kernel32.lib user32.lib gdi32.lib
-+XMLSEC_NSS_SOLIBS = smime3.lib nss3.lib libnspr4.lib libplds4.lib libplc4.lib kernel32.lib user32.lib gdi32.lib
++XMLSEC_NSS_SOLIBS = smime3.lib nss3.lib nspr4.lib kernel32.lib user32.lib gdi32.lib
XMLSEC_NSS_ALIBS = smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib
XMLSEC_MSCRYPTO_SOLIBS = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib
(openoffice) 03/03: Adjustment for nss libs on Windows
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 868749956f8b2d89b5f9f5e3738493c240f582b3
Author: mseidel <ms...@apache.org>
AuthorDate: Sat Mar 9 23:58:02 2024 +0100
Adjustment for nss libs on Windows
(cherry picked from commit 66131ff522c1f6517d63b9a9d97fd218a05322a4)
---
main/scp2/source/ooo/file_library_ooo.scp | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/main/scp2/source/ooo/file_library_ooo.scp b/main/scp2/source/ooo/file_library_ooo.scp
index 4b9dcdc39d..f3435a8b6a 100644
--- a/main/scp2/source/ooo/file_library_ooo.scp
+++ b/main/scp2/source/ooo/file_library_ooo.scp
@@ -1626,16 +1626,22 @@ STD_LIB_FILE( gid_File_Lib_Freebl3, freebl3)
#ifdef LINUX
STD_LIB_FILE( gid_File_Lib_Freeblpriv3, freeblpriv3)
#endif
-STD_LIB_FILE( gid_File_Lib_Nspr4, libnspr4)
STD_LIB_FILE( gid_File_Lib_Nss3, nss3)
STD_LIB_FILE( gid_File_Lib_Nsckbi, nssckbi)
STD_LIB_FILE( gid_File_Lib_Nssdbm3, nssdbm3)
STD_LIB_FILE( gid_File_Lib_Nssutil3, nssutil3)
-STD_LIB_FILE( gid_File_Lib_Plc4, libplc4)
-STD_LIB_FILE( gid_File_Lib_Plds4, libplds4)
STD_LIB_FILE( gid_File_Lib_Smime3, smime3)
STD_LIB_FILE( gid_File_Lib_Softokn3, softokn3)
STD_LIB_FILE( gid_File_Lib_Ssl3, ssl3)
+#ifdef WNT
+STD_LIB_FILE( gid_File_Lib_Nspr4, libnspr4)
+STD_LIB_FILE( gid_File_Lib_Plc4, libplc4)
+STD_LIB_FILE( gid_File_Lib_Plds4, libplds4)
+#else
+STD_LIB_FILE( gid_File_Lib_Nspr4, nspr4)
+STD_LIB_FILE( gid_File_Lib_Plc4, plc4)
+STD_LIB_FILE( gid_File_Lib_Plds4, plds4)
+#endif
#ifndef MACOSX // #i108575# use system sqlite3 on MacOSX
STD_LIB_FILE( gid_File_Lib_Sqlite3, sqlite3)