rpms/openoffice.org/FC-4 openoffice.org-2.0.0.ooo55603.mythes.crash.patch, NONE, 1.1 .cvsignore, 1.52, 1.53 openoffice.org.spec, 1.213, 1.214 sources, 1.77, 1.78 workspace.cmcfixes17.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Oct 19 09:34:51 UTC 2005
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv26027
Modified Files:
.cvsignore openoffice.org.spec sources
Added Files:
openoffice.org-2.0.0.ooo55603.mythes.crash.patch
Removed Files:
workspace.cmcfixes17.patch
Log Message:
sync to RC3
openoffice.org-2.0.0.ooo55603.mythes.crash.patch:
lingucomponent/source/thesaurus/mythes/mythes.cxx | 2 +-
source/thesaurus/mythes/mythes.cxx | 0
2 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE openoffice.org-2.0.0.ooo55603.mythes.crash.patch ---
Index: source/thesaurus/mythes/mythes.cxx
===================================================================
RCS file: /cvs/whiteboard/lingucomponent/source/thesaurus/mythes/mythes.cxx,v
retrieving revision 1.3
diff -u -p -u -r1.3 mythes.cxx
--- openoffice.org.orig/lingucomponent/source/thesaurus/mythes/mythes.cxx 9 Mar 2004 12:43:29 -0000 1.3
+++ openoffice.org/lingucomponent/source/thesaurus/mythes/mythes.cxx 7 Oct 2005 09:51:37 -0000
@@ -147,7 +150,7 @@ int MyThes::Lookup(const char * pText, i
memcpy(wrd,pText,len);
/* find it in the list */
- int idx = binsearch(wrd,list,nw);
+ int idx = nw > 0 ? binsearch(wrd,list,nw) : -1;
free(wrd);
if (idx < 0) return 0;
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore 2 Oct 2005 13:05:44 -0000 1.52
+++ .cvsignore 19 Oct 2005 09:34:47 -0000 1.53
@@ -112,3 +112,4 @@
gcj-sed.sh
RegisterAndLicence.xcu
OOO680_m1.tar.bz2
+OOO680_m3.tar.bz2
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- openoffice.org.spec 3 Oct 2005 10:48:11 -0000 1.213
+++ openoffice.org.spec 19 Oct 2005 09:34:47 -0000 1.214
@@ -1,5 +1,5 @@
-%define ooo2ver 1
-%define ooo_rpm_release 2.cmc1
+%define ooo2ver 3
+%define ooo_rpm_release 1
%define build_fc5 0
%define build_fc4 1
%define build_rhel4 0
@@ -198,19 +198,19 @@
Patch48: openoffice.org-1.9.125.ooo54040.savecrash.svtools.patch
Patch49: workspace.gslpatches6.patch
Patch50: workspace.dmake43p01.patch
-Patch51: workspace.cmcfixes17.patch
-Patch52: workspace.emblock1.patch
-Patch53: openoffice.org-1.9.128.ooo54479.systemicu.patch
-Patch54: workspace.cmcfixes18.patch
-Patch55: openoffice.org-1.9.130.ooo54692.fasterhelpcontent2.patch
-Patch56: openoffice.org-1.9.104-berkeleydb-jni-casting-misuse.patch
-Patch57: openoffice.org-1.9.114.ooo51718.rpath.patch
-Patch58: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
-Patch59: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
-Patch60: workspace.cmcfixes19.patch
-Patch61: workspace.atkbridge.patch
-Patch62: openoffice.org-1.9.130.oooXXXXX.sysui.linkforce.patch
-Patch63: openoffice.org-1.9.112.ooo51724.testtools.patch
+Patch51: workspace.emblock1.patch
+Patch52: openoffice.org-1.9.128.ooo54479.systemicu.patch
+Patch53: workspace.cmcfixes18.patch
+Patch54: openoffice.org-1.9.130.ooo54692.fasterhelpcontent2.patch
+Patch55: openoffice.org-1.9.104-berkeleydb-jni-casting-misuse.patch
+Patch56: openoffice.org-1.9.114.ooo51718.rpath.patch
+Patch57: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
+Patch58: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
+Patch59: workspace.cmcfixes19.patch
+Patch60: workspace.atkbridge.patch
+Patch61: openoffice.org-1.9.130.oooXXXXX.sysui.linkforce.patch
+Patch62: openoffice.org-1.9.112.ooo51724.testtools.patch
+Patch63: openoffice.org-2.0.0.ooo55603.mythes.crash.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -871,24 +871,24 @@
%patch48 -p1 -b .ooo54040.savecrash.svtools.patch
%patch49 -p1 -b .workspace.gslpatches6.patch
%patch50 -p1 -b .dmake43p01.patch
-%patch51 -p1 -b .workspace.cmcfixes17.patch
-%patch52 -p1 -b .workspace.emblock1.patch
+%patch51 -p1 -b .workspace.emblock1.patch
%if ! %{internalicu}
-%patch53 -p1 -b .ooo54479.systemicu.patch
+%patch52 -p1 -b .ooo54479.systemicu.patch
%endif
-%patch54 -p1 -b .workspace.cmcfixes18.patch
-#%patch55 -p1 -b .ooo54692.fasterhelpcontent2.patch
+%patch53 -p1 -b .workspace.cmcfixes18.patch
+#%patch54 -p1 -b .ooo54692.fasterhelpcontent2.patch
%if %{internaljavabits}
-%patch56 -p1 -b .berkeleydb-jni-casting-misuse.patch
-%patch57 -p1 -b .ooo51718.rpath.patch
+%patch55 -p1 -b .berkeleydb-jni-casting-misuse.patch
+%patch56 -p1 -b .ooo51718.rpath.patch
%else
-%patch58 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
+%patch57 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
%endif
-%patch59 -p1 -b .ooo54959.negativeindent.sw.patch
-%patch60 -p1 -b .workspace.cmcfixes19.patch
-%patch61 -p1 -b .workspace.atkbridge.patch
-%patch62 -p1 -b .oooXXXXX.sysui.linkforce.patch
-%patch63 -p1 -b .ooo51724.testtools.patch
+%patch58 -p1 -b .ooo54959.negativeindent.sw.patch
+%patch59 -p1 -b .workspace.cmcfixes19.patch
+%patch60 -p1 -b .workspace.atkbridge.patch
+%patch61 -p1 -b .oooXXXXX.sysui.linkforce.patch
+%patch62 -p1 -b .ooo51724.testtools.patch
+%patch63 -p1 -b .ooo55603.mythes.crash.patch
%if %{includingexternals}
#start ludicrous workaround
@@ -976,9 +976,14 @@
export BUILD_TYPE="$BUILD_TYPE xalan"
%endif
-#give these security flags a whirl
-export ARCH_FLAGS="-Wp,-D_FORTIFY_SOURCE=2"
-#export ARCH_FLAGS="-Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param ssp-buffer-size=3 -fasynchronous-unwind-tables"
+#use the RPM_OPT_FLAGS but remove the OOo overridden ones
+for i in $RPM_OPT_FLAGS; do
+ case "$i" in
+ -O?|-pipe|-Wall|-g|-fexceptions|-fasynchronous-unwind-tables) continue;;
+ esac
+ ARCH_FLAGS="$ARCH_FLAGS $i"
+done
+export ARCH_FLAGS
# see tamil translation issue rh#159381#, remove when complete and upstreamed
cd transex3/prj
@@ -3236,6 +3241,19 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Fri Oct 14 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.0-3.5
+- get RPM_OPT_FLAGS in operation minus -fasynchronous-unwind-tables
+
+* Fri Oct 14 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.0-3.1
+- release candidate 3
+- alias en_US thesasurus for other en varients
+- can crash on empty thesasurus rh#170091#/ooo#55603#
+- drop thesaruses not in new format
+
+* Thu Oct 06 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.0-2.1
+- release candidate 2
+- workspace.cmcfixes17 integrated
+
* Thu Sep 29 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.0-1.2
- add mmeeks workspace.atkbridge for rh#169323# acessibility
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- sources 2 Oct 2005 13:05:44 -0000 1.77
+++ sources 19 Oct 2005 09:34:47 -0000 1.78
@@ -7,4 +7,4 @@
66ee360bd11d33b0ba2283922d853706 opens___.ttf
f2fc336c9bd7672a13e58d39bbb4553f GSI_ga.sdf
49c02048e40f0b51a97abdb94d97dc1f javavendors.xml
-c7ff48e12d409da17de928739cf1498e OOO680_m1.tar.bz2
+bc67b66be8f80c0ef695a5b03ad09890 OOO680_m3.tar.bz2
--- workspace.cmcfixes17.patch DELETED ---
More information about the fedora-cvs-commits
mailing list