rpms/openoffice.org/devel openoffice.org-2.1.0.ooo71815.bridges.x86_64.patch, 1.1, 1.2 openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch, 1.2, 1.3 openoffice.org.spec, 1.946, 1.947
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Nov 23 12:49:19 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11425
Modified Files:
openoffice.org-2.1.0.ooo71815.bridges.x86_64.patch
openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
openoffice.org.spec
Log Message:
next upstream milestone
openoffice.org-2.1.0.ooo71815.bridges.x86_64.patch:
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx | 32 ++++++++++++-------
source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx | 0
2 files changed, 21 insertions(+), 11 deletions(-)
Index: openoffice.org-2.1.0.ooo71815.bridges.x86_64.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.1.0.ooo71815.bridges.x86_64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.1.0.ooo71815.bridges.x86_64.patch 21 Nov 2006 13:16:07 -0000 1.1
+++ openoffice.org-2.1.0.ooo71815.bridges.x86_64.patch 23 Nov 2006 12:49:17 -0000 1.2
@@ -94,3 +94,14 @@
(sal_uInt64 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_uInt64) );
// NO exception occured...
*ppUnoExc = 0;
+--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx 16 Sep 2006 15:50:53 -0000 1.6
++++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx 21 Nov 2006 16:15:19 -0000
+@@ -122,7 +122,7 @@ invoke_copy_to_stack(sal_uInt64 * pDS,
+ // value verbatim, as a double without conversion.
+ pFPR[nr_fpr++] = *reinterpret_cast<double *>( pSV++ );
+ else
+- *pDS++ = *reinterpret_cast<double *>( pSV++ );
++ *pDS++ = *pSV++;
+ break;
+
+ case 'H': // 64-bit Word
openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch:
cppuhelper/inc/cppuhelper/implbase1.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase10.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase11.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase12.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase2.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase3.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase4.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase5.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase6.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase7.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase8.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase9.hxx | 2 +-
cppuhelper/inc/cppuhelper/implbase_ex.hxx | 16 ++++++++++++++++
inc/cppuhelper/implbase1.hxx | 0
inc/cppuhelper/implbase10.hxx | 0
inc/cppuhelper/implbase11.hxx | 0
inc/cppuhelper/implbase12.hxx | 0
inc/cppuhelper/implbase2.hxx | 0
inc/cppuhelper/implbase3.hxx | 0
inc/cppuhelper/implbase4.hxx | 0
inc/cppuhelper/implbase5.hxx | 0
inc/cppuhelper/implbase6.hxx | 0
inc/cppuhelper/implbase7.hxx | 0
inc/cppuhelper/implbase8.hxx | 0
inc/cppuhelper/implbase9.hxx | 0
inc/cppuhelper/implbase_ex.hxx | 0
inc/rtl/instance.hxx | 0
inc/salhelper/singletonref.hxx | 0
sal/inc/rtl/instance.hxx | 2 +-
salhelper/inc/salhelper/singletonref.hxx | 2 +-
30 files changed, 30 insertions(+), 14 deletions(-)
Index: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch 21 Nov 2006 16:07:27 -0000 1.2
+++ openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch 23 Nov 2006 12:49:17 -0000 1.3
@@ -227,3 +227,35 @@
/** ImplHelper
@internal
+Index: inc/salhelper/singletonref.hxx
+===================================================================
+RCS file: /cvs/udk/salhelper/inc/salhelper/singletonref.hxx,v
+retrieving revision 1.3
+diff -u -r1.3 singletonref.hxx
+--- openoffice.org.orig/salhelper/inc/salhelper/singletonref.hxx 8 Sep 2005 16:59:58 -0000 1.3
++++ openoffice.org/salhelper/inc/salhelper/singletonref.hxx 23 Nov 2006 12:36:05 -0000
+@@ -207,7 +207,7 @@
+
+ ::osl::Mutex& ownStaticLock() const
+ {
+- return *rtl_Instance< ::osl::Mutex,
++ return *rtl::rtl_Instance< ::osl::Mutex,
+ SingletonLockInit,
+ ::osl::MutexGuard,
+ ::osl::GetGlobalMutex >::create(SingletonLockInit(), ::osl::GetGlobalMutex());
+Index: inc/rtl/instance.hxx
+===================================================================
+RCS file: /cvs/porting/sal/inc/rtl/instance.hxx,v
+retrieving revision 1.8
+diff -u -r1.8 instance.hxx
+--- openoffice.org.orig/sal/inc/rtl/instance.hxx 8 Sep 2005 14:37:41 -0000 1.8
++++ openoffice.org/sal/inc/rtl/instance.hxx 23 Nov 2006 12:36:41 -0000
+@@ -43,7 +43,7 @@
+ #include "osl/getglobalmutex.hxx"
+ #endif
+
+-namespace {
++namespace rtl {
+
+ /** A non-broken version of the double-checked locking pattern.
+
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.946
retrieving revision 1.947
diff -u -r1.946 -r1.947
--- openoffice.org.spec 21 Nov 2006 14:25:29 -0000 1.946
+++ openoffice.org.spec 23 Nov 2006 12:49:17 -0000 1.947
@@ -1,6 +1,6 @@
%define oootag OOE680
-%define ooomilestone 4
-%define rh_rpm_release 2
+%define ooomilestone 5
+%define rh_rpm_release 1
# gcc#19664#
%define stlvisibilityfcked 1
@@ -2523,6 +2523,9 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Thu Nov 23 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-5.1
+- next one
+
* Tue Nov 21 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-4.2
- Resolves: rhbz#216347 openoffice.org-2.1.0.ooo71815.bridges.x86_64.patch
- Resolves: rhbz#216662 stick to a single .desktop launcher name
More information about the fedora-cvs-commits
mailing list