rebase all import libs

Change-Id: I9e1fc613816c943f4fb1033185e34e3acf317f1d

3 files changed, 4 insertions, 37 deletions

diff --git a/external/libvisio/0001-fdo-70480-do-not-crash-reading-malformed-zip.patch b/external/libvisio/0001-fdo-70480-do-not-crash-reading-malformed-zip.patch
deleted file mode 100644
index 6c7135f36ea4..000000000000
--- a/external/libvisio/0001-fdo-70480-do-not-crash-reading-malformed-zip.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 410f564d9a728b983cf11ba9b3eadfc7d59c187c Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Thu, 17 Oct 2013 10:35:34 +0200
-Subject: [PATCH] fdo#70480 do not crash reading malformed zip
-
-Change-Id: Ia37e8be5172a49669cb9f7271c5401ca88f39072
----
- src/lib/VSDZipStream.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/lib/VSDZipStream.cpp b/src/lib/VSDZipStream.cpp
-index 3b3e08a..1c12d56 100644
---- a/src/lib/VSDZipStream.cpp
-+++ b/src/lib/VSDZipStream.cpp
-@@ -203,6 +203,8 @@ bool libvisio::VSDZipStreamImpl::isZipStream()
-     return false;
-   if (!readCentralDirectory(end))
-     return false;
-+  if (m_cdir.empty())
-+    return false;
-   CentralDirectoryEntry entry = m_cdir.begin()->second;
-   m_input->seek(entry.offset, WPX_SEEK_SET);
-   LocalFileHeader header;
--- 
-1.8.3.1
-
diff --git a/external/libvisio/ExternalProject_libvisio.mk b/external/libvisio/ExternalProject_libvisio.mk
index 597ea938b5e8..4ea2b238cf05 100644
--- a/external/libvisio/ExternalProject_libvisio.mk
+++ b/external/libvisio/ExternalProject_libvisio.mk
@@ -18,9 +18,8 @@ $(eval $(call gb_ExternalProject_register_targets,libvisio,\
 $(eval $(call gb_ExternalProject_use_externals,libvisio,\
 	boost_headers \
 	icu \
-	wpd \
-	wpg \
 	libxml2 \
+	revenge \
 	zlib \
 ))
 
@@ -32,14 +31,14 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
 			--enable-static \
 			--disable-shared \
 			--without-docs \
+			--disable-tools \
 			--disable-debug \
 			--disable-werror \
+			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
 			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side)) \
 			$(if $(SYSTEM_LIBXML),,-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-		&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
-		    $(if $(VERBOSE)$(verbose),V=1) \
-		    $(MAKE)) \
+		&& $(MAKE) \
 	)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libvisio/UnpackedTarball_libvisio.mk b/external/libvisio/UnpackedTarball_libvisio.mk
index 4680d78346b5..e4c0561f72f8 100644
--- a/external/libvisio/UnpackedTarball_libvisio.mk
+++ b/external/libvisio/UnpackedTarball_libvisio.mk
@@ -11,10 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libvisio))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,libvisio,1))
-
-$(eval $(call gb_UnpackedTarball_add_patches,libvisio,\
-	external/libvisio/0001-fdo-70480-do-not-crash-reading-malformed-zip.patch \
-))
-
 # vim: set noet sw=4 ts=4: