diff options
| -rw-r--r-- | editors/ooo-build/Makefile | 4 | ||||
| -rw-r--r-- | editors/ooo-build/distinfo | 12 | ||||
| -rw-r--r-- | editors/ooo-build/files/ooo-build-patch | 11 |
3 files changed, 8 insertions, 19 deletions
diff --git a/editors/ooo-build/Makefile b/editors/ooo-build/Makefile index 031d97eda064..f875d918bb6c 100644 --- a/editors/ooo-build/Makefile +++ b/editors/ooo-build/Makefile @@ -30,8 +30,8 @@ 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.m2 -OOOBUILD_TAG=ood680-m2 +OOOBUILD_VERSION=2.0.4.m4 +OOOBUILD_TAG=ood680-m4 #OOOBUILD= ooo-build-${OOOBUILD_VERSION} OOOBUILD= ooo-build-${OOOBUILD_TAG} OOOBUILD_SOURCE=${OOOBUILD}.tar.gz diff --git a/editors/ooo-build/distinfo b/editors/ooo-build/distinfo index d141cc67a1ca..e82003a098de 100644 --- a/editors/ooo-build/distinfo +++ b/editors/ooo-build/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/ooo-build-ood680-m2.tar.gz) = b107dceb6f5a11a819531f21fdc8b90f -SHA256 (openoffice.org2.0/ooo-build-ood680-m2.tar.gz) = 73598930e7e8b94446a5cc9e49ae8d60fff3605396e6f4c0be2d86b27223e3cd -SIZE (openoffice.org2.0/ooo-build-ood680-m2.tar.gz) = 4314684 +MD5 (openoffice.org2.0/ooo-build-ood680-m4.tar.gz) = 400590f308afd5189bfceaca9eb75878 +SHA256 (openoffice.org2.0/ooo-build-ood680-m4.tar.gz) = 668c654b7d73a44d19c6529b6cdc5b6a8f3dcdad0fdee4a56dbef56c43a2214d +SIZE (openoffice.org2.0/ooo-build-ood680-m4.tar.gz) = 4349611 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 @@ -10,9 +10,9 @@ SIZE (openoffice.org2.0/ooo_crystal_images-1.tar.gz) = 1068060 MD5 (openoffice.org2.0/openclipart-0.18-full.tar.gz) = bf32bda3914b27d3bcd0ef8f8e363619 SHA256 (openoffice.org2.0/openclipart-0.18-full.tar.gz) = e57cceacd62e51da8e13b0d8e6700306fe3e04ed33b9cf686644e58446f4232a SIZE (openoffice.org2.0/openclipart-0.18-full.tar.gz) = 126709000 -MD5 (openoffice.org2.0/OOo_OOD680_m2_source.tar.bz2) = 2a9672f7a2f6138db5a8e57034d07163 -SHA256 (openoffice.org2.0/OOo_OOD680_m2_source.tar.bz2) = 9b5329d62c7419a4098543a3072d5cb5a55488a94b8c115cca1d7897dcf0eaaf -SIZE (openoffice.org2.0/OOo_OOD680_m2_source.tar.bz2) = 264280263 +MD5 (openoffice.org2.0/OOo_2.0.4rc2_src.tar.gz) = bbc1786e29f4b8de8e70d347b7bfc812 +SHA256 (openoffice.org2.0/OOo_2.0.4rc2_src.tar.gz) = e5ae257bdead899ac369bab3f8d8b7ce902d45013175ee5827745256fb156e45 +SIZE (openoffice.org2.0/OOo_2.0.4rc2_src.tar.gz) = 333859530 MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2.0/unowinreg.dll) = 6144 diff --git a/editors/ooo-build/files/ooo-build-patch b/editors/ooo-build/files/ooo-build-patch index 9f5138f9dc8b..6d0a6a146025 100644 --- a/editors/ooo-build/files/ooo-build-patch +++ b/editors/ooo-build/files/ooo-build-patch @@ -50,14 +50,3 @@ gnu patch is gpatch for FreeBSD. # Fix warnings that appear on x86-64 & are considered dangerous # FIXME file up-stream ---- patches/gstreamer/gstreamer-avmedia-source-gstreamer.diff~ Fri Sep 1 03:11:26 2006 -+++ patches/gstreamer/gstreamer-avmedia-source-gstreamer.diff Sun Sep 3 20:57:30 2006 -@@ -1162,7 +1162,7 @@ - +void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB ) - + throw (uno::RuntimeException) - +{ --+ mnUnmutedVolume = pow10 ( nVolumeDB / 20.0 ); -++ mnUnmutedVolume = pow ( 10.0, nVolumeDB / 20.0 ); - + - + OSL_TRACE( "set volume: %d gst volume: %lf", nVolumeDB, mnUnmutedVolume ); - + |