From 1960b64916f65024cb3f18251deda802ae30513a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20H=C3=BCttel?= Date: Sun, 8 Feb 2015 22:42:23 +0000 Subject: [PATCH] Version bump (without keywords so far); update live ebuilds to git-r3.eclass; backport DPI patch for bug 523822 to the 4.3 branch. Thanks to Andreas Sturmlechner. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xEBE6A336BE19039C! --- app-office/libreoffice/ChangeLog | 14 +- app-office/libreoffice/Manifest | 43 +- .../files/libreoffice-4.3.5.2-DPI.patch | 51 ++ ...reoffice-4.4.0.3-telepathy-build-fix.patch | 40 ++ .../libreoffice/libreoffice-4.2.9999.ebuild | 14 +- .../libreoffice/libreoffice-4.3.9999.ebuild | 15 +- .../libreoffice/libreoffice-4.4.0.3.ebuild | 604 ++++++++++++++++++ .../libreoffice/libreoffice-4.4.9999.ebuild | 17 +- .../libreoffice/libreoffice-9999.ebuild | 14 +- 9 files changed, 760 insertions(+), 52 deletions(-) create mode 100644 app-office/libreoffice/files/libreoffice-4.3.5.2-DPI.patch create mode 100644 app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch create mode 100644 app-office/libreoffice/libreoffice-4.4.0.3.ebuild diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index abd6c8e4893a..42528f532cc9 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.610 2015/02/08 18:59:16 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.611 2015/02/08 22:42:18 dilfridge Exp $ + +*libreoffice-4.4.0.3 (08 Feb 2015) + + 08 Feb 2015; Andreas K. Huettel + +files/libreoffice-4.3.5.2-DPI.patch, + +files/libreoffice-4.4.0.3-telepathy-build-fix.patch, + +libreoffice-4.4.0.3.ebuild, libreoffice-4.2.9999.ebuild, + libreoffice-4.3.9999.ebuild, libreoffice-4.4.9999.ebuild, + libreoffice-9999.ebuild: + Version bump (without keywords so far); update live ebuilds to git-r3.eclass; + backport DPI patch for bug 523822 to the 4.3 branch. Thanks to Andreas + Sturmlechner. 08 Feb 2015; Andreas K. Huettel libreoffice-4.4.9999.ebuild, libreoffice-9999.ebuild: diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 2500dfea94cf..ce758c00aa11 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -15,11 +15,13 @@ AUX libreoffice-4.3.1.2-implement--with-system-coinmp.patch 2854 SHA256 5de29eb4 AUX libreoffice-4.3.1.2-implement--with-system-gltf.patch 4983 SHA256 c61e8dd67a6299555fe1ccc0f31263cd3b15b921bf844dacd1f09905ca60734f SHA512 af251ff2e10c3c6e096de4c866e05e22b8763a01cac1f66bcad597615f387daeba18348e45f49a8aacb2b0855e9d3240e373be59d33c821dbef6c79b2d047f40 WHIRLPOOL 4ac552215e634f5cc1bf2f3a253cff9f48032b3ad485942c49a2923c265d6fd0ae45050bc876c422ef95b74e699af182483b6b276319f26f0b35728eb4e05d77 AUX libreoffice-4.3.1.2-upgrade-to-libgltf-0.0.1.patch 15709 SHA256 22551358fa6e161c2ecdd267bae3de1245fb671eda8b592efa48e7939e9353f2 SHA512 c29b18c5d9b14f2d9a0c08618e274e1fa3bae540b68569fcd0ff216aef4942e7aa5fe89184cadbcb3d6ea04316a5ae9876f3fae085727b13247bb5e0499b10a8 WHIRLPOOL 2d3ee1e39a965cf28e6b633dd5f62dd7aca3dbf4a583aa48cade71cfb8814c93fdfa54099db7774d5db62e2b21d61017dd279fb2cdf1b0fc7633ad3323d2fceb AUX libreoffice-4.3.4.1-boost-1.56.0.patch 10696 SHA256 47700e383c40679809cf3577798fd9211458b0814b8b360f49847491c4bc9ca0 SHA512 d8d84a9106aabfb06f64b2101de9d9767828e6349f948732f017d7972d02bd6a64cad1b5dee44fa2fbcaa6b2dc9df9caf77070168091e0798911d07a21550b56 WHIRLPOOL edf37dbd8a6f5858fd3583551cbcdca590122436406a0f6016402c1b7423ed99c26d64a7116ff2575f112e3fdbf698f04357e33daba76016b3c4ef778d4cddef +AUX libreoffice-4.3.5.2-DPI.patch 2041 SHA256 8f81d3ee81bcf27039ae1700d4d61c6fe39d8a9ab40936cd9555adc6158b941f SHA512 c67c09b9d08c8b4d56d3d83fd3db1b07ac9257ce8d3219079a0ec4fe907b2ce0ee4785284ada10a23a73befc9892ef0d939c619d8638057cc4c0e56ec6df0ed7 WHIRLPOOL e839af0b762fa6881c8e94288d3253148eb1397e21aafcf575bf4110c6dd7c882805cce8d81486a28fafe7e31505f6e1da8f61aa0b58f984c410f46a6c45a830 AUX libreoffice-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch 2123 SHA256 f424034d9af92f1ca281dc68b484d28503c261705791409f813c2359874b455d SHA512 1621411ad99d9d43abd2363b86ce892f14e25bc236f6b04a55b9765252ec2904af295475d70d09eb3fe9278dda08c8944a08dd9aae81d426da7d6cb0ece47295 WHIRLPOOL 59655dff3ff8491ce7b6a61cc6ca5a5469fcad2e530cfd5c36b50031dce591730ff20dab9eac173c04e09093740341eba86c324f857b19716c8f994272ad9878 AUX libreoffice-4.3.5.2-remove-bashisms.patch 1180 SHA256 60c9874b724cd0de61578e67a76e53cef5e5ac5fdbdc4360c6b3f4b8f9faa89e SHA512 cf7336dd8a7596f48edb7d73ffb19071f0455456b99e6492f41c78417de01ec2e7e3aad5b1c7e7c7bc431b5d4afe0e2095591f3f62d1a4a1dc221a55711b485c WHIRLPOOL cb90fe2e6b2f94458e5ac70a1716819dbc5942d1648b9db80abd199507ad235e69044d2645cc62fcbca93194169443b71783bfb361f9202c879c39d7a9462b9a AUX libreoffice-4.3.5.2-return-IsUserDefined-w-o-negation.patch 1379 SHA256 f64326c3089189520683b8def52dadd73225abf259212ff22cd8e0f5ef183767 SHA512 1366e3914d78ddc22c2dd324b53478c5d76fc8d563f46d02f83b09cceded2e71ea19311e29e6fa23ce230d3bec8f3a56c5ff18572050c6e5a4e03a975d54c38e WHIRLPOOL 2d16b6f90e6bb16de3a53a38e146930eb15685e306558c362e08ffe8c3b410a5124860e22475410f8db6e71fedbed4098b292c8efddfeb8570158046c5736f8a AUX libreoffice-4.3.5.2-system-opencollada.patch 5810 SHA256 5ae98f04551520db1118a873a8cb02c0b3306db0d55e3d5b863729e5393c280e SHA512 6749be7d372d2e92ba16697c3bf90be4bdda01d759100a13fcfe89c935e5291715e8556bc42ab8ce5fa47b6dced95f750c7c497051bdf140e8e504e281e2fe58 WHIRLPOOL 47f02ce1e5ca88cef50c75b339206ee0768a0e74862ab37040be7260c35b6c1d5c56a16fe9f2ca077ab457f1bec3b166c8ee031722eb9711cd63e9222e20a33f AUX libreoffice-4.4-system-pyuno.patch 1598 SHA256 444ba9a06a548952cd82f7ea2ff17e5bd7b04788dc894ef5376bf3440749de9e SHA512 043c78f923b941a1e8985ee16d8e6b23859207eac0f4fdc52fedbce0103d62309aa7aae14e19f8bb26bef9d4213dee9871fcc3770f99be84f3405573e32ced78 WHIRLPOOL 51f85f39847a587551b6887362557771a81b6abc59b926eace36f8e2eb61cd4895486c28d44fe38e77fc1b77b0ed4e142d65f4793bf2161c9d0c5c0abeca07f7 +AUX libreoffice-4.4.0.3-telepathy-build-fix.patch 1503 SHA256 d23431960aa3898331b0e80f827c2eb224c3586bdaf9d2bb9dc10e2aa58ae6f3 SHA512 cf76698e851e31646ad7e6f9547d8c0917a047fa93b5132d00f0ea246945344f3e1df2376a9e3ffcd7ee7a4a200e24e213330482fddf50fc47558b5a9b949426 WHIRLPOOL 92e870da0ea77954d2b04e39887909a0cf20fe4277388be0074c01fac5c7adfa1cfed84333b3e7ae26f7866082bb1711ba453f877b8bc2b390d74a17d41830c0 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 @@ -32,34 +34,37 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51 DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0 DIST libreoffice-4.2.8.2.tar.xz 124149528 SHA256 46de052a6de144363128f1e1ec5ce5f80e3fbba34b0d0ee2b532e14c743e6816 SHA512 3596e23268ea3fd500ca72cf114699ecbca46b634cc13069669d4568c1f09625130abe66d8e6c2fb8b93cc6dd8948a9ec01181a7e7b0a330bea05f3388612a79 WHIRLPOOL e1dd4b797df978c7841f90e16be12edcceae6fc8d1ff21869dad44a02195f2fe1f4232a53fcf6e47e805f4c8a8a78f8cc042265f1486f62933bd8f3d71880f72 DIST libreoffice-4.3.5.2.tar.xz 152786724 SHA256 78e6821a69f37b6c0c2c8d436aef24810d0a76b5d087ef95f6107a6bdbef2637 SHA512 4dd9737c53b080413458fe63e86c43514c0c44f77bc5eb680f615af584a3de4f4733644658d8e53b2b20002e7ea003c2116b6ba3a58f3e581f9fffbd6b7444a9 WHIRLPOOL cb7c74e5f282e92bb715848f904ba155015d91514edff3151aac0f3ff0a14592a31b002e629ddccdd79951b8f18c3174578cd25dcad57a93d5d74edb63c978e4 +DIST libreoffice-4.4.0.3.tar.xz 164003832 SHA256 d168f3d27e840a861def7739515b4093635c422275b11b25bddd783519300cf7 SHA512 0792b9441a2030fdd1b3f4afc660993d63a069575e6426e3cf367fd8a57c684bf0cfcedc82e8bdc473b057cd6f5b471a773e98b148333f4e5885e5b8a1f9bfb8 WHIRLPOOL 90535c519edb5b4295d659c3188f215e298e05c27e8a4a8f957065974f533cb4078f825e5175c8e2048160dc1e4e6c331314671d946d3b3d59c1182559091345 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538 DIST libreoffice-help-4.2.8.2.tar.xz 1855204 SHA256 9cafdc22f0af401dc31bb713e0c477eb111cf4092fbc3582f5bde55a2d6d33d0 SHA512 9ab75261323ed5170c33c74d8cfb630c7d5552701301e6d1fc5890a4b73a831b000172ea9bfa816ced033b8179df38d7d91600e833ec6def67cc8af43e9e1a25 WHIRLPOOL c89f2c9adf9ffd7d1e6124b40d3a5818cea9f6ab57770910cbb0ff440ba8490be80acf2b7e0a702e733412884004600ea2a5c31f7750f1f48e9b2f3f6f0ba40a DIST libreoffice-help-4.3.5.2.tar.xz 1852412 SHA256 78b586931d8e085aa18d137711e7c878f858ea386a80ee673b0a787953836d92 SHA512 8525cc1bef1ac95a89c3100e137793bdea9ac05a85468e0ec96c6a360ce65baf3dfef7e634d9e8dbc644dec138df2b979cdb8a636ff27cdb7ee652ddee114236 WHIRLPOOL f5bd7d1da705e20def1cc6bff3dd3902ce6d77e2b5fb977860a4fbf9748a6ffec3524fe9ab0e2c539ece015082aadcf9f7392a145862ebb20f4abc117667b25e +DIST libreoffice-help-4.4.0.3.tar.xz 1875968 SHA256 2d805934b8fe74ca9478d550ca21c8237a7b88e2e7f48d2a74e68bcf76115415 SHA512 f00058026e6badf1a560ea36f1de10f85c004e47e537e6359071b98afa1ff5867580c4ebb1694e1bf8f8cebd21e3e3fd649bc0fa4712c0aa417b615d7d1c23e9 WHIRLPOOL c4a446430b49a82597c34f3bd1fae6c3fda115cfadb23ee98c95eb9d8e27dfa585f5ccd6c4e410c8c7fedf431d1e63caeb154a4c6a5805840ca25fd9c0e858f0 EBUILD libreoffice-4.2.8.2.ebuild 17952 SHA256 47b3d7661bac7965053ccd96368a1ba417f1d172f2faa71ca64f59a8c96b738f SHA512 14d5254340ee2c05426cdd3eb1d0c76c3adc3d226eb424ba6dc1891a676b4e6f2dc8ce742dd99fb592bbc7187427007d0bfd207c279a57b18bec66286c5f5d0f WHIRLPOOL 1de2d1a662a296bc26719fe6d23feaefaa5550c8cdc9b6c175783c1462f0588a71ad0f8d61fe7d725e90366817983890bc41a94157ca666527fd50b11589800d -EBUILD libreoffice-4.2.9999.ebuild 17983 SHA256 e636bf8845c2d6e94375d3d616f71e568587e6ca3c47ab7dea4e47cf6eb7241f SHA512 7aa5aa780bf4143a2a2b88c1c1f7763d7cd6aac87e587bc02b55d3fcc0c3de9fa5e8e01bc506df6a765917dcdd4028961077bfd8d2960e05b7c32904aa5b5bef WHIRLPOOL b429e779bd347a4e9147f89d97935a55b51a2ad8e4f51e3fe8c8274e0d11cf894c682cc5a1387d58b197758c80c2e125b464e0eb98dedbda05e0bc4f5b791a61 +EBUILD libreoffice-4.2.9999.ebuild 17926 SHA256 0f2909c0eea7b24fa4cbe4d673db0cdc98710e92067e2c4bb3f800620cc390c6 SHA512 e05949e157d208d68b07aae017c4d534159eafacc891801756e302b655afffd8c498bc81b145a5779a502223cd8150f5f5e654deab6f42806add53da192c6a5a WHIRLPOOL 633b570bcc923df072de13b117620fe7ea3e99c6d1660c1d34057fee3f2b5fd67f3986d162a11f496889cba7b701caa77abeee22f165a16b33bb6bcbce7e0ecc EBUILD libreoffice-4.3.5.2.ebuild 19021 SHA256 6321a2d312bde561441c60b50b4824c720104a9c7dac6a60454cc489a52cbce9 SHA512 ee3aa3ecd1050d190fc93c1f83bd337e32781f43f5bc4ae808bc44bff867d495eff099bb2c2dbd14fc3d897e1f0c4d6dca437c9c43c3bcb2632a50a16c4a747e WHIRLPOOL be1f1ed63e27079192a422d7906ee15700dab6f4d44405e73f482ea95b73c99ee17bd213c8800de1353be2063ddd0cc16e56d30c7174ee3feab06821df3ba580 -EBUILD libreoffice-4.3.9999.ebuild 18928 SHA256 7ce919b74dd6e43238a59a5d2aadeeff5b9113566aef62cc0139f25392a48e39 SHA512 3d0d662367f2f8e90223fa3bf99762cac2c34c527328df90a55e01cc0eca39f08e7114005e4b624657124d38d38029ca667e143c148ecbf3ec50fe5afcc942f7 WHIRLPOOL 0800baeabc5e30eeb8e908d2b9819b616ea8dc63a9bdd5b73e29def46a781b1d4b8d427750bc13a0bf3d23e44988247d58800cbdaec7e0fa9425616aa055e133 -EBUILD libreoffice-4.4.9999.ebuild 18537 SHA256 90b572d2770c382b67b8de69d41ed4b19e4e943398636ee06003905771cc74c6 SHA512 b3cd9ca6a2b3dba78bef9a8ded9075cbfc2613010d6040c141c58761b815d59141a13e6aa716bc24c748f5e0ea406023fcf1823aa579705cd40c0b58a29a3c9f WHIRLPOOL ec59eba31af69f9a182e95bd5687b9d1b89904c1342eeb1e925e5744577433d00480d28122e0481273163d463a8414d18a3b9a612972095712d75924085c5cef -EBUILD libreoffice-9999.ebuild 18534 SHA256 76e55dacec9cbaeab8f7c44f5458b4aa2f70aefe70b51433ac370bb3fe1afa30 SHA512 7c1dad8f37368f64834ab1251598a09ba58c68d3ef5ab7bad89cd2bc7fdc02795595bd237365835416ee07c15e122fe8f90b009ff89cdb88bc5abd8d01a4d51c WHIRLPOOL 22020d615e0a63d2fb6fd4f41078ce84951c18e8430d81960c2fb08fec27a897ff98cc00163de7885bede63f7601e5f2c3d83ab42a9b34c7d62c6f2aadd9b775 -MISC ChangeLog 1650 SHA256 9e1440cae6829a059500189e8e23d07cc7043fd38138ebe5ba782ea37d0a4fa3 SHA512 a3ce2b16cfcf083479c47de7e2d9cad51cc2452020654f1e6b9b382a833f91b0a3ceae9b4685b5201eba19608285f96c993f058d0256207dd47b329d1bf49138 WHIRLPOOL 2cf11dbebd0d0eeb27afb3a327c550ad044d52d66d4b1ab8ecab1171819bcf6e5815b516ac92fcd3e397c63067bc0398fadf3a8658e82feef3da9c7b94af7318 +EBUILD libreoffice-4.3.9999.ebuild 18910 SHA256 642c9fc9c069fcb426be5f2c36fbd8f63a3e3a2d67e6039cc93ff9bd08fd7ca2 SHA512 4596fcf90a6626675d52208313acac64a062578525db93e1a1f59e4436836f3ed5e57ee5314e4170e2e6bdbbd742f07c39b8177047c57a01c4f7bff8894cf45b WHIRLPOOL 0520f6b7d52791d53603f837ed283623f8d1ae5a20ed0cd693286146f34765be09325f6bf736af65d204fd6201fe126cf5e39573bbaf8dd7bbba0d362f8d7c5a +EBUILD libreoffice-4.4.0.3.ebuild 18628 SHA256 b975107ce7d1eb7b9b44c1fefb5bf6c9168f85f1286a97b14a256a491ad304a2 SHA512 c3bb52daa31a8037153ffa039d3640d052136068949595313059a4b102f3cec79be12ee373e29844447e506959dc206fc84c412e18321a400d8ec10a1a11d1f9 WHIRLPOOL a6231536e1b00ef4d6a6f56efedaf8ef545ad66598829bbeed42ef601b3109de0710a9a97f5343f3d83c1cddcadb8504c8a35734f4fd193cefca0eb1f7f2d5dc +EBUILD libreoffice-4.4.9999.ebuild 18558 SHA256 a8303b9bc3e520beceec16b65c3aaf9b77208180bce80d7fb5f1b50a84a92119 SHA512 66181a2a16751194829b38daf8130799d2165b4b9f63b0ffb9378e27117cdd00d1b4962e5e935513488efad4a991844f425a6702dfea2847c68f27f2774086f5 WHIRLPOOL edb222f83b4b462c0da479dcf3818099b102d87626974b2948828df735d5d8f4331af9b6ea5b438a0b7bc020ff0463aa50c03579c84c300791fb6efec0fd2875 +EBUILD libreoffice-9999.ebuild 18477 SHA256 6fb127d5f4a2defe175fe397f195b1c03651ac1aa01376ce1e81e70b4dce1e0d SHA512 c0299dea8ea04926d19efdc6e468db727aea952dfecd0cd7ee5442440d572c1f89377a133514fef40dea140d8af562026188eab4fc884b70a3729afd4b3efc9f WHIRLPOOL 4278dbde26ed6b30b28e4f859f8eab26f828bc65645f3f6eb83f846a2f49df9f2a177f48379d93b7e2de7eb6b97a4f92b8358b5021d7ce8cc7d96082760be37d +MISC ChangeLog 2156 SHA256 c0e8f25509128090905e69d79beba785458c7a00302151482c86212509e7509a SHA512 1614da87cd5bc86e2e849341ee0553ef24ca1fa7568d1a6c67be86f3c7518ce7ab3e554b4962b15eee4b5d6b862f5de726dc7342aee91418cb6c01856dfd051d WHIRLPOOL f22b46188d5666a5acb2062ce9dbac98a99ec79a57d2128e81435fecf9a93e380b7345a67858cae73d22f0399d5167199b2667be5b91c284188e52d924f3c694 MISC ChangeLog-2014 109721 SHA256 db62affd74b541212d4043dbc88acf51fb8aa36602d6e5625cab9b0b823a54f7 SHA512 6481d8f26924300ca46f0cd216962167b6ce5d53028558b0128ed4f996a8cf5576182e9e511493e4b57f628189fc127dec9ce62110bc8d3d85c6d4e2a815bf26 WHIRLPOOL 76c87a30a9296f64675baeb5f77a8500b9b1ff25c6edd5a5d0b984dc3cb3b3aecee37938d882194d6be58ef34c8b1925c1d9b8b7a7b786a5d68539fba714e627 MISC metadata.xml 1354 SHA256 bf91c27f941b42e977112a3ea9465babd4c4d94dde3f8308d6db1ccd56bc65b9 SHA512 636da2f295d3055de61b52b2a1d371a25101efdc55014ba2e5a7446bb55b30dca1bb58cc2a84873fb862e40f60de10122c55dba19ba9e5d058eab36f7c33aad6 WHIRLPOOL 4aa957484052955572b2bdca42a7d32f5a89f3916a646e92cca940ce2f4e5c8dec824c75150bf80455dcbc2e13f550d1158c418ca38cecac5ac3090419a52f5e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJU17IFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJU1+ZMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF -QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcYWMP/AuZlNKyHnkRN6luIuR4jW46 -hlgMUXUhbnA4M7REGQFCI0ZOStqNBqNGG0dvBLhsllMvBODU/suH10KdzJXXjsdj -k8enY520aMgnZiacY29pqwTgCAG6qXOcDEfKFxCNaq7wnWXUUx0pyCv9Jhic91p0 -lvmFJSQSXdmrdWxey70+30QyQPBvJYAPd9cYf1d3KSQAkmMWZo1EHR0ffGaflRID -qtX9b69yOQ6Eh+QmEcPiiVMdLINWOdEKK2pNHE49toK8hFrcIowEW0FBqDDERjFk -yhioGqSQMRLH24n5KDit836GAhMR98FIlPqwQkdI3xd8Ji/+nm0IJd3BcbyHXMT6 -ACOp9cHNrngegpZM3gnyUT6czPb7+uPnWsXDUbFsCWaiC+zqA41wd8XTLLx2crPO -rclQ3EioZpLov+COH8kxXwFLKHaM5GNCx5ratSPCXTkVTr1aXfRRRXN1uNodn6qG -C4AoFzzDWU/I1b8hKsAx7CJrUNtLFnVI8U5NrWZYwgNPdKDX8gWKnphTQb/0P5XF -G59OQTV9k/ecVsYwYjpy0dFPl8XCGQtWk9qVuxhn/JAU2R+WzKb/vpZby1yFqQJ9 -T1wfaz+Ca06r7HpcALFkzLnyI1Ie6b33Ung2jBj8kRku/S28vsMOcHDpFVItYw3x -9UGCR2jhECw7TKHQrmYi -=5Bif +QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOchmEP/RVI5G3vI+wRnBp8FDk7fdjD +oGr3kq3GmuuTnh/BHcJGlNp25FMhToRnK5dt5vMNewjN0HTnDRdzVPVBBw2Oiwhi +dDtizrfuxgz21XrA05WaTk951yinZHac012H2D/f6kb2a8BkspOjxYLyeCxvJMNY +/phJYs9XtAL7MXNy8Oh/DXiKYTIZp2ZzpqILIq/Se5l4/tcWZOp8nNS0/ofW541v +TRz2Ec6TiZEc7kB48+DVcVo5ALoiDmNwbS2+U2gfMdS20PNiVq5WJET14+0mSQjQ +TD1IWnBvzEhbUv9bO1MS2P0Nnx8p29VQnPKjNR+F+/Dr4Im1W0rtf4j53fIQUWQl +EIH4ybZl7JZJbjif3EnFIIIvLOzLZPPxfTg5XY5zE/Ch+vKt74LUwFDsLWV1flrt +xFjBQsYLoo57whwfrsqoosH/3Bo5ePuAHaJWMA2aJhwwG3RHEMQ71LDKmNFW7CwR +GfraVZAqeOxcCLr/B2wbVG9lJzV0BbLpAkNUbjPuhd6Opm+gQBj8lhhouCfDJIWg +FCClSlPe/cVu/WcllSnAZNJsDBXQFiaAXY0qecheNu24vxLaLyhHbcst95+etq02 +yO4CsTKfIRP3PzP8+R/J43VRX5AlhC4/rLlPLgStUK6rBAA5Zwn9YfVSdFGNnlSQ +PIpekuhnUmFFEoPz5T3/ +=NF0g -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/files/libreoffice-4.3.5.2-DPI.patch b/app-office/libreoffice/files/libreoffice-4.3.5.2-DPI.patch new file mode 100644 index 000000000000..0ec73faceeb3 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-4.3.5.2-DPI.patch @@ -0,0 +1,51 @@ +From 1964870db4ad1e4334e8fc5050795469dc1fb05e Mon Sep 17 00:00:00 2001 +From: Giuseppe Bilotta +Date: Tue, 9 Sep 2014 21:34:45 +0200 +Subject: [PATCH] Fallback DPI detection on X11 + +When the Xft.dpi setting is not found, and if only one screen is +available, fall back to detecting the screen DPI from the reported +resolution and monitor size. + +Change-Id: I1481d94b5dc4072c1f8da4659a221dfc7971080b +Reviewed-on: https://gerrit.libreoffice.org/11377 +Reviewed-by: Chris Sherlock +Tested-by: Chris Sherlock +--- + vcl/unx/generic/app/saldisp.cxx | 20 +++++++++++++++++++- + 1 file changed, 19 insertions(+), 1 deletion(-) + +diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx +index 7c97a24..ee6aad7 100644 +--- a/vcl/unx/generic/app/saldisp.cxx ++++ b/vcl/unx/generic/app/saldisp.cxx +@@ -569,7 +569,25 @@ void SalDisplay::Init() + } + if( bExactResolution == false ) + { +- aResolution_ = Pair( 96, 96 ); ++ /* if Xft.dpi is not set, try and find the DPI from the ++ * reported screen sizes and resolution. If there are multiple ++ * screens, just fall back to the default 96x96 ++ */ ++ long xDPI = 96; ++ long yDPI = 96; ++ if (m_aScreens.size() == 1) { ++ xDPI = (long)round(DisplayWidth(pDisp_, 0)*25.4/DisplayWidthMM(pDisp_, 0)); ++ yDPI = (long)round(DisplayHeight(pDisp_, 0)*25.4/DisplayHeightMM(pDisp_, 0)); ++ // if either is invalid set it equal to the other ++ if (!sal_ValidDPI(xDPI) && sal_ValidDPI(yDPI)) ++ xDPI = yDPI; ++ if (!sal_ValidDPI(yDPI) && sal_ValidDPI(xDPI)) ++ yDPI = xDPI; ++ // if both are invalid, reset them to the default ++ if (!sal_ValidDPI(xDPI) && !sal_ValidDPI(yDPI)) ++ xDPI = yDPI = 96; ++ } ++ aResolution_ = Pair( xDPI, yDPI ); + } + + nMaxRequestSize_ = XExtendedMaxRequestSize( pDisp_ ) * 4; +-- +2.3.0 + diff --git a/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch b/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch new file mode 100644 index 000000000000..2833385a1adf --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch @@ -0,0 +1,40 @@ +From 623b38fa5769f8cdec10b54b2a600bc4c4e077e6 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Sun, 11 Jan 2015 13:08:37 +0100 +Subject: OSL_ENSURE was not declared in this scope + +Change-Id: I426c0feee7b76fe02473e07fa209a61967af3e99 + +diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx +index 86986fc..df4a63f 100644 +--- a/tubes/source/conference.cxx ++++ b/tubes/source/conference.cxx +@@ -248,7 +248,7 @@ static void channel_closed_cb( TpChannel *channel, gpointer user_data, GObject * + + void TeleConference::setChannel( TpAccount *pAccount, TpDBusTubeChannel* pChannel ) + { +- OSL_ENSURE( !mpChannel, "TeleConference::setChannel: already have channel"); ++ SAL_WARN_IF( mpChannel, "tubes", "TeleConference::setChannel: already have channel"); + if (mpChannel) + g_object_unref( mpChannel); + if (mpAccount) +@@ -297,7 +297,7 @@ bool TeleConference::offerTube() + { + INFO_LOGGER( "TeleConference::offerTube"); + +- OSL_ENSURE( mpChannel, "TeleConference::offerTube: no channel"); ++ SAL_WARN_IF( !mpChannel, "tubes", "TeleConference::offerTube: no channel"); + if (!mpChannel) + return false; + +@@ -319,7 +319,7 @@ bool TeleConference::setTube( GDBusConnection* pTube) + { + INFO_LOGGER( "TeleConference::setTube"); + +- OSL_ENSURE( !pImpl->mpTube, "TeleConference::setTube: already tubed"); ++ SAL_WARN_IF( pImpl->mpTube, "tubes", "TeleConference::setTube: already tubed"); + + pImpl->mpTube = pTube; + +-- +cgit v0.10.2 diff --git a/app-office/libreoffice/libreoffice-4.2.9999.ebuild b/app-office/libreoffice/libreoffice-4.2.9999.ebuild index 684f99676f59..77d11f81e3db 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-2015 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.33 2015/02/08 18:53:59 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild,v 1.34 2015/02/08 22:42:18 dilfridge Exp $ EAPI=5 @@ -26,7 +26,7 @@ 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" +[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3" 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 @@ -313,12 +313,10 @@ src_unpack() { 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_CHECKOUT_DIR="${WORKDIR}/${P}" + [[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}" EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}" - EGIT_NOUNPACK="true" - git-2_src_unpack + git-r3_src_unpack if [[ ${mod} != core ]]; then mod2=${mod} # mapping does not match on help @@ -328,7 +326,7 @@ src_unpack() { rm -rf "${WORKDIR}/${PN}-${mod}-${PV}" fi done - unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH + unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH fi } diff --git a/app-office/libreoffice/libreoffice-4.3.9999.ebuild b/app-office/libreoffice/libreoffice-4.3.9999.ebuild index 761f70ab641e..5897b0ac82d7 100644 --- a/app-office/libreoffice/libreoffice-4.3.9999.ebuild +++ b/app-office/libreoffice/libreoffice-4.3.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild,v 1.12 2015/02/08 18:53:59 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild,v 1.13 2015/02/08 22:42:18 dilfridge Exp $ EAPI=5 @@ -26,7 +26,7 @@ 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" +[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3" 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 @@ -252,6 +252,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.3.4.1-boost-1.56.0.patch" # bug 522178 "${FILESDIR}/${PN}-4.3.5.2-system-opencollada.patch" "${FILESDIR}/${PN}-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch" + "${FILESDIR}/${PN}-4.3.5.2-DPI.patch" # from master branch @@ -325,12 +326,10 @@ src_unpack() { 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_CHECKOUT_DIR="${WORKDIR}/${P}" + [[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}" EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}" - EGIT_NOUNPACK="true" - git-2_src_unpack + git-r3_src_unpack if [[ ${mod} != core ]]; then mod2=${mod} # mapping does not match on help @@ -340,7 +339,7 @@ src_unpack() { rm -rf "${WORKDIR}/${PN}-${mod}-${PV}" fi done - unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH + unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH fi } diff --git a/app-office/libreoffice/libreoffice-4.4.0.3.ebuild b/app-office/libreoffice/libreoffice-4.4.0.3.ebuild new file mode 100644 index 000000000000..a6bb3ddfb442 --- /dev/null +++ b/app-office/libreoffice/libreoffice-4.4.0.3.ebuild @@ -0,0 +1,604 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.0.3.ebuild,v 1.1 2015/02/08 22:42:18 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 multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic ${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+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )" +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 coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer ++gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc" + +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 ~x86 ~amd64-linux ~x86-linux" +# temporarily +COMMON_DEPEND=" + ${PYTHON_DEPS} + app-arch/zip + app-arch/unzip + >=app-text/hunspell-1.3.2-r3 + app-text/mythes + >=app-text/libabw-0.1.0 + >=app-text/libexttextcat-3.2 + >=app-text/libebook-0.1.1 + >=app-text/libetonyek-0.1.1 + app-text/liblangtag + >=app-text/libmspub-0.1.0 + >=app-text/libmwaw-0.3.4 + >=app-text/libodfgen-0.1.0 + app-text/libwpd:0.10[tools] + app-text/libwpg:0.3 + >=app-text/libwps-0.3.0 + >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] + >=dev-cpp/clucene-2.3.3.4-r2 + =dev-cpp/libcmis-0.5* + dev-db/unixODBC + >=dev-libs/boost-1.55:= + dev-libs/expat + >=dev-libs/hyphen-2.7.1 + >=dev-libs/icu-4.8.1.1:= + >=dev-libs/liborcus-0.7.0 + >=dev-libs/librevenge-0.0.1 + >=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/glew-1.10 + >=media-libs/harfbuzz-0.9.18:=[icu(+)] + media-libs/lcms:2 + >=media-libs/libpng-1.4 + >=media-libs/libcdr-0.1.0 + >=media-libs/libfreehand-0.1.0 + media-libs/libpagemaker + >=media-libs/libvisio-0.1.0 + >=net-misc/curl-7.21.4 + net-libs/neon + 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 + virtual/glu + virtual/opengl + bluetooth? ( net-wireless/bluez ) + coinmp? ( sci-libs/coinor-mp ) + collada? ( >=media-libs/opencollada-1.2.2_p20150207 ) + cups? ( net-print/cups ) + dbus? ( >=dev-libs/dbus-glib-0.92 ) + eds? ( gnome-extra/evolution-data-server ) + firebird? ( >=dev-db/firebird-2.5 ) + gltf? ( media-libs/libgltf ) + 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 ) + 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 + ) +" + +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:= + media-libs/glm + 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 + virtual/pkgconfig + 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}-4.4-system-pyuno.patch" + + # from master branch + "${FILESDIR}/${PN}-4.4.0.3-telepathy-build-fix.patch" +) + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + bluetooth? ( dbus ) + collada? ( gltf ) + 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) + + if use collada; then + export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser" + export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser" + fi + + # 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 pyuno/source/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 + + # 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-{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-neon \ + --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=$(makeopts_jobs) \ + --with-system-ucpp \ + --with-vendor="Gentoo Foundation" \ + --with-x \ + --without-fonts \ + --without-myspell-dicts \ + --without-help \ + --with-helppack-integration \ + --without-sun-templates \ + $(use_enable bluetooth sdremote-bluetooth) \ + $(use_enable coinmp) \ + $(use_enable collada) \ + $(use_enable cups) \ + $(use_enable debug) \ + $(use_enable dbus) \ + $(use_enable eds evolution2) \ + $(use_enable firebird firebird-sdbc) \ + $(use_enable gltf) \ + $(use_enable gnome gconf) \ + $(use_enable gnome gio) \ + $(use_enable gnome lockdown) \ + $(use_enable gstreamer gstreamer-1-0) \ + $(use_enable gtk) \ + $(use_enable gtk3) \ + $(use_enable kde kde4) \ + $(use_enable mysql ext-mariadb-connector) \ + $(use_enable odk) \ + $(use_enable postgres postgresql-sdbc) \ + $(use_enable telepathy) \ + $(use_enable vlc) \ + $(use_with coinmp system-coinmp) \ + $(use_with collada system-opencollada) \ + $(use_with gltf system-libgltf) \ + $(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} + bashcomp_alias \ + libreoffice \ + unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice + rm -rf "${ED}"/etc/ || die + + if use branding; then + insinto /usr/$(get_libdir)/${PN}/program + newins "${WORKDIR}/branding-sofficerc" sofficerc + dodir /etc/env.d + echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} + fi + + # 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/ + + # FIXME: Hack add missing file + insinto /usr/$(get_libdir)/${PN}/program + doins "${S}"/instdir/program/libsaxlo.so + + 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.4.9999.ebuild b/app-office/libreoffice/libreoffice-4.4.9999.ebuild index d384f8f4dcac..3aea647b469c 100644 --- a/app-office/libreoffice/libreoffice-4.4.9999.ebuild +++ b/app-office/libreoffice/libreoffice-4.4.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.9999.ebuild,v 1.2 2015/02/08 18:59:16 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.9999.ebuild,v 1.3 2015/02/08 22:42:18 dilfridge Exp $ EAPI=5 @@ -26,7 +26,7 @@ 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" +[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3" inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic ${SCM_ECLASS} unset SCM_ECLASS @@ -243,6 +243,9 @@ DEPEND="${COMMON_DEPEND} PATCHES=( # not upstreamable stuff "${FILESDIR}/${PN}-4.4-system-pyuno.patch" + + # from master branch + "${FILESDIR}/${PN}-4.4.0.3-telepathy-build-fix.patch" ) REQUIRED_USE=" @@ -311,12 +314,10 @@ src_unpack() { 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_CHECKOUT_DIR="${WORKDIR}/${P}" + [[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}" EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}" - EGIT_NOUNPACK="true" - git-2_src_unpack + git-r3_src_unpack if [[ ${mod} != core ]]; then mod2=${mod} # mapping does not match on help @@ -326,7 +327,7 @@ src_unpack() { rm -rf "${WORKDIR}/${PN}-${mod}-${PV}" fi done - unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH + unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH fi } diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 066a387e22d3..ce6bccb982bc 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v 1.26 2015/02/08 18:59:16 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v 1.27 2015/02/08 22:42:18 dilfridge Exp $ EAPI=5 @@ -26,7 +26,7 @@ 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" +[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3" inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic ${SCM_ECLASS} unset SCM_ECLASS @@ -311,12 +311,10 @@ src_unpack() { 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_CHECKOUT_DIR="${WORKDIR}/${P}" + [[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}" EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}" - EGIT_NOUNPACK="true" - git-2_src_unpack + git-r3_src_unpack if [[ ${mod} != core ]]; then mod2=${mod} # mapping does not match on help @@ -326,7 +324,7 @@ src_unpack() { rm -rf "${WORKDIR}/${PN}-${mod}-${PV}" fi done - unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH + unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH fi } -- 2.26.2