diff options
| -rw-r--r-- | Makefile.fetch | 2 | ||||
| -rw-r--r-- | download.lst | 3 | ||||
| -rw-r--r-- | external/libodfgen/0001-use-correct-header-for-std-swap.patch | 26 | ||||
| -rw-r--r-- | external/libodfgen/ExternalProject_libodfgen.mk | 1 | ||||
| -rw-r--r-- | external/libodfgen/UnpackedTarball_libodfgen.mk | 6 | ||||
| -rw-r--r-- | writerperfect/Library_wpftdraw.mk | 1 | ||||
| -rw-r--r-- | writerperfect/Library_wpftwriter.mk | 1 | ||||
| -rw-r--r-- | writerperfect/StaticLibrary_writerperfect.mk | 1 |
8 files changed, 39 insertions, 2 deletions
diff --git a/Makefile.fetch b/Makefile.fetch index 39332d7328d7..be6c2e979ed6 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -81,6 +81,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,HARFBUZZ,HARFBUZZ_TARBALL) \ $(call fetch_Optional,MSPUB,MSPUB_TARBALL) \ $(call fetch_Optional,MWAW,MWAW_TARBALL) \ + $(call fetch_Optional,ODFGEN,ODFGEN_TARBALL) \ $(call fetch_Optional,VISIO,VISIO_TARBALL) \ ,$(call fetch_Download_item_special,http://dev-www.libreoffice.org/src,$(item))) $(foreach item, \ @@ -146,7 +147,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,NEON,$(NEON_TARBALL)) \ $(call fetch_Optional,NSS,$(NSS_TARBALL)) \ $(NUMBERTEXT_EXTENSION_PACK) \ - $(call fetch_Optional,ODFGEN,$(ODFGEN_TARBALL)) \ $(call fetch_Optional,OPENLDAP,$(OPENLDAP_TARBALL)) \ $(call fetch_Optional,OPENSSL,$(OPENSSL_TARBALL)) \ $(call fetch_Optional,ORCUS,$(ORCUS_TARBALL)) \ diff --git a/download.lst b/download.lst index c90964611fa0..e8cbc2af7176 100644 --- a/download.lst +++ b/download.lst @@ -6,6 +6,8 @@ MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2 MWAW_MD5SUM := 828dd03510791fbe037081a2b4a1a8ff export MWAW_TARBALL := libmwaw-0.1.11.tar.bz2 +ODFGEN_MD5SUM := 9cafe7f50a3b2c5ebd2dc9c6c509d2b4 +ODFGEN_TARBALL := libodfgen-0.0.3.tar.bz2 VISIO_MD5SUM := 82628333418f101a20cd21f980cf9f40 export VISIO_TARBALL := libvisio-0.0.31.tar.bz2 FIREBIRD_MD5SUM := 21154d2004e025c8a3666625b0357bb5 @@ -78,7 +80,6 @@ export MYSQLCPPCONN_TARBALL := 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector- export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz export NSS_TARBALL := a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz -export ODFGEN_TARBALL := 8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz export OPENSSL_TARBALL := 66bf6f10f060d561929de96f9dfe5b8c-openssl-1.0.1e.tar.gz export ORCUS_TARBALL := ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 diff --git a/external/libodfgen/0001-use-correct-header-for-std-swap.patch b/external/libodfgen/0001-use-correct-header-for-std-swap.patch new file mode 100644 index 000000000000..13502d975b5c --- /dev/null +++ b/external/libodfgen/0001-use-correct-header-for-std-swap.patch @@ -0,0 +1,26 @@ +From 9008d84be1eb0b3def0df39b069a309d54aa73ab Mon Sep 17 00:00:00 2001 +From: David Tardon <dtardon@redhat.com> +Date: Wed, 30 Oct 2013 19:30:30 +0100 +Subject: [PATCH] use correct header for std::swap + +--- + src/GraphicFunctions.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/GraphicFunctions.cxx b/src/GraphicFunctions.cxx +index d8809f9..606c640 100644 +--- a/src/GraphicFunctions.cxx ++++ b/src/GraphicFunctions.cxx +@@ -24,8 +24,8 @@ + * Corel Corporation or Corel Corporation Limited." + */ + ++#include <algorithm> + #include <math.h> +-#include <utility> + + #include "GraphicFunctions.hxx" + +-- +1.8.3.1 + diff --git a/external/libodfgen/ExternalProject_libodfgen.mk b/external/libodfgen/ExternalProject_libodfgen.mk index 8514282c57b4..eea9ad1aeb5d 100644 --- a/external/libodfgen/ExternalProject_libodfgen.mk +++ b/external/libodfgen/ExternalProject_libodfgen.mk @@ -17,6 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,libodfgen,\ $(eval $(call gb_ExternalProject_use_externals,libodfgen,\ boost_headers \ + etonyek \ wpd \ wpg \ )) diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk b/external/libodfgen/UnpackedTarball_libodfgen.mk index 1a7f26cf9a8c..28e589c5506a 100644 --- a/external/libodfgen/UnpackedTarball_libodfgen.mk +++ b/external/libodfgen/UnpackedTarball_libodfgen.mk @@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libodfgen)) $(eval $(call gb_UnpackedTarball_set_tarball,libodfgen,$(ODFGEN_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,1)) + +$(eval $(call gb_UnpackedTarball_add_patches,libodfgen,\ + external/libodfgen/0001-use-correct-header-for-std-swap.patch \ +)) + # vim: set noet sw=4 ts=4: diff --git a/writerperfect/Library_wpftdraw.mk b/writerperfect/Library_wpftdraw.mk index 566b77bd07d5..5be55c8c86cd 100644 --- a/writerperfect/Library_wpftdraw.mk +++ b/writerperfect/Library_wpftdraw.mk @@ -46,6 +46,7 @@ $(eval $(call gb_Library_use_static_libraries,wpftdraw,\ $(eval $(call gb_Library_use_externals,wpftdraw,\ cdr \ + etonyek \ mspub \ odfgen \ visio \ diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk index 502668fbdc1e..6f5dafae4572 100644 --- a/writerperfect/Library_wpftwriter.mk +++ b/writerperfect/Library_wpftwriter.mk @@ -49,6 +49,7 @@ $(eval $(call gb_Library_use_static_libraries,wpftwriter,\ $(eval $(call gb_Library_use_externals,wpftwriter,\ boost_headers \ + etonyek \ mwaw \ odfgen \ wps \ diff --git a/writerperfect/StaticLibrary_writerperfect.mk b/writerperfect/StaticLibrary_writerperfect.mk index 5fcfb95339bb..d6b7ab537d3c 100644 --- a/writerperfect/StaticLibrary_writerperfect.mk +++ b/writerperfect/StaticLibrary_writerperfect.mk @@ -26,6 +26,7 @@ $(eval $(call gb_StaticLibrary_set_include,writerperfect,\ $(eval $(call gb_StaticLibrary_use_externals,writerperfect,\ boost_headers \ + etonyek \ odfgen \ wpd \ wpg \ |