[Libreoffice-commits] .: configure.ac libvisio/libvisio-0.0.20-zlib.patch libvisio/UnpackedTarball_visio.mk

[Libreoffice Gerrit user]

 configure.ac                        |    2 +-
 libvisio/UnpackedTarball_visio.mk   |    6 ------
 libvisio/libvisio-0.0.20-zlib.patch |   26 --------------------------
 3 files changed, 1 insertion(+), 33 deletions(-)

New commits:
commit d34ce24fb22566ed3db91aba71a003d5919a3f00
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Nov 21 10:55:35 2012 +0100

    Uploading libvisio 0.0.21 release
    
    We can now open ALL Visio file-formats that ever existed
    
    Change-Id: Icfe91421c8ddbba206e2cc0ce59bf718883e5477

diff --git a/configure.ac b/configure.ac
index 2f16682..4fb7e73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6960,7 +6960,7 @@ elif test $_os = iOS; then
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBVISIO=NO
-    VISIO_TARBALL=2d8c3b50f77c544f317ab0a8838fadcb-libvisio-0.0.20.tar.bz2
+    VISIO_TARBALL=1e961f0112e5986105749640c2b9bc41-libvisio-0.0.21.tar.bz2
 fi
 AC_SUBST(SYSTEM_LIBVISIO)
 AC_SUBST(VISIO_CFLAGS)
diff --git a/libvisio/UnpackedTarball_visio.mk b/libvisio/UnpackedTarball_visio.mk
index 59d4adb..aa9113b 100644
--- a/libvisio/UnpackedTarball_visio.mk
+++ b/libvisio/UnpackedTarball_visio.mk
@@ -11,10 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,visio))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,visio,$(VISIO_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,visio,1))
-
-$(eval $(call gb_UnpackedTarball_add_patches,visio,\
-	libvisio/libvisio-0.0.20-zlib.patch \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/libvisio/libvisio-0.0.20-zlib.patch b/libvisio/libvisio-0.0.20-zlib.patch
deleted file mode 100644
index 28cf881..0000000
--- a/libvisio/libvisio-0.0.20-zlib.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- libvisio-0.0.20/configure
-+++ libvisio-0.0.20/configure
-@@ -17165,8 +17165,8 @@
- fi
- 
- fi
--LIBVISIO_CXXFLAGS="${WPD_CFLAGS} ${WPG_CFLAGS} ${LIBXML_CFLAGS}"
--LIBVISIO_LIBS="${WPD_LIBS} ${WPG_LIBS} ${LIBXML_LIBS}"
-+LIBVISIO_CXXFLAGS="${WPD_CFLAGS} ${WPG_CFLAGS} ${LIBXML_CFLAGS} ${ZLIB_CFLAGS}"
-+LIBVISIO_LIBS="${WPD_LIBS} ${WPG_LIBS} ${LIBXML_LIBS} ${ZLIB_LIBS}"
- 
- 
- 
---- libvisio-0.0.20/Makefile.in
-+++ libvisio-0.0.20/Makefile.in
-@@ -55,8 +55,8 @@
- 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
- 	$(srcdir)/libvisio-0.0.pc.in $(srcdir)/libvisio-zip.in \
- 	$(srcdir)/libvisio.spec.in $(top_srcdir)/configure AUTHORS \
--	NEWS ar-lib config.guess config.sub install-sh ltmain.sh \
--	missing
-+	NEWS ar-lib config.guess config.sub depcomp install-sh \
-+	ltmain.sh missing
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \