rpms/openoffice.org/devel openoffice.org-3.1.1-rh505574.gccXXXX.patch, NONE, 1.1 openoffice.org.spec, 1.1942, 1.1943

[Caolan McNamara]

Author: caolanm

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

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/devel/openoffice.org.spec,v
retrieving revision 1.1942
retrieving revision 1.1943
diff -u -p -r1.1942 -r1.1943
--- openoffice.org.spec	16 Jun 2009 08:58:28 -0000	1.1942
+++ openoffice.org.spec	16 Jun 2009 11:47:35 -0000	1.1943
@@ -150,6 +150,7 @@ Patch72: openoffice.org-3.1.0.ooo102142.
 Patch73: workspace.calc51.patch
 Patch74: openoffice.org-3.1.1-ooo102679.sdext.buildfix.patch
 Patch75: openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch
+Patch76: 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}
@@ -1657,6 +1658,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch73 -p0 -b .workspace.calc51.patch
 %patch74 -p0 -b .ooo102679.sdext.buildfix.patch
 %patch75 -p0 -b .ooo46270.svx.search-dialog.no-find-all-in-draw.patch
+%patch76 -p0 -b .rh505574.gccXXXX.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4176,6 +4178,7 @@ fi
 - add hyphen-cy requires for Welsh
 - add hyphen-gl requires for Galician
 - add hyphen-eu requires for Basque
+- Workaround: rhbz#505574 add openoffice.org-3.1.1-rh505574.gccXXXX.patch
 
 * Thu Jun 09 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-13.1
 - latest version