Uploading libvisio-0.0.5

3 files changed, 5 insertions, 96 deletions

diff --git a/libvisio/libvisio-0.0.3-uint8_t.patch b/libvisio/libvisio-0.0.3-uint8_t.patch
deleted file mode 100644
index e41526857ee3..000000000000
--- a/libvisio/libvisio-0.0.3-uint8_t.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- misc/libvisio-0.0.3/src/lib/VSDXCollector.h	2011-07-22 14:35:49.000000000 +0200
-+++ misc/build/libvisio-0.0.3/src/lib/VSDXCollector.h	2011-07-25 12:18:22.334328001 +0200
-@@ -22,7 +22,6 @@
- #define VSDXCOLLECTOR_H
- 
- #include <vector>
--#include <stdint.h>
- #include "VSDXParser.h"
- 
- namespace libvisio {
-@@ -63,7 +62,7 @@
-   virtual void collectColours(const std::vector<Colour> &colours) = 0;
- 
-   virtual void collectCharList(unsigned id, unsigned level) = 0;
--  virtual void collectText(unsigned id, unsigned level, const std::vector<uint8_t> &textStream, TextFormat format) = 0;
-+  virtual void collectText(unsigned id, unsigned level, const std::vector<unsigned char> &textStream, TextFormat format) = 0;
-   virtual void collectCharFormat(unsigned id , unsigned level, unsigned charCount, unsigned langId, double fontSize, bool bold, bool italic, bool underline, WPXString fontFace) = 0;
- 
-   // Temporary hack
---- misc/libvisio-0.0.3/src/lib/VSDXContentCollector.cpp	2011-07-22 14:35:49.000000000 +0200
-+++ misc/build/libvisio-0.0.3/src/lib/VSDXContentCollector.cpp	2011-07-25 12:18:30.722328001 +0200
-@@ -987,7 +987,7 @@
-     m_colours.push_back(colours[i]);
- }
- 
--void libvisio::VSDXContentCollector::collectText(unsigned /*id*/, unsigned level, const std::vector<uint8_t> &textStream, TextFormat format)
-+void libvisio::VSDXContentCollector::collectText(unsigned /*id*/, unsigned level, const std::vector<unsigned char> &textStream, TextFormat format)
- {
-   _handleLevelChange(level);
- 
-@@ -1156,7 +1156,7 @@
-   if (fail)
-     throw GenericException();
- 
--  uint8_t first;
-+  unsigned char first;
-   int len;
-   if (ucs4Character < 0x80)
-   {
-@@ -1189,7 +1189,7 @@
-     len = 6;
-   }
- 
--  uint8_t outbuf[6] = { 0, 0, 0, 0, 0, 0};
-+  unsigned char outbuf[6] = { 0, 0, 0, 0, 0, 0};
-   int i;
-   for (i = len - 1; i > 0; --i)
-   {
---- misc/libvisio-0.0.3/src/lib/VSDXContentCollector.h	2011-07-22 14:35:49.000000000 +0200
-+++ misc/build/libvisio-0.0.3/src/lib/VSDXContentCollector.h	2011-07-25 12:18:13.810328000 +0200
-@@ -77,7 +77,7 @@
-   void collectColours(const std::vector<Colour> &colours);
- 
-   void collectCharList(unsigned id, unsigned level);
--  void collectText(unsigned id, unsigned level, const std::vector<uint8_t> &textStream, TextFormat format);
-+  void collectText(unsigned id, unsigned level, const std::vector<unsigned char> &textStream, TextFormat format);
-   void collectCharFormat(unsigned id , unsigned level, unsigned charCount, unsigned langId, double fontSize, bool bold, bool italic, bool underline, WPXString fontFace);
- 
-   void startPage();
-@@ -148,7 +148,7 @@
- 
-   std::map<unsigned, NURBSData> m_NURBSData;
-   std::map<unsigned, PolylineData> m_polylineData;
--  std::vector<uint8_t> m_textStream;
-+  std::vector<unsigned char> m_textStream;
-   TextFormat m_textFormat;
-   bool m_outputTextStart;
- };
---- misc/libvisio-0.0.3/src/lib/VSDXStylesCollector.cpp	2011-07-22 14:35:49.000000000 +0200
-+++ misc/build/libvisio-0.0.3/src/lib/VSDXStylesCollector.cpp	2011-07-25 12:18:26.586328031 +0200
-@@ -180,7 +180,7 @@
- {
- }
- 
--void libvisio::VSDXStylesCollector::collectText(unsigned /*id*/, unsigned level, const std::vector<uint8_t> & /*textStream*/, TextFormat /*format*/)
-+void libvisio::VSDXStylesCollector::collectText(unsigned /*id*/, unsigned level, const std::vector<unsigned char> & /*textStream*/, TextFormat /*format*/)
- {
-  _handleLevelChange(level);
- }
---- misc/libvisio-0.0.3/src/lib/VSDXStylesCollector.h	2011-07-22 14:35:49.000000000 +0200
-+++ misc/build/libvisio-0.0.3/src/lib/VSDXStylesCollector.h	2011-07-25 12:18:06.970328002 +0200
-@@ -68,7 +68,7 @@
-   void collectColours(const std::vector<Colour> &colours);
- 
-   void collectCharList(unsigned id, unsigned level);
--  void collectText(unsigned id, unsigned level, const std::vector<uint8_t> &textStream, TextFormat format);
-+  void collectText(unsigned id, unsigned level, const std::vector<unsigned char> &textStream, TextFormat format);
-   void collectCharFormat(unsigned id , unsigned level, unsigned charCount, unsigned langId, double fontSize, bool bold, bool italic, bool underline, WPXString fontFace);
-   // Temporary hack
-   void startPage();
diff --git a/libvisio/libvisio-0.0.3.patch b/libvisio/libvisio-0.0.5.patch
index 7da3ff3b3a7e..8be6ceaca431 100644
--- a/libvisio/libvisio-0.0.3.patch
+++ b/libvisio/libvisio-0.0.5.patch
@@ -1,5 +1,5 @@
---- misc/libvisio-0.0.3/src/lib/libvisio_utils.h
-+++ misc/build/libvisio-0.0.3/src/lib/libvisio_utils.h
+--- misc/libvisio-0.0.5/src/lib/libvisio_utils.h
++++ misc/build/libvisio-0.0.5/src/lib/libvisio_utils.h
 @@ -31,17 +31,8 @@
  
  #else
diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk
index 9e185efa3b29..a99ecff60125 100644
--- a/libvisio/makefile.mk
+++ b/libvisio/makefile.mk
@@ -54,12 +54,11 @@ INCPRE+=$(LIBWPG_CFLAGS)
 INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg
 .ENDIF
 
-TARFILE_NAME=libvisio-0.0.3
-TARFILE_MD5=90882496f9ff4cd6d75d61dac2f62f66
+TARFILE_NAME=libvisio-0.0.5
+TARFILE_MD5=9b8eb71bf58b006ac0d2f0b464786cee
 
 PATCH_FILES=\
-    libvisio-0.0.3.patch \
-    libvisio-0.0.3-uint8_t.patch
+    libvisio-0.0.5.patch
 
 
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)