rpms/openoffice.org/devel openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch, NONE, 1.1 openoffice.org.2.0.3.gcc28409.anonymousexternc.patch, NONE, 1.1 openoffice.org.spec, 1.774, 1.775 openoffice.org-2.0.3.gccXXXXX.all.tediousanonfoo.patch, 1.1, NONE openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch, 1.2, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jul 17 13:59:21 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20061
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch
openoffice.org.2.0.3.gcc28409.anonymousexternc.patch
Removed Files:
openoffice.org-2.0.3.gccXXXXX.all.tediousanonfoo.patch
openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch
Log Message:
track gcc bugids
openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch:
sd/source/ui/inc/DrawController.hxx | 6 ++----
source/filter/inc/msfilter.hxx | 0
source/filter/ww8/writerwordglue.cxx | 0
source/ui/inc/DrawController.hxx | 0
sw/source/filter/inc/msfilter.hxx | 5 +----
sw/source/filter/ww8/writerwordglue.cxx | 5 +++++
6 files changed, 8 insertions(+), 8 deletions(-)
--- NEW FILE openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch ---
Index: source/filter/inc/msfilter.hxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/inc/msfilter.hxx,v
retrieving revision 1.12
diff -u -r1.12 msfilter.hxx
--- openoffice.org.orig/sw/source/filter/inc/msfilter.hxx 26 Jan 2006 18:18:54 -0000 1.12
+++ openoffice.org/sw/source/filter/inc/msfilter.hxx 16 Jul 2006 14:17:13 -0000
@@ -84,10 +84,7 @@
class SwNoTxtNode;
class SwTxtNode;
-namespace
-{
- template<class C> class StyleMapperImpl;
-}
+template<class C> class StyleMapperImpl;
class SwTxtFmtColl;
class SwCharFmt;
typedef StyleMapperImpl<SwTxtFmtColl> ParaMapper;
Index: source/filter/ww8/writerwordglue.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/ww8/writerwordglue.cxx,v
retrieving revision 1.18
diff -u -r1.18 writerwordglue.cxx
--- openoffice.org.orig/sw/source/filter/ww8/writerwordglue.cxx 26 Jan 2006 18:19:58 -0000 1.18
+++ openoffice.org/sw/source/filter/ww8/writerwordglue.cxx 16 Jul 2006 14:17:31 -0000
@@ -324,6 +324,8 @@
return mrDoc.MakeCharFmt(rName, mrDoc.GetDfltCharFmt());
}
+}
+
template<class C> class StyleMapperImpl
{
private:
@@ -408,6 +410,9 @@
sRet = GetSubsFontName(rFont, SUBSFONT_ONLYONE | SUBSFONT_MS);
return sRet;
}
+
+namespace
+ {
/*
Utility to categorize unicode characters into the best fit windows charset
Index: source/ui/inc/DrawController.hxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/inc/DrawController.hxx,v
retrieving revision 1.11
diff -u -r1.11 DrawController.hxx
--- openoffice.org.orig/sd/source/ui/inc/DrawController.hxx 21 Mar 2006 17:19:23 -0000 1.11
+++ openoffice.org/sd/source/ui/inc/DrawController.hxx 16 Jul 2006 16:49:42 -0000
@@ -81,16 +81,14 @@
::com::sun::star::view::XSelectionChangeListener
> DrawControllerInterfaceBase;
+} // end of anonymous namespace.
+
class BroadcastHelperOwner
{
public:
BroadcastHelperOwner (::osl::Mutex& rMutex) : maBroadcastHelper(rMutex) {};
::cppu::OBroadcastHelper maBroadcastHelper;
};
-
-
-} // end of anonymous namespace.
-
namespace sd {
openoffice.org.2.0.3.gcc28409.anonymousexternc.patch:
bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx | 3 +++
source/uno/lbenv.cxx | 5 ++---
2 files changed, 5 insertions(+), 3 deletions(-)
--- NEW FILE openoffice.org.2.0.3.gcc28409.anonymousexternc.patch ---
Index: source/uno/lbenv.cxx
===================================================================
RCS file: /cvs/udk/cppu/source/uno/lbenv.cxx,v
retrieving revision 1.33
diff -u -r1.33 lbenv.cxx
--- openoffice.org.orig/cppu/source/uno/lbenv.cxx 6 Mar 2006 10:16:59 -0000 1.33
+++ openoffice.org/source/uno/lbenv.cxx 13 Jul 2006 15:43:37 -0000
@@ -1049,6 +1049,8 @@
}
}
+}
+
extern "C"
{
@@ -1158,6 +1160,3 @@
}
} // extern "C"
-
-}
-
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx 2006-07-14 09:20:10.000000000 +0100
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx 2006-07-14 09:21:29.000000000 +0100
@@ -224,6 +224,7 @@
}
}
+}
//==================================================================================================
extern "C" void cpp_vtable_call(
@@ -358,6 +359,8 @@
extern "C" void privateSnippetExecutorClass();
extern "C" typedef void (*PrivateSnippetExecutor)();
+namespace {
+
int const codeSnippetSize = 16;
unsigned char * codeSnippet(
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.774
retrieving revision 1.775
diff -u -r1.774 -r1.775
--- openoffice.org.spec 17 Jul 2006 12:34:51 -0000 1.774
+++ openoffice.org.spec 17 Jul 2006 13:59:18 -0000 1.775
@@ -112,8 +112,8 @@
Patch46: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
Patch47: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
Patch48: ooobuild.VBAObjects.patch
-Patch49: openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch
-Patch50: openoffice.org-2.0.3.gccXXXXX.all.tediousanonfoo.patch
+Patch49: openoffice.org.2.0.3.gcc28409.anonymousexternc.patch
+Patch50: openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch
Patch51: openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -854,8 +854,8 @@
%patch46 -p1 -b .rh187919.gtkunderkde.patch
%patch47 -p1 -b .ooo67186.sw.eventisULONG.patch
%patch48 -p0 -b .ooobuild.VBAObjects.patch
-%patch49 -p1 -b .gccXXXXX.anonymousexternc.patch
-%patch50 -p1 -b .gccXXXXX.all.tediousanonfoo.patch
+%patch49 -p1 -b .gcc28409.anonymousexternc.patch
+%patch50 -p1 -b .oooXXXXX.all.ODR.anonymousmembers.patch
%patch51 -p1 -b .oooXXXXX.sal.importvisibilityasexported.patch
tar xzf %{SOURCE1}
@@ -3344,8 +3344,8 @@
+ add openoffice.org.2.0.3.gcc28370.statics.patch to workaround gcc28370
-> drop with 4.1.1-8
+ add openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch for namespace { extern "C" ... }
- + add openoffice.org-2.0.3.gccXXXXX.all.tediousanonfoo.patch to
- workaround strict gcc anon namespace handling
+ + add openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch to
+ workaround strict gcc ODR anon namespace handling
+ what gcc "visibility" means has changed significantly, futile to update OOo to work with
it anymore, most unfortunate :-(
+ add openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch to import
--- openoffice.org-2.0.3.gccXXXXX.all.tediousanonfoo.patch DELETED ---
--- openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch DELETED ---
More information about the fedora-cvs-commits
mailing list