rpms/openoffice.org/F-11 openoffice.org-3.1.1-rh505574.gccXXXX.patch, NONE, 1.1 openoffice.org.spec, 1.1915, 1.1916

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26959/F-11

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.1-rh505574.gccXXXX.patch 
Log Message:
Workaround: rhbz#505574 add openoffice.org-3.1.1-rh505574.gccXXXX.patch

openoffice.org-3.1.1-rh505574.gccXXXX.patch:

--- NEW FILE openoffice.org-3.1.1-rh505574.gccXXXX.patch ---
diff -ru sal.orig/osl/unx/file.cxx sal/osl/unx/file.cxx
--- sal.orig/osl/unx/file.cxx	2009-06-16 12:28:38.000000000 +0100
+++ sal/osl/unx/file.cxx	2009-06-16 12:38:37.000000000 +0100
@@ -215,8 +215,8 @@
 
 typedef struct _oslVolumeDeviceHandleImpl
 {
-    sal_Char pszMountPoint[PATH_MAX];
     sal_Char pszFilePath[PATH_MAX];
+    sal_Char pszMountPoint[PATH_MAX];
     sal_Char pszDevice[PATH_MAX];
     sal_Char ident[4];
     sal_uInt32   RefCount;
diff -ru sal.orig/osl/unx/profile.c sal/osl/unx/profile.c
--- sal.orig/osl/unx/profile.c	2009-06-16 12:28:38.000000000 +0100
+++ sal/osl/unx/profile.c	2009-06-16 12:28:46.000000000 +0100
@@ -126,10 +126,10 @@
 */
 typedef struct _osl_TProfileImpl
 {
+	sal_Char    m_FileName[PATH_MAX + 1];
 	sal_uInt32	m_Flags;
 	osl_TFile*	m_pFile;
 	osl_TStamp	m_Stamp;
-	sal_Char    m_FileName[PATH_MAX + 1];
 	sal_uInt32	m_NoLines;
 	sal_uInt32  m_MaxLines;
 	sal_uInt32  m_NoSections;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1915
retrieving revision 1.1916
diff -u -p -r1.1915 -r1.1916
--- openoffice.org.spec	15 Jun 2009 12:26:44 -0000	1.1915
+++ openoffice.org.spec	16 Jun 2009 11:47:33 -0000	1.1916
@@ -143,6 +143,7 @@ Patch67: openoffice.org-3.1.0.ooo101566.
 Patch68: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
 Patch69: openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch
 Patch70: workspace.pdfextfix02.patch
+Patch71: openoffice.org-3.1.1-rh505574.gccXXXX.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1644,6 +1645,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch68 -p0 -b .ooo101567.i18npool.mailocaledata.patch
 %patch69 -p0 -b .ooo102566.sc.less.frenetic.progress.patch
 %patch70 -p0 -b .workspace.pdfextfix02.patch
+%patch71 -p0 -b .rh505574.gccXXXX.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4146,11 +4148,12 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Jun 15 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.4.UNRELEASED
+* Tue Jun 16 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.4.UNRELEASED
 - Related: rhbz#472853 openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch
 - Resolves: rhbz#503003 silence warnings on updates
 - Resolves: rhbz#504419 openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch
 - Resolves: rhbz#506039 workspace.pdfextfix02.patch upsidedown images in pdf import
+- Workaround: rhbz#505574 add openoffice.org-3.1.1-rh505574.gccXXXX.patch
 
 * Mon May 25 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.3
 - add in the ia64 and arm fixes for the secondary arch people