[Libreoffice-commits] .: download.lst libvisio/libvisio-lineheight.patch libvisio/UnpackedTarball_visio.mk

[Libreoffice Gerrit user]

 download.lst                       |    4 ++--
 libvisio/UnpackedTarball_visio.mk  |    8 --------
 libvisio/libvisio-lineheight.patch |   11 -----------
 3 files changed, 2 insertions(+), 21 deletions(-)

New commits:
commit 687138f72c607e02f9dabf0ca6c936209e4c76b7
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Dec 18 10:36:20 2012 +0100

    Fix the regression in fdo#47499: wrong fill colour
    
    Change-Id: I986a5f4c944f9fe9e985c408a72f766d9b1eed12

diff --git a/download.lst b/download.lst
index bbca618..3abd8ed 100644
--- a/download.lst
+++ b/download.lst
@@ -2,8 +2,8 @@ CDR_MD5SUM := 3c0037fb07dea2f0bbae8386fa7c6a9a
 export CDR_TARBALL := libcdr-0.0.9.tar.bz2
 MSPUB_MD5SUM := b2db54b6e96287ac995d7ed654ace4fc
 export MSPUB_TARBALL := libmspub-0.0.3.tar.bz2
-VISIO_MD5SUM := 2552fffcc8428c8b5506218f0cf802db
-export VISIO_TARBALL := libvisio-0.0.23.tar.bz2
+VISIO_MD5SUM := 1962a4183bac8a247989af17ef8882ea
+export VISIO_TARBALL := libvisio-0.0.24.tar.bz2
 
 export AFMS_TARBALL := 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
 export APACHE_COMMONS_CODEC_TARBALL := af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
diff --git a/libvisio/UnpackedTarball_visio.mk b/libvisio/UnpackedTarball_visio.mk
index 3afd8af..aa9113b 100644
--- a/libvisio/UnpackedTarball_visio.mk
+++ b/libvisio/UnpackedTarball_visio.mk
@@ -11,12 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,visio))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,visio,$(VISIO_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_add_patches,visio,\
-    libvisio/libvisio-lineheight.patch \
-))
-# libvisio/libvisio-lineheight.patch: see upstream
-#  <https://gerrit.libreoffice.org/gitweb?p=libvisio.git;a=commitdiff;
-#  h=257e1896942a7028f1d0669ac6d4f61f294cb14d>
-#  "Fixed line height is in inches :("
-
 # vim: set noet sw=4 ts=4:
diff --git a/libvisio/libvisio-lineheight.patch b/libvisio/libvisio-lineheight.patch
deleted file mode 100644
index 922fac8..0000000
--- a/libvisio/libvisio-lineheight.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/libvisio-0.0.23/src/lib/VSDContentCollector.cpp
-+++ misc/build/libvisio-0.0.23/src/lib/VSDContentCollector.cpp
-@@ -526,7 +526,7 @@ void libvisio::VSDContentCollector::_flushText()
-       break;
-     }
-     if ((*paraIt).spLine > 0)
--      paraProps.insert("fo:line-height", (*paraIt).spLine, WPX_POINT);
-+      paraProps.insert("fo:line-height", (*paraIt).spLine);
-     else
-       paraProps.insert("fo:line-height", -(*paraIt).spLine, WPX_PERCENT);
-