From: Andreas Hüttel Date: Sun, 28 Dec 2014 20:53:37 +0000 (+0000) Subject: Version bump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c03b00007f72c552a2ea5ab444747a41891b1929;p=gentoo.git Version bump Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x84AD142F --- diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index a5475412e674..d0123f94c440 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,13 @@ # 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.599 2014/12/28 18:52:58 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.600 2014/12/28 20:53:23 dilfridge Exp $ + +*libreoffice-4.2.8.2 (28 Dec 2014) + + 28 Dec 2014; Andreas K. Huettel + +libreoffice-4.2.8.2.ebuild, libreoffice-4.2.9999.ebuild, + +files/libreoffice-4.2.8.2-boost-1.56.0.patch: + Version bump 28 Dec 2014; Andreas K. Huettel libreoffice-4.2.6.3.ebuild: diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index d55b7e5a8c66..74b9a80fda2d 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -9,6 +9,7 @@ AUX libreoffice-4.2.0.4-curl-config.patch 2192 SHA256 0501a9cd9f98e788cf52c2c249 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.6.3-jpeg9.patch 1930 SHA256 b13f71d65911067cbf4377ad4315ffff1d3434a1590687519835b91b17ef9209 SHA512 618867f39005402c83cfab1d46c4f06ff2855969b86210b58db82a6bc7e8154de1d7a95f88ee9115b264deb551e0a7b5750e0096e9c0abb3bb23be01a56a78bb WHIRLPOOL f813bdc1c19ce0e29f57ae4224b003de94199748fd544ed23b42604086d1e878d9f98249c5d6061f949fc26c2e21679bad87e881280115bf8478cae93f30f253 +AUX libreoffice-4.2.8.2-boost-1.56.0.patch 10888 SHA256 0ab6802658b6cb95ba3ec5d283361f4eba8b2d0ba3be128224fc59b28198c046 SHA512 f43b28c0810a5bf6981f2e87cf57f064353059316db5bfa3005f79411df8eef5db58b7e4ce9fe48c354de6d30f9d95b230c5b66d2b6fd9b32c99f9ba80c79956 WHIRLPOOL 1e2a6c0cd6213dd2e7a45a13870ffaab6283af76d0b8aafeb21aed4ee027dcd7b0309b127884eab0b836b6f9d7168fc4b74a93fd39334cf44580714b40c814a3 AUX libreoffice-4.3.1.2-handle-collada-libs-seperately.patch 7384 SHA256 6c37667a7db1a5a6177a11ac874065e492a1f8004de5183057572e8120697207 SHA512 2cff4fece0d3b6315699374ce244fc410be635350347ad1b84edb39f71138d611964c7290b49fa11b42e9597e66f0180c896bba950fb0100fff15a9ba7f82d78 WHIRLPOOL ea6a7255fd82c907d05bdfece8e8e5df7922b2cb00d74e44f0242239ff4fd56b5c34f9194412067e2d9cec783f0f185b07bf75d9545d8643fdb4a3dd4e69ae48 AUX libreoffice-4.3.1.2-implement--with-system-coinmp.patch 2854 SHA256 5de29eb41dcd774379483a750f9eb55f44faebed929a7ed2e46f7493efecf8eb SHA512 900e4ecb148133f9cd8900b60d2b837d7ede09e1a0ce55fc3540783110fac4a8ff4f9c8ecab0deda9715478c3e56642644fc0f604a3295f531232a624cd3428c WHIRLPOOL ce4e85e48b669be73df12f237f326da3105bb54d75a127f73b58ded7583cf85cc60b4fbc019dbf536b6e1de4eb7691b71114684a8e19f11cce15f12066c927f1 AUX libreoffice-4.3.1.2-implement--with-system-gltf.patch 4983 SHA256 c61e8dd67a6299555fe1ccc0f31263cd3b15b921bf844dacd1f09905ca60734f SHA512 af251ff2e10c3c6e096de4c866e05e22b8763a01cac1f66bcad597615f387daeba18348e45f49a8aacb2b0855e9d3240e373be59d33c821dbef6c79b2d047f40 WHIRLPOOL 4ac552215e634f5cc1bf2f3a253cff9f48032b3ad485942c49a2923c265d6fd0ae45050bc876c422ef95b74e699af182483b6b276319f26f0b35728eb4e05d77 @@ -28,34 +29,37 @@ DIST OpenCOLLADA-master-6509aa13af.tar.bz2 9691335 SHA256 8f25d429237cde289a448c DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0 DIST libreoffice-4.2.6.3.tar.xz 123839476 SHA256 d954b9fd0df1e51d5441254ae932262b3f4a06ff3275f1a97dea1b369d4f8f9a SHA512 689bb422285bc4db479d940d87e8cc12a2aeb7c410a9928f12ec853ad05b89729b7a893f546318c68c30eb6759db081a194746a5baa7185ddf4074465503629f WHIRLPOOL cdb9a91b71cd04e3d9d8744c0ac433cb49c720ae36000ef107f0bd4e1ce0ef83589413f63dcb13f7484b6aa4428e1c714893a9158aaab152e51c6019cbda1ad9 +DIST libreoffice-4.2.8.2.tar.xz 124149528 SHA256 46de052a6de144363128f1e1ec5ce5f80e3fbba34b0d0ee2b532e14c743e6816 SHA512 3596e23268ea3fd500ca72cf114699ecbca46b634cc13069669d4568c1f09625130abe66d8e6c2fb8b93cc6dd8948a9ec01181a7e7b0a330bea05f3388612a79 WHIRLPOOL e1dd4b797df978c7841f90e16be12edcceae6fc8d1ff21869dad44a02195f2fe1f4232a53fcf6e47e805f4c8a8a78f8cc042265f1486f62933bd8f3d71880f72 DIST libreoffice-4.3.4.1.tar.xz 152803160 SHA256 a2413419dd635eccac20b4f9bf359661e218583af5d8a8c974fd02dc84975775 SHA512 b44b14f025756676e36419a82f30a700c0f5ab6edb995a0b59e87ff313eb1ae869f9794027279bfb443fb99d617cb9466ae0446e2da1e5fc0807a5be470a8662 WHIRLPOOL d19c85350b683c8f6d1229d41661026fcd12f30bb7de1c2522b5772b3549f2ad88ec1b92442e6bd1a66eebfa6e3faf72e30c8d908d6fc8652251112cf6ea9448 DIST libreoffice-4.3.5.2.tar.xz 152786724 SHA256 78e6821a69f37b6c0c2c8d436aef24810d0a76b5d087ef95f6107a6bdbef2637 SHA512 4dd9737c53b080413458fe63e86c43514c0c44f77bc5eb680f615af584a3de4f4733644658d8e53b2b20002e7ea003c2116b6ba3a58f3e581f9fffbd6b7444a9 WHIRLPOOL cb7c74e5f282e92bb715848f904ba155015d91514edff3151aac0f3ff0a14592a31b002e629ddccdd79951b8f18c3174578cd25dcad57a93d5d74edb63c978e4 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538 DIST libreoffice-help-4.2.6.3.tar.xz 1855444 SHA256 892a78b667f5b1d771920c71bb010a7b1e537d965007591288094ae1e37bf21f SHA512 7eb441bd8e07485a3f003a3317a050c2a9a623d63b42ccbd1dd8e8fa387ab3ea8155e6a2ee135c829a851517a2bfe1ca78d89927ba4afe2f5cc6a59d14e5de80 WHIRLPOOL 217b634e51695465f4ff8e78145a7b4030b634c37f7daf0f8c46fc13db72dc9fdbb9ea8c4b669fd0c7a61fa5a1b75386cf966e3f351534a33691a817baac9e6e +DIST libreoffice-help-4.2.8.2.tar.xz 1855204 SHA256 9cafdc22f0af401dc31bb713e0c477eb111cf4092fbc3582f5bde55a2d6d33d0 SHA512 9ab75261323ed5170c33c74d8cfb630c7d5552701301e6d1fc5890a4b73a831b000172ea9bfa816ced033b8179df38d7d91600e833ec6def67cc8af43e9e1a25 WHIRLPOOL c89f2c9adf9ffd7d1e6124b40d3a5818cea9f6ab57770910cbb0ff440ba8490be80acf2b7e0a702e733412884004600ea2a5c31f7750f1f48e9b2f3f6f0ba40a DIST libreoffice-help-4.3.4.1.tar.xz 1854700 SHA256 a9ab46e2f775a8914fd4377e4859da87344c05ad1ec928646cc40021717c71a3 SHA512 6f9572f785975c014ba6ce589a7f5274c7fe157e9950a7f5ab34d7df0b085737ca2dfa13715e8df93af758c256d7f5bc8b4f0a27dc6abd4421b79e7cca364416 WHIRLPOOL 688180f8d98e1355ac144b2c2565a58c9cbd1f599b043aeed4c217f38638260cc5a1f6856bbf2a2d7716968ace480df0a1db76e7d3794226fab5ee7830e6c8dd DIST libreoffice-help-4.3.5.2.tar.xz 1852412 SHA256 78b586931d8e085aa18d137711e7c878f858ea386a80ee673b0a787953836d92 SHA512 8525cc1bef1ac95a89c3100e137793bdea9ac05a85468e0ec96c6a360ce65baf3dfef7e634d9e8dbc644dec138df2b979cdb8a636ff27cdb7ee652ddee114236 WHIRLPOOL f5bd7d1da705e20def1cc6bff3dd3902ce6d77e2b5fb977860a4fbf9748a6ffec3524fe9ab0e2c539ece015082aadcf9f7392a145862ebb20f4abc117667b25e EBUILD libreoffice-4.2.6.3.ebuild 17902 SHA256 9c98d675646b69189c84fe908c7b61da27df3537a50a9d47480a9cb1dfea8efa SHA512 85437ab700deb7556b62763bdce4077bd8b543ae8be581463dd930887f6d9c71a86f22457d2906c698d929bc39a0d684eea41eaa9c51b3853f8f7042ff2a97d2 WHIRLPOOL 46d6c4b03da243cd174756b73808bace5f67d5e9cc332c2f792ec7e592bb38da329da7556f8d0af5082345416b2ed4a24c7b295757c1f39ce9c8ccdd6d7ae663 -EBUILD libreoffice-4.2.9999.ebuild 17883 SHA256 f95a82baef7635df697688e80184869ce3499da7b9261ee2312a3729bfef5003 SHA512 c222fd3fcd41441547b59246394f09cf53436c0a59d7f239ee9ef8892bfc8f495610965029eb0fb0486661c04484d7d1de4d3758f582fc0ba223e0436a0b74b2 WHIRLPOOL 85cdac5976a83a54bfaef4fa3293d96e2ad974f9ec9577c04f7854610bbffdd8df487850beac5d09d6b710c646ea89b39d2c6591915f6e71440536a01b1de059 +EBUILD libreoffice-4.2.8.2.ebuild 17960 SHA256 290aa276033ca870cb1be57af4783681e3f239909cc365fe9ed878d98799a020 SHA512 7506994c14259c95db446203af4f42a80e7e392dbaf5860ed8dadfd5491cd9b631c02614d13693b7fd7199969571da740bb6207d29cc7ed478262957463cb1eb WHIRLPOOL 0cf624e27c10a8199f7ba28c44eefd74035beb31f809b2d820485e9f984f5a00a318ed09644e36bab6a863d3397b77228e98ddc94ac80b0b5886e1932934744f +EBUILD libreoffice-4.2.9999.ebuild 17962 SHA256 1f6ec520a9d02ca93498adddd51d10b9300ce4592619f18075fb9e2eca9f9e68 SHA512 30fad42e0029f92e00d6dc59e1bd5597cf08239d6f36349c34f2fdecd3848faa147130a4b1a1ff889bf1fd6a714e2cd6df3f4b8b4a202bc6bccb19d2c0dffbe0 WHIRLPOOL 84ca07b618a6a8716583984951471114fa083a2c14c26c43b3868693079336d67970af6c37d1ba9e04624aae96b0689b2774018cd088ad4364a441351ef874ba EBUILD libreoffice-4.3.4.1.ebuild 18317 SHA256 9531e640da61f61fbf375361bbbbcdec8d1c0e4d15c2198ae1b5d6bb66abd5d9 SHA512 5d62a730205ac258396f590e6808b75c562e5e6a734086ef32ea74c06f6ee6801c6540c927e71b5024a76808227c35e39d818bda242e7dcf66be3fd5c7d34a95 WHIRLPOOL 969dd87dceeabd12512d542c000acb28d577f77a95d7c4cd2bc8e133ab169fa7fdf3a1aec148c2a54d646e3550bf5eb441188cc5609a492d49213aa2239dd50f EBUILD libreoffice-4.3.5.2.ebuild 18924 SHA256 47866c540522bfc4c6268cd1c7a961001241f259a09112a5fe0bfbdd5effa03f SHA512 a1efc99f4143ea468e7354920181cda66bec7ea19f6016caeaddffe83382085cb48eb82c1faed01a96cc4f8f267f47644a1d4d25206721675b4ecbebc7bac07c WHIRLPOOL 4041ccfcb9cd3017cbbbdaa505faae58fcc084e982befd85c8bfbbec8061251dabe0872e0c3f8523332b3c916b097cdad9027cd0cfbbacdd07e1435354a5ab43 EBUILD libreoffice-4.3.9999.ebuild 18828 SHA256 6f06153754460c8600dd977a75a8ce8e9cbcac42d2d59c27236569290b0e30a0 SHA512 27011e103313dec19704e5ef2458db75c1fa96ea496ab072f8a163efff8dac40c1bc434c6199fa6e532c19d24ada5fee8ade932a549a96f8f11d785d9509e6e1 WHIRLPOOL 44731dfc071f663d6ed911cc1be07a97ca2128d74f07ddd3fec60c4d089b5da65db1d45d3de7cf48a5b4d6e88a730f1dd3fbd6ce2b447a4b7574262cf3d23ee6 EBUILD libreoffice-9999-r2.ebuild 18274 SHA256 876d1d7736b956b7afd6a70dad4cc524bddfa9f1496cf2ed92b0140fd2abe0c4 SHA512 8bf27d6a397f3c8211f759b9b0c7a10d4a07050d0b3b33061c88e5ed3757d0ce380b4b2b23efa00701c5102872f5806a3a99a962e5c550c16a18463ca57016b1 WHIRLPOOL 22007f26781dcfbb1109ddaf6ad4ca715a34700094693d456f5fc47489448fc7e6861cdc4fe616d9683264e4586673bd99e1eb965bd62a51064554b843e2ef5b -MISC ChangeLog 109115 SHA256 d7754d6e9e0069253724ab342e06dfb178e1c49abc70998a0ac380154686c8a3 SHA512 40afb9d09a18c9393d165d6d36c72a0c609f75dab0ef65a37e542703e435467f0639e701c7fa6bd1e9fdb1d9884a24902d46d6c865dfd9c3418717fd68afcf9e WHIRLPOOL 508d74cc431f79309c04f7d9cb07daa5cad7b1b424a4d3e0e69f57a49f94eb3a95b3badfb578510e8d83f5620d07f00ab5038247fc000822320f37b9bf00b344 +MISC ChangeLog 109333 SHA256 35f66cac188ef53d9695bf239d8992c40403b8bb3e3e49a3197f84ac11ff832c SHA512 b9adb1846f15fdfa5f7e806c01b6d2815ad3783da540658349ead976680055b488fc27e0b224cf721d0146df9382caccff4e6c5f99ddf70d4ab391c0d6c3a1bb WHIRLPOOL e9e38f52aed245d017899dcb427c71077b9befd51a6938788f3bf963168d3b1e79d018a8b480cec29975c36f05cf41e88a0ce8300aae3f8681397112c365dfa8 MISC metadata.xml 1354 SHA256 bf91c27f941b42e977112a3ea9465babd4c4d94dde3f8308d6db1ccd56bc65b9 SHA512 636da2f295d3055de61b52b2a1d371a25101efdc55014ba2e5a7446bb55b30dca1bb58cc2a84873fb862e40f60de10122c55dba19ba9e5d058eab36f7c33aad6 WHIRLPOOL 4aa957484052955572b2bdca42a7d32f5a89f3916a646e92cca940ce2f4e5c8dec824c75150bf80455dcbc2e13f550d1158c418ca38cecac5ac3090419a52f5e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUoFHmAAoJEJS/30SErRQvNAsP/2bSjj9jefgeCeU4uGZ3VwyJ -2/LteR7rJ6q/+9OukdnhaDB9+kFV81FX11Wxb2qOyckNxU21E20F5XYkSENR5LI8 -iPd83Vuxj6GSbANGsQgNFYk9k1zQqQfUfJUqVIoRpdrnUemR1TBhd51g2lb5mhzF -GsU0iCAPpT6QF2TDpppjCLGAa6C9fMj9lCi1k1VJ1unvJTBmCxeQtXJvIKvsxVmd -W5hCUzrPQwWl6LLgJHUa4HOdlMFXsZ3jJqQkEygjXAGcHFCCVi9djaT0i/DkxkzT -06lKasPxztdr5BIddwZnnul8Ucyoc+TJWfibQKoPsfkciep7XiGmRfj6le4f+SZv -eSOUPxg70nNnNtkyNDRNTOhJu2OdB3Mol+5PLP7Qq4gH6JjqwSL7In8+jdyQZ0u7 -YxC261Wwhc76NHpyWIQ3dst0Vl7CxtmYTo2FJVqoHHeiS3u6FbKX7BUpG2rhvX0l -RnKLloEmCp4WaimbBlsggwwEI9wf/wAxEkf37ISqQinX/ePMjacWfK401PD+KQTP -UcgtAMMx+UDClbo32lciFjgPPU9Z27iIJCJvv8Kq/X4/mekyg/CqzqZJ3zik1CWj -Hrs3x0so5i6F3XHj7CinFH/LImoKJiZHX8GbZqYa1dON19+Jg5j7XVdA+aYsHEMR -4YZsdZmGHNu/yvaxXH/C -=6XLG +iQIcBAEBCAAGBQJUoG4fAAoJEJS/30SErRQvSMsP/RAS53NOQ5UpfogT9W25jo9g +6lfxbdwoM2iC5mzzfffQl//HzpuvQZGkbxBRPTw+72+h3rE6izXouF1xUrqPSEBz +w5795rcz7G4s3xMqGqUh3wkj1vu/WDdJYm5f29negpA8MXRfdK7+CJywPyuUuYoV ++dtTotpeBtvGmQjwY6mq6B61uMZYLIanmkAAUvyCJvE+1pUMvIMYbnHtZu9iloaC +w+mHj+qBGFE73133z0xGaEr9052mpTcbL/0ZkxUjuAWriV32wMc9HUftkeM0nZBq +iPsnBfOP5LMF0z37TbfIbQj7Qvxu9OgG2+rSjN/KQaK1iwKchV2RipFFhiMbSQK+ +Fpu8khnj//uSSHzNgcwHMea/Xk1s1QkNPA4sTBXh2SUp+cfXI6Eug9K01ovCcy3t +V4CMVcf1u0tojMAqQW9tpcaToUFpPenBBETma2+YIZtGAbge60ak+8tohJuAHbje +FIQNBrZp2/T+Y0FCZu/kN5SGjnj0BEUw4sxIJFe8pVZJA9brOC9ywabHOd2Gq6Hy +RAoZvff3iL26GCbHjkEvet2IXjjFmgaVLoRFcZ6ffKsEdiR2Tzd0v0gFrCoPtta+ +lGrSPvmrMzxAFqtyxP7UCJiDTfXmZ7ayVk6VjoaJrQO53uL2reNi/duFU+Z6ypUZ +FIZb8KT3xLFB6nBj2i9r +=7+W0 -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/files/libreoffice-4.2.8.2-boost-1.56.0.patch b/app-office/libreoffice/files/libreoffice-4.2.8.2-boost-1.56.0.patch new file mode 100644 index 000000000000..6485aff2f6ed --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-4.2.8.2-boost-1.56.0.patch @@ -0,0 +1,187 @@ +Backport of 45dfbdca6a9afba1a6aef21623ec025ded635a4d from LO master +by Mark Wright, gienah@gentoo.org + + +--- libreoffice-4.2.6.3-orig/canvas/source/cairo/cairo_spritecanvashelper.cxx 2014-08-23 00:22:41.000000000 +1000 ++++ libreoffice-4.2.6.3/canvas/source/cairo/cairo_spritecanvashelper.cxx 2014-09-14 22:25:51.323259895 +1000 +@@ -402,11 +402,12 @@ + ::basegfx::computeSetDifference( aUncoveredAreas, + rUpdateArea.maTotalBounds, + ::basegfx::B2DRange( rDestRect ) ); ++ SurfaceSharedPtr surface(mpOwningSpriteCanvas->getBufferSurface()); + ::std::for_each( aUncoveredAreas.begin(), + aUncoveredAreas.end(), + ::boost::bind( &repaintBackground, + boost::cref(pCompositingCairo), +- boost::cref(mpOwningSpriteCanvas->getBufferSurface()), ++ boost::cref(surface), + _1 ) ); + + cairo_rectangle( pWindowCairo.get(), 0, 0, rSize.getX(), rSize.getY() ); +--- libreoffice-4.2.6.3-orig/canvas/source/vcl/spritecanvashelper.cxx 2014-08-23 00:22:41.000000000 +1000 ++++ libreoffice-4.2.6.3/canvas/source/vcl/spritecanvashelper.cxx 2014-09-14 22:25:51.323721613 +1000 +@@ -573,12 +573,12 @@ + + // repaint all affected sprites on top of background into + // VDev. ++ ::basegfx::B2DPoint outPos( ::vcl::unotools::b2DPointFromPoint(aOutputPosition) ); + ::std::for_each( rSortedUpdateSprites.begin(), + rSortedUpdateSprites.end(), + ::boost::bind( &spriteRedrawStub2, + ::boost::ref( maVDev.get() ), +- ::boost::cref( +- ::vcl::unotools::b2DPointFromPoint(aOutputPosition)), ++ ::boost::cref( outPos ), + _1 ) ); + + // flush to screen +--- libreoffice-4.2.6.3-orig/dbaccess/source/ui/tabledesign/TableController.cxx 2014-08-23 00:22:41.000000000 +1000 ++++ libreoffice-4.2.6.3/dbaccess/source/ui/tabledesign/TableController.cxx 2014-09-14 22:28:42.327186979 +1000 +@@ -1393,7 +1393,8 @@ + setEditable( xMeta.is() && !xMeta->isReadOnly() && (isAlterAllowed() || isDropAllowed() || isAddAllowed()) ); + if(!isEditable()) + { +- ::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( &OTableRow::SetReadOnly, _1, boost::cref( sal_True ))); ++ sal_Bool t( sal_True ); ++ ::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( &OTableRow::SetReadOnly, _1, boost::cref( t ))); + } + m_bNew = sal_False; + // be notified when the table is in disposing +--- libreoffice-4.2.6.3-orig/oox/source/drawingml/table/tablecell.cxx 2014-08-23 00:22:41.000000000 +1000 ++++ libreoffice-4.2.6.3/oox/source/drawingml/table/tablecell.cxx 2014-09-14 22:25:51.325066244 +1000 +@@ -117,9 +117,9 @@ + if (rTableStylePart.getTextColor().isUsed()) + aTextCharProps.maCharColor = rTableStylePart.getTextColor(); + if( rTableStylePart.getTextBoldStyle().is_initialized() ) +- aTextCharProps.moBold = rTableStylePart.getTextBoldStyle(); ++ aTextCharProps.moBold = *rTableStylePart.getTextBoldStyle(); + if( rTableStylePart.getTextItalicStyle().is_initialized() ) +- aTextCharProps.moItalic = rTableStylePart.getTextItalicStyle(); ++ aTextCharProps.moItalic = *rTableStylePart.getTextItalicStyle(); + } + + void applyTableCellProperties( const Reference < ::com::sun::star::table::XCell >& rxCell, const TableCell& rTableCell ) +--- libreoffice-4.2.6.3-orig/reportdesign/source/core/api/ReportDefinition.cxx 2014-08-23 00:22:41.000000000 +1000 ++++ libreoffice-4.2.6.3/reportdesign/source/core/api/ReportDefinition.cxx 2014-09-14 22:25:51.326473733 +1000 +@@ -1623,8 +1623,9 @@ + m_pImpl->m_pObjectContainer->SwitchPersistence(m_pImpl->m_xStorage); + } + // notify our container listeners ++ OWeakObject *weakObjectThis = static_cast(this); + m_pImpl->m_aStorageChangeListeners.forEach( +- ::boost::bind(&document::XStorageChangeListener::notifyStorageChange,_1,boost::cref(static_cast(this)),boost::cref(_xStorage))); ++ ::boost::bind(&document::XStorageChangeListener::notifyStorageChange,_1,boost::cref(weakObjectThis),boost::cref(_xStorage))); + } + // ----------------------------------------------------------------------------- + uno::Reference< embed::XStorage > SAL_CALL OReportDefinition::getDocumentStorage( ) throw (io::IOException, uno::Exception, uno::RuntimeException) +--- libreoffice-4.2.6.3-orig/slideshow/source/engine/activities/activitybase.hxx 2014-08-23 00:22:41.000000000 +1000 ++++ libreoffice-4.2.6.3/slideshow/source/engine/activities/activitybase.hxx 2014-09-14 22:25:51.326839852 +1000 +@@ -111,7 +111,7 @@ + ShapeAttributeLayerSharedPtr getShapeAttributeLayer() const + { return mpAttributeLayer; } + +- bool isRepeatCountValid() const { return maRepeats; } ++ bool isRepeatCountValid() const { return bool(maRepeats); } + double getRepeatCount() const { return *maRepeats; } + bool isAutoReverse() const { return mbAutoReverse; } + +--- libreoffice-4.2.6.3-orig/slideshow/source/engine/rehearsetimingsactivity.cxx 2014-08-23 00:22:41.000000000 +1000 ++++ libreoffice-4.2.6.3/slideshow/source/engine/rehearsetimingsactivity.cxx 2014-09-14 22:25:51.327321898 +1000 +@@ -398,11 +398,12 @@ + { + // new sprite pos, transformation might have changed: + maSpriteRectangle = calcSpriteRectangle( maViews.front().first ); ++ ::basegfx::B2DPoint rectMin( maSpriteRectangle.getMinimum() ); + + // reposition sprites + for_each_sprite( boost::bind( &cppcanvas::Sprite::move, + _1, +- boost::cref(maSpriteRectangle.getMinimum())) ); ++ boost::cref( rectMin )) ); + + // sprites changed, need screen update + mrScreenUpdater.notifyUpdate(); +--- libreoffice-4.2.6.3-orig/slideshow/source/engine/shapes/appletshape.cxx 2014-08-23 00:22:41.000000000 +1000 ++++ libreoffice-4.2.6.3/slideshow/source/engine/shapes/appletshape.cxx 2014-09-14 22:25:51.327829537 +1000 +@@ -148,12 +148,13 @@ + void AppletShape::implViewsChanged() + { + // resize all ViewShapes ++ ::basegfx::B2DRectangle bounds( AppletShape::getBounds() ); + ::std::for_each( maViewAppletShapes.begin(), + maViewAppletShapes.end(), + ::boost::bind( + &ViewAppletShape::resize, + _1, +- ::boost::cref( AppletShape::getBounds())) ); ++ ::boost::cref( bounds )) ); + } + + // --------------------------------------------------------------------- +@@ -252,11 +253,12 @@ + + bool AppletShape::implStartIntrinsicAnimation() + { ++ ::basegfx::B2DRectangle bounds( getBounds() ); + ::std::for_each( maViewAppletShapes.begin(), + maViewAppletShapes.end(), + ::boost::bind( &ViewAppletShape::startApplet, + _1, +- ::boost::cref( getBounds() ))); ++ ::boost::cref( bounds ))); + mbIsPlaying = true; + + return true; +--- libreoffice-4.2.6.3-orig/slideshow/source/engine/shapes/drawshape.cxx 2014-08-23 00:22:41.000000000 +1000 ++++ libreoffice-4.2.6.3/slideshow/source/engine/shapes/drawshape.cxx 2014-09-14 22:25:51.328463497 +1000 +@@ -168,6 +168,7 @@ + } + + // redraw all view shapes, by calling their update() method ++ ViewShape::RenderArgs renderArgs( getViewRenderArgs() ); + if( ::std::count_if( maViewShapes.begin(), + maViewShapes.end(), + ::boost::bind( +@@ -178,8 +179,7 @@ + // the extra mem_fn. WTF. + _1, + ::boost::cref( mpCurrMtf ), +- ::boost::cref( +- getViewRenderArgs() ), ++ ::boost::cref( renderArgs ), + nUpdateFlags, + isVisible() ) ) + != static_cast(maViewShapes.size()) ) +--- libreoffice-4.2.6.3-orig/slideshow/source/engine/shapes/mediashape.cxx 2014-08-23 00:22:41.000000000 +1000 ++++ libreoffice-4.2.6.3/slideshow/source/engine/shapes/mediashape.cxx 2014-09-14 22:25:51.328874055 +1000 +@@ -125,12 +125,13 @@ + void MediaShape::implViewsChanged() + { + // resize all ViewShapes ++ ::basegfx::B2DRectangle bounds( getBounds() ); + ::std::for_each( maViewMediaShapes.begin(), + maViewMediaShapes.end(), + ::boost::bind( + &ViewMediaShape::resize, + _1, +- ::boost::cref( getBounds())) ); ++ ::boost::cref( bounds )) ); + } + + // --------------------------------------------------------------------- +--- libreoffice-4.2.6.3-orig/slideshow/source/engine/unoviewcontainer.cxx 2014-08-23 00:22:41.000000000 +1000 ++++ libreoffice-4.2.6.3/slideshow/source/engine/unoviewcontainer.cxx 2014-09-14 22:25:51.329303003 +1000 +@@ -45,11 +45,12 @@ + const UnoViewVector::iterator aEnd( maViews.end() ); + + // already added? ++ uno::Reference xView (rView->getUnoView()); + if( ::std::find_if( maViews.begin(), + aEnd, + ::boost::bind( + ::std::equal_to< uno::Reference< presentation::XSlideShowView > >(), +- ::boost::cref( rView->getUnoView() ), ++ ::boost::cref( xView ), + ::boost::bind( + &UnoView::getUnoView, + _1 ) ) ) != aEnd ) diff --git a/app-office/libreoffice/libreoffice-4.2.8.2.ebuild b/app-office/libreoffice/libreoffice-4.2.8.2.ebuild new file mode 100644 index 000000000000..cfc99cc74abd --- /dev/null +++ b/app-office/libreoffice/libreoffice-4.2.8.2.ebuild @@ -0,0 +1,595 @@ +# 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.8.2.ebuild,v 1.1 2014/12/28 20:53:23 dilfridge Exp $ + +EAPI=5 + +KDE_REQUIRED="optional" +QT_MINIMAL="4.7.4" +KDE_SCM="git" +CMAKE_REQUIRED="never" + +PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) +PYTHON_REQ_USE="threads,xml" + +# experimental ; release ; old +# Usually the tarballs are moved a lot so this should make +# everyone happy. +DEV_URI=" + http://dev-builds.libreoffice.org/pre-releases/src + http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/ + http://download.documentfoundation.org/libreoffice/old/${PV}/ +" +EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice" +ADDONS_URI="http://dev-www.libreoffice.org/src/" + +BRANDING="${PN}-branding-gentoo-0.8.tar.xz" +# PATCHSET="${P}-patchset-01.tar.xz" + +[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2" +inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS} +unset SCM_ECLASS + +DESCRIPTION="LibreOffice, a full office productivity suite" +HOMEPAGE="http://www.libreoffice.org" +SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" +[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}" + +# Split modules following git/tarballs +# Core MUST be first! +# Help is used for the image generator +MODULES="core help" +# Only release has the tarballs +if [[ ${PV} != *9999* ]]; then + for i in ${DEV_URI}; do + for mod in ${MODULES}; do + if [[ ${mod} == core ]]; then + SRC_URI+=" ${i}/${P}.tar.xz" + else + SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz" + fi + done + unset mod + done + unset i +fi +unset DEV_URI + +# Really required addons +# These are bundles that can't be removed for now due to huge patchsets. +# If you want them gone, patches are welcome. +ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz" +ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code +ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" +ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it? +ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all +ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino +ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable +SRC_URI+=" ${ADDONS_SRC}" + +unset ADDONS_URI +unset EXT_URI +unset ADDONS_SRC + +IUSE="bluetooth +branding +cups dbus debug eds firebird gnome gstreamer +gtk +gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba vlc +webdav" + +LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" +# Unpackaged separate extensions: +# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf? +# hunart: only on ooo extensions -> fubared download path somewhere on sf +# numbertext, typo, validator, watch-window: ^^ +# oooblogger: no homepage or anything +# Extensions that need extra work: +for lo_xt in ${LO_EXTS}; do + IUSE+=" libreoffice_extensions_${lo_xt}" +done +unset lo_xt + +LICENSE="|| ( LGPL-3 MPL-1.1 )" +SLOT="0" +[[ ${PV} == *9999* ]] || \ +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" + +COMMON_DEPEND=" + ${PYTHON_DEPS} + app-arch/zip + app-arch/unzip + >=app-text/hunspell-1.3.2-r3 + app-text/mythes + =app-text/libabw-0.0* + >=app-text/libexttextcat-3.2 + =app-text/libebook-0.0* + =app-text/libetonyek-0.0* + app-text/liblangtag + =app-text/libmspub-0.0* + =app-text/libmwaw-0.2* + =app-text/libodfgen-0.0* >=app-text/libodfgen-0.0.3 + app-text/libwpd:0.9[tools] + app-text/libwpg:0.2 + =app-text/libwps-0.2* + >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] + >=dev-cpp/clucene-2.3.3.4-r2 + dev-cpp/libcmis:0.4 + dev-db/unixODBC + >=dev-libs/boost-1.46:= + dev-libs/expat + >=dev-libs/hyphen-2.7.1 + >=dev-libs/icu-4.8.1.1:= + =dev-libs/liborcus-0.5* + >=dev-libs/nspr-4.8.8 + >=dev-libs/nss-3.12.9 + >=dev-lang/perl-5.0 + >=dev-libs/openssl-1.0.0d:0 + >=dev-libs/redland-1.0.16 + media-gfx/graphite2 + >=media-libs/fontconfig-2.8.0 + media-libs/freetype:2 + >=media-libs/harfbuzz-0.9.18:=[icu(+)] + media-libs/lcms:2 + >=media-libs/libpng-1.4 + =media-libs/libcdr-0.0* + =media-libs/libfreehand-0.0* + =media-libs/libvisio-0.0* + >=net-misc/curl-7.21.4 + net-nds/openldap + sci-mathematics/lpsolve + virtual/jpeg:0 + >=x11-libs/cairo-1.10.0[X] + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + bluetooth? ( net-wireless/bluez ) + cups? ( net-print/cups ) + dbus? ( >=dev-libs/dbus-glib-0.92 ) + eds? ( gnome-extra/evolution-data-server ) + firebird? ( >=dev-db/firebird-2.5 ) + gnome? ( gnome-base/gconf:2 ) + gtk? ( + x11-libs/gdk-pixbuf[X] + >=x11-libs/gtk+-2.24:2 + ) + gtk3? ( >=x11-libs/gtk+-3.2:3 ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + ) + jemalloc? ( dev-libs/jemalloc ) + libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) + libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) + libreoffice_extensions_wiki-publisher? ( + dev-java/commons-codec:0 + dev-java/commons-httpclient:3 + dev-java/commons-lang:2.1 + dev-java/commons-logging:0 + dev-java/tomcat-servlet-api:3.0 + ) + mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) + opengl? ( + virtual/glu + virtual/opengl + ) + postgres? ( >=dev-db/postgresql-9.0[kerberos] ) + telepathy? ( + dev-libs/glib:2 + >=net-libs/telepathy-glib-0.18.0 + >=x11-libs/gtk+-2.24:2 + ) + webdav? ( net-libs/neon ) +" + +RDEPEND="${COMMON_DEPEND} + !app-office/libreoffice-bin + !app-office/libreoffice-bin-debug + !=virtual/jre-1.6 ) + vlc? ( media-video/vlc ) +" + +if [[ ${PV} != *9999* ]]; then + PDEPEND="~app-office/libreoffice-l10n-${PV}" +else + # Translations are not reliable on live ebuilds + # rather force people to use english only. + PDEPEND="!app-office/libreoffice-l10n" +fi + +# FIXME: cppunit should be moved to test conditional +# after everything upstream is under gbuild +# as dmake execute tests right away +DEPEND="${COMMON_DEPEND} + >=dev-libs/libatomic_ops-7.2d + >=dev-libs/libxml2-2.7.8 + dev-libs/libxslt + dev-perl/Archive-Zip + dev-util/cppunit + >=dev-util/gperf-3 + dev-util/intltool + >=dev-util/mdds-0.10.3:= + virtual/pkgconfig + net-misc/npapi-sdk + >=sys-apps/findutils-4.4.2 + sys-devel/bison + sys-apps/coreutils + sys-devel/flex + sys-devel/gettext + >=sys-devel/make-3.82 + sys-devel/ucpp + sys-libs/zlib + x11-libs/libXt + x11-libs/libXtst + x11-proto/randrproto + x11-proto/xextproto + x11-proto/xineramaproto + x11-proto/xproto + java? ( + >=virtual/jdk-1.6 + >=dev-java/ant-core-1.7 + ) + odk? ( >=app-doc/doxygen-1.8.4 ) + test? ( dev-util/cppunit ) +" + +PATCHES=( + # not upstreamable stuff + "${FILESDIR}/${PN}-3.7-system-pyuno.patch" + + # from libreoffice-4-3 branch + "${FILESDIR}/${PN}-4.2.6.3-jpeg9.patch" + + # from libreoffice-4-4 branch + "${FILESDIR}/${PN}-4.2.8.2-boost-1.56.0.patch" + + # staged for git master + "${FILESDIR}/${PN}-4.2.0.4-curl-config.patch" +) + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + bluetooth? ( dbus ) + gnome? ( gtk ) + eds? ( gnome ) + telepathy? ( gtk ) + libreoffice_extensions_nlpsolver? ( java ) + libreoffice_extensions_scripting-beanshell? ( java ) + libreoffice_extensions_scripting-javascript? ( java ) + libreoffice_extensions_wiki-publisher? ( java ) +" + +CHECKREQS_MEMORY="512M" +CHECKREQS_DISK_BUILD="6G" + +pkg_pretend() { + local pgslot + + if [[ ${MERGE_TYPE} != binary ]]; then + check-reqs_pkg_pretend + + if [[ $(gcc-major-version) -lt 4 ]] || \ + ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \ + ; then + eerror "Compilation with gcc older than 4.6 is not supported" + die "Too old gcc found." + fi + fi + + # Ensure pg version but we have to be sure the pg is installed (first + # install on clean system) + if use postgres && has_version dev-db/postgresql; then + pgslot=$(postgresql-config show) + if [[ ${pgslot//.} < 90 ]] ; then + eerror "PostgreSQL slot must be set to 9.0 or higher." + eerror " postgresql-config set 9.0" + die "PostgreSQL slot is not set to 9.0 or higher." + fi + fi +} + +pkg_setup() { + java-pkg-opt-2_pkg_setup + kde4-base_pkg_setup + python-single-r1_pkg_setup + + [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup +} + +src_unpack() { + local mod mod2 dest tmplfile tmplname mypv + + [[ -n ${PATCHSET} ]] && unpack ${PATCHSET} + use branding && unpack "${BRANDING}" + + if [[ ${PV} != *9999* ]]; then + unpack "${P}.tar.xz" + for mod in ${MODULES}; do + [[ ${mod} == core ]] && continue + unpack "${PN}-${mod}-${PV}.tar.xz" + done + else + for mod in ${MODULES}; do + mypv=${PV/.9999} + [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}" + EGIT_PROJECT="${PN}/${mod}" + EGIT_SOURCEDIR="${WORKDIR}/${P}" + [[ ${mod} != core ]] && EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}" + EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}" + EGIT_NOUNPACK="true" + git-2_src_unpack + if [[ ${mod} != core ]]; then + mod2=${mod} + # mapping does not match on help + [[ ${mod} == help ]] && mod2="helpcontent2" + mkdir -p "${S}/${mod2}/" || die + mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die + rm -rf "${WORKDIR}/${PN}-${mod}-${PV}" + fi + done + unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH + fi +} + +src_prepare() { + # optimization flags + export GMAKE_OPTIONS="${MAKEOPTS}" + # System python 2.7 enablement: + export PYTHON_CFLAGS=$(python_get_CFLAGS) + export PYTHON_LIBS=$(python_get_LIBS) + + # patchset + if [[ -n ${PATCHSET} ]]; then + EPATCH_FORCE="yes" \ + EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \ + EPATCH_SUFFIX="patch" \ + epatch + fi + + base_src_prepare + + AT_M4DIR="m4" eautoreconf + # hack in the autogen.sh + touch autogen.lastrun + + # system pyuno mess + sed \ + -e "s:%eprefix%:${EPREFIX}:g" \ + -e "s:%libdir%:$(get_libdir):g" \ + -i pyuno/source/module/uno.py \ + -i scripting/source/pyprov/officehelper.py || die + # sed in the tests + sed -i \ + -e 's#all : build unitcheck#all : build#g' \ + solenv/gbuild/Module.mk || die + sed -i \ + -e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \ + -e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \ + Makefile.in || die + + if use branding; then + # hack... + mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die + fi +} + +src_configure() { + local java_opts + local internal_libs + local lo_ext + local ext_opts + local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}") + + # recheck that there is some value in jobs + [[ -z ${jbs} ]] && jbs="1" + + # sane: just sane.h header that is used for scan in writer, not + # linked or anything else, worthless to depend on + # vigra: just uses templates from there + # it is serious pain in the ass for packaging + # should be replaced by boost::gil if someone interested + internal_libs+=" + --without-system-sane + --without-system-vigra + " + + # libreoffice extensions handling + for lo_xt in ${LO_EXTS}; do + if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then + ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})" + else + ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})" + fi + done + + if use java; then + # hsqldb: system one is too new + java_opts=" + --without-junit + --without-system-hsqldb + --with-ant-home="${ANT_HOME}" + --with-jdk-home=$(java-config --jdk-home 2>/dev/null) + --with-jvm-path="${EPREFIX}/usr/lib/" + " + + use libreoffice_extensions_scripting-beanshell && \ + java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" + + use libreoffice_extensions_scripting-javascript && \ + java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)" + + if use libreoffice_extensions_wiki-publisher; then + java_opts+=" + --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar) + --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar) + --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar) + --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar) + --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar) + " + fi + fi + + # system headers/libs/...: enforce using system packages + # --enable-cairo: ensure that cairo is always required + # --enable-graphite: disabling causes build breakages + # --enable-*-link: link to the library rather than just dlopen on runtime + # --enable-release-build: build the libreoffice as release + # --disable-fetch-external: prevent dowloading during compile phase + # --disable-gnome-vfs: old gnome virtual fs support + # --disable-kdeab: kde3 adressbook + # --disable-kde: kde3 support + # --disable-systray: quickstarter does not actually work at all so do not + # promote it + # --enable-extension-integration: enable any extension integration support + # --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs + # --disable-report-builder: too much java packages pulled in without pkgs + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}/" \ + --with-system-headers \ + --with-system-libs \ + --with-system-jars \ + --with-system-dicts \ + --enable-cairo-canvas \ + --enable-graphite \ + --enable-largefile \ + --enable-mergelibs \ + --enable-python=system \ + --enable-randr \ + --enable-randr-link \ + --enable-release-build \ + --disable-hardlink-deliver \ + --disable-ccache \ + --disable-crashdump \ + --disable-dependency-tracking \ + --disable-epm \ + --disable-fetch-external \ + --disable-gnome-vfs \ + --disable-gstreamer-0-10 \ + --disable-report-builder \ + --disable-kdeab \ + --disable-kde \ + --disable-online-update \ + --disable-systray \ + --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \ + --with-build-version="Gentoo official package" \ + --enable-extension-integration \ + --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \ + --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \ + --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \ + --with-external-tar="${DISTDIR}" \ + --with-lang="" \ + --with-parallelism=${jbs} \ + --with-system-ucpp \ + --with-vendor="Gentoo Foundation" \ + --with-x \ + --without-afms \ + --without-fonts \ + --without-myspell-dicts \ + --without-help \ + --with-helppack-integration \ + --without-sun-templates \ + $(use_enable bluetooth sdremote-bluetooth) \ + $(use_enable cups) \ + $(use_enable debug) \ + $(use_enable dbus) \ + $(use_enable eds evolution2) \ + $(use_enable firebird firebird-sdbc) \ + $(use_enable gnome gconf) \ + $(use_enable gnome gio) \ + $(use_enable gnome lockdown) \ + $(use_enable gstreamer) \ + $(use_enable gtk) \ + $(use_enable gtk3) \ + $(use_enable kde kde4) \ + $(use_enable mysql ext-mariadb-connector) \ + $(use_enable odk) \ + $(use_enable opengl) \ + $(use_enable postgres postgresql-sdbc) \ + $(use_enable telepathy) \ + $(use_enable vba) \ + $(use_enable vlc) \ + $(use_enable webdav neon) \ + $(use_with java) \ + $(use_with mysql system-mysql-cppconn) \ + $(use_with odk doxygen) \ + ${internal_libs} \ + ${java_opts} \ + ${ext_opts} +} + +src_compile() { + # hack for offlinehelp, this needs fixing upstream at some point + # it is broken because we send --without-help + # https://bugs.freedesktop.org/show_bug.cgi?id=46506 + ( + grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" + source "${T}/config_host.mk" 2&> /dev/null + + local path="${WORKDIR}/helpcontent2/source/auxiliary/" + mkdir -p "${path}" || die + + echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\"" + perl "${S}/helpcontent2/helpers/create_ilst.pl" \ + -dir=icon-themes/galaxy/res/helpimg \ + > "${path}/helpimg.ilst" + [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug." + ) + + local target + use test && target="build" || target="build-nocheck" + + # this is not a proper make script + make ${target} || die +} + +src_test() { + make unitcheck || die + make slowcheck || die +} + +src_install() { + # This is not Makefile so no buildserver + make DESTDIR="${D}" distro-pack-install -o build -o check || die + + # Fix bash completion placement + newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} + rm -rf "${ED}"/etc/ + + if use branding; then + insinto /usr/$(get_libdir)/${PN}/program + newins "${WORKDIR}/branding-sofficerc" sofficerc + echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} + fi + + # symlink the nsplugin to proper location + # use gtk && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so + + # Hack for offlinehelp, this needs fixing upstream at some point. + # It is broken because we send --without-help + # https://bugs.freedesktop.org/show_bug.cgi?id=46506 + insinto /usr/$(get_libdir)/libreoffice/help + doins xmlhelp/util/*.xsl + + # Remove desktop files for support to old installs that can't parse mime + rm -rf "${ED}"/usr/share/mimelnk/ + + pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin + pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin +} + +pkg_preinst() { + # Cache updates - all handled by kde eclass for all environments + kde4-base_pkg_preinst +} + +pkg_postinst() { + kde4-base_pkg_postinst + + use java || \ + ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.' +} + +pkg_postrm() { + kde4-base_pkg_postrm +} diff --git a/app-office/libreoffice/libreoffice-4.2.9999.ebuild b/app-office/libreoffice/libreoffice-4.2.9999.ebuild index 6e01704af0bc..541bb788ce14 100644 --- a/app-office/libreoffice/libreoffice-4.2.9999.ebuild +++ b/app-office/libreoffice/libreoffice-4.2.9999.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.9999.ebuild,v 1.30 2014/12/28 14:57:43 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild,v 1.31 2014/12/28 20:53:23 dilfridge Exp $ EAPI=5 @@ -241,6 +241,9 @@ PATCHES=( # from libreoffice-4-3 branch "${FILESDIR}/${PN}-4.2.6.3-jpeg9.patch" + # from libreoffice-4-4 branch + "${FILESDIR}/${PN}-4.2.8.2-boost-1.56.0.patch" + # staged for git master "${FILESDIR}/${PN}-4.2.0.4-curl-config.patch" )