[openoffice.org] get this to build
Caolan McNamara
caolanm at fedoraproject.org
Fri Jul 30 08:15:06 UTC 2010
commit ab2bf42ee79f4af9ce1530ccbdecc82100545475
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 30 09:14:59 2010 +0100
get this to build
openoffice.org-gccXXXXX.idlc.patch | 17 +++++++++++++++++
openoffice.org.spec | 8 ++++++--
2 files changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/openoffice.org-gccXXXXX.idlc.patch b/openoffice.org-gccXXXXX.idlc.patch
new file mode 100644
index 0000000..c41b118
--- /dev/null
+++ b/openoffice.org-gccXXXXX.idlc.patch
@@ -0,0 +1,17 @@
+--- OOO330_m2/idlc/source/preproc/include.c 2010-05-26 17:30:44.000000000 +0100
++++ OOO330_m2/idlc/source/preproc/include.c 2010-07-28 10:35:37.000000000 +0100
+@@ -107,7 +107,14 @@
+ else
+ for (fd = -1, i = (depth < 0) ? (NINCLUDE - 1) : (depth - 1); i >= 0; i--)
+ {
++ if (i >= NINCLUDE)
++ {
++ fprintf(stderr, "OUT OF BOUNDS\n");
++ _exit(-1);
++ }
++
+ ip = &includelist[i];
++
+ if (ip->file == NULL || ip->deleted || (angled && ip->always == 0))
+ continue;
+ if (strlen(fname) + strlen(ip->file) + 2 > sizeof(iname))
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 4be290b..344e48c 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -114,6 +114,7 @@ Patch36: workspace.cmcfixes77.patch
Patch37: workspace.sb126.patch
Patch38: workspace.vcl114.patch
Patch39: openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
+Patch40: openoffice.org-gccXXXXX.idlc.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@@ -1640,7 +1641,8 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
%patch36 -p1 -b .workspace.cmcfixes77.patch
%patch37 -p1 -b .workspace.sb126.patch
%patch38 -p0 -b .workspace.vcl114.patch
-%patch39 -p0 -b .openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
+%patch39 -p0 -b .ooo113273.desktop.resolvelinks.patch
+%patch40 -p1 -b .gccXXXXX.idlc.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3783,10 +3785,12 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
%endif
%changelog
-* Tue Jul 27 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-2.1
+* Fri Jul 28 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-2.1
- latest milestone
- drop integrated openoffice.org-3.3.0.ooo111699.svx.nullfield.patch
- drop integrated workspace.tl81.patch
+- add openoffice.org-gccXXXXX.idlc.patch for weird fortify triggered
+ idlc failure
* Thu Jul 22 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-1.5
- Resolves: rhbz#617210 allow linking with gold
More information about the scm-commits
mailing list