rpms/openoffice.org/devel openoffice.org-3.3.0.ooo113259.vcl.xioerror.patch, NONE, 1.1 openoffice.org.spec, 1.2292, 1.2293

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28360

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.3.0.ooo113259.vcl.xioerror.patch 
Log Message:
Resolves: rhbz#587600 openoffice.org-3.3.0.ooo113259.vcl.xioerror.patch

openoffice.org-3.3.0.ooo113259.vcl.xioerror.patch:
 gtkdata.cxx |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE openoffice.org-3.3.0.ooo113259.vcl.xioerror.patch ---
diff -ru vcl.orig/unx/gtk/app/gtkdata.cxx vcl/unx/gtk/app/gtkdata.cxx
--- vcl.orig/unx/gtk/app/gtkdata.cxx	2010-07-19 15:32:25.000000000 +0100
+++ vcl/unx/gtk/app/gtkdata.cxx	2010-07-19 15:43:33.000000000 +0100
@@ -519,6 +519,7 @@
 	GSource				*m_pUserEvent;
     oslMutex             m_aDispatchMutex;
     oslCondition         m_aDispatchCondition;
+    XIOErrorHandler      m_aOrigGTKXIOErrorHandler;
 
 public:
 	static gboolean      timeoutFn(gpointer data);
@@ -552,6 +553,7 @@
     m_pUserEvent = NULL;
     m_aDispatchCondition = osl_createCondition();
     m_aDispatchMutex = osl_createMutex();
+    m_aOrigGTKXIOErrorHandler = NULL;
 }
 
 GtkXLib::~GtkXLib()
@@ -565,6 +567,9 @@
     osl_setCondition( m_aDispatchCondition );
     osl_destroyCondition( m_aDispatchCondition );
     osl_destroyMutex( m_aDispatchMutex );
+
+    PopXErrorLevel();
+    XSetIOErrorHandler (m_aOrigGTKXIOErrorHandler);
 }
 
 void GtkXLib::Init()
@@ -626,6 +631,10 @@
     // init gtk/gdk
     gtk_init_check( &nParams, &pCmdLineAry );
 
+    //gtk_init_check sets XError/XIOError handlers, we want our own one
+    m_aOrigGTKXIOErrorHandler = XSetIOErrorHandler ( (XIOErrorHandler)X11SalData::XIOErrorHdl );
+    PushXErrorLevel( !!getenv( "SAL_IGNOREXERRORS" ) );
+
 	for (i = 0; i < nParams; i++ )
 		g_free( pCmdLineAry[i] );
 	delete [] pCmdLineAry;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2292
retrieving revision 1.2293
diff -u -p -r1.2292 -r1.2293
--- openoffice.org.spec	17 Jul 2010 15:58:19 -0000	1.2292
+++ openoffice.org.spec	19 Jul 2010 19:45:48 -0000	1.2293
@@ -1,6 +1,6 @@
 %define oootag OOO330
 %define ooomilestone 1
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -118,6 +118,7 @@ Patch40: workspace.sb128.patch
 Patch41: openoffice.org-3.3.0.oooXXXXX.offapi.weirdness.patch
 Patch42: openoffice.org-3.3.0.oooXXXXX.afms.buildtype.patch
 Patch43: workspace.sb126.patch
+Patch44: openoffice.org-3.3.0.ooo113259.vcl.xioerror.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1649,6 +1650,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch41 -p0 -b .oooXXXXX.offapi.weirdness.patch
 %patch42 -p0 -b .oooXXXXX.afms.buildtype.patch
 %patch43 -p1 -b .workspace.sb126.patch
+%patch44 -p0 -b .openoffice.org-3.3.0.ooo113259.vcl.xioerror.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2337,7 +2339,6 @@ sed -i -e "s#URE_MORE_JAVA_CLASSPATH_URL
 source ./Linux*Env.Set.sh
 cd test
 build && deliver -link
-unset nodep #i101000
 cd ../smoketestoo_native
 #JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY="1" works around flawed accessibility check
 #SAL_USE_VCLPLUGIN="svp" uses the headless plugin for these tests
@@ -3795,6 +3796,9 @@ unopkg remove --shared org.openoffice.le
 %endif
 
 %changelog
+* Mon Jul 19 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-1.3
+- Resolves: rhbz#587600 openoffice.org-3.3.0.ooo113259.vcl.xioerror.patch
+
 * Sat Jul 17 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-1.2
 - enable silgraphite support