diff options
| -rw-r--r-- | editors/ooo-build/Makefile | 2 | ||||
| -rw-r--r-- | editors/ooo-build/distinfo | 6 | ||||
| -rw-r--r-- | editors/ooo-build/files/ooo-build-patch | 18 |
3 files changed, 22 insertions, 4 deletions
diff --git a/editors/ooo-build/Makefile b/editors/ooo-build/Makefile index 69c78ea8314f..e4e434bd36c5 100644 --- a/editors/ooo-build/Makefile +++ b/editors/ooo-build/Makefile @@ -30,7 +30,7 @@ OOO_CRYSTAL_IMAGES= ooo_crystal_images-1.tar.gz OOO_OPENCLIPART= openclipart-0.18-full.tar.gz OOO_PATCHDIR=src680 .else -OOOBUILD_VERSION=2.0.4.1 +OOOBUILD_VERSION=2.0.4.3 OOOBUILD_TAG=ood680-m5 OOOSRC= OOo_2.0.4_src.tar.gz OOOTAG= OOD680_m5 diff --git a/editors/ooo-build/distinfo b/editors/ooo-build/distinfo index 4e3b3e70de91..29d90da32648 100644 --- a/editors/ooo-build/distinfo +++ b/editors/ooo-build/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/ooo-build-2.0.4.1.tar.gz) = 38a82068e85ca4bc96d088f13e3bedc3 -SHA256 (openoffice.org2.0/ooo-build-2.0.4.1.tar.gz) = 7be9022682bc65f77f995f33c91938f2fd83f819377851f77a71790e243d1ae9 -SIZE (openoffice.org2.0/ooo-build-2.0.4.1.tar.gz) = 4453648 +SIZE (openoffice.org2.0/ooo-build-2.0.4.3.tar.gz) = 4602866 +MD5 (openoffice.org2.0/ooo-build-2.0.4.3.tar.gz) = 100eb6ba7f7abcafea042a75692eb948 +SHA256 (openoffice.org2.0/ooo-build-2.0.4.3.tar.gz) = 932c25a6e1f91a5ad8be257179b0e3b18b46bab5736fbdd4223760b23e81ead5 MD5 (openoffice.org2.0/extras-2.tar.bz2) = 733051ebeffae5232a2eb760162da020 SHA256 (openoffice.org2.0/extras-2.tar.bz2) = 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863 SIZE (openoffice.org2.0/extras-2.tar.bz2) = 94740 diff --git a/editors/ooo-build/files/ooo-build-patch b/editors/ooo-build/files/ooo-build-patch index 86b13278d40f..4c6de5c00027 100644 --- a/editors/ooo-build/files/ooo-build-patch +++ b/editors/ooo-build/files/ooo-build-patch @@ -31,6 +31,15 @@ gnu patch is gpatch for FreeBSD. # -------- [ Tag [ >= <tag> etc. ], ] patch sets -------- +@@ -169,7 +169,7 @@ + cws-cmcfixes28.diff + + # fix build with newer gccs +-buildfix-gcc-4.1.2-NULL.diff, rengelha, i#70684 ++# buildfix-gcc-4.1.2-NULL.diff, rengelha, i#70684 + + # [ LinuxOnly ] + @@ -755,7 +757,7 @@ autodoc-add-missing-stdio-h.diff, rengelha @@ -49,3 +58,12 @@ gnu patch is gpatch for FreeBSD. # Fix warnings that appear on x86-64 & are considered dangerous # FIXME file up-stream +@@ -908,7 +908,7 @@ + sixtyfour-warnings-binfilter.diff, jholesov + + # fix build with newer gccs +-buildfix-binfilter-gcc-4.1.2-NULL.diff, rengelha, i#70684 ++# buildfix-binfilter-gcc-4.1.2-NULL.diff, rengelha, i#70684 + + [ VCL ] + |