rpms/openoffice.org/devel openoffice.org-2.0.4.ooo68369.dtrans.crash.patch, NONE, 1.1 openoffice.org.spec, 1.850, 1.851

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sun Aug 20 14:30:51 UTC 2006


Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17149

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.4.ooo68369.dtrans.crash.patch 
Log Message:
tracked down the problem

openoffice.org-2.0.4.ooo68369.dtrans.crash.patch:
 dtrans/source/X11/X11_selection.cxx |    1 -
 source/X11/X11_selection.cxx        |    0 
 2 files changed, 1 deletion(-)

--- NEW FILE openoffice.org-2.0.4.ooo68369.dtrans.crash.patch ---
Index: source/X11/X11_selection.cxx
===================================================================
RCS file: /cvs/gsl/dtrans/source/X11/X11_selection.cxx,v
retrieving revision 1.79.6.1
diff -u -r1.79.6.1 X11_selection.cxx
--- openoffice.org.orig/dtrans/source/X11/X11_selection.cxx	10 Aug 2006 14:48:39 -0000	1.79.6.1
+++ openoffice.org/dtrans/source/X11/X11_selection.cxx	20 Aug 2006 14:27:03 -0000
@@ -519,7 +519,6 @@
     if( m_xDisplayConnection.is() )
     {
         m_xDisplayConnection->removeEventHandler( Any(), this );
-        m_xDisplayConnection.clear();
     }
 
 	if( m_pDisplay )


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.850
retrieving revision 1.851
diff -u -r1.850 -r1.851
--- openoffice.org.spec	17 Aug 2006 15:51:18 -0000	1.850
+++ openoffice.org.spec	20 Aug 2006 14:30:47 -0000	1.851
@@ -1,6 +1,6 @@
 %define oootag OOD680
 %define ooomilestone 1
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -120,6 +120,7 @@
 Patch52: openoffice.org-2.0.3.ooo68532.vcl.needpointerarithmetic.patch
 Patch53: openoffice.org-2.0.4.oooXXXXX.solenv.warnnoterror.patch
 Patch54: openoffice.org-2.0.4.ooo68665.x86_64gcj.jvm.patch
+Patch55: openoffice.org-2.0.4.ooo68369.dtrans.crash.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -974,6 +975,7 @@
 %patch52 -p1 -b .ooo68532.vcl.needpointerarithmetic.patch
 %patch53 -p1 -b .oooXXXXX.solenv.warnnoterror.patch
 %patch54 -p1 -b .ooo68665.x86_64gcj.jvm.patch
+%patch55 -p1 -b .ooo68369.dtrans.crash.patch
 
 tar xzf %{SOURCE1}
 
@@ -2497,6 +2499,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Sun Aug 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-1.2
+- fix openoffice.org-2.0.4.ooo68369.dtrans.crash.patch
+
 * Thu Aug 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-1.1
 - rh#201447# -> openoffice.org-2.0.3.ooo68339.vcl.maskingtoomanybytes.patch
 - rh#201305# -> openoffice.org-1.9.115.ooo51931.fixxmlsec.patch




More information about the fedora-cvs-commits mailing list