rpms/openoffice.org/devel openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch, NONE, 1.1 openoffice.org.spec, 1.1794, 1.1795

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch 
Log Message:
add openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch

openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch:

--- NEW FILE openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch ---
--- OOO310_m1.orig/sw/source/core/doc/docbm.cxx	2009-02-13 09:42:48.000000000 +0000
+++ OOO310_m1/sw/source/core/doc/docbm.cxx	2009-02-13 09:42:56.000000000 +0000
@@ -334,7 +334,7 @@
     return pA==pB;    
 }
 */
-
+#if 0
 // TODO not finished yet, still neet to add this check
 bool _checkFieldBookmarkSanity(const SwDoc *pDoc) 
 {
@@ -355,7 +355,7 @@
     }
     return true;
 }
-
+#endif
 void SwDoc::deleteBookmark( /*[in]*/sal_uInt16 nPos )
 {
 	SwBookmark *pBM = (*pBookmarkTbl)[nPos];


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1794
retrieving revision 1.1795
diff -u -r1.1794 -r1.1795
--- openoffice.org.spec	12 Feb 2009 15:40:57 -0000	1.1794
+++ openoffice.org.spec	13 Feb 2009 09:47:24 -0000	1.1795
@@ -120,6 +120,7 @@
 Patch47: openoffice.org-3.0.1.ooo98909.sfx2.missingplugins.patch
 Patch48: openoffice.org-3.0.1.ooo99050.sw.htmlload.patch
 Patch49: openoffice.org-3.0.1.ooo99081.vcl.dont.release.before-reuse.patch
+Patch50: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1562,6 +1563,7 @@
 %patch47 -p1 -b .ooo98909.sfx2.missingplugins.patch
 %patch48 -p1 -R -b .ooo99050.sw.htmlload.patch
 %patch49 -p1 -b .ooo99081.vcl.dont.release.before-reuse.patch
+%patch50 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1570,7 +1572,8 @@
 autoconf
 %configure \
  --with-build-version="Ver: %{version}-%{release}" --with-unix-wrapper=%{name} \
- --with-use-shell=bash --disable-ldap --disable-crashdump --disable-epm \
+ --with-use-shell=bash \
+ --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo \
  --disable-fontooo --disable-mathmldtd --disable-Xaw --disable-gnome-vfs \
  --enable-gio --enable-gstreamer --enable-symbols --enable-lockdown \
  --enable-evolution2 --enable-cairo --enable-dbus --enable-opengl \
@@ -1755,29 +1758,10 @@
 # unpack report-builder extension
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/sun-report-builder.oxt
 unzip solver/%{OFFICEUPD}/unxlng*/bin/sun-report-builder.oxt -d $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/sun-report-builder.oxt
-pushd $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/sun-report-builder.oxt
-ln -sf %{_datadir}/java/flute.jar flute-1.3-jfree-20061107.jar
-ln -sf %{_datadir}/java/jcommon.jar jcommon-1.0.10.jar
-ln -sf %{_datadir}/java/jcommon-serializer.jar jcommon-serializer-0.2.0.jar
-ln -sf %{_datadir}/java/libfonts.jar libfonts-0.3.3.jar
-ln -sf %{_datadir}/java/libformula.jar libformula-0.1.14.jar
-ln -sf %{_datadir}/java/liblayout.jar liblayout-0.2.8.jar
-ln -sf %{_datadir}/java/libloader.jar libloader-0.3.6.jar
-ln -sf %{_datadir}/java/librepository.jar librepository-0.1.4.jar
-ln -sf %{_datadir}/java/libxml.jar libxml-0.9.9.jar
-ln -sf %{_datadir}/java/pentaho-reporting-flow-engine.jar pentaho-reporting-flow-engine-0.9.2.jar
-ln -sf %{_datadir}/java/sac.jar sac.jar
-popd
 
 # unpack wiki-publisher extension
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/wiki-publisher.oxt
 unzip solver/%{OFFICEUPD}/unxlng*/bin/swext/wiki-publisher.oxt -d $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/wiki-publisher.oxt
-pushd $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/wiki-publisher.oxt
-ln -sf %{_datadir}/java/commons-codec.jar commons-codec-1.3.jar
-ln -sf %{_datadir}/java/commons-httpclient.jar commons-httpclient-3.1.jar
-ln -sf %{_datadir}/java/commons-lang.jar commons-lang-2.3.jar
-ln -sf %{_datadir}/java/commons-logging.jar commons-logging-1.1.1.jar
-popd
 
 # unpack presentation-minimizer extension
 install -d -m 755 $RPM_BUILD_ROOT%{baseinstdir}/extensions/sun-presentation-minimizer.oxt