libvisio/libvisio-0.0.14.patch | 20 -------------------- libvisio/libvisio-0.0.15-makefile_mk.patch | 10 ++++++++++ libvisio/libvisio-0.0.15.patch | 20 ++++++++++++++++++++ libvisio/makefile.mk | 7 ++++--- libvisio/prj/d.lst | 1 + ooo.lst.in | 2 +- 6 files changed, 36 insertions(+), 24 deletions(-)
New commits: commit bb65fed6eea196e766c0ac21898b426795ec1a2d Author: Fridrich Å trba <fridrich.st...@bluewin.ch> Date: Mon Feb 20 10:03:48 2012 +0100 Uploading new release of libvisio (cherry picked from commit 21366a4b95defb007ddccd409126536a6e8dc50d) ...plus... Fix libvisio's makefile.mk (cherry picked from commit f241f91e03c25d337598092b21f1c1360c7731eb) Signed-off-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/libvisio/libvisio-0.0.14.patch b/libvisio/libvisio-0.0.14.patch deleted file mode 100644 index 456f5ad..0000000 --- a/libvisio/libvisio-0.0.14.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- misc/libvisio-0.0.14/src/lib/libvisio_utils.h -+++ misc/build/libvisio-0.0.14/src/lib/libvisio_utils.h -@@ -42,17 +42,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.15-makefile_mk.patch b/libvisio/libvisio-0.0.15-makefile_mk.patch new file mode 100644 index 0000000..a22f128 --- /dev/null +++ b/libvisio/libvisio-0.0.15-makefile_mk.patch @@ -0,0 +1,10 @@ +--- misc/libvisio-0.0.15/src/lib/makefile.mk 2012-01-17 19:19:29.000000000 +0100 ++++ misc/build/libvisio-0.0.15/src/lib/makefile.mk 2012-02-20 10:36:43.448244813 +0100 +@@ -45,6 +45,7 @@ + $(SLO)$/VSDXParser.obj \ + $(SLO)$/VSDXShapeList.obj \ + $(SLO)$/VSDXStencils.obj \ ++ $(SLO)$/VSDStringVector.obj \ + $(SLO)$/VSDXStylesCollector.obj \ + $(SLO)$/VSDXStyles.obj + diff --git a/libvisio/libvisio-0.0.15.patch b/libvisio/libvisio-0.0.15.patch new file mode 100644 index 0000000..fbebce9 --- /dev/null +++ b/libvisio/libvisio-0.0.15.patch @@ -0,0 +1,20 @@ +--- misc/libvisio-0.0.15/src/lib/libvisio_utils.h ++++ misc/build/libvisio-0.0.15/src/lib/libvisio_utils.h +@@ -42,17 +42,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 9adf426..c2064ce 100644 --- a/libvisio/makefile.mk +++ b/libvisio/makefile.mk @@ -54,11 +54,12 @@ INCPRE+=$(WPG_CFLAGS) INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg .ENDIF -TARFILE_NAME=libvisio-0.0.14 -TARFILE_MD5=776ad69a63ac1e99abed176e54ce25d9 +TARFILE_NAME=libvisio-0.0.15 +TARFILE_MD5=d28864eb2b59bb57b034c0d4662a3cee PATCH_FILES=\ - $(TARFILE_NAME).patch + $(TARFILE_NAME).patch \ + $(TARFILE_NAME)-makefile_mk.patch BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) diff --git a/libvisio/prj/d.lst b/libvisio/prj/d.lst index f03b25b..5680abe 100644 --- a/libvisio/prj/d.lst +++ b/libvisio/prj/d.lst @@ -1,5 +1,6 @@ mkdir: %_DEST%\inc\libvisio ..\%__SRC%\misc\build\libvisio*\src\lib\libvisio.h %_DEST%\inc\libvisio ..\%__SRC%\misc\build\libvisio*\src\lib\VisioDocument.h %_DEST%\inc\libvisio\ +..\%__SRC%\misc\build\libvisio*\src\lib\VSDStringVector.h %_DEST%\inc\libvisio\ ..\%__SRC%\lib\*.a %_DEST%\lib\*.a ..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib diff --git a/ooo.lst.in b/ooo.lst.in index a71ed38..9ad3c24 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -88,7 +88,7 @@ c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz -776ad69a63ac1e99abed176e54ce25d9-libvisio-0.0.14.tar.bz2 +d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2 e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.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