Hello community, here is the log from the commit of package OpenOffice_org-ure for openSUSE:Factory checked in at Fri Jul 3 16:35:42 CEST 2009. -------- --- OpenOffice_org-ure/OpenOffice_org-ure.changes 2009-06-17 21:40:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-ure/OpenOffice_org-ure.changes 2009-06-30 17:38:51.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Jun 29 19:30:31 CEST 2009 - pmladek@suse.cz + +- updated to the milestone ooo310-m14 +- updated ooo-build to version 3.1.0.98.2 (3.1.1-alpha2) +- added libstlport_gcc4 into Recommends; added hacks to create compat + symlinks to improve compatibility with upstream extensions (bnc#458952) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo310-m13-sdk.tar.bz2 ooo310-m13-ure.tar.bz2 New: ---- ooo310-m14-sdk.tar.bz2 ooo310-m14-ure.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-ure.spec ++++++ --- /var/tmp/diff_new_pack.Y13167/_old 2009-07-03 16:35:06.000000000 +0200 +++ /var/tmp/diff_new_pack.Y13167/_new 2009-07-03 16:35:06.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-ure (Version 3.1.0.98.1) +# spec file for package OpenOffice_org-ure (Version 3.1.0.98.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,19 +19,23 @@ Name: OpenOffice_org-ure -Version: 3.1.0.98.1 +Version: 3.1.0.98.2 Release: 1 -%define ooo_build_version 3.1.0.98.1 +%define ooo_build_version 3.1.0.98.2 %define piece ure #!BuildIgnore: OpenOffice_org BuildRequires: OpenOffice_org-bootstrap = %version BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel db-devel flac-devel flex gnome-vfs2-devel gperf gtk2-devel icu java-devel kdelibs3-devel krb5 libexif mono-devel neon-devel openldap2-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel recode unixODBC-devel unzip xml-commons-apis xorg-x11 zip %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo310-m13 +%define ooo_build_tag ooo310-m14 License: Artistic License .. ; BSD 3-clause (or similar) ; GPL v2 or later ; LPPL .. ; LGPL v2.1 or later ; LGPL v3 only ; MPL .. ; MIT License (or similar) Group: Productivity/Office/Suite AutoReqProv: on +%ifarch %ix86 +# libstlport_gcc4 improves compatibility with the upstream extensions (bnc#458952) +Recommends: libstlport_gcc4 +%endif Summary: OpenOffice.org UNO Runtime Environment Url: http://www.openoffice.org/ Source0: %ooo_build_tag-%piece.tar.bz2 @@ -163,6 +167,10 @@ $OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag # bin the SDK-related zip files from solver; they were installed together with URE find $RPM_BUILD_ROOT%ooo_prefix/%ooo_home/solver -name "*.zip" -exec rm -f {} \; +%ifarch %ix86 +# compat ghost file needed to run upstream extensions (bnc#458952) +touch $RPM_BUILD_ROOT%_libdir/libstlport_gcc.so +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -185,7 +193,33 @@ # clean the UNO cache if there is a broken extension unopkg-regenerate-cache %{_libdir}/%ooo_home LanguageTool-0.9.3.oxt || true -%postun -p /sbin/ldconfig +%postun +/sbin/ldconfig +# create compat link needed to run upstream extensions (bnc#458952) +%ifarch %ix86 + +%triggerin -- libstlport_gcc4 +if ! test -L %_libdir/libstlport_gcc.so -a -r %_libdir/libstlport_gcc.so ; then + lib_name=`ls %_libdir/libstlport_gcc.so.4* | tail -n 1` + lib_name=`basename $lib_name` + if test -r %_libdir/$lib_name ; then + rm -f %_libdir/libstlport_gcc.so + ln -sf $lib_name %_libdir/libstlport_gcc.so + fi +fi +exit 0 +%endif +# remove compat link needed to run upstream extensions (bnc#458952) +%ifarch %ix86 + +%triggerpostun -- libstlport_gcc4 +if test $2 = 0 ; then + if test -L %_libdir/libstlport_gcc.so -a ! -r %_libdir/libstlport_gcc.so ; then + rm -f %_libdir/libstlport_gcc.so + fi +fi +exit 0 +%endif %post devel /sbin/ldconfig @@ -195,6 +229,10 @@ %files -f files-%piece.txt %defattr(-,root,root) +%ifarch %ix86 +# compat ghost file needed to run upstream extensions (bnc#458952) +%ghost %_libdir/libstlport_gcc.so +%endif %files -f files-mono.txt -n OpenOffice_org-mono %defattr(-,root,root) @@ -211,86 +249,3 @@ %defattr(-,root,root) %changelog -* Wed Jun 17 2009 pmladek@suse.cz -- updated prebuilt cli dlls for PPC and SLED10 -* Mon Jun 15 2009 pmladek@suse.cz -- updated to the milestone ooo310-m13 -- updated ooo-build to version 3.1.0.98.1 (3.1.1-alpha1) -* Thu May 28 2009 pmladek@suse.cz -- updated ooo-build to version 3.1.0.6 (3.1-rc7 == final) -* Tue May 26 2009 pmladek@suse.cz -- updated ooo-build to version 3.1.0.5 (3.1-rc6) -* Fri May 22 2009 pmladek@suse.cz -- updated ooo-build to version 3.1.0.4 (3.1-rc5) -* Thu May 21 2009 pmladek@suse.cz -- updated ooo-build to version 3.1.0.3 (3.1-rc4) -* Tue May 19 2009 pmladek@suse.cz -- updated ooo-build to version 3.1.0.2 (3.1-rc3) -* Fri May 15 2009 pmladek@suse.cz -- updated ooo-build to version 3.1.0.1 (3.1-rc2) -* Thu May 07 2009 pmladek@suse.cz -- updated ooo-build to version 3.1.0.0 (3.1-rc1) -* Thu Apr 30 2009 pmladek@suse.cz -- updated to the milestone ooo310-m11 (3.1-rc2) -- updated ooo-build to version 3.0.99.7 (3.1-beta7) -* Fri Apr 24 2009 pmladek@suse.cz -- updated to the milestone ooo310-m10 -- updated ooo-build to version 3.0.99.6 (3.1-beta6) -* Fri Apr 17 2009 pmladek@suse.cz -- updated ooo-build to version 3.0.99.5 (3.1-beta5) -- added the SDK stuff (bnc#428403): - * added sdk source tarball - * added prebuilt unowinreg.dll - * fixed build of the SDK stuff together with the ure stuff - * added provides and obsoletes of OpenOffice_org-sdk to - OpenOffice_org-ure-devel - * created new subpackage ure-devel-doc; it provides and obsoletes the older - OpenOffice_org-sdk-doc -* Wed Apr 15 2009 pmladek@suse.cz -- added a workaround to fix build with mono-2.4 (bnc#495112) -* Wed Apr 08 2009 pmladek@suse.cz -- updated to the milestone ooo310-m9 -- updated ooo-build to version 3.0.99.4 (3.1-beta4) -* Fri Mar 27 2009 pmladek@suse.cz -- updated to the milestone ooo310-m7 -- updated ooo-build to version 3.0.99.3 (3.1-beta3) -- added hacks to remove the broken LanguageTool-0.9.3.oxt -* Fri Mar 20 2009 pmladek@suse.cz -- updated to the milestone ooo310-m6 -- updated ooo-build to version 3.0.99.2 (3.1-beta2) -* Tue Mar 10 2009 pmladek@suse.cz -- updated to the milestone ooo310-m4 -- updated ooo-build to version 3.0.99.1 (3.1-beta1) -* Fri Feb 20 2009 pmladek@suse.cz -- updated ooo-build to version 3.0.0.16.1 -* Fri Feb 06 2009 pmladek@suse.cz -- updated ooo-build to version 3.0.0.15 -* Fri Jan 23 2009 pmladek@suse.cz -- updated ooo-build to version 3.0.0.13 -- added ExclusiveArch: %%ix86 x86_64 ppc (bnc#465252) -* Fri Jan 09 2009 pmladek@suse.cz -- updated ooo-build to version 3.0.0.11 -* Fri Dec 05 2008 pmladek@suse.cz -- updated ooo-build to version 3.0.0.10 -* Thu Nov 27 2008 pmladek@suse.cz -- enabled mono on PPC; added prebuilt cli dlls for PPC and older - distributions (bnc#449047, bnc#449711) -* Fri Nov 21 2008 pmladek@suse.cz -- updated ooo-build to version 3.0.0.9 -- added OpenOffice_org-mono to requires of the devel package; the devel - package is common for all subpackages -* Fri Nov 07 2008 pmladek@suse.cz -- updated ooo-build to version 3.0.0.8 -* Mon Oct 27 2008 pmladek@suse.cz -- updated ooo-build to version 3.0.0.7 -- added OpenOffice_org-pyuno to requires of the devel package; the devel - package is common for all subpackages -* Fri Oct 10 2008 pmladek@suse.cz -- updated to the milestone ooo300-m9 (3.0rc4) -- updated ooo-build to version 3.0.0.6 -- added BuildIgnore OpenOffice_org to avoid cyclic build dependency -* Sat Sep 27 2008 pmladek@suse.cz -- updated to the milestone ooo300-m7 (3.0rc2) -- updated ooo-build to version 3.0.0.5 -* Thu Sep 11 2008 pmladek@suse.cz -- split from the main OpenOffice_org package, version 3.0.0.4 ++++++ ooo310-m13-sdk.tar.bz2 -> ooo310-m14-sdk.tar.bz2 ++++++ Files old/ooo310-m13-sdk/odk/docs/images/sdk_head-1.gif and new/ooo310-m14-sdk/odk/docs/images/sdk_head-1.gif differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo310-m13-sdk/odk/setsdkenv_unix.csh.in new/ooo310-m14-sdk/odk/setsdkenv_unix.csh.in --- old/ooo310-m13-sdk/odk/setsdkenv_unix.csh.in 2008-07-11 16:14:23.000000000 +0200 +++ new/ooo310-m14-sdk/odk/setsdkenv_unix.csh.in 2009-06-23 10:08:31.000000000 +0200 @@ -237,34 +237,40 @@ endif -# For URE, prepare symbolic links for libraries: -rm -f "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.so" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" +if [ "${platform}" == "MacOSX" ] then +# For URE, prepare symbolic links for libraries: +# Only necessary on MacOSX, on other Unix systems the links are already prepared +# in the SDK installation. + +# cleanup potential old links first + rm -f "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.so" \ + "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" \ + "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" \ + "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" -if ( -e "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" ) then - rm -rf "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" -endif - -if ( "${OO_SDK_URE_HOME}" != "" ) then - mkdir -p "${OO_SDK_OUT}/${directoryname}/lib" - ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppu.${soext}.3" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}" - ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" - ln -s "${OO_SDK_URE_LIB_DIR}/libuno_sal.${soext}.3" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" - ln -s "${OO_SDK_URE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" - - if ( -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" ) then - ln -s "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" \ - "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" + if ( -e "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" ) then + rm -rf "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" endif + if ( "${OO_SDK_URE_HOME}" != "" ) then + mkdir -p "${OO_SDK_OUT}/${directoryname}/lib" + ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppu.${soext}.3" \ + "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}" + ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \ + "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" + ln -s "${OO_SDK_URE_LIB_DIR}/libuno_sal.${soext}.3" \ + "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" + ln -s "${OO_SDK_URE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \ + "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" + + if ( -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" ) then + ln -s "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" \ + "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" + endif + endif endif + echo echo " ************************************************************************" echo " *" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo310-m13-sdk/odk/setsdkenv_unix.sh.in new/ooo310-m14-sdk/odk/setsdkenv_unix.sh.in --- old/ooo310-m13-sdk/odk/setsdkenv_unix.sh.in 2008-07-11 16:14:23.000000000 +0200 +++ new/ooo310-m14-sdk/odk/setsdkenv_unix.sh.in 2009-06-23 10:08:31.000000000 +0200 @@ -122,7 +122,7 @@ # Prepare appropriate output directory. if [ -n "${OO_SDK_OUTPUT_DIR}" ] then - OO_SDK_OUT=${OO_SDK_OUTPUT_DIR}/$OO_SDK_NAME + OO_SDK_OUT=${OO_SDK_OUTPUT_DIR}/${OO_SDK_NAME} export OO_SDK_OUT fi @@ -278,37 +278,44 @@ export STLDEBUG fi -# For URE, prepare symbolic links for libraries: -rm -f "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" - -if [ -L "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" ] +if [ "${platform}" = "MacOSX" ] then - rm -rf "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" -fi +# For URE, prepare symbolic links for libraries: +# Only necessary on MacOSX, on other Unix systems the links are already prepared +# in the SDK installation. +# cleanup potential old links first + rm -f "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}" \ + "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" \ + "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" \ + "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" -if [ "${OO_SDK_URE_HOME}" ] -then - mkdir -p "${OO_SDK_OUT}/${directoryname}/lib" - ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppu.${soext}.3" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}" - ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" - ln -s "${OO_SDK_URE_LIB_DIR}/libuno_sal.${soext}.3" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" - ln -s "${OO_SDK_URE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" + if [ -L "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" ] + then + rm -rf "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" + fi - if [ -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" ] +# prepare links + if [ "${OO_SDK_URE_HOME}" ] then - ln -s "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" \ - "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" + mkdir -p "${OO_SDK_OUT}/${directoryname}/lib" + ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppu.${soext}.3" \ + "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}" + ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \ + "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" + ln -s "${OO_SDK_URE_LIB_DIR}/libuno_sal.${soext}.3" \ + "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" + ln -s "${OO_SDK_URE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \ + "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" + + if [ -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" ] + then + ln -s "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" \ + "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" + fi fi +fi -fi # Prepare shell with all necessary environment variables. echo diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo310-m13-sdk/odk/settings/settings.mk new/ooo310-m14-sdk/odk/settings/settings.mk --- old/ooo310-m13-sdk/odk/settings/settings.mk 2008-08-27 15:50:24.000000000 +0200 +++ new/ooo310-m14-sdk/odk/settings/settings.mk 2009-06-23 10:08:31.000000000 +0200 @@ -216,7 +216,7 @@ COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -M $(PRJ)/settings/component.uno.map EXE_LINK_FLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -Bdirect -z defs -LINK_LIBS=-L$(OUT)/lib -L$(OO_SDK_OUT)/$(PLATFORM)/lib -L"$(OO_SDK_URE_LIB_DIR)" +LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)" LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)" ifeq "$(PROCTYPE)" "sparc64" @@ -362,7 +362,7 @@ #EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,--no-whole-archive -LINK_LIBS=-L$(OUT)/lib -L$(OO_SDK_OUT)/$(PLATFORM)/lib -L"$(OO_SDK_URE_LIB_DIR)" +LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)" LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)" ifneq "$(OO_SDK_URE_HOME)" "" @@ -570,7 +570,7 @@ EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined #EXE_LINK_FLAGS+=-Wl,-export-dynamic -Wl,-z,defs -LINK_LIBS=-L$(OUT)/lib -L$(OO_SDK_OUT)/$(PLATFORM)/lib -L"$(OO_SDK_URE_LIB_DIR)" $(PTHREAD_LIBS) +LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)" $(PTHREAD_LIBS) LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)" ifneq "$(OO_SDK_URE_HOME)" "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo310-m13-sdk/odk/util/makefile.pmk new/ooo310-m14-sdk/odk/util/makefile.pmk --- old/ooo310-m13-sdk/odk/util/makefile.pmk 2009-02-02 18:48:42.000000000 +0100 +++ new/ooo310-m14-sdk/odk/util/makefile.pmk 2009-06-23 10:08:31.000000000 +0200 @@ -30,7 +30,7 @@ #************************************************************************* # used for sdk common files -PRODUCT_RELEASE=3.1 +PRODUCT_RELEASE=3.1.1 OFFICENAME=OpenOffice.org SDKDIRNAME=openoffice.org$(PRODUCT_RELEASE)_sdk OFFICEPRODUCTNAME=$(OFFICENAME) $(PRODUCT_RELEASE) ++++++ ooo310-m13-ure.tar.bz2 -> ooo310-m14-ure.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo310-m13-ure/bridges/source/remote/urp/urp_environment.cxx new/ooo310-m14-ure/bridges/source/remote/urp/urp_environment.cxx --- old/ooo310-m13-ure/bridges/source/remote/urp/urp_environment.cxx 2008-10-01 12:04:58.000000000 +0200 +++ new/ooo310-m14-ure/bridges/source/remote/urp/urp_environment.cxx 2009-06-23 09:17:53.000000000 +0200 @@ -182,6 +182,7 @@ { ~StaticSingleton() { + ::osl::MutexGuard guard( ::osl::Mutex::getGlobalMutex() ); g_bStaticDestructorsCalled = sal_True; } }; @@ -267,7 +268,13 @@ } // in case, that the static destructors already have been called, no // tiding up is done. - if( ! g_bStaticDestructorsCalled && ! pContext->m_pBridgeImpl->m_bDisposed ) + bool tidyUp; + { + ::osl::MutexGuard guard2( ::osl::Mutex::getGlobalMutex() ); + tidyUp = ! g_bStaticDestructorsCalled && + ! pContext->m_pBridgeImpl->m_bDisposed; + } + if( tidyUp ) { // TODO : not threadsafe // synchronization with dispatch methods needed ! @@ -335,9 +342,15 @@ pImpl->m_pReader = 0; } - // delete the stubs - releaseStubs( pEnvRemote ); - + bool bReleaseStubs = false; + { + ::osl::MutexGuard guard2( ::osl::Mutex::getGlobalMutex() ); + bReleaseStubs = !g_bStaticDestructorsCalled; + } + if( bReleaseStubs ) + { + releaseStubs( pEnvRemote ); + } } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org