libvisio/libvisio-0.0.8-build.patch | 18 -- libvisio/libvisio-0.0.8-draw_stroke.patch | 11 - libvisio/libvisio-0.0.8.patch | 33 ----- libvisio/libvisio-0.0.9-valgrind.patch | 190 ++++++++++++++++++++++++++++++ libvisio/libvisio-0.0.9.patch | 20 +++ libvisio/makefile.mk | 9 - ooo.lst.in | 2 7 files changed, 215 insertions(+), 68 deletions(-)
New commits: commit 4dedf9d43d83f6f142ca060eb4edb93e3e5bda84 Author: Fridrich Å trba <fridrich.st...@bluewin.ch> Date: Sun Oct 23 03:24:35 2011 +0200 Dump unnecessary patch hunk diff --git a/libvisio/libvisio-0.0.9.patch b/libvisio/libvisio-0.0.9.patch index 24a8d65..f7e6df2 100644 --- a/libvisio/libvisio-0.0.9.patch +++ b/libvisio/libvisio-0.0.9.patch @@ -18,16 +18,3 @@ #endif ---- misc/libvisio-0.0.9/src/lib/makefile.mk -+++ misc/build/libvisio-0.0.9/src/lib/makefile.mk -@@ -37,9 +37,9 @@ - $(SLO)$/VSDSVGGenerator.obj \ - $(SLO)$/VSDXCharacterList.obj \ - $(SLO)$/VSDXCollector.obj \ -+ $(SLO)$/VSDXOutputElementList.obj \ - $(SLO)$/VSDXContentCollector.obj \ - $(SLO)$/VSDXGeometryList.obj \ -- $(SLO)$/VSDXOutputElementList.obj \ - $(SLO)$/VSDXPages.obj \ - $(SLO)$/VSDXParser.obj \ - $(SLO)$/VSDXShapeList.obj \ commit 7420da1e95f394d4f0e97ddf14a8886da991bfe0 Author: Fridrich Å trba <fridrich.st...@bluewin.ch> Date: Sun Oct 23 03:21:35 2011 +0200 Fix valgrind errors diff --git a/libvisio/libvisio-0.0.9-valgrind.patch b/libvisio/libvisio-0.0.9-valgrind.patch new file mode 100644 index 0000000..39442a9 --- /dev/null +++ b/libvisio/libvisio-0.0.9-valgrind.patch @@ -0,0 +1,190 @@ +--- misc/libvisio-0.0.9/src/lib/VSDXStyles.cpp 2011-10-22 15:25:55.000000000 +0200 ++++ misc/build/libvisio-0.0.9/src/lib/VSDXStyles.cpp 2011-10-23 03:18:45.209282989 +0200 +@@ -37,8 +37,151 @@ + { + } + ++libvisio::VSDXStyles::VSDXStyles(const libvisio::VSDXStyles &styles) : ++ m_lineStyles(), m_fillStyles(), m_textBlockStyles(), m_charStyles(), m_paraStyles(), ++ m_lineStyleMasters(styles.m_lineStyleMasters), m_fillStyleMasters(styles.m_fillStyleMasters), ++ m_textStyleMasters(styles.m_textStyleMasters) ++{ ++ for (std::map<unsigned, VSDXFillStyle *>::const_iterator iterFillStyle = styles.m_fillStyles.begin(); ++ iterFillStyle != styles.m_fillStyles.end(); iterFillStyle++) ++ { ++ if (iterFillStyle->second) ++ m_fillStyles[iterFillStyle->first] = new VSDXFillStyle(*(iterFillStyle->second)); ++ } ++ for (std::map<unsigned, VSDXLineStyle *>::const_iterator iterLineStyle = styles.m_lineStyles.begin(); ++ iterLineStyle != styles.m_lineStyles.end(); iterLineStyle++) ++ { ++ if (iterLineStyle->second) ++ m_lineStyles[iterLineStyle->first] = new VSDXLineStyle(*(iterLineStyle->second)); ++ } ++ for (std::map<unsigned, VSDXTextBlockStyle *>::const_iterator iterTextBlockStyle = styles.m_textBlockStyles.begin(); ++ iterTextBlockStyle != styles.m_textBlockStyles.end(); iterTextBlockStyle++) ++ { ++ if (iterTextBlockStyle->second) ++ m_textBlockStyles[iterTextBlockStyle->first] = new VSDXTextBlockStyle(*(iterTextBlockStyle->second)); ++ } ++ for (std::map<unsigned, VSDXCharStyle *>::const_iterator iterCharStyle = styles.m_charStyles.begin(); ++ iterCharStyle != styles.m_charStyles.end(); iterCharStyle++) ++ { ++ if (iterCharStyle->second) ++ m_charStyles[iterCharStyle->first] = new VSDXCharStyle(*(iterCharStyle->second)); ++ } ++ for (std::map<unsigned, VSDXParaStyle *>::const_iterator iterParaStyle = styles.m_paraStyles.begin(); ++ iterParaStyle != styles.m_paraStyles.end(); iterParaStyle++) ++ { ++ if (iterParaStyle->second) ++ m_paraStyles[iterParaStyle->first] = new VSDXParaStyle(*(iterParaStyle->second)); ++ } ++} ++ + libvisio::VSDXStyles::~VSDXStyles() + { ++ for (std::map<unsigned, VSDXFillStyle *>::iterator iterFillStyle = m_fillStyles.begin(); ++ iterFillStyle != m_fillStyles.end(); iterFillStyle++) ++ { ++ if (iterFillStyle->second) ++ delete iterFillStyle->second; ++ } ++ for (std::map<unsigned, VSDXLineStyle *>::iterator iterLineStyle = m_lineStyles.begin(); ++ iterLineStyle != m_lineStyles.end(); iterLineStyle++) ++ { ++ if (iterLineStyle->second) ++ delete iterLineStyle->second; ++ } ++ for (std::map<unsigned, VSDXTextBlockStyle *>::iterator iterTextBlockStyle = m_textBlockStyles.begin(); ++ iterTextBlockStyle != m_textBlockStyles.end(); iterTextBlockStyle++) ++ { ++ if (iterTextBlockStyle->second) ++ delete (iterTextBlockStyle->second); ++ } ++ for (std::map<unsigned, VSDXCharStyle *>::iterator iterCharStyle = m_charStyles.begin(); ++ iterCharStyle != m_charStyles.end(); iterCharStyle++) ++ { ++ if (iterCharStyle->second) ++ delete (iterCharStyle->second); ++ } ++ for (std::map<unsigned, VSDXParaStyle *>::iterator iterParaStyle = m_paraStyles.begin(); ++ iterParaStyle != m_paraStyles.end(); iterParaStyle++) ++ { ++ if (iterParaStyle->second) ++ delete iterParaStyle->second; ++ } ++} ++ ++libvisio::VSDXStyles & libvisio::VSDXStyles::operator=(const libvisio::VSDXStyles &styles) ++{ ++ for (std::map<unsigned, VSDXFillStyle *>::iterator iterFillStyle = m_fillStyles.begin(); ++ iterFillStyle != m_fillStyles.end(); iterFillStyle++) ++ { ++ if (iterFillStyle->second) ++ delete iterFillStyle->second; ++ } ++ m_fillStyles.clear(); ++ for (std::map<unsigned, VSDXLineStyle *>::iterator iterLineStyle = m_lineStyles.begin(); ++ iterLineStyle != m_lineStyles.end(); iterLineStyle++) ++ { ++ if (iterLineStyle->second) ++ delete iterLineStyle->second; ++ } ++ m_lineStyles.clear(); ++ for (std::map<unsigned, VSDXTextBlockStyle *>::iterator iterTextBlockStyle = m_textBlockStyles.begin(); ++ iterTextBlockStyle != m_textBlockStyles.end(); iterTextBlockStyle++) ++ { ++ if (iterTextBlockStyle->second) ++ delete (iterTextBlockStyle->second); ++ } ++ m_textBlockStyles.clear(); ++ for (std::map<unsigned, VSDXCharStyle *>::iterator iterCharStyle = m_charStyles.begin(); ++ iterCharStyle != m_charStyles.end(); iterCharStyle++) ++ { ++ if (iterCharStyle->second) ++ delete (iterCharStyle->second); ++ } ++ m_charStyles.clear(); ++ for (std::map<unsigned, VSDXParaStyle *>::iterator iterParaStyle = m_paraStyles.begin(); ++ iterParaStyle != m_paraStyles.end(); iterParaStyle++) ++ { ++ if (iterParaStyle->second) ++ delete iterParaStyle->second; ++ } ++ m_paraStyles.clear(); ++ ++ for (std::map<unsigned, VSDXFillStyle *>::const_iterator iterFillStyle = styles.m_fillStyles.begin(); ++ iterFillStyle != styles.m_fillStyles.end(); iterFillStyle++) ++ { ++ if (iterFillStyle->second) ++ m_fillStyles[iterFillStyle->first] = new VSDXFillStyle(*(iterFillStyle->second)); ++ } ++ for (std::map<unsigned, VSDXLineStyle *>::const_iterator iterLineStyle = styles.m_lineStyles.begin(); ++ iterLineStyle != styles.m_lineStyles.end(); iterLineStyle++) ++ { ++ if (iterLineStyle->second) ++ m_lineStyles[iterLineStyle->first] = new VSDXLineStyle(*(iterLineStyle->second)); ++ } ++ for (std::map<unsigned, VSDXTextBlockStyle *>::const_iterator iterTextBlockStyle = styles.m_textBlockStyles.begin(); ++ iterTextBlockStyle != styles.m_textBlockStyles.end(); iterTextBlockStyle++) ++ { ++ if (iterTextBlockStyle->second) ++ m_textBlockStyles[iterTextBlockStyle->first] = new VSDXTextBlockStyle(*(iterTextBlockStyle->second)); ++ } ++ for (std::map<unsigned, VSDXCharStyle *>::const_iterator iterCharStyle = styles.m_charStyles.begin(); ++ iterCharStyle != styles.m_charStyles.end(); iterCharStyle++) ++ { ++ if (iterCharStyle->second) ++ m_charStyles[iterCharStyle->first] = new VSDXCharStyle(*(iterCharStyle->second)); ++ } ++ for (std::map<unsigned, VSDXParaStyle *>::const_iterator iterParaStyle = styles.m_paraStyles.begin(); ++ iterParaStyle != styles.m_paraStyles.end(); iterParaStyle++) ++ { ++ if (iterParaStyle->second) ++ m_paraStyles[iterParaStyle->first] = new VSDXParaStyle(*(iterParaStyle->second)); ++ } ++ ++ m_lineStyleMasters = styles.m_lineStyleMasters; ++ m_fillStyleMasters = styles.m_fillStyleMasters; ++ m_textStyleMasters = styles.m_textStyleMasters; ++ ++ return *this; + } + + void libvisio::VSDXStyles::addLineStyle(unsigned lineStyleIndex, VSDXLineStyle *lineStyle) +--- misc/libvisio-0.0.9/src/lib/VSDXStyles.h 2011-10-21 17:53:42.000000000 +0200 ++++ misc/build/libvisio-0.0.9/src/lib/VSDXStyles.h 2011-10-23 03:18:45.209282989 +0200 +@@ -119,6 +119,7 @@ + superscript(super), + subscript(sub), + face(f) {} ++ ~VSDXCharStyle() {} + unsigned charCount; + unsigned short faceID; + Colour colour; +@@ -158,6 +159,7 @@ + spBefore(sb), + spAfter(sa), + align(a) {} ++ ~VSDXParaStyle() {} + unsigned charCount; + double indFirst; + double indLeft; +@@ -190,6 +192,7 @@ + textBkgndColour(bgClr), + defaultTabStop(defTab), + textDirection(td) {} ++ ~VSDXTextBlockStyle() {} + double leftMargin; + double rightMargin; + double topMargin; +@@ -205,7 +208,9 @@ + { + public: + VSDXStyles(); ++ VSDXStyles(const VSDXStyles &styles); + ~VSDXStyles(); ++ VSDXStyles &operator=(const VSDXStyles &styles); + void addLineStyle(unsigned lineStyleIndex, VSDXLineStyle *lineStyle); + void addFillStyle(unsigned fillStyleIndex, VSDXFillStyle *fillStyle); + void addTextBlockStyle(unsigned textStyleIndex, VSDXTextBlockStyle *textBlockStyle); diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk index f0bd586..a10a5bd 100644 --- a/libvisio/makefile.mk +++ b/libvisio/makefile.mk @@ -58,6 +58,7 @@ TARFILE_NAME=libvisio-0.0.9 TARFILE_MD5=6b44e084c84c721423bf855ebe674e76 PATCH_FILES=\ + libvisio-0.0.9-valgrind.patch \ libvisio-0.0.9.patch commit ffcc6a284a2907bb33c96423f86e12a8d5e86d32 Author: Fridrich Å trba <fridrich.st...@bluewin.ch> Date: Sat Oct 22 23:15:21 2011 +0200 Uploading new release of libvisio (0.0.9) diff --git a/libvisio/libvisio-0.0.8-build.patch b/libvisio/libvisio-0.0.8-build.patch deleted file mode 100644 index fffa177..0000000 --- a/libvisio/libvisio-0.0.8-build.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- misc/libvisio-0.0.8/src/lib/makefile.mk 2011-10-05 14:44:34.615230761 +0200 -+++ misc/build/libvisio-0.0.8/src/lib/makefile.mk 2011-10-05 14:44:28.456175697 +0200 -@@ -17,13 +17,13 @@ - .ENDIF - - .IF "$(SYSTEM_LIBWPD)" == "YES" --INCPRE+=$(LIBWPD_CFLAGS) -I.. -+INCPRE+=$(WPD_CFLAGS) -I.. - .ELSE - INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd - .ENDIF - - .IF "$(SYSTEM_LIBWPG)" == "YES" --INCPRE+=$(LIBWPG_CFLAGS) -I.. -+INCPRE+=$(WPG_CFLAGS) -I.. - .ELSE - INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg - .ENDIF diff --git a/libvisio/libvisio-0.0.8-draw_stroke.patch b/libvisio/libvisio-0.0.8-draw_stroke.patch deleted file mode 100644 index 407be89..0000000 --- a/libvisio/libvisio-0.0.8-draw_stroke.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- misc/libvisio-0.0.8/src/lib/VSDXContentCollector.cpp 2011-09-29 14:45:38.000000000 +0200 -+++ misc/build/libvisio-0.0.8/src/lib/VSDXContentCollector.cpp 2011-10-05 15:06:20.374633773 +0200 -@@ -876,7 +876,7 @@ - m_noLine = noLine; - m_noShow = noShow; - if (m_noLine || m_linePattern == 0) -- m_styleProps.insert("svg:stroke-color", "none"); -+ m_styleProps.insert("draw:stroke", "none"); - else - m_styleProps.insert("svg:stroke-color", m_lineColour); - if (m_noFill || m_fillPattern == 0) diff --git a/libvisio/libvisio-0.0.8.patch b/libvisio/libvisio-0.0.8.patch deleted file mode 100644 index ab138db..0000000 --- a/libvisio/libvisio-0.0.8.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- misc/libvisio-0.0.8/src/lib/libvisio_utils.h -+++ misc/build/libvisio-0.0.8/src/lib/libvisio_utils.h -@@ -41,17 +41,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 - ---- misc/libvisio-0.0.8/src/lib/makefile.mk -+++ misc/build/libvisio-0.0.8/src/lib/makefile.mk -@@ -37,9 +37,9 @@ - $(SLO)$/VSDSVGGenerator.obj \ - $(SLO)$/VSDXCharacterList.obj \ - $(SLO)$/VSDXCollector.obj \ -+ $(SLO)$/VSDXOutputElementList.obj \ - $(SLO)$/VSDXContentCollector.obj \ - $(SLO)$/VSDXGeometryList.obj \ -- $(SLO)$/VSDXOutputElementList.obj \ - $(SLO)$/VSDXPages.obj \ - $(SLO)$/VSDXParser.obj \ - $(SLO)$/VSDXShapeList.obj \ diff --git a/libvisio/libvisio-0.0.9.patch b/libvisio/libvisio-0.0.9.patch new file mode 100644 index 0000000..24a8d65 --- /dev/null +++ b/libvisio/libvisio-0.0.9.patch @@ -0,0 +1,33 @@ +--- misc/libvisio-0.0.9/src/lib/libvisio_utils.h ++++ misc/build/libvisio-0.0.9/src/lib/libvisio_utils.h +@@ -41,17 +41,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 + +--- misc/libvisio-0.0.9/src/lib/makefile.mk ++++ misc/build/libvisio-0.0.9/src/lib/makefile.mk +@@ -37,9 +37,9 @@ + $(SLO)$/VSDSVGGenerator.obj \ + $(SLO)$/VSDXCharacterList.obj \ + $(SLO)$/VSDXCollector.obj \ ++ $(SLO)$/VSDXOutputElementList.obj \ + $(SLO)$/VSDXContentCollector.obj \ + $(SLO)$/VSDXGeometryList.obj \ +- $(SLO)$/VSDXOutputElementList.obj \ + $(SLO)$/VSDXPages.obj \ + $(SLO)$/VSDXParser.obj \ + $(SLO)$/VSDXShapeList.obj \ diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk index fa4e069..f0bd586 100644 --- a/libvisio/makefile.mk +++ b/libvisio/makefile.mk @@ -54,13 +54,11 @@ INCPRE+=$(WPG_CFLAGS) INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg .ENDIF -TARFILE_NAME=libvisio-0.0.8 -TARFILE_MD5=3c9c6cba49387e9b8e2bced5f2eba4e3 +TARFILE_NAME=libvisio-0.0.9 +TARFILE_MD5=6b44e084c84c721423bf855ebe674e76 PATCH_FILES=\ - libvisio-0.0.8.patch \ - libvisio-0.0.8-build.patch \ - libvisio-0.0.8-draw_stroke.patch + libvisio-0.0.9.patch BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) diff --git a/ooo.lst.in b/ooo.lst.in index 5eea4b4..223ec9b 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -88,7 +88,7 @@ d6447e3ae278800c58ae40b740c861c0-libwpd-0.9.3.tar.bz2 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz -3c9c6cba49387e9b8e2bced5f2eba4e3-libvisio-0.0.8.tar.bz2 +6b44e084c84c721423bf855ebe674e76-libvisio-0.0.9.tar.bz2 30c468d0c27ae4784195b53f78bc6f64-LinLibertineG-20110922.zip 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz @GOOGLE_DOCS_EXTENSION_PACK@
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits