diff options
| -rw-r--r-- | libvisio/libvisio-0.0.8-build.patch | 18 | ||||
| -rw-r--r-- | libvisio/libvisio-0.0.8-draw_stroke.patch | 11 | ||||
| -rw-r--r-- | libvisio/libvisio-0.0.9.patch (renamed from libvisio/libvisio-0.0.8.patch) | 8 | ||||
| -rw-r--r-- | libvisio/makefile.mk | 8 | ||||
| -rw-r--r-- | ooo.lst.in | 2 |
5 files changed, 8 insertions, 39 deletions
diff --git a/libvisio/libvisio-0.0.8-build.patch b/libvisio/libvisio-0.0.8-build.patch deleted file mode 100644 index fffa17758f50..000000000000 --- 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 407be890dc4d..000000000000 --- 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.9.patch index ab138dbed20a..24a8d65f84ba 100644 --- a/libvisio/libvisio-0.0.8.patch +++ b/libvisio/libvisio-0.0.9.patch @@ -1,5 +1,5 @@ ---- misc/libvisio-0.0.8/src/lib/libvisio_utils.h -+++ misc/build/libvisio-0.0.8/src/lib/libvisio_utils.h +--- 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 @@ -18,8 +18,8 @@ #endif ---- misc/libvisio-0.0.8/src/lib/makefile.mk -+++ misc/build/libvisio-0.0.8/src/lib/makefile.mk +--- 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 \ diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk index fa4e069f3503..f0bd586a9e72 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 5eea4b43739d..223ec9b909af 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@ |