SPECS: openoffice.org.spec - More fixes for gcc4. Still doesn't ...

qrczak qrczak at pld-linux.org
Sun Dec 25 01:03:16 CET 2005


Author: qrczak                       Date: Sun Dec 25 00:03:16 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- More fixes for gcc4.
  Still doesn't build for me: xml2cmp crashes later.

---- Files affected:
SPECS:
   openoffice.org.spec (1.566 -> 1.567) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.566 SPECS/openoffice.org.spec:1.567
--- SPECS/openoffice.org.spec:1.566	Sat Dec 24 19:59:46 2005
+++ SPECS/openoffice.org.spec	Sun Dec 25 01:03:10 2005
@@ -147,6 +147,7 @@
 Patch2:		%{name}-filter.patch
 Patch3:		buildfix-64bit-sc.diff
 Patch4:		%{name}-desktop.patch
+Patch5:		%{name}-gcc4.diff
 
 URL:		http://www.openoffice.org/
 BuildRequires:	ImageMagick
@@ -1669,6 +1670,8 @@
 # add to ooo-build patch-system
 install %{PATCH1} patches/src680
 install %{PATCH3} patches/64bit
+install %{PATCH5} patches/src680
+(echo "[ Fixes ]"; echo `basename %{PATCH5}`) >>patches/OOO_2_0/apply
 # fake patch to make buildsystem happy (patch is included)
 touch patches/64bit/cws-ooo64bit02.2005-04-19-math-h.diff
 
@@ -2266,6 +2269,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.567  2005/12/25 00:03:10  qrczak
+- More fixes for gcc4.
+  Still doesn't build for me: xml2cmp crashes later.
+
 Revision 1.566  2005/12/24 18:59:46  qrczak
 - Added -fpermissive to turn "extra qualification" errors with gcc4
   into warnings.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.566&r2=1.567&f=u



More information about the pld-cvs-commit mailing list