[Libreoffice-commits] .: 4 commits - libcdr/ExternalProject_libcdr.mk libcdr/libcdr-0.0.10-ellipse.patch libcdr/UnpackedTarball_cdr.mk

[Libreoffice Gerrit user]

 libcdr/ExternalProject_libcdr.mk   |    4 +++-
 libcdr/UnpackedTarball_cdr.mk      |    6 ++++++
 libcdr/libcdr-0.0.10-ellipse.patch |   19 +++++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

New commits:
commit 302eebf0c88251a1514840a01a73316d898a6709
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Jan 25 16:56:55 2013 +0100

    CDR: Actually apply the patch
    
    Change-Id: I9ffd7123b8f79128c559f30eade6ae49bf809981

diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk
index be1e7d7..541fa96 100644
--- a/libcdr/UnpackedTarball_cdr.mk
+++ b/libcdr/UnpackedTarball_cdr.mk
@@ -11,4 +11,10 @@ $(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:
commit 7a50b16839f96a3afdb4be699b3c429c0510881a
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Jan 25 16:43:12 2013 +0100

    CDR: We want ICU_LIBS always empty since this is a static library
    
    Change-Id: I90730e08b07182fa73a1e3a60bed6da11cfd9e06

diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index 2c207c4..e8736d6 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -61,8 +61,9 @@ else
 $(call gb_ExternalProject_get_state_target,libcdr,build) :
 	cd $(EXTERNAL_WORKDIR) \
 	&& export PKG_CONFIG="" \
-	$(if $(filter NO,$(SYSTEM_ICU)),&& export ICU_LIBS=" " ICU_CFLAGS="-I$(OUTDIR)/inc/external") \
-	$(if $(filter YES,$(SYSTEM_ICU)),&& export ICU_LIBS=" " ICU_CFLAGS=" ") \
+	&& export ICU_LIBS=" " \
+	$(if $(filter NO,$(SYSTEM_ICU)),&& export ICU_CFLAGS="-I$(OUTDIR)/inc/external") \
+	$(if $(filter YES,$(SYSTEM_ICU)),&& ICU_CFLAGS=" ") \
 	&& ./configure \
 		--with-pic \
 		--enable-static \
commit f1ebdbd541225f1f31334114f3456d0fd7572eb7
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Jan 25 16:23:44 2013 +0100

    CDR: Override pkg-config with SYSTEM_ICU
    
    Change-Id: I8c802ae3ee91978bb445a47ba80c64eef355907b

diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index 4ec7d09..2c207c4 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -62,6 +62,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
 	cd $(EXTERNAL_WORKDIR) \
 	&& export PKG_CONFIG="" \
 	$(if $(filter NO,$(SYSTEM_ICU)),&& export ICU_LIBS=" " ICU_CFLAGS="-I$(OUTDIR)/inc/external") \
+	$(if $(filter YES,$(SYSTEM_ICU)),&& export ICU_LIBS=" " ICU_CFLAGS=" ") \
 	&& ./configure \
 		--with-pic \
 		--enable-static \
commit ab0195a5a40e441dea72cc2950e74cbd777115d5
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Jan 25 16:17:29 2013 +0100

    CDR: fix large-angle computation
    
    Change-Id: Ia3f937b0b49093fbdbbe259b835a2d8a81633fe1

diff --git a/libcdr/libcdr-0.0.10-ellipse.patch b/libcdr/libcdr-0.0.10-ellipse.patch
new file mode 100644
index 0000000..0b392a7
--- /dev/null
+++ b/libcdr/libcdr-0.0.10-ellipse.patch
@@ -0,0 +1,19 @@
+--- 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)