rpms/openoffice.org/devel workspace.s390xport02.patch,1.2,1.3

Caolan McNamara caolanm at fedoraproject.org
Mon Jan 25 11:40:40 UTC 2010


Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25317

Modified Files:
	workspace.s390xport02.patch 
Log Message:
remove this bit until 3.3

workspace.s390xport02.patch:
 gcc3_linux_s390/except.cxx   |    6 +++---
 gcc3_linux_s390x/cpp2uno.cxx |   10 ++++++++--
 gcc3_linux_s390x/except.cxx  |    6 +++---
 gcc3_linux_s390x/uno2cpp.cxx |   10 +++++-----
 4 files changed, 19 insertions(+), 13 deletions(-)

Index: workspace.s390xport02.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.s390xport02.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- workspace.s390xport02.patch	19 Jan 2010 11:34:23 -0000	1.2
+++ workspace.s390xport02.patch	25 Jan 2010 11:40:40 -0000	1.3
@@ -129,22 +129,3 @@ diff -r 0ce3ce7034ec -r 5e39d90161b3 bri
      
      switch (pMemberDescr->eTypeClass)
      {
-diff -r a92f79b9fc30 -r 0ce3ce7034ec basegfx/test/basegfx2d.cxx
---- a/basegfx/test/basegfx2d.cxx	Mon Jan 18 11:56:59 2010 +0000
-+++ b/basegfx/test/basegfx2d.cxx	Mon Jan 18 15:37:42 2010 +0000
-@@ -489,8 +489,13 @@
-         // depending on float precision and the getContinuity() implemetation using 
-         // fTools::equal, linux and mac produce more 'C' than 'S' statements, while WIN32
-         // uses more 'S' statements (as it should be for circles)
--        CPPUNIT_ASSERT_MESSAGE("exporting to circle does not produce the expected number of coordinates", 
--                               nCount==67 || nCount==50);
-+        CPPUNIT_ASSERT_MESSAGE("exporting to circle does not produce the expected number of coordinates",
-+#ifdef S390X
-+                               nCount==61
-+#else
-+                               nCount==67 || nCount==50
-+#endif
-+        );
- 
-         const B2DPolygon aRect(
-             tools::createPolygonFromRect( B2DRange(0.0,0.0,4000.0,4000.0) ));



More information about the scm-commits mailing list