rpms/openoffice.org/devel openoffice.org-2.2.0.oooXXXXX.atkthreads.atexit.patch, NONE, 1.1 openoffice.org.spec, 1.1020, 1.1021

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Feb 5 11:54:52 UTC 2007 

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.2.0.oooXXXXX.atkthreads.atexit.patch 
Log Message:
rhbz#227245 add openoffice.org-2.2.0.oooXXXXX.atkthreads.atexit.patch

openoffice.org-2.2.0.oooXXXXX.atkthreads.atexit.patch:
 unx/gtk/app/gtkinst.cxx     |    0 
 vcl/unx/gtk/app/gtkinst.cxx |   10 +++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE openoffice.org-2.2.0.oooXXXXX.atkthreads.atexit.patch ---
Index: unx/gtk/app/gtkinst.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
retrieving revision 1.16
diff -u -r1.16 gtkinst.cxx
--- openoffice.org.orig/vcl/unx/gtk/app/gtkinst.cxx	17 Sep 2006 12:29:23 -0000	1.16
+++ openofficeorg/vcl/unx/gtk/app/gtkinst.cxx	5 Feb 2007 11:51:04 -0000
@@ -103,16 +103,16 @@
 
 extern "C" 
 {
-	#define GET_YIELD_MUTEX() static_cast<GtkHookedYieldMutex*>(GetSalData()->m_pInstance->GetYieldMutex())
+	#define GET_YIELD_MUTEX() ImplGetSVData() ? static_cast<GtkHookedYieldMutex*>(GetSalData()->m_pInstance->GetYieldMutex()) : 0
 	static void GdkThreadsEnter( void )
 	{
-		GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
-		pYieldMutex->ThreadsEnter();
+		if (GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX())
+		    pYieldMutex->ThreadsEnter();
 	}
 	static void GdkThreadsLeave( void )
 	{
-		GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
-		pYieldMutex->ThreadsLeave();
+		if (GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX())
+		    pYieldMutex->ThreadsLeave();
 	}
 	static bool hookLocks( oslModule pModule )
 	{


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1020
retrieving revision 1.1021
diff -u -r1.1020 -r1.1021
--- openoffice.org.spec	2 Feb 2007 09:05:23 -0000	1.1020
+++ openoffice.org.spec	5 Feb 2007 11:54:50 -0000	1.1021
@@ -1,6 +1,6 @@
 %define oootag OOF680
 %define ooomilestone 5
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -32,7 +32,7 @@
 License:	LGPL
 Group:		Applications/Productivity
 URL:		http://www.openoffice.org/
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source:		%{ooo_base_name}.tar.bz2
 Source1:	openoffice.org-myspell-contrib.tar.gz
 Source2:	openoffice.org-simple-crash_report.sh
@@ -119,6 +119,7 @@
 Patch52: openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch
 Patch53: openoffice.org-2.2.0.ooo73295.basctl.extraqual.patch
 Patch54: openoffice.org-2.2.0.oooXXXXX.binfilter.toodeep.patch
+Patch55: openoffice.org-2.2.0.oooXXXXX.atkthreads.atexit.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -982,6 +983,7 @@
 %patch52 -p1 -b .ooo73974.bridges.doublereturn.patch
 %patch53 -p1 -b .ooo73295.basctl.extraqual.patch
 %patch54 -p1 -b .oooXXXXX.binfilter.toodeep.patch
+%patch55 -p1 -b .oooXXXXX.atkthreads.atexit.patch
 
 %if %{langpacks}
 tar xzf %{SOURCE1}
@@ -1470,7 +1472,7 @@
 %endif
 
 %files core
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %dir %{instdir}
 %{instdir}/LICENSE
 %{instdir}/LICENSE.html
@@ -2145,7 +2147,7 @@
 done
 
 %files base
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{instdir}/help/en/sdatabase.*
 %{instdir}/program/sbase
 %dir %{instdir}/program/resource
@@ -2180,7 +2182,7 @@
 update-desktop-database -q %{_datadir}/applications
 
 %files calc
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %dir %{instdir}
 %dir %{instdir}/help
 %dir %{instdir}/help/en
@@ -2243,7 +2245,7 @@
 update-desktop-database -q %{_datadir}/applications
 
 %files draw
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %dir %{instdir}
 %dir %{instdir}/help
 %dir %{instdir}/help/en
@@ -2292,7 +2294,7 @@
 update-desktop-database -q %{_datadir}/applications
 
 %files emailmerge
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %dir %{instdir}
 %dir %{instdir}/program
 %{instdir}/program/mailmerge.py*
@@ -2306,7 +2308,7 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-javamail.xcu
 
 %files writer
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %dir %{instdir}
 %dir %{instdir}/help
 %dir %{instdir}/help/en
@@ -2373,7 +2375,7 @@
 update-desktop-database -q %{_datadir}/applications
 
 %files impress
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %dir %{instdir}
 %dir %{instdir}/help
 %dir %{instdir}/help/en
@@ -2428,7 +2430,7 @@
 update-desktop-database -q %{_datadir}/applications
 
 %files math
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %dir %{instdir}
 %dir %{instdir}/help
 %dir %{instdir}/help/en
@@ -2481,7 +2483,7 @@
 update-desktop-database -q %{_datadir}/applications
 
 %files graphicfilter
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %dir %{instdir}
 %dir %{instdir}/program
 %{instdir}/program/libflash680*.so
@@ -2499,7 +2501,7 @@
 %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_impressgraphics_types.xcu
 
 %files xsltfilter
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %dir %{instdir}
 %dir %{instdir}/share
 %dir %{instdir}/share/registry
@@ -2517,7 +2519,7 @@
 %{instdir}/share/xslt/export/xhtml
 
 %files javafilter
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %dir %{instdir}
 %dir %{instdir}/program
 %dir %{instdir}/program/classes
@@ -2540,7 +2542,7 @@
 %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_pocketword_types.xcu
 
 %files testtools
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %dir %{instdir}
 %dir %{instdir}/program
 %{instdir}/program/hid.lst
@@ -2552,7 +2554,7 @@
 %{instdir}/program/resource/stt680en-US.res
 
 %files pyuno
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %dir %{instdir}
 %dir %{instdir}/program
 %{instdir}/program/libpyuno.so
@@ -2576,6 +2578,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Mon Feb 05 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-5.2
+- Resolves: rhbz#227245 add openoffice.org-2.2.0.oooXXXXX.atkthreads.atexit.patch
+
 * Thu Feb 01 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-5.1
 - next candidate
 - workspace.npower5 integrated

More information about the fedora-cvs-commits mailing list