rpms/openoffice.org/devel openoffice.org-3.0.0.ooo86588.sw.buildfix.patch, NONE, 1.1.2.1 openoffice.org.spec, 1.1440.2.4, 1.1440.2.5

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Sun Mar 9 14:44:14 UTC 2008


Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1838

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org.spec 
Added Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org-3.0.0.ooo86588.sw.buildfix.patch 
Log Message:
add openoffice.org-3.0.0.ooo86588.sw.buildfix.patch

openoffice.org-3.0.0.ooo86588.sw.buildfix.patch:

--- NEW FILE openoffice.org-3.0.0.ooo86588.sw.buildfix.patch ---
Index: source/filter/xml/xmlmeta.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/xml/xmlmeta.cxx,v
retrieving revision 1.17.76.4
diff -u -r1.17.76.4 xmlmeta.cxx
--- openoffice.org.orig/sw/source/filter/xml/xmlmeta.cxx	18 Dec 2007 18:30:32 -0000	1.17.76.4
+++ openoffice.org/sw/source/filter/xml/xmlmeta.cxx	3 Mar 2008 10:05:21 -0000
@@ -156,8 +156,8 @@
 struct statistic {
     SvXMLTokenMapAttrs token;
     const char* name;
-    sal_uInt16 SwDocStat::* target16;
-    sal_uInt32 SwDocStat::* target32;
+    USHORT SwDocStat::* target16;
+    ULONG  SwDocStat::* target32; /* or 64, on LP64 platforms */
 };
 
 static const struct statistic s_stats [] = {


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.4
retrieving revision 1.1440.2.5
diff -u -r1.1440.2.4 -r1.1440.2.5
--- openoffice.org.spec	7 Mar 2008 17:05:50 -0000	1.1440.2.4
+++ openoffice.org.spec	9 Mar 2008 14:43:40 -0000	1.1440.2.5
@@ -140,6 +140,7 @@
 Patch66: openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch
 Patch67: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
 Patch68: workspace.cmcfixes43.patch
+Patch69: openoffice.org-3.0.0.ooo86588.sw.buildfix.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1093,6 +1094,7 @@
 %patch66 -p1 -b .ooo86268.desktop.visibilitycockup.patch
 %patch67 -p1 -b .oooXXXXX.psprint.debugcups.patch
 %patch68 -p1 -b .workspace.cmcfixes43.patch
+%patch69 -p1 -b .ooo86588.sw.buildfix.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2868,7 +2870,7 @@
 
 
 %6changelog
-* Fri Mar 07 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.1.1
+* Sun Mar 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.1.1
 - extend selinux bodge to ia64 
 - drop integrated workspace.notes2.patch
 - drop integrated openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
@@ -2877,6 +2879,7 @@
 - drop integrated openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch
 - drop integrated openoffice.org-2.4.0.ooo86123.ucb.newneon.patch
 - add workspace.cmcfixes43.patch
+- add openoffice.org-3.0.0.ooo86588.sw.buildfix.patch
 
 * Thu Mar 06 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-9.1
 - next release candidate




More information about the fedora-extras-commits mailing list