[Libreoffice-commits] .: libvisio/libvisio-0.0.15-makefile_mk.patch libvisio/libvisio-0.0.15.patch libvisio/libvisio-0.0.16.patch libvisio/makefile.mk ooo.lst.in

[Fridrich Strba]

 libvisio/libvisio-0.0.15-makefile_mk.patch |   10 ----------
 libvisio/libvisio-0.0.15.patch             |   20 --------------------
 libvisio/libvisio-0.0.16.patch             |   20 ++++++++++++++++++++
 libvisio/makefile.mk                       |    7 +++----
 ooo.lst.in                                 |    2 +-
 5 files changed, 24 insertions(+), 35 deletions(-)

New commits:
commit df80de1f47ed555ad28d78065f1c1853feab0c85
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Apr 16 12:27:38 2012 +0200

    Uploading new release of libvisio (0.0.16)

diff --git a/libvisio/libvisio-0.0.15-makefile_mk.patch b/libvisio/libvisio-0.0.15-makefile_mk.patch
deleted file mode 100644
index a22f128..0000000
--- a/libvisio/libvisio-0.0.15-makefile_mk.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- misc/libvisio-0.0.15/src/lib/makefile.mk	2012-01-17 19:19:29.000000000 +0100
-+++ misc/build/libvisio-0.0.15/src/lib/makefile.mk	2012-02-20 10:36:43.448244813 +0100
-@@ -45,6 +45,7 @@
- 	$(SLO)$/VSDXParser.obj \
- 	$(SLO)$/VSDXShapeList.obj \
- 	$(SLO)$/VSDXStencils.obj \
-+	$(SLO)$/VSDStringVector.obj \
- 	$(SLO)$/VSDXStylesCollector.obj \
- 	$(SLO)$/VSDXStyles.obj
- 
diff --git a/libvisio/libvisio-0.0.15.patch b/libvisio/libvisio-0.0.15.patch
deleted file mode 100644
index fbebce9..0000000
--- a/libvisio/libvisio-0.0.15.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- misc/libvisio-0.0.15/src/lib/libvisio_utils.h
-+++ misc/build/libvisio-0.0.15/src/lib/libvisio_utils.h
-@@ -42,17 +42,8 @@
- 
- #else
- 
--#ifdef HAVE_CONFIG_H
--#include <config.h>
--#endif
--
--#ifdef HAVE_STDINT_H
- #include <stdint.h>
--#endif
--
--#ifdef HAVE_INTTYPES_H
- #include <inttypes.h>
--#endif
- 
- #endif
- 
diff --git a/libvisio/libvisio-0.0.16.patch b/libvisio/libvisio-0.0.16.patch
new file mode 100644
index 0000000..6a8824f
--- /dev/null
+++ b/libvisio/libvisio-0.0.16.patch
@@ -0,0 +1,20 @@
+--- misc/libvisio-0.0.16/src/lib/libvisio_utils.h
++++ misc/build/libvisio-0.0.16/src/lib/libvisio_utils.h
+@@ -42,17 +42,8 @@
+ 
+ #else
+ 
+-#ifdef HAVE_CONFIG_H
+-#include <config.h>
+-#endif
+-
+-#ifdef HAVE_STDINT_H
+ #include <stdint.h>
+-#endif
+-
+-#ifdef HAVE_INTTYPES_H
+ #include <inttypes.h>
+-#endif
+ 
+ #endif
+ 
diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk
index c2064ce..f428918 100644
--- a/libvisio/makefile.mk
+++ b/libvisio/makefile.mk
@@ -54,12 +54,11 @@ INCPRE+=$(WPG_CFLAGS)
 INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg
 .ENDIF
 
-TARFILE_NAME=libvisio-0.0.15
-TARFILE_MD5=d28864eb2b59bb57b034c0d4662a3cee
+TARFILE_NAME=libvisio-0.0.16
+TARFILE_MD5=2fa6028324347860e684e75310818d43
 
 PATCH_FILES=\
-    $(TARFILE_NAME).patch \
-    $(TARFILE_NAME)-makefile_mk.patch
+    $(TARFILE_NAME).patch
 
 
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
diff --git a/ooo.lst.in b/ooo.lst.in
index eef3c26..1d6bfde 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -87,7 +87,7 @@ c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2
 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
-d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2
+2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2
 e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
 44d0c579b342f6cdbc0f76534c5d29b2-libcdr-0.0.6.tar.bz2