[Libreoffice-commits] .: libvisio/libvisio-0.0.3.patch libvisio/libvisio-0.0.3-uint8_t.patch libvisio/libvisio-0.0.5.patch libvisio/makefile.mk ooo.lst.in
Fridrich Strba
fridrich at kemper.freedesktop.org
Fri Aug 19 06:47:54 PDT 2011
libvisio/libvisio-0.0.3-uint8_t.patch | 90 ----------------------------------
libvisio/libvisio-0.0.3.patch | 20 -------
libvisio/libvisio-0.0.5.patch | 20 +++++++
libvisio/makefile.mk | 7 +-
ooo.lst.in | 2
5 files changed, 24 insertions(+), 115 deletions(-)
New commits:
commit 7a02f65534b27242780406d1532cd8ca93873de8
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Fri Aug 19 15:47:09 2011 +0200
Uploading libvisio-0.0.5
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 e415268..0000000
--- 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.3.patch
deleted file mode 100644
index 7da3ff3..0000000
--- a/libvisio/libvisio-0.0.3.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- misc/libvisio-0.0.3/src/lib/libvisio_utils.h
-+++ misc/build/libvisio-0.0.3/src/lib/libvisio_utils.h
-@@ -31,17 +31,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.5.patch b/libvisio/libvisio-0.0.5.patch
new file mode 100644
index 0000000..8be6cea
--- /dev/null
+++ b/libvisio/libvisio-0.0.5.patch
@@ -0,0 +1,20 @@
+--- 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
+
+-#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 9e185ef..a99ecff 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)
diff --git a/ooo.lst.in b/ooo.lst.in
index 9cd6619..f114ec0 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -88,7 +88,7 @@ debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz
-90882496f9ff4cd6d75d61dac2f62f66-libvisio-0.0.3.tar.bz2
+9b8eb71bf58b006ac0d2f0b464786cee-libvisio-0.0.5.tar.bz2
881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip
http://dev-www.libreoffice.org/extern
185d60944ea767075d27247c3162b3bc-unowinreg.dll
More information about the Libreoffice-commits
mailing list