[Libreoffice-commits] core.git: 2 commits - download.lst external/libetonyek external/libwps writerperfect/Library_wpftimpress.mk

[David Tardon]

 download.lst                                      |    8 +++++---
 external/libetonyek/UnpackedTarball_libetonyek.mk |    6 ------
 external/libetonyek/assert.patch                  |   20 --------------------
 external/libwps/ExternalPackage_libwps.mk         |    2 +-
 writerperfect/Library_wpftimpress.mk              |    1 +
 5 files changed, 7 insertions(+), 30 deletions(-)

New commits:
commit 3828a18f5f4134daea616121b6df5f06b463e3bb
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 19 15:56:04 2015 +0200

    upload libetonyek 0.1.2
    
    Change-Id: I7b8382b5ca74f5a1d9535ef0715629f2537d9f7e

diff --git a/download.lst b/download.lst
index 2e917f5..86ce10c 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 448e41e..52e6a95 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 39d68db..0000000
--- 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 3d35aa7..d256c3d 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 \
commit ac210e9d544df8509e4f53036754d1046c08883d
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 19 15:41:58 2015 +0200

    avoid the need to touch the Package makefile on updates
    
    Change-Id: I4c9d3e8cf9e5635c848c165d4eda44ad3798ae38

diff --git a/download.lst b/download.lst
index 7ea4862..2e917f5 100644
--- a/download.lst
+++ b/download.lst
@@ -146,7 +146,8 @@ export WPD_TARBALL := libwpd-0.10.0.tar.bz2
 export WPG_MD5SUM := 17da9770cb8b317b7633f9807b32b71a
 export WPG_TARBALL := libwpg-0.3.0.tar.bz2
 export WPS_MD5SUM := e9162d2566421d9d71b3ad2377a68fd5
-export WPS_TARBALL := libwps-0.4.0.tar.bz2
+export WPS_VERSION_MICRO := 0
+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
diff --git a/external/libwps/ExternalPackage_libwps.mk b/external/libwps/ExternalPackage_libwps.mk
index f37dc31..034900c 100644
--- a/external/libwps/ExternalPackage_libwps.mk
+++ b/external/libwps/ExternalPackage_libwps.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4.4
 else ifeq ($(OS),WNT)
 $(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4.dll,src/lib/.libs/libwps-0.4.dll))
 else ifeq ($(filter IOS ANDROID,$(OS)),)
-$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4.so.4,src/lib/.libs/libwps-0.4.so.4.0.0))
+$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4.so.4,src/lib/.libs/libwps-0.4.so.4.0.$(WPS_VERSION_MICRO)))
 endif
 
 # vim: set noet sw=4 ts=4: