Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2485
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/85/2485/1
Upload libcdr 0.0.11; fixing fdo#55366 fdo#59528 fdo#53278 fdo#54586
Change-Id: Iadebf93d6002ce1a13152e9f7a8e4c490a4fbd94
(cherry picked from commit 8fad92201dc18592f2ffaecc798071f96fec82ba)
---
M download.lst
M libcdr/UnpackedTarball_cdr.mk
D libcdr/libcdr-0.0.10-ellipse.patch
3 files changed, 2 insertions(+), 27 deletions(-)
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_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)
--
To view, visit https://gerrit.libreoffice.org/2485
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iadebf93d6002ce1a13152e9f7a8e4c490a4fbd94
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Fridrich Strba <fridrich@documentfoundation.org>
Context
- [PATCH libreoffice-4-0] Upload libcdr 0.0.11; fixing fdo#55366 fdo#59528 fdo#53278 f... · Fridrich Strba (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.