[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - download.lst libcdr/libcdr-0.0.10-ellipse.patch libcdr/UnpackedTarball_cdr.mk

[Fridrich Å trba]

 download.lst                       |    4 ++--
 libcdr/UnpackedTarball_cdr.mk      |    6 ------
 libcdr/libcdr-0.0.10-ellipse.patch |   19 -------------------
 3 files changed, 2 insertions(+), 27 deletions(-)

New commits:
commit ada8b3fb0e84013c9793a0213a7637678dd79b55
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Mar 1 10:38:31 2013 +0100

    Upload libcdr 0.0.11; fixing fdo#55366 fdo#59528 fdo#53278 fdo#54586
    
    Change-Id: Iadebf93d6002ce1a13152e9f7a8e4c490a4fbd94
    (cherry picked from commit 8fad92201dc18592f2ffaecc798071f96fec82ba)
    Reviewed-on: https://gerrit.libreoffice.org/2485
    Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/download.lst b/download.lst
index 75d928c..0420af9 100644
--- a/download.lst
+++ b/download.lst
@@ -1,5 +1,5 @@
-CDR_MD5SUM := bfc46d536c39b03563ab2a0e3beaf51b
-export CDR_TARBALL := libcdr-0.0.10.tar.bz2
+CDR_MD5SUM := 107a3d18f637b342684b3c21eb0fcd7d
+export CDR_TARBALL := libcdr-0.0.11.tar.bz2
 MSPUB_MD5SUM := 881c4628ec5f54d47f35d5d19e335662
 export MSPUB_TARBALL := libmspub-0.0.5.tar.bz2
 VISIO_MD5SUM := 92bde158f249b9b27f76f48cc65a0242
diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk
index 541fa96..be1e7d7 100644
--- a/libcdr/UnpackedTarball_cdr.mk
+++ b/libcdr/UnpackedTarball_cdr.mk
@@ -11,10 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,cdr,1))
-
-$(eval $(call gb_UnpackedTarball_add_patches,cdr,\
-	libcdr/libcdr-0.0.10-ellipse.patch \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/libcdr/libcdr-0.0.10-ellipse.patch b/libcdr/libcdr-0.0.10-ellipse.patch
deleted file mode 100644
index 0b392a7..0000000
--- a/libcdr/libcdr-0.0.10-ellipse.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/lib/CDRParser.cpp
-+++ b/src/lib/CDRParser.cpp
-@@ -1186,6 +1186,16 @@ void libcdr::CDRParser::readEllipse(WPXInputStream *input)
-   double rx = fabs(cx);
-   double ry = fabs(cy);
- 
-+  while (angle1 < 0.0)
-+    angle1 += 2*M_PI;
-+  while (angle1 > 2*M_PI)
-+    angle1 -= 2*M_PI;
-+
-+  while (angle2 < 0.0)
-+    angle2 += 2*M_PI;
-+  while (angle2 > 2*M_PI)
-+    angle2 -= 2*M_PI;
-+
-   if (angle1 != angle2)
-   {
-     if (angle2 < angle1)