diff options
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/Manifest | 25 | ||||
| -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 |
4 files changed, 54 insertions, 17 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/Manifest b/app-office/libreoffice/Manifest index 92dc46bfa615..1b4698fa052b 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -8,6 +8,7 @@ AUX libreoffice-4.1.4.2-curl-config.patch 2201 SHA256 d8c15dffb4448d326bcc8fad3c AUX libreoffice-4.2.0.4-curl-config.patch 2192 SHA256 0501a9cd9f98e788cf52c2c249de94cdf8b532516bd535351a646cc0aaeb153e SHA512 3698208c100aeac31a8e92c3fe826ebcf9b88e8cde655ecedf6922f2dd0b7489e34833fb8252bcd0fa2112c6a490df199a62a87e6bad4838c635958e8b5337fc WHIRLPOOL 8d13a44899509c2bdd95493a668032185c987414c1a52cb236c499e339018b447adcc137765cb419478b53b3bfee2e54fa2b043f47e270fd652dbd5d733c5b9b AUX libreoffice-4.2.3.3-kde4-startup.patch 2369 SHA256 9bed1863450f65a5f11c6ebb8bc3f8585793373b6e37f9486eaa76f269f3dcde SHA512 ddd2e9b6d7de87e9eca45780e5458b1b93c60c4768e2463f97e0770074d5a4f8787f3e645411754fc247cb9e95e24dc1433d3a1555ae9582947808549be139d6 WHIRLPOOL fe0fc1cd9c1f281eb7f300ac683ad7c360a6c24a1e2b74e9fc34cbc00f19f5ba724fe08650bb214f66c4bf3b79c2bc8615244a4332e1532639c1e7a8fd2f1ec6 AUX libreoffice-4.2.3.3-kde4-timer-mutex.patch 1152 SHA256 23621bb7d0480520889cfb9bc4fe65b8a42d3301b90df64a00504b2a25ca162f SHA512 633fbddbe64d8b463dd7012dd460d69009dd64e2bd64b1a9257840d66d94370af910ee82d455cb3964ea43510cbdbe4bbfe60b389f2d6a796f7bad2cf531d92a WHIRLPOOL 8aa52115bcf1e1e4c17f721ae9db3fabf4228f147b7ea59a2204227005f339c02cbb033ef4f96828c5e1b3d691be1f56c4c942e90b5e15d64b57a0f51108638b +AUX libreoffice-4.2.5.2-jpeg-9a.patch 1107 SHA256 24b5f42834a53bf6f9c807bb5fe95d3dd1b4a6e68be7b16c7461d6564340ad61 SHA512 2abdd689ad7ac9f50befef7797e021041d8827d473ce0c600d5d5c5b1c3556bb2503074ce06859cc75350afa7217680e2d4c4195e8646bf6611f710f99392eb4 WHIRLPOOL 573a5ac520a6060cddccc461dd758269830475200eb3f1b73f026c47fccbb796af803afde99e313a2755fb5a1349e346066a94d2a837119dfcec06f2b5270ff7 AUX libreoffice-9999-curl-config.patch 2483 SHA256 ae1de898a921089932da214f667d979f7057d7e99c8f8f08fa21b7a827cb8f2e SHA512 ab10307f099368e71684d22a92b70703ebce5755ec618016393df014d1054fa723b5ebed031575ffd8bbbaa2449582c44646ed389bda16adda9c1df90f13f2f9 WHIRLPOOL 4ab824d86abe300c4c863e4162f3646ec499a4b0f519bc3d6a77bc702bd307b5b4b642d24d3921f52c8da6d96613afa85cb5fd6310d0ede61612a6b437eca6b6 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5 @@ -19,25 +20,19 @@ DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac0 DIST libreoffice-4.2.5.2.tar.xz 123615344 SHA256 4bf7898d7d0ba918a8f6668eff0904a549e5a2de837854716e6d996f121817d5 SHA512 e08aab26f79fdebbaac542a12f19e9eaa6b515802b12e9fb866036f6002b60503bc0fddd443a232c92c14d1e1fbbf7e9cc684142af5ac7558ff1907881ee7d7c WHIRLPOOL 3d43fdca47a16d2d5d8a4df955b89d69c6107453e8321219ce513ef741e6ce6ba329d84914f83f328ef2421df6e7d3dff6c5dbca3bc2b34abdc795cf67309601 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538 DIST libreoffice-help-4.2.5.2.tar.xz 1855424 SHA256 bb306643a337c6184cf1663afa8bd0f891ae28b5db6c0290c0eea5819f6d73cd SHA512 ba3e350736e3c51b7dd7a8f8c3f819eb19728bbd73eeb031375ca43bee3dfc0aacba19e919c9bf8f9ff2ac82f4fb82ded90d23c3a30912412564913315f7e24a WHIRLPOOL 1c047f8c98cb252fa28b5f67f7a13244f2112e9bdde06af58796657f228ec315d8ca42a6b91433cbf5c997a6f0660c7187634333ef3f11941817da97e5da6862 -EBUILD libreoffice-4.2.5.2.ebuild 17760 SHA256 e52fa5449d68f1eadb6a89464b402a4ddaca5fa163b03d398838e0e0b6e222c6 SHA512 2018f50087f0f253c34d06667da544287a0937588abaf830be37501828327047f8c83c9ffdb322a23d47b2ffb2f1b4c0396ee067c8d83ae9b5d14aea9c058ca1 WHIRLPOOL 373ba2b5df4abf8db38ce45c270b77af933266c9c1a108fd05feb552efb85b1601db5bf21510006a36238021d3b52594532e19f5ea267bee091fb2f4e7c7943e +EBUILD libreoffice-4.2.5.2.ebuild 17810 SHA256 909e9941ee6a43375b96529133a5b2eee83e5ebc249e46d077d432008e6d6ca6 SHA512 9424add89dc3cae0d3c6e5f299606771bf66c8bb4f4222b89c37ea8b51dcb4732510c23f863cd4fa6dc52e87222b3f109d0204293a9b068cca48baa4aabba051 WHIRLPOOL aa6752339d002e41a191f4a8fb1041267efe6afa45caa1583be9f96e1ed514642dbbf92b1bf8b487a4c97ed6fb339f338d05a04749b4334c54535e9fdb9d052c EBUILD libreoffice-4.2.9999.ebuild 17764 SHA256 9df169126a91be1d7859fb228a465b4665f8f4798f340b3e5ab7875d838e3d28 SHA512 74d7136f2f1f4e917e94d959899acb2acfa757f870f218cb17343678f85d3415f6907117c3e43e86765cae0c0d8dc1fef66b54eb6d986a3b4fdf76c13d9126be WHIRLPOOL 4f5506cc2f7cc923aadb49adef0ddc199f4a943b560db73baf8745dca1c3281cd35f090564a39e9aa2dd39125a42bd18203ccbf0f0e0d948c9ec576c7bab0bd1 EBUILD libreoffice-9999-r2.ebuild 17709 SHA256 b110fca24cbf9028c1ab0ed68514c5c8bbed49a1b57f39db7c93f509af4b3bfb SHA512 6f0a2cab81fbc470fe7a269ebf582cd945271729703f2c289eadd6668a97c988b86bf56dd9e158e0ca69a8745f68202ae9ce00542c512aa3fb10d3fe3df24ca1 WHIRLPOOL 6cd101261987c034483c06e545b2acfac9b69326e5996cb11f561cf9d365ea1ba3706f1b4db645ee1b115548a6648cf50c9e166205b4f769d3a3655414c33d42 -MISC ChangeLog 102262 SHA256 831af5c6a1058aad7cc32bf40e86c014e0ac6b8f25b340b8be167f3a78791e11 SHA512 168308be14fef21b17dbec6ffa8e8a4976f77c544bee74ca534c4362d9fca16d1dd028564e1d9bfab7b15aad13b740d9c6d856171c9c86c8ced904a8b1a31e80 WHIRLPOOL 5e7fad4a6d035904d2a1b4857aa670faf98a1948b6ffce2bdaab58be17f93d2a06e5a3a3f2b1e7950bca567ce72f0e6b59635de4ada2e51ca415e461f0edcc0c +MISC ChangeLog 102460 SHA256 0c1339fca16b5d50b29c5db35a9eb54900aa5f9e84590ad37974a9743ee591c1 SHA512 0a465a58b559d135cc94db7e386ffb6bae38681bb11f83d83fd43a7101de0b0e6d35c8b6195e47976ce7a9bba2a47b9633d4faa9ee9fc705859dae242d97438b WHIRLPOOL 8790216ddb77b2ed745be7cba2a6d05b7f9bfb4b223f3f13b32c661f28508e3577094b02f353c48a148fa1b0063ca0eab8e0c81e02200717d5520c85bb4f2545 MISC metadata.xml 1057 SHA256 fae4981111eeb4ca46bc24106d32559f0ae4372e60b38433b4eebf748fead545 SHA512 d249cec1b2ce6e600d34034fa961ffbcef9bd5b0d614dfe043b414ba105e477681bbe0c9b98f982ccfc075f98d409c3897f76b6eec0aaaafb7f3d841442bd355 WHIRLPOOL 73de668873d556236dfc7b86cc197f8426c4e1617e860df1f60dac51cb68e620b01d335fa6d9553927adfb0aba3a349fe6f4baff0e994ce078833b2bbd17b682 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJT7c5+AAoJEOSiRoyO7jvokQUP/2dxWOEiLm16voXIcbSzrQrh -ELtIYQhOjliC/9M+i3qEnKJSbkohgpOCDPPbm9jkxAV2lk5u3FoM5U1tXbCMS3fh -Z3arASeROeRnNwQmPB0VHIU9Hsw3rFtfp4BAMHR44CwQcrnIHvyzlrkxTnrqCQD9 -CmaT5wIcg8xdTmbXbgPfGatPfjzpHAhSFAorOumj6BdCPOXLqLreA1GdQDWzxu5w -sPtk3qnzZmwnP8Csx8VMFaWGEl4P+dQxmh4dRvetcGOirfnt31h52gZpZ0k8X4Qx -hlfjm/7YrDoKFlG8E7yVfGAHDPoryOTiMBuDfAu0WiJFXw5IUczu7v4KvfA73kej -s4gK310yW4vKnk7f1pdiK2EJ0gxLM+MK0cm7Y7AswE/1o/PA8ePtpHbq+acVyHXu -sMxExpiY0hUyIITg3b7Iy5R/+FRabH5M+0ip6Gp3k38jro3aXgWEKUbMdWDq7KEX -9iw3oQjKmDVHTxHC4/V9KYaW96yk5sV/ZjX4tVcaeiVz2/66dCQDOsYwY1zHbeXn -aQO2z5MkRoDE9pFYrX5EfS+mUk/RgGBAlpcYLiIyFQWBb4+34aEfbdfbJ3Z5gN3A -mjO6Z0BuOAxOZTg6vBto7pPeGpnN6wMA3AT3ySHIDvVPdN5sIx5Q6WRTIgXWQrrE -AIekbD/FRHhgKy2QUCvN -=qDsH +iQEcBAEBCAAGBQJT9duCAAoJEEdUh39IaPFNKr4H/0C5HjJdvRRbrtzEdju2lEBC +yTnjkvm0wTGy3eWH74yBewcprjmuOF1W27RffroQNOGP2WxcPv9P1+HhMfQctiLq +OW4JUFSGa07mq90vnXnbi9inCxLd7dYOW/0/byNKEWKIOfqUA6YPG4ZXqhDs4EDw +HczkXGvyOb9eS12bduF7t+2KqPaBULhsLMnxufDzALlwIZID6O2iKgN6esNBw3Ru +hHwb3OOa0PNhQp5OSlfQXrnY06TydBsq8hD2Ysn7Ifafml44umMAtsooTReJNAEW +YFQ6VAf4mMOCZzsT0W7tqwizupXiYDc2YHf6qdG+bohEhWuwTJSSvxj5dcOxsbI= +=6f5g -----END PGP SIGNATURE----- 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 |