diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2014-08-21 12:13:49 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2014-08-21 12:13:49 +0000 |
| commit | 5d99a5824566a159f789529b728a46edf82fc1cd (patch) | |
| tree | 7bb0943ce2d8d4f7f46bb1f8582096623a207dc8 /app-office/libreoffice | |
| parent | Bring back the libudev.so.0 kludge as requested upstream. (diff) | |
| download | gentoo-2-5d99a5824566a159f789529b728a46edf82fc1cd.tar.gz gentoo-2-5d99a5824566a159f789529b728a46edf82fc1cd.tar.bz2 gentoo-2-5d99a5824566a159f789529b728a46edf82fc1cd.zip | |
Revert last commit.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
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, 6 insertions, 40 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index e4179ce3958b..2da9fa92adfc 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.565 2014/08/21 11:45:51 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.566 2014/08/21 12:13:49 scarabeus Exp $ + + 21 Aug 2014; Tomáš Chvátal <scarabeus@gentoo.org> + -files/libreoffice-4.2.5.2-jpeg-9a.patch, libreoffice-4.2.5.2.ebuild: + Revert last commit. 21 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> +files/libreoffice-4.2.5.2-jpeg-9a.patch, libreoffice-4.2.5.2.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 deleted file mode 100644 index d9b7090a24e2..000000000000 --- a/app-office/libreoffice/files/libreoffice-4.2.5.2-jpeg-9a.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 c08402391a9c..6aa56dfe3948 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.7 2014/08/21 11:45:51 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.5.2.ebuild,v 1.8 2014/08/21 12:13:49 scarabeus Exp $ EAPI=5 @@ -341,8 +341,6 @@ src_prepare() { epatch fi - epatch "${FILESDIR}"/${P}-jpeg-9a.patch #479946 - base_src_prepare AT_M4DIR="m4" eautoreconf |