[Libreoffice-commits] .: 4 commits - libvisio/libvisio-0.0.7.patch libvisio/libvisio-0.0.8.patch libvisio/makefile.mk libwpg/libwpg-0.2.0.patch libwpg/libwpg-mingw.patch libwpg/makefile.mk ooo.lst.in writerperfect/source
Fridrich Strba
fridrich at kemper.freedesktop.org
Tue Oct 4 07:46:36 PDT 2011
libvisio/libvisio-0.0.7.patch | 33 ---------------------------
libvisio/libvisio-0.0.8.patch | 33 +++++++++++++++++++++++++++
libvisio/makefile.mk | 6 ++--
libwpg/libwpg-0.2.0.patch | 14 -----------
libwpg/libwpg-mingw.patch | 11 ---------
libwpg/makefile.mk | 7 +----
ooo.lst.in | 4 +--
writerperfect/source/filter/OdgGenerator.cxx | 12 +++------
8 files changed, 44 insertions(+), 76 deletions(-)
New commits:
commit 8f4a14e07ceffc0b86e233c0adb711eafa087ba5
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Oct 4 16:45:30 2011 +0200
Uploading release binary of libvisio 0.0.8
diff --git a/libvisio/libvisio-0.0.7.patch b/libvisio/libvisio-0.0.7.patch
deleted file mode 100644
index d8c2209..0000000
--- a/libvisio/libvisio-0.0.7.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- misc/libvisio-0.0.7/src/lib/libvisio_utils.h
-+++ misc/build/libvisio-0.0.7/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.7/src/lib/makefile.mk
-+++ misc/build/libvisio-0.0.7/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.8.patch b/libvisio/libvisio-0.0.8.patch
new file mode 100644
index 0000000..ab138db
--- /dev/null
+++ b/libvisio/libvisio-0.0.8.patch
@@ -0,0 +1,33 @@
+--- 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/makefile.mk b/libvisio/makefile.mk
index ba46253..ce39d64 100644
--- a/libvisio/makefile.mk
+++ b/libvisio/makefile.mk
@@ -54,11 +54,11 @@ INCPRE+=$(LIBWPG_CFLAGS)
INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg
.ENDIF
-TARFILE_NAME=libvisio-0.0.7
-TARFILE_MD5=cfb4259665fa96874deaa1b233d0b9c2
+TARFILE_NAME=libvisio-0.0.8
+TARFILE_MD5=3c9c6cba49387e9b8e2bced5f2eba4e3
PATCH_FILES=\
- libvisio-0.0.7.patch
+ libvisio-0.0.8.patch
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
diff --git a/ooo.lst.in b/ooo.lst.in
index 4b62e3e..4ba17d2 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
-cfb4259665fa96874deaa1b233d0b9c2-libvisio-0.0.7.tar.bz2
+3c9c6cba49387e9b8e2bced5f2eba4e3-libvisio-0.0.8.tar.bz2
30c468d0c27ae4784195b53f78bc6f64-LinLibertineG-20110922.zip
7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
@GOOGLE_DOCS_EXTENSION_PACK@
commit f4e71b5aa2b40aa76946a8f93c1d20a0a87ec439
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Oct 4 16:25:45 2011 +0200
Uploading release binary of libwpg 0.2.1
diff --git a/libwpg/libwpg-0.2.0.patch b/libwpg/libwpg-0.2.0.patch
deleted file mode 100644
index 86567b1..0000000
--- a/libwpg/libwpg-0.2.0.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- misc/build/libwpg-0.2.0/src/lib/WPGSVGGenerator.cpp
-+++ misc/build/libwpg-0.2.0/src/lib/WPGSVGGenerator.cpp
-@@ -30,7 +30,11 @@
- {
- std::ostringstream tempStream;
- tempStream << value;
-+#ifndef __ANDROID__
- std::string decimalPoint(localeconv()->decimal_point);
-+#else
-+ std::string decimalPoint(".");
-+#endif
- if ((decimalPoint.size() == 0) || (decimalPoint == "."))
- return tempStream.str();
- std::string stringValue(tempStream.str());
diff --git a/libwpg/libwpg-mingw.patch b/libwpg/libwpg-mingw.patch
deleted file mode 100644
index 45b8d68..0000000
--- a/libwpg/libwpg-mingw.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/build/libwpg-0.2.0/src/lib/makefile.mk.orig 2011-08-22 07:21:59.000000000 +0200
-+++ misc/build/libwpg-0.2.0/src/lib/makefile.mk 2011-08-22 07:22:08.000000000 +0200
-@@ -9,7 +9,7 @@ LIBTARGET=NO
-
- .INCLUDE : settings.mk
-
--.IF "$(GUI)"=="WNT"
-+.IF "$(GUI)$(COM)"=="WNTMSC"
- CFLAGS+=-GR
- .ENDIF
- .IF "$(COM)"=="GCC"
diff --git a/libwpg/makefile.mk b/libwpg/makefile.mk
index 7602102..ff18fbc 100644
--- a/libwpg/makefile.mk
+++ b/libwpg/makefile.mk
@@ -49,11 +49,8 @@ INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream
.ENDIF
-TARFILE_NAME=libwpg-0.2.0
-TARFILE_MD5=5ba6a61a2f66dfd5fee8cdd4cd262a37
-
-PATCH_FILES=$(TARFILE_NAME).patch libwpg-mingw.patch
-
+TARFILE_NAME=libwpg-0.2.1
+TARFILE_MD5=9d283e02441d8cebdcd1e5d9df227d67
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src/lib
diff --git a/ooo.lst.in b/ooo.lst.in
index 04f3661..4b62e3e 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -81,7 +81,7 @@ b99fb620b1324b4ce79ee6998b507146-JLanguageTool-1.4.0.tar.bz2
debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz
71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz
-5ba6a61a2f66dfd5fee8cdd4cd262a37-libwpg-0.2.0.tar.bz2
+9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2
d6447e3ae278800c58ae40b740c861c0-libwpd-0.9.3.tar.bz2
9717505e864a16173afa681bda4bc910-libwps-0.2.3.tar.bz2
0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
commit 73ccf2254adaa6f78a41f625df20d56c6cdc8d02
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Oct 4 11:02:46 2011 +0200
Make draw:stroke==solid default for missing draw:stroke element
diff --git a/writerperfect/source/filter/OdgGenerator.cxx b/writerperfect/source/filter/OdgGenerator.cxx
index 478d64e..a848b35 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -1168,16 +1168,14 @@ void OdgGeneratorPrivate::_writeGraphicsStyle()
if (mxStyle["svg:stroke-linecap"])
pStyleGraphicsPropertiesElement->addAttribute("svg:stoke-linecap", mxStyle["svg:stroke-linecap"]->getStr());
- if(mxStyle["libwpg:stroke-solid"] && mxStyle["libwpg:stroke-solid"]->getInt())
- pStyleGraphicsPropertiesElement->addAttribute("draw:stroke", "solid");
- else if (mxStyle["draw:stroke"] && mxStyle["draw:stroke"]->getStr() == "solid")
- pStyleGraphicsPropertiesElement->addAttribute("draw:stroke", "solid");
- else if (mxStyle["draw:stroke"] && mxStyle["draw:stroke"]->getStr() == "dash")
+ if (mxStyle["draw:stroke"] && mxStyle["draw:stroke"]->getStr() == "dash")
{
pStyleGraphicsPropertiesElement->addAttribute("draw:stroke", "dash");
sValue.sprintf("Dash_%i", miDashIndex-1);
pStyleGraphicsPropertiesElement->addAttribute("draw:stroke-dash", sValue);
}
+ else
+ pStyleGraphicsPropertiesElement->addAttribute("draw:stroke", "solid");
}
if(mxStyle["draw:fill"] && mxStyle["draw:fill"]->getStr() == "none")
commit c4cedbc155bb1b561e8cd084a598b3d1e275832f
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Oct 4 11:00:40 2011 +0200
Allow hairlines svg:stroke-width==0 and handle special cases in the libraries themselves
diff --git a/writerperfect/source/filter/OdgGenerator.cxx b/writerperfect/source/filter/OdgGenerator.cxx
index 602e6b7..478d64e 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -1149,9 +1149,7 @@ void OdgGeneratorPrivate::_writeGraphicsStyle()
TagOpenElement *pStyleGraphicsPropertiesElement = new TagOpenElement("style:graphic-properties");
- if((mxStyle["draw:stroke"] && mxStyle["draw:stroke"]->getStr() == "none") ||
- (mxStyle["svg:stroke-width"] && mxStyle["svg:stroke-width"]->getDouble() == 0.0) ||
- (mxStyle["svg:stroke-color"] && mxStyle["svg:stroke-color"]->getStr() == "none"))
+ if (mxStyle["draw:stroke"] && mxStyle["draw:stroke"]->getStr() == "none")
pStyleGraphicsPropertiesElement->addAttribute("draw:stroke", "none");
else
{
More information about the Libreoffice-commits
mailing list