rpms/openoffice.org/devel openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch, NONE, 1.1 openoffice.org.spec, 1.985, 1.986

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24047

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch 
Log Message:
still need openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch

openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch:
 basegfx/source/polygon/b2dpolypolygoncutter.cxx |   26 ++++++++++++------------
 source/polygon/b2dpolypolygoncutter.cxx         |    0 
 2 files changed, 14 insertions(+), 12 deletions(-)

--- NEW FILE openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch ---
Index: source/polygon/b2dpolypolygoncutter.cxx
===================================================================
RCS file: /cvs/graphics/basegfx/source/polygon/b2dpolypolygoncutter.cxx,v
retrieving revision 1.11
diff -u -r1.11 b2dpolypolygoncutter.cxx
--- openoffice.org.orig/basegfx/source/polygon/b2dpolypolygoncutter.cxx	26 Jan 2006 17:17:33 -0000	1.11
+++ openoffice.org/basegfx/source/polygon/b2dpolypolygoncutter.cxx	24 Jul 2006 10:43:46 -0000
@@ -112,25 +112,27 @@
 			sal_uInt32								mnIndex;
 
 			// sort operator to be able to sort on coordinates to later see common points
-			bool operator<(const impSortNode& rComp) const
+			bool operator<(const impSortNode& rComp) const;
+		};
+
+		bool impSortNode::operator<(const impSortNode& rComp) const
+		{
+			if(fTools::equal(maPoint.getX(), rComp.maPoint.getX()))
 			{
-				if(fTools::equal(maPoint.getX(), rComp.maPoint.getX()))
+				if(fTools::equal(maPoint.getY(), rComp.maPoint.getY()))
 				{
-					if(fTools::equal(maPoint.getY(), rComp.maPoint.getY()))
-					{
-						return (mnIndex < rComp.mnIndex);
-					}
-					else
-					{
-						return fTools::less(maPoint.getY(), rComp.maPoint.getY());
-					}
+					return (mnIndex < rComp.mnIndex);
 				}
 				else
 				{
-					return fTools::less(maPoint.getX(), rComp.maPoint.getX());
+					return fTools::less(maPoint.getY(), rComp.maPoint.getY());
 				}
 			}
-		};
+			else
+			{
+				return fTools::less(maPoint.getX(), rComp.maPoint.getX());
+			}
+		}
 
 		//////////////////////////////////////////////////////////////////////////////
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.985
retrieving revision 1.986
diff -u -r1.985 -r1.986
--- openoffice.org.spec	19 Dec 2006 14:45:06 -0000	1.985
+++ openoffice.org.spec	20 Dec 2006 15:56:19 -0000	1.986
@@ -1,6 +1,6 @@
 %define oootag OOE680
 %define ooomilestone 6
-%define rh_rpm_release 8
+%define rh_rpm_release 9
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -124,6 +124,7 @@
 Patch56: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
 Patch57: openoffice.org-2.1.0.oooXXXXX.vcl.filterzwatrender.patch
 Patch58: workspace.vcl71.patch
+Patch59: openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch
 
 %define instdir %{_libdir}/openoffice.org2.1
 
@@ -985,6 +986,7 @@
 %patch56 -p1 -b .ooo72129.vcl.fontglyphindex.patch
 %patch57 -p1 -b .oooXXXXX.vcl.filterzwatrender.patch
 %patch58 -p1 -b .workspace.vcl71.patch
+%patch59 -p1 -b .gccXXXXX.basegfx.crash.patch
 
 %if %{langpacks}
 tar xzf %{SOURCE1}
@@ -1040,7 +1042,7 @@
         esac
         ARCH_FLAGS="$ARCH_FLAGS $i"
 done
-ARCH_FLAGS="$ARCH_FLAGS -fno-threadsafe-statics -fno-omit-frame-pointer -D_FILE_OFFSET_BITS=64"
+ARCH_FLAGS="$ARCH_FLAGS -fno-omit-frame-pointer -D_FILE_OFFSET_BITS=64"
 export ARCH_FLAGS
 
 # see tamil translation issue rh#159381#, remove when complete and upstreamed
@@ -2569,6 +2571,10 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Wed Dec 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-6.9
+- still need openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch for rh#199870#
+- experiment and drop -fno-threadsafe-statics
+
 * Mon Dec 18 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-6.8
 - rename and appropiately merge commited patches as their respective workspaces
 - drop rh200118.filter.xalanbroken.patch