diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-08-21 11:45:51 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-08-21 11:45:51 +0000 |
| commit | 80faf26f5a2f96f595c0fe91eae71318b34dcbdf (patch) | |
| tree | 19b1a552ae7228ac3bd8efb52332ec9a0508d3c7 /app-office/libreoffice | |
| parent | Stable for AMD64 x86 too. (diff) | |
| download | gentoo-2-80faf26f5a2f96f595c0fe91eae71318b34dcbdf.tar.gz gentoo-2-80faf26f5a2f96f595c0fe91eae71318b34dcbdf.tar.bz2 gentoo-2-80faf26f5a2f96f595c0fe91eae71318b34dcbdf.zip | |
Fix building with media-libs/jpeg >= 9a wrt #479946 by Andrew Church
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'app-office/libreoffice')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-4.2.5.2-jpeg-9a.patch | 36 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-4.2.5.2.ebuild | 4 |
3 files changed, 44 insertions, 2 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index a9d6d5328c88..e4179ce3958b 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.564 2014/08/15 09:10:14 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.565 2014/08/21 11:45:51 ssuominen Exp $ + + 21 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> + +files/libreoffice-4.2.5.2-jpeg-9a.patch, libreoffice-4.2.5.2.ebuild: + Fix building with media-libs/jpeg >= 9a wrt #479946 by Andrew Church 15 Aug 2014; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.2.5.2.ebuild, libreoffice-4.2.9999.ebuild, libreoffice-9999-r2.ebuild: diff --git a/app-office/libreoffice/files/libreoffice-4.2.5.2-jpeg-9a.patch b/app-office/libreoffice/files/libreoffice-4.2.5.2-jpeg-9a.patch new file mode 100644 index 000000000000..d9b7090a24e2 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-4.2.5.2-jpeg-9a.patch @@ -0,0 +1,36 @@ +http://bugs.gentoo.org/479946 + +--- vcl/source/filter/jpeg/JpegReader.cxx ++++ vcl/source/filter/jpeg/JpegReader.cxx +@@ -71,7 +71,7 @@ + * but we don't clear the input buffer. + * This is correct behavior for reading a series of images from one source. + */ +- source->start_of_file = sal_True; ++ source->start_of_file = boolean(sal_True); + } + + long StreamRead( SvStream* pStream, void* pBuffer, long nBufferSize ) +@@ -119,9 +119,9 @@ + + source->pub.next_input_byte = source->buffer; + source->pub.bytes_in_buffer = nbytes; +- source->start_of_file = sal_False; ++ source->start_of_file = boolean(sal_False); + +- return sal_True; ++ return boolean(sal_True); + } + + extern "C" void skip_input_data (j_decompress_ptr cinfo, long numberOfBytes) +--- vcl/source/filter/jpeg/JpegWriter.cxx ++++ vcl/source/filter/jpeg/JpegWriter.cxx +@@ -86,7 +86,7 @@ + destination->pub.next_output_byte = destination->buffer; + destination->pub.free_in_buffer = BUFFER_SIZE; + +- return sal_True; ++ return boolean(sal_True); + } + + extern "C" void term_destination (j_compress_ptr cinfo) diff --git a/app-office/libreoffice/libreoffice-4.2.5.2.ebuild b/app-office/libreoffice/libreoffice-4.2.5.2.ebuild index 69a65e012730..c08402391a9c 100644 --- a/app-office/libreoffice/libreoffice-4.2.5.2.ebuild +++ b/app-office/libreoffice/libreoffice-4.2.5.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.5.2.ebuild,v 1.6 2014/08/15 09:10:14 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.5.2.ebuild,v 1.7 2014/08/21 11:45:51 ssuominen Exp $ EAPI=5 @@ -341,6 +341,8 @@ src_prepare() { epatch fi + epatch "${FILESDIR}"/${P}-jpeg-9a.patch #479946 + base_src_prepare AT_M4DIR="m4" eautoreconf |