diff options
| author | David Tardon <dtardon@redhat.com> | 2016-09-07 13:50:03 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2016-09-09 05:29:27 +0000 |
| commit | a013b8505534896bc926e54116ef14e7879b0545 (patch) | |
| tree | d030fc4ae6ce5491f077f6e76025e91409473a62 | |
| parent | 6cf44da0395ce5d8dc9cfda838fb15c593507363 (diff) | |
upload libzmf 0.0.1
Change-Id: I706d454226d17fe1386c876782f6ad2843f17197
Reviewed-on: https://gerrit.libreoffice.org/28718
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libzmf/0001-add-missing-include.patch.1 | 12 | ||||
| -rw-r--r-- | writerperfect/Library_wpftdraw.mk | 1 |
3 files changed, 9 insertions, 8 deletions
diff --git a/download.lst b/download.lst index 1c7250926a8d..55057f6b1f15 100644 --- a/download.lst +++ b/download.lst @@ -171,8 +171,8 @@ export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.bz2 export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip export ZLIB_MD5SUM := 44d667c142d7cda120332623eab69f40 export ZLIB_TARBALL := zlib-1.2.8.tar.gz -export ZMF_MD5SUM := b64a7780bfef91e0a953f436366b2047 -export ZMF_TARBALL := libzmf-0.0.0.tar.bz2 +export ZMF_MD5SUM := c611df8664240de0276ab95670f413d8 +export ZMF_TARBALL := libzmf-0.0.1.tar.bz2 export MOZ_ZIP_INC := $(OS)$(COM)$(if $(filter INTEL,$(CPUNAME)),I,X)inc.zip export MOZ_ZIP_LIB := $(OS)$(COM)$(if $(filter INTEL,$(CPUNAME)),I,X)lib.zip diff --git a/external/libzmf/0001-add-missing-include.patch.1 b/external/libzmf/0001-add-missing-include.patch.1 index ff1dc2a923f2..d64053147520 100644 --- a/external/libzmf/0001-add-missing-include.patch.1 +++ b/external/libzmf/0001-add-missing-include.patch.1 @@ -5,16 +5,16 @@ Subject: [PATCH] add missing include Change-Id: Ia21873123179902b2c3cad95b39db7d15c5b388a --- - src/lib/ZMFCollector.cpp | 2 ++ + src/lib/ZMFTypes.cpp | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/src/lib/ZMFCollector.cpp b/src/lib/ZMFCollector.cpp +diff --git a/src/lib/ZMFTypes.cpp b/src/lib/ZMFTypes.cpp index ded93c7..7e024b3 100644 ---- a/src/lib/ZMFCollector.cpp -+++ b/src/lib/ZMFCollector.cpp +--- a/src/lib/ZMFTypes.cpp ++++ b/src/lib/ZMFTypes.cpp @@ -9,6 +9,19 @@ - #include "ZMFCollector.h" + #include "ZMFTypes.h" +#include <cmath> + @@ -30,8 +30,8 @@ index ded93c7..7e024b3 100644 +#endif + #include <boost/math/constants/constants.hpp> - #include <boost/variant.hpp> + namespace libzmf -- 2.7.4 diff --git a/writerperfect/Library_wpftdraw.mk b/writerperfect/Library_wpftdraw.mk index 23d294518466..ec9057c79a1d 100644 --- a/writerperfect/Library_wpftdraw.mk +++ b/writerperfect/Library_wpftdraw.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_externals,wpftdraw,\ mspub \ mwaw \ odfgen \ + png \ pagemaker \ revenge \ staroffice \ |