rpms/openoffice.org/devel workspace.gcc430.patch, NONE, 1.1 openoffice.org.spec, 1.1360, 1.1361
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Thu Dec 13 15:26:47 UTC 2007
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31112
Modified Files:
openoffice.org.spec
Added Files:
workspace.gcc430.patch
Log Message:
add workspace.gcc430.patch for gcc 4.3.0
workspace.gcc430.patch:
--- NEW FILE workspace.gcc430.patch ---
Index: framework/binfilter/bf_basic/source/comp/codegen.cxx
diff -u framework/binfilter/bf_basic/source/comp/codegen.cxx:1.2 framework/binfilter/bf_basic/source/comp/codegen.cxx:1.2.80.1
--- framework/binfilter/bf_basic/source/comp/codegen.cxx:1.2 Thu Mar 15 08:07:02 2007
+++ framework/binfilter/bf_basic/source/comp/codegen.cxx Thu Dec 13 02:41:14 2007
@@ -537,7 +537,9 @@
// this to force instatiation of the template. Otherwise using the template
// in another code module results in link errors :-(
PCodeBuffConvertor< UINT16, UINT32 > aInst1(0,0);
+ aInst1.convert();
PCodeBuffConvertor< UINT32, UINT16 > aInst2(0,0);
+ aInst2.convert();
}
}
Index: framework/binfilter/bf_sch/source/core/sch_chartdoc.cxx
diff -u framework/binfilter/bf_sch/source/core/sch_chartdoc.cxx:1.9 framework/binfilter/bf_sch/source/core/sch_chartdoc.cxx:1.9.34.1
--- framework/binfilter/bf_sch/source/core/sch_chartdoc.cxx:1.9 Thu Sep 6 04:14:56 2007
+++ framework/binfilter/bf_sch/source/core/sch_chartdoc.cxx Thu Dec 13 02:50:17 2007
@@ -82,8 +82,20 @@
#ifndef _SCH_DOCSHELL_HXX
#include "docshell.hxx"
#endif
+
+#ifdef ITEMID_FONT
+#undef ITEMID_FONT
+#endif
#define ITEMID_FONT EE_CHAR_FONTINFO
+
+#ifdef ITEMID_COLOR
+#undef ITEMID_COLOR
+#endif
#define ITEMID_COLOR EE_CHAR_COLOR
+
+#ifdef ITEMID_FONTHEIGHT
+#undef ITEMID_FONTHEIGHT
+#endif
#define ITEMID_FONTHEIGHT EE_CHAR_FONTHEIGHT
#include "glob.hrc"
Index: framework/binfilter/bf_sd/source/ui/inc/sdstring.hrc
diff -u framework/binfilter/bf_sd/source/ui/inc/sdstring.hrc:1.4 framework/binfilter/bf_sd/source/ui/inc/sdstring.hrc:1.4.144.1
--- framework/binfilter/bf_sd/source/ui/inc/sdstring.hrc:1.4 Fri Oct 27 11:31:24 2006
+++ framework/binfilter/bf_sd/source/ui/inc/sdstring.hrc Thu Dec 13 02:50:17 2007
@@ -35,6 +35,10 @@
#include <bf_sfx2/sfx.hrc>
#define SID_SD_STRING_START RID_APP_START+300
+#undef STR_LINESTYLE
+#undef STR_COLOR
+#undef STR_HATCH
+#undef STR_CHANGE
#define STR_GRADIENT SID_SD_STRING_START+1
#define STR_DESC_GRADIENT SID_SD_STRING_START+2
Index: framework/binfilter/bf_svx/source/inc/fmstatic.hxx
diff -u framework/binfilter/bf_svx/source/inc/fmstatic.hxx:1.3 framework/binfilter/bf_svx/source/inc/fmstatic.hxx:1.3.272.1
--- framework/binfilter/bf_svx/source/inc/fmstatic.hxx:1.3 Wed Sep 7 23:04:54 2005
+++ framework/binfilter/bf_svx/source/inc/fmstatic.hxx Thu Dec 13 02:50:17 2007
@@ -86,5 +86,5 @@
}//end of namespace binfilter
-#endif _FM_STATIC_HXX_
+#endif
Index: framework/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
diff -u framework/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx:1.10 framework/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx:1.10.28.1
--- framework/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx:1.10 Tue Oct 23 07:05:19 2007
+++ framework/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx Thu Dec 13 02:50:17 2007
@@ -497,7 +497,7 @@
#ifndef PRODUCT
BYTE *pRefSdrObjects;
-#endif;
+#endif
Sw3IoImp( Sw3Io& );
~Sw3IoImp();
Index: framework/binfilter/bf_sw/source/filter/sw6/sw6par.hxx
diff -u framework/binfilter/bf_sw/source/filter/sw6/sw6par.hxx:1.8 framework/binfilter/bf_sw/source/filter/sw6/sw6par.hxx:1.8.124.1
--- framework/binfilter/bf_sw/source/filter/sw6/sw6par.hxx:1.8 Mon Nov 20 04:38:58 2006
+++ framework/binfilter/bf_sw/source/filter/sw6/sw6par.hxx Thu Dec 13 02:50:18 2007
@@ -229,4 +229,4 @@
} //namespace binfilter
-#endif _SW6PAR_HXX
+#endif
Index: framework/binfilter/bf_xmloff/source/core/xmloff_attrlist.cxx
diff -u framework/binfilter/bf_xmloff/source/core/xmloff_attrlist.cxx:1.6 framework/binfilter/bf_xmloff/source/core/xmloff_attrlist.cxx:1.6.110.1
--- framework/binfilter/bf_xmloff/source/core/xmloff_attrlist.cxx:1.6 Tue Jan 2 10:13:15 2007
+++ framework/binfilter/bf_xmloff/source/core/xmloff_attrlist.cxx Thu Dec 13 02:50:18 2007
@@ -42,7 +42,9 @@
#include <rtl/memory.h>
#if OSL_DEBUG_LEVEL == 0
-#define NDEBUG
+# ifndef NDEBUG
+# define NDEBUG
+# endif
#endif
#include <assert.h>
Index: framework/binfilter/bf_xmloff/source/forms/formcellbinding.hxx
diff -u framework/binfilter/bf_xmloff/source/forms/formcellbinding.hxx:1.4 framework/binfilter/bf_xmloff/source/forms/formcellbinding.hxx:1.4.144.1
--- framework/binfilter/bf_xmloff/source/forms/formcellbinding.hxx:1.4 Fri Oct 27 18:47:40 2006
+++ framework/binfilter/bf_xmloff/source/forms/formcellbinding.hxx Thu Dec 13 02:50:18 2007
@@ -299,4 +299,4 @@
//............................................................................
}//end of namespace binfilter
-#endif XMLOFF_FORMS_FORMCELLBINDING
+#endif
Index: framework/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx
diff -u framework/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx:1.8 framework/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx:1.8.48.1
--- framework/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx:1.8 Tue Jul 17 05:17:15 2007
+++ framework/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx Thu Dec 13 02:50:18 2007
@@ -60,8 +60,6 @@
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
-#define DEFINE_CONST_UNICODE(CONSTASCII) UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII##))
-
static SwDLL* pSwDLL = 0L;
static SdDLL* pSdDLL = 0L;
static ScDLL* pScDLL = 0L;
Index: framework/binfilter/inc/bf_starmath/rect.hxx
diff -u framework/binfilter/inc/bf_starmath/rect.hxx:1.6 framework/binfilter/inc/bf_starmath/rect.hxx:1.6.144.1
--- framework/binfilter/inc/bf_starmath/rect.hxx:1.6 Fri Oct 27 20:13:46 2006
+++ framework/binfilter/inc/bf_starmath/rect.hxx Thu Dec 13 02:50:18 2007
@@ -36,7 +36,7 @@
#ifndef RECT_HXX
#define RECT_HXX
-#include <new.h>
+#include <new>
#ifndef _GEN_HXX //autogen
Index: framework/binfilter/inc/bf_svx/svdstr.hrc
diff -u framework/binfilter/inc/bf_svx/svdstr.hrc:1.4 framework/binfilter/inc/bf_svx/svdstr.hrc:1.4.144.1
--- framework/binfilter/inc/bf_svx/svdstr.hrc:1.4 Fri Oct 27 21:11:59 2006
+++ framework/binfilter/inc/bf_svx/svdstr.hrc Thu Dec 13 02:50:19 2007
@@ -77,7 +77,6 @@
#define STR_LayerBegin (STR_UndoEnd+1)
#define STR_StandardLayerName (STR_LayerBegin +0)
-#define STR_LayerEnd (STR_StandardLayerName)
//changed by jmeng begin
#define STR_LayerEnd (STR_LayerBegin +0)
//changed by jmeng end
Index: framework/binfilter/inc/bf_sw/TextCursorHelper.hxx
diff -u framework/binfilter/inc/bf_sw/TextCursorHelper.hxx:1.3 framework/binfilter/inc/bf_sw/TextCursorHelper.hxx:1.3.272.1
--- framework/binfilter/inc/bf_sw/TextCursorHelper.hxx:1.3 Fri Sep 9 08:45:23 2005
+++ framework/binfilter/inc/bf_sw/TextCursorHelper.hxx Thu Dec 13 02:50:19 2007
@@ -63,6 +63,6 @@
};
} //namespace binfilter
-#endif _SW_TEXTCURSORHELPER_HXX
+#endif
Index: framework/binfilter/inc/bf_sw/flypos.hxx
diff -u framework/binfilter/inc/bf_sw/flypos.hxx:1.3 framework/binfilter/inc/bf_sw/flypos.hxx:1.3.272.1
--- framework/binfilter/inc/bf_sw/flypos.hxx:1.3 Fri Sep 9 09:00:57 2005
+++ framework/binfilter/inc/bf_sw/flypos.hxx Thu Dec 13 02:50:19 2007
@@ -70,4 +70,4 @@
SV_DECL_PTRARR_SORT( SwPosFlyFrms, SwPosFlyFrmPtr, 0, 40 )
} //namespace binfilter
-#endif _FLYPOS_HXX
+#endif
Index: util/extensions/source/nsplugin/source/npshell.hxx
diff -u util/extensions/source/nsplugin/source/npshell.hxx:1.5 util/extensions/source/nsplugin/source/npshell.hxx:1.5.428.1
--- util/extensions/source/nsplugin/source/npshell.hxx:1.5 Thu Sep 8 12:39:08 2005
+++ util/extensions/source/nsplugin/source/npshell.hxx Thu Dec 13 02:15:27 2007
@@ -35,7 +35,9 @@
#ifdef UNIX
-#define MOZ_X11
+#ifndef MOZ_X11
+# define MOZ_X11
+#endif
#include <gtk/gtk.h>
#include <X11/Xlib.h>
Index: util/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
diff -u util/extensions/source/plugin/inc/plugin/unx/plugcon.hxx:1.10 util/extensions/source/plugin/inc/plugin/unx/plugcon.hxx:1.10.178.1
--- util/extensions/source/plugin/inc/plugin/unx/plugcon.hxx:1.10 Fri Dec 1 06:18:46 2006
+++ util/extensions/source/plugin/inc/plugin/unx/plugcon.hxx Thu Dec 13 02:15:27 2007
@@ -80,7 +80,9 @@
#define MOZ_X11
#include <stdio.h>
#ifdef SYSTEM_MOZILLA
-#define OJI
+#ifndef OJI
+# define OJI
+#endif
#define MOZ_X11
#include <npupp.h>
#include <npapi.h>
Index: script/basic/source/comp/codegen.cxx
diff -u script/basic/source/comp/codegen.cxx:1.18 script/basic/source/comp/codegen.cxx:1.18.30.1
--- script/basic/source/comp/codegen.cxx:1.18 Thu Aug 30 02:59:33 2007
+++ script/basic/source/comp/codegen.cxx Thu Dec 13 02:21:16 2007
@@ -538,5 +538,7 @@
// this to force instatiation of the template. Otherwise using the template
// in another code module results in link errors :-(
PCodeBuffConvertor< UINT16, UINT32 > aInst1(0,0);
+ aInst1.convert();
PCodeBuffConvertor< UINT32, UINT16 > aInst2(0,0);
+ aInst2.convert();
}
Index: source/core/view/viewsh.cxx
===================================================================
RCS file: /cvs/sw/sw/source/core/view/viewsh.cxx,v
retrieving revision 1.75
diff -u -r1.75 viewsh.cxx
--- openoffice.org.orig/sw/source/core/view/viewsh.cxx 3 Aug 2007 13:40:32 -0000 1.75
+++ openoffice.org/sw/source/core/view/viewsh.cxx 13 Dec 2007 14:08:54 -0000
@@ -172,7 +175,7 @@
// #i74769#
#ifndef _SDRPAINTWINDOW_HXX
#include <svx/sdrpaintwindow.hxx>
-#endif _SDRPAINTWINDOW_HXX
+#endif
BOOL ViewShell::bLstAct = FALSE;
ShellResource *ViewShell::pShellRes = 0;
Index: source/ui/app/docshini.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/app/docshini.cxx,v
retrieving revision 1.60
diff -u -r1.60 docshini.cxx
--- openoffice.org.orig/sw/source/ui/app/docshini.cxx 22 May 2007 16:37:27 -0000 1.60
+++ openoffice.org/sw/source/ui/app/docshini.cxx 13 Dec 2007 14:10:32 -0000
@@ -234,7 +234,9 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
using namespace ::rtl;
-#define C2U(cChar) OUString::createFromAscii(cChar)
+#ifndef C2U
+# define C2U(cChar) OUString::createFromAscii(cChar)
+#endif
/*-----------------21.09.96 15.29-------------------
--------------------------------------------------*/
Index: inc/index.hrc
===================================================================
RCS file: /cvs/sw/sw/inc/index.hrc,v
retrieving revision 1.3
diff -u -r1.3 index.hrc
--- openoffice.org.orig/sw/inc/index.hrc 9 Sep 2005 01:58:19 -0000 1.3
+++ openoffice.org/sw/inc/index.hrc 13 Dec 2007 14:27:19 -0000
@@ -51,6 +51,9 @@
#define STR_TITLE (RC_INDEX_BEGIN + 6)
#define STR_ALPHA (RC_INDEX_BEGIN + 7)
+#ifdef STR_LEVEL
+#undef STR_LEVEL
+#endif
#define STR_LEVEL (RC_INDEX_BEGIN + 8)
#define DLG_INSAUTHMARK (RC_INDEX_BEGIN + 9)
Index: inc/fmtui.hrc
===================================================================
RCS file: /cvs/sw/sw/inc/fmtui.hrc,v
retrieving revision 1.3
diff -u -r1.3 fmtui.hrc
--- openoffice.org.orig/sw/inc/fmtui.hrc 9 Sep 2005 01:53:34 -0000 1.3
+++ openoffice.org/sw/inc/fmtui.hrc 13 Dec 2007 14:27:33 -0000
@@ -54,6 +54,9 @@
#define MN_TEXT (RC_FMTUI_BEGIN + 20)
#define MN_GRAFIC (RC_FMTUI_BEGIN + 21)
#define MN_TABLE (RC_FMTUI_BEGIN + 22)
+#ifdef MN_FRAME
+#undef MN_FRAME
+#endif
#define MN_FRAME (RC_FMTUI_BEGIN + 23)
#define MN_REGION (RC_FMTUI_BEGIN + 24)
#define MN_REGION_SUB (RC_FMTUI_BEGIN + 25)
Index: source/ui/envelp/labelexp.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/envelp/labelexp.cxx,v
retrieving revision 1.8
diff -u -r1.8 labelexp.cxx
--- openoffice.org.orig/sw/source/ui/envelp/labelexp.cxx 16 Sep 2006 22:55:11 -0000 1.8
+++ openoffice.org/sw/source/ui/envelp/labelexp.cxx 13 Dec 2007 14:28:47 -0000
@@ -80,7 +80,9 @@
using namespace ::comphelper;
using namespace ::rtl;
-#define C2U(char) rtl::OUString::createFromAscii(char)
+#ifndef C2U
+# define C2U(char) rtl::OUString::createFromAscii(char)
+#endif
#ifdef SW_PROP_NAME_STR
#undef SW_PROP_NAME_STR
Index: inc/comcore.hrc
===================================================================
RCS file: /cvs/sw/sw/inc/comcore.hrc,v
retrieving revision 1.8
diff -u -r1.8 comcore.hrc
--- openoffice.org.orig/sw/inc/comcore.hrc 3 Aug 2007 13:38:53 -0000 1.8
+++ openoffice.org/sw/inc/comcore.hrc 13 Dec 2007 14:34:57 -0000
@@ -80,11 +80,17 @@
// -> #115575#
#define STR_FRAME (RC_COMCORE_BEGIN + 34)
#define STR_OLE (RC_COMCORE_BEGIN + 35)
+#ifdef STR_FORMULA
+#undef STR_FORMULA
+#endif
#define STR_FORMULA (RC_COMCORE_BEGIN + 36)
#define STR_CHART (RC_COMCORE_BEGIN + 37)
#define STR_NOTE (RC_COMCORE_BEGIN + 38)
#define STR_REFERENCE (RC_COMCORE_BEGIN + 39)
#define STR_SCRIPT (RC_COMCORE_BEGIN + 40)
+#ifdef STR_AUTHORITY
+#undef STR_AUTHORITY
+#endif
#define STR_AUTHORITY (RC_COMCORE_BEGIN + 41)
#define STR_SPECIALCHAR (RC_COMCORE_BEGIN + 42)
#define STR_FOOTNOTE (RC_COMCORE_BEGIN + 43)
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1360
retrieving revision 1.1361
diff -u -r1.1360 -r1.1361
--- openoffice.org.spec 9 Dec 2007 12:24:25 -0000 1.1360
+++ openoffice.org.spec 13 Dec 2007 15:25:58 -0000 1.1361
@@ -1,6 +1,6 @@
%define oootag OOG680
%define ooomilestone 9
-%define rh_rpm_release 9
+%define rh_rpm_release 10
# undef to get english only and no-langpacks for a faster smoketest build
%define langpacks 1
@@ -161,6 +161,7 @@
Patch76: workspace.cmcfixes39.patch
Patch77: workspace.notes2.patch
Patch78: openoffice.org-2.3.1.oooXXXXX.ucb.davprotocol.patch
+Patch79: workspace.gcc430.patch
%define instdir %{_libdir}/openoffice.org
@@ -1119,6 +1120,7 @@
%patch76 -p1 -b .workspace.cmcfixes39.patch
%patch77 -p1 -b .workspace.notes2.patch
%patch78 -p1 -b .oooXXXXX.ucb.davprotocol.patch
+%patch79 -p1 -b .workspace.gcc430.patch
%if %{linkopt}
chmod a+x solenv/bin/mklinkscript.pl
@@ -2383,7 +2385,12 @@
fi
fi
done
-rm -rf %{instdir}/share/uno_packages/cache/*
+
+%preun core
+if [ $1 -eq 0 ]; then
+ # not upgrading => remove component cache
+ rm -rf %{instdir}/share/uno_packages/cache/* || :
+fi
%files base
%defattr(-,root,root,-)
@@ -2839,6 +2846,9 @@
%changelog
+* Thu Dec 13 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.1-9.10
+- add workspace.gcc430.patch for gcc 4.3.0
+
* Sun Dec 09 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.1-9.9
- oops
More information about the fedora-extras-commits
mailing list