diff options
| author | David Tardon <dtardon@redhat.com> | 2015-05-19 15:56:04 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2015-05-19 16:00:59 +0200 |
| commit | 3828a18f5f4134daea616121b6df5f06b463e3bb (patch) | |
| tree | 45a64e83523026a9a85cdb5269c482c6294db745 | |
| parent | ac210e9d544df8509e4f53036754d1046c08883d (diff) | |
upload libetonyek 0.1.2
Change-Id: I7b8382b5ca74f5a1d9535ef0715629f2537d9f7e
| -rw-r--r-- | download.lst | 5 | ||||
| -rw-r--r-- | external/libetonyek/UnpackedTarball_libetonyek.mk | 6 | ||||
| -rw-r--r-- | external/libetonyek/assert.patch | 20 | ||||
| -rw-r--r-- | writerperfect/Library_wpftimpress.mk | 1 |
4 files changed, 4 insertions, 28 deletions
diff --git a/download.lst b/download.lst index 2e917f54ce14..86ce10c58fc7 100644 --- a/download.lst +++ b/download.lst @@ -34,8 +34,9 @@ export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll export EBOOK_MD5SUM := 6b48eda57914e6343efebc9381027b78 export EBOOK_TARBALL := libe-book-0.1.2.tar.bz2 export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz -export ETONYEK_MD5SUM := 805f941b06448212a988cb65f0691a7a -export ETONYEK_TARBALL := libetonyek-0.1.1.tar.bz2 +export ETONYEK_MD5SUM := 1704a75df7621d8073b921f8b6506951 +export ETONYEK_VERSION_MICRO := 2 +export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.bz2 export EXPAT_TARBALL := dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz export FIREBIRD_MD5SUM := 21154d2004e025c8a3666625b0357bb5 export FIREBIRD_TARBALL := Firebird-2.5.2.26540-0.tar.bz2 diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk index 448e41e379e5..52e6a9598a26 100644 --- a/external/libetonyek/UnpackedTarball_libetonyek.mk +++ b/external/libetonyek/UnpackedTarball_libetonyek.mk @@ -11,10 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libetonyek)) $(eval $(call gb_UnpackedTarball_set_tarball,libetonyek,$(ETONYEK_TARBALL))) -$(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,0)) - -$(eval $(call gb_UnpackedTarball_add_patches,libetonyek, \ - external/libetonyek/assert.patch \ -)) - # vim: set noet sw=4 ts=4: diff --git a/external/libetonyek/assert.patch b/external/libetonyek/assert.patch deleted file mode 100644 index 39d68db27a29..000000000000 --- a/external/libetonyek/assert.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/lib/EtonyekDocument.cpp -+++ src/lib/EtonyekDocument.cpp -@@ -7,6 +7,8 @@ - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -+#include <cassert> -+ - #include <boost/scoped_ptr.hpp> - #include <boost/shared_ptr.hpp> - #include <boost/logic/tribool.hpp> -@@ -179,7 +181,7 @@ - info.input->seek(0, RVNG_SEEK_SET); - } - -- assert(!isGzipped); -+ assert(bool(!isGzipped)); - - return probeXMLImpl(info.input, probe, type, info); - } diff --git a/writerperfect/Library_wpftimpress.mk b/writerperfect/Library_wpftimpress.mk index 3d35aa778151..d256c3d94998 100644 --- a/writerperfect/Library_wpftimpress.mk +++ b/writerperfect/Library_wpftimpress.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,wpftimpress,\ $(eval $(call gb_Library_use_externals,wpftimpress,\ boost_headers \ etonyek \ + glm \ mwaw \ odfgen \ revenge \ |