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 2019/10/09 20:49:24 UTC
[openoffice] branch AOO418 updated (142c271 -> 3d054da)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a change to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git.
from 142c271 Add .DIB as an extension for BMP files.
new 4c01c3a Upgrade bundled expat to 2.2.9.
new 1a6276c Remove loadlibrary.obj build from 64-bit Windows build as well. This will fix the Windows 32-bit build of expat on 64-bit Windows when the --enable-win-x64-shellext configure option is specified.
new 3d054da Patch for Win64 shell extension, provided by: Don Lewis
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:
.../expat/{expat-2.2.3.patch => expat-2.2.9.patch} | 26 ++++++----------------
main/expat/expat-winapi.patch | 14 ------------
main/expat/makefile.mk | 9 ++++----
main/expat/prj/d.lst | 4 ++--
main/external_deps.lst | 6 ++---
main/solenv/gbuild/gbuild.mk | 5 +++++
main/solenv/inc/set_wntx64.mk | 4 ++++
main/solenv/inc/settings.mk | 5 +++++
8 files changed, 30 insertions(+), 43 deletions(-)
rename main/expat/{expat-2.2.3.patch => expat-2.2.9.patch} (81%)
delete mode 100644 main/expat/expat-winapi.patch
[openoffice] 02/03: Remove loadlibrary.obj build from 64-bit
Windows build as well. This will fix the Windows 32-bit build of expat on
64-bit Windows when the --enable-win-x64-shellext configure option is
specified.
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 1a6276c6e3e067a72c17b97f23acd7e4d034fc9a
Author: Don Lewis <tr...@apache.org>
AuthorDate: Wed Oct 2 17:50:49 2019 -0700
Remove loadlibrary.obj build from 64-bit Windows build as well.
This will fix the Windows 32-bit build of expat on 64-bit Windows
when the --enable-win-x64-shellext configure option is specified.
Clean up loadlibrary.obj leftovers.
(cherry picked from commit 883a5120b3cdc2b17b07fe726623b93bc7a70551)
---
main/expat/expat-2.2.9.patch | 22 +++++-----------------
1 file changed, 5 insertions(+), 17 deletions(-)
diff --git a/main/expat/expat-2.2.9.patch b/main/expat/expat-2.2.9.patch
index 96e23a5..beb860d 100644
--- a/main/expat/expat-2.2.9.patch
+++ b/main/expat/expat-2.2.9.patch
@@ -1,6 +1,6 @@
--- misc/expat-2.2.9/lib/makefile.mk Wed Aug 20 14:33:55 2008
+++ misc/build/expat-2.2.9/lib/makefile.mk Wed Aug 20 14:26:42 2008
-@@ -1 +1,91 @@
+@@ -1 +1,79 @@
-dummy
+#**************************************************************
+#
@@ -49,19 +49,13 @@
+UNICODE_SLOFILES=$(SLO)$/xmlparse.obj
+UNICODECDEFS+=-DXML_UNICODE
+
-+#.IF "$(OS)"=="WNT"
-+# LOADLIBOBJFILE=$(SLO)/loadlibrary.obj
-+#.ELSE
-+# LOADLIBOBJFILE=
-+#.ENDIF
-+
+LIB1ARCHIV=$(LB)$/libascii_$(TARGET)_xmlparse.a
+LIB1TARGET=$(SLB)$/ascii_$(TARGET)_xmlparse.lib
-+LIB1OBJFILES=$(SLO)$/xmlparse.obj $(LOADLIBOBJFILE)
++LIB1OBJFILES=$(SLO)$/xmlparse.obj
+
+LIB2ARCHIV=$(LB)$/lib$(TARGET)_xmlparse.a
+LIB2TARGET=$(SLB)$/$(TARGET)_xmlparse.lib
-+LIB2OBJFILES =$(REAL_UNICODE_SLOFILES) $(LOADLIBOBJFILE)
++LIB2OBJFILES =$(REAL_UNICODE_SLOFILES)
+
+LIB3ARCHIV=$(LB)$/lib$(TARGET)_xmltok.a
+LIB3TARGET=$(SLB)$/$(TARGET)_xmltok.lib
@@ -72,19 +66,13 @@
+# use UNICODE only because shell/shlxthandler
+# doesn't link against ascii_expat_xmlparse
+#---------------------------------------------------------
-+.IF "$(OS)"=="WNT"
-+ LOADLIBOBJFILE_X64=$(SLO_X64)/loadlibrary.obj
-+.ELSE
-+ LOADLIBOBJFILE_X64=
-+.ENDIF
+SLOFILES_X64=$(SLO_X64)$/xmlparse.obj \
+ $(SLO_X64)$/xmlrole.obj \
-+ $(SLO_X64)$/xmltok.obj \
-+ $(LOADLIBOBJFILE_X64)
++ $(SLO_X64)$/xmltok.obj
+CDEFS_X64+=-DXML_UNICODE -DWIN32
+CFLAGS_X64+=-I..
+LIB1TARGET_X64=$(SLB_X64)$/$(TARGET)_xmlparse.lib
-+LIB1OBJFILES_X64=$(SLO_X64)$/xmlparse.obj $(LOADLIBOBJFILE_X64)
++LIB1OBJFILES_X64=$(SLO_X64)$/xmlparse.obj
+LIB2TARGET_X64=$(SLB_X64)$/$(TARGET)_xmltok.lib
+LIB2OBJFILES_X64=$(SLO_X64)$/xmlrole.obj $(SLO_X64)$/xmltok.obj
+.ENDIF # "$(BUILD_X64)"!=""
[openoffice] 03/03: Patch for Win64 shell extension,
provided by: Don Lewis
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 3d054da97496f0fc4f74496ac5cb992a77a3c3d3
Author: mseidel <ms...@apache.org>
AuthorDate: Sat Oct 5 11:37:13 2019 +0200
Patch for Win64 shell extension, provided by: Don Lewis
(cherry picked from commit f65b8bff325add857d0f70d81aeb09a90aa05edf)
---
main/solenv/inc/set_wntx64.mk | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/main/solenv/inc/set_wntx64.mk b/main/solenv/inc/set_wntx64.mk
index 58a037c..d62b420 100644
--- a/main/solenv/inc/set_wntx64.mk
+++ b/main/solenv/inc/set_wntx64.mk
@@ -47,6 +47,10 @@ USE_CDEFS_X64+= -DWIN32 -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO
USE_CFLAGS_X64+=-Zi -Fd$(MISC_X64)/$(@:b).pdb
USE_CDEFS_X64+=-DDEBUG
.ENDIF # "$(debug)"!=""
+# Required for correct Windows function call ABI for expat static library
+.IF "$(SYSTEM_EXPAT)"=="NO"
+USE_CDEFS_X64+=-DXML_STATIC
+.ENDIF
USE_CFLAGS_X64+=$(CFLAGS_X64)
USE_CDEFS_X64+=$(CDEFS_X64)
INCLUDE_X64=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
[openoffice] 01/03: Upgrade bundled expat to 2.2.9.
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 4c01c3a04df53b53a32984fb2e6cd8acf6afe4b8
Author: Don Lewis <tr...@apache.org>
AuthorDate: Wed Oct 2 10:07:37 2019 -0700
Upgrade bundled expat to 2.2.9.
Delete expat-winapi.patch which was needed to get linkage on Windows
to work with the expat static libraries. Instead add -DXML_STATIC
to the compiler flags when building the modules that link to the
expat static libraries to accomplish the same thing, but in a
supported way.
Don't build the expat man pages since we don't have the necessary
build dependencies and we don't need them anyway.
(cherry picked from commit 190cb14849237ec7207449ab78b1e9f4cddb3d32)
---
main/expat/{expat-2.2.3.patch => expat-2.2.9.patch} | 14 +++++++-------
main/expat/expat-winapi.patch | 14 --------------
main/expat/makefile.mk | 9 ++++-----
main/expat/prj/d.lst | 4 ++--
main/external_deps.lst | 6 +++---
main/solenv/gbuild/gbuild.mk | 5 +++++
main/solenv/inc/settings.mk | 5 +++++
7 files changed, 26 insertions(+), 31 deletions(-)
diff --git a/main/expat/expat-2.2.3.patch b/main/expat/expat-2.2.9.patch
similarity index 92%
rename from main/expat/expat-2.2.3.patch
rename to main/expat/expat-2.2.9.patch
index 2453518..96e23a5 100644
--- a/main/expat/expat-2.2.3.patch
+++ b/main/expat/expat-2.2.9.patch
@@ -1,5 +1,5 @@
---- misc/expat-2.2.3/lib/makefile.mk Wed Aug 20 14:33:55 2008
-+++ misc/build/expat-2.2.3/lib/makefile.mk Wed Aug 20 14:26:42 2008
+--- misc/expat-2.2.9/lib/makefile.mk Wed Aug 20 14:33:55 2008
++++ misc/build/expat-2.2.9/lib/makefile.mk Wed Aug 20 14:26:42 2008
@@ -1 +1,91 @@
-dummy
+#**************************************************************
@@ -49,11 +49,11 @@
+UNICODE_SLOFILES=$(SLO)$/xmlparse.obj
+UNICODECDEFS+=-DXML_UNICODE
+
-+.IF "$(OS)"=="WNT"
-+ LOADLIBOBJFILE=$(SLO)/loadlibrary.obj
-+.ELSE
-+ LOADLIBOBJFILE=
-+.ENDIF
++#.IF "$(OS)"=="WNT"
++# LOADLIBOBJFILE=$(SLO)/loadlibrary.obj
++#.ELSE
++# LOADLIBOBJFILE=
++#.ENDIF
+
+LIB1ARCHIV=$(LB)$/libascii_$(TARGET)_xmlparse.a
+LIB1TARGET=$(SLB)$/ascii_$(TARGET)_xmlparse.lib
diff --git a/main/expat/expat-winapi.patch b/main/expat/expat-winapi.patch
deleted file mode 100644
index 17667ac..0000000
--- a/main/expat/expat-winapi.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur misc/expat-2.2.3/lib/expat_external.h misc/build/expat-2.2.3/lib/expat_external.h
---- misc/expat-2.2.3/lib/expat_external.h 2016-06-21 05:58:38.000000000 -0700
-+++ misc/build/expat-2.2.3/lib/expat_external.h 2016-07-31 17:10:53.551556000 -0700
-@@ -7,10 +7,6 @@
-
- /* External API definitions */
-
--#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)
--#define XML_USE_MSC_EXTENSIONS 1
--#endif
--
- /* Expat tries very hard to make the API boundary very specifically
- defined. There are two macros defined to control this boundary;
- each of these can be defined before including this header to
diff --git a/main/expat/makefile.mk b/main/expat/makefile.mk
index 6a96d92..4d19604 100644
--- a/main/expat/makefile.mk
+++ b/main/expat/makefile.mk
@@ -38,17 +38,16 @@ all:
# --- Files --------------------------------------------------------
-TARFILE_NAME=expat-2.2.3
-TARFILE_MD5=f053af63ef5f39bd9b78d01fbc203334
+TARFILE_NAME=expat-2.2.9
+TARFILE_MD5=875a2c2ff3e8eb9e5a5cd62db2033ab5
ADDITIONAL_FILES=lib$/makefile.mk
-PATCH_FILES=$(TARFILE_NAME).patch \
- expat-winapi.patch
+PATCH_FILES=$(TARFILE_NAME).patch
CONFIGURE_DIR=
.IF "$(OS)"=="WNT"
CONFIGURE_ACTION=
.ELSE
-CONFIGURE_ACTION=.$/configure
+CONFIGURE_ACTION=.$/configure --without-docbook
.ENDIF
BUILD_DIR=lib
diff --git a/main/expat/prj/d.lst b/main/expat/prj/d.lst
index 951ac27..fe7184e 100644
--- a/main/expat/prj/d.lst
+++ b/main/expat/prj/d.lst
@@ -1,7 +1,7 @@
mkdir: %_DEST%\inc%_EXT%\external\expat
mkdir: %_DEST%\lib%_EXT%\x64
-..\%__SRC%\misc\build\expat-2.2.3\lib\expat.h %_DEST%\inc%_EXT%\external\expat.h
-..\%__SRC%\misc\build\expat-2.2.3\lib\expat_external.h %_DEST%\inc%_EXT%\external\expat_external.h
+..\%__SRC%\misc\build\expat-2.2.9\lib\expat.h %_DEST%\inc%_EXT%\external\expat.h
+..\%__SRC%\misc\build\expat-2.2.9\lib\expat_external.h %_DEST%\inc%_EXT%\external\expat_external.h
..\%__SRC%\slb\expat_xmltok.lib %_DEST%\lib%_EXT%\expat_xmltok.lib
..\%__SRC%\slb\expat_xmlparse.lib %_DEST%\lib%_EXT%\expat_xmlparse.lib
..\%__SRC%\slb\ascii_expat_xmlparse.lib %_DEST%\lib%_EXT%\ascii_expat_xmlparse.lib
diff --git a/main/external_deps.lst b/main/external_deps.lst
index 42ea34c..c530627 100644
--- a/main/external_deps.lst
+++ b/main/external_deps.lst
@@ -225,9 +225,9 @@ if (SYSTEM_VIGRA != YES)
URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_EXPAT != YES)
- MD5 = f053af63ef5f39bd9b78d01fbc203334
- name = expat-2.2.3.tar.bz2
- URL1 = https://sourceforge.net/projects/expat/files/expat/2.2.3/expat-2.2.3.tar.bz2
+ MD5 = 875a2c2ff3e8eb9e5a5cd62db2033ab5
+ name = expat-2.2.9.tar.bz2
+ URL1 = https://sourceforge.net/projects/expat/files/expat/2.2.9/expat-2.2.9.tar.bz2
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_CURL != YES)
diff --git a/main/solenv/gbuild/gbuild.mk b/main/solenv/gbuild/gbuild.mk
index 7f1fe75..d0b133f 100644
--- a/main/solenv/gbuild/gbuild.mk
+++ b/main/solenv/gbuild/gbuild.mk
@@ -201,6 +201,11 @@ ifeq ($(strip $(ENABLE_GRAPHITE)),TRUE)
gb_GLOBALDEFS += -DENABLE_GRAPHITE
endif
+# Required for correct Windows function call ABI for expat static library
+ifeq ($(SYSTEM_EXPAT),NO)
+gb_GLOBALDEFS += -DXML_STATIC
+endif
+
gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
include $(GBUILDDIR)/Deliver.mk
diff --git a/main/solenv/inc/settings.mk b/main/solenv/inc/settings.mk
index d6afac1..efc2099 100644
--- a/main/solenv/inc/settings.mk
+++ b/main/solenv/inc/settings.mk
@@ -895,6 +895,11 @@ CDEFS+=$(CDEFS_PRESET)
CDEFS+=-DTIMELOG
.ENDIF
+# Required for correct Windows function call ABI for expat static library
+.IF "$(SYSTEM_EXPAT)"=="NO"
+CDEFS+=-DXML_STATIC
+.ENDIF
+
CDEFSCXX=
CDEFSOBJ=
CDEFSSLO=-DSHAREDLIB -D_DLL_