rpms/openoffice.org/FC-5 openoffice.org.2.0.3.gcc28370.statics.patch, NONE, 1.1 openoffice.org.spec, 1.676, 1.677
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jul 13 11:32:16 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv4610
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org.2.0.3.gcc28370.statics.patch
Log Message:
add openoffice.org.2.0.3.gcc28370.statics.patch
openoffice.org.2.0.3.gcc28370.statics.patch:
inc/rtl/instance.hxx | 0
sal/inc/rtl/instance.hxx | 20 ++++++++++++--------
2 files changed, 12 insertions(+), 8 deletions(-)
--- NEW FILE openoffice.org.2.0.3.gcc28370.statics.patch ---
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 13 Jul 2006 11:00:59 -0000
@@ -43,6 +43,10 @@
#include "osl/getglobalmutex.hxx"
#endif
+#if defined (_MSC_VER) || defined ( GCC )
+#define NOT_CLASSMEMBER_INSTANCE
+#endif
+
namespace {
/** A non-broken version of the double-checked locking pattern.
@@ -286,9 +290,9 @@
public:
static inline Inst * create(InstCtor aInstCtor, GuardCtor aGuardCtor)
{
-#if defined _MSC_VER
+#if defined NOT_CLASSMEMBER_INSTANCE
static Inst * m_pInstance = 0;
-#endif // _MSC_VER
+#endif // NOT_CLASSMEMBER_INSTANCE
Inst * p = m_pInstance;
if (!p)
{
@@ -309,9 +313,9 @@
static inline Inst * create(InstCtor aInstCtor, GuardCtor aGuardCtor,
DataCtor aDataCtor)
{
-#if defined _MSC_VER
+#if defined NOT_CLASSMEMBER_INSTANCE
static Inst * m_pInstance = 0;
-#endif // _MSC_VER
+#endif // NOT_CLASSMEMBER_INSTANCE
Inst * p = m_pInstance;
if (!p)
{
@@ -331,19 +335,19 @@
}
private:
-#if !defined _MSC_VER
+#if !defined NOT_CLASSMEMBER_INSTANCE
static Inst * m_pInstance;
-#endif // _MSC_VER
+#endif // NOT_CLASSMEMBER_INSTANCE
};
-#if !defined _MSC_VER
+#if !defined NOT_CLASSMEMBER_INSTANCE
template< typename Inst, typename InstCtor,
typename Guard, typename GuardCtor,
typename Data, typename DataCtor >
Inst *
rtl_Instance< Inst, InstCtor, Guard, GuardCtor, Data, DataCtor >::m_pInstance
= 0;
-#endif // _MSC_VER
+#endif // NOT_CLASSMEMBER_INSTANCE
}
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.676
retrieving revision 1.677
diff -u -r1.676 -r1.677
--- openoffice.org.spec 12 Jul 2006 12:59:52 -0000 1.676
+++ openoffice.org.spec 13 Jul 2006 11:32:13 -0000 1.677
@@ -181,6 +181,7 @@
Patch53: openoffice.org-2.0.1.ooo64206.sfx2.saveas.patch
Patch54: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
Patch55: openoffice.org-2.0.3.gcc28357.binfilter.constcrash.patch
+Patch56: openoffice.org.2.0.3.gcc28370.statics.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -844,8 +845,8 @@
%patch52 -p1 -b .ooo66510.shell.recentlyused.patch
%patch53 -p1 -b .ooo64206.sfx2.saveas.patch
%patch54 -p1 -b .rh187919.gtkunderkde.patch
-%patch56 -p1 -b .gcc28357.binfilter.constcrash.patch
-
+%patch55 -p1 -b .gcc28357.binfilter.constcrash.patch
+%patch56 -p1 -b .gcc28370.statics.patch
%if %{includingexternals}
#start ludicrous workaround
@@ -3297,6 +3298,7 @@
~/.recently-used safe
- add openoffice.org-2.0.3.rh187919.gtkunderkde.patch
- rh#198603# gcc ate my office suite, add openoffice.org-2.0.3.gcc28357.binfilter.constcrash.patch
+- gcc#28370# I'm suspicious of these statics lately
* Fri Jun 30 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.16
- CVE-2006-2198 macro security
More information about the fedora-cvs-commits
mailing list