diff options
Diffstat (limited to 'app-office/libreoffice')
19 files changed, 0 insertions, 2590 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest deleted file mode 100644 index 18cf6fb..0000000 --- a/app-office/libreoffice/Manifest +++ /dev/null @@ -1,33 +0,0 @@ -AUX Make-the-SAL_STREAM-thing-compile.patch 919 SHA256 c5bbc809fa159db87330576727fe1da13fba5f6cf27e5f5e89cdb82f9cbd3891 SHA512 c865c25c85567a96068747f2331817193de03326f0d56b740351d5c93dcc54986bb2ec897ea859d749ca9f12ce131d9b7a5a07a65d5a3f13e318ca75d58de91f WHIRLPOOL 76438d501bbc3d5816c0479125d7357680d07c4a3ce7f374fff65355827955bdaec3083a60e56654e515593c43928f162702239a2ba25d797d76094b34522bd9 -AUX Nah-we-still-need-the-dynamic_cast.patch 997 SHA256 55a5ff9b8f877fe522c27c1f8db0a93202030412be8cc2087026bd74753c4410 SHA512 9047f3c6d3530c02a8f3d924b48daf77dc9d0d04d5f219bbf1e7c83b4a2a2d8d47f0d4815364dd0e8aef32fcdb2fa25b13d190a283164ee28205b84052874544 WHIRLPOOL d6c836862ff97ef0dca0394105735d6236a6f2411acb0d29389dc948279640ac01ff5b8aadea0d2a89cbdac30d4c0ea4f25c32208b0755857e5d7098ebfe848c -AUX No-need-for-a-buggy-rewrite.patch 1867 SHA256 188cd24434f7dad88d49f2d62324be641e4d6beb9613f55099b2c88b3746518b SHA512 1c322d5aa21adb72a66d53a2d739f19e8bdab02c4e05cdcec1db574414c2e9a1014f80eb84c854d29398447a93c4b41f7150e0e12b920d4afdaa87b93060ca11 WHIRLPOOL c9913b9cb517d418fbdf4d8f78f5530287c0105251659af80d818a387456fe0c2a7ea20c49ffdf6817f974e48864ffbe80eef09529f12ff98c240b2f9a4c8115 -AUX cppcheck-fix-duplicateExpression.patch 1119 SHA256 0b9e4f5d37d1ad8c43f94df395f4011fab03a759d127a67a8b895c66d3b36f33 SHA512 cbc230442e283e814283be39c8ae150ddaff76db2d6ce13887f6f9fef3766de472ede7d7d22fe26b9b40ed0bb1e4b23a8429c16abb17a007a6557c4248aaf391 WHIRLPOOL fa8ce9b6937d5ad6bcf75cc20713f0739a73c2a04bf11f1e1d10abe4d2c4e19d8d68ce172abbddac4546ef1b0af1a3da3dae5eb61f92bf4c5d9d4469173fd193 -AUX disable-uno-test.patch 340 SHA256 6a1ba7096375416b5ebee4253bdfd1445f5072f3377455d57a33232b1b4887b0 SHA512 b647d6a87a5cae253400e086a53eda139bd9c5a2affc0ead4613e16c67cf1ff6ca5b6ac863a3951c7e13a559383b1f025c0e170a9e0a0618625289d3fc91b541 WHIRLPOOL 32aaeca9098749c94bb2f671c36bf7227406b6a221eb8d252826e64fff9b7a83cd72b27f04369d458b4de7c2552fd147dfc5e9c0036e3a9770c52e2ea15f8acc -AUX eliminate-type-ambiguity-for-std-accumulate.patch 1617 SHA256 eace41e236379c320f940b76c84b7e612f694d2d1c779432261d78d39b2aff32 SHA512 e53a0dc05011373806fe3b60a832ce8375de23f9ecb5b15c2699cb0e4e0bd6a6f8a2ea4bc79c065a54274c9ea236c322621b0a4173ad0adebbe4b30c30d9c668 WHIRLPOOL 2011fb1b291a49af71b031d78f9a7a23da302dff289ab2c9b0d478e03ff171090807df83b4a1a480fd2a5657f2f749be9b42d09aec650513e950757603a9b26d -AUX fake-exception-name2.patch 1651 SHA256 f21083cae202e59a87c0c8f4b747e6c254fa16719d0db52cd8b39c526b55db77 SHA512 155dc573a097f66d742231be55eddab38c0beb6a342d95abe61d94a31516fdd3b3db2fe55e520089cf43fbd7cf3bafce74105eca0d1c23b78503ae4dc9b004d2 WHIRLPOOL 380c5dd4daa626e273e40138a2e30ca516afd17b05bb80d9e021dd436803765285c37c0d5ad26aa7e75119ea73b7d726bbd8167da9e74d828fce19246d871c3c -AUX i122208-replace-the-binaryurp-cache.patch 8403 SHA256 e726928abc300cea245746823fc0c95ed198a758d591c3210a052887f8c7dcaf SHA512 9bbec361401d7560ccb09f11ee70c67a16065ba8fc5426073387e10bfe67f0e0dc0b3be75b181474d5ff018d3fa0a17d67d0fc6542fd484444abebbd525ec7b5 WHIRLPOOL 3b34abb7e79aa70fd1bc40864f62cf483b538521baa5e65fafb74304d02553a040ee92e3e61ecc4e7ca461f9489cbf496d677dc30f9526f2cfb470cecfcc4227 -AUX libreoffice-3.7-separate-checks.patch 1554 SHA256 d1128006f0e49cd0262a3c8e5f5251160929282cf65a5b560cde637346f7b724 SHA512 23f2d9587f5fdcfb1b59e9629d373b870a838003265cd48d88d1c6450e6d7e7bbb40df2b2ffc01efbe3cf14b9c5702174782797cfda152b7fcaa89eac7606314 WHIRLPOOL 0a3fe76cc8034a705a55886ac65242f3aa03a27d6905b7b1599295b97720321760884c2d2dedd6749d87dea9c769e34ade5f686e3c7e7d89900bec358f46ca04 -AUX libreoffice-3.7-system-pyuno.patch 1642 SHA256 191d2462c13947d63a3f2758ec26b4b5b7765d06f0454add1c471e9dccfa9016 SHA512 76d0b836f2b26c9cd3a0ad2b471d033c863ffc1eb593f28f1ebecaae30f205adb97b4b0a63483f93d2f32d5934480f580776e1ce83baf77e5bedee759112fb8d WHIRLPOOL efada275cfa123b2f3fd96a20057fab5a8f83c50e0d401df1af76d1eb017e5c7ceb74d0a5d8fd77352379be4a69b67f22d99a072213b5644012094a31f353da0 -AUX libreoffice-4.1.0.4-neon-build.patch 1953 SHA256 c54c39eab184d7507d22f83769185f0c174a90589baa36fbd6a6474d14349a21 SHA512 0074a85db007e36e80319882a45cb3cc756038e66be5be69af73f4f86f8e49b5ced46d28574b3daa126ed66cb1908fd80d803274e083cbd5b79590c5ab3271c6 WHIRLPOOL b9ca8b66d19a27d0c8359ffb3ba77b1dc035ccae7acd4aef2a11ab32830a48197f4fc217cb3f15be35f0fc2a0e61feebd13dc1cbc5ca7359f94d39cdf06fa37b -AUX libreoffice-4.1.2.2-idfattrib.patch 1086 SHA256 b41b26e4e8365fca2c8e07bd7d4bf3259d86bfe6e3bb2aef586892660681ffb1 SHA512 59ad9d8301cce1a0e2eca3bd30b3896c1c1c65e6c2583fcf5d3a64385c043629bbb4634ee2e1b47296b03ad8400fc550fd552fa52a08cfffe851e2535dac5a0b WHIRLPOOL ba25852dd1fbff85bc7e4efad72be1d7aed596f91fa1c07af9a0224c755f64c8cd437b8beb1e4b8a3d45860347ebaf68709d0b0a69bfc820216ad43817831d6c -AUX stop-messing-with-stdlib-internals.patch 2772 SHA256 b62a948fac70a7ec446118cbe1e7256a0e0a500ea38cd513480fc5193395ede2 SHA512 f15fcbcaff056d2ce386c5650335f29cfbbd8c69f006b25f694e728b3cf9a68d631ad6a6bd69948f664a20605303e02c78263d1486538b9c18909260d3a0ee50 WHIRLPOOL 332066773155cb0d6df1eff1f86595af254d954d365fa353154b509ccfc2685e9aebd231d79cc653714a582f08950b83c2f2df45dbee983d5dc3109112ad93f7 -AUX stop-messing-with-stdlib-internals2.patch 3239 SHA256 699808f5d926f721272a7d95b0285f5b1625976f7eeb5a6dc5f3de7f643a715a SHA512 406409fa02f611570f9edffabad4c1eb28df669d97437919f5a57967a562c9b3ca495d873610e311740bfe1aaebea3db445aa4b4c4e1f28bcf4f4d3e91adb988 WHIRLPOOL aa7807e8e27024297612e85f26161eb24896b173226618a63b6528f751a8ad2ab8f60ba1e704e586178e067a2bad2c6a4e2df114a4bd9896743a22f48ac780fe -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 -DIST 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1652670 SHA256 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a SHA512 5664203e6426880041cdb227e91f79f00d2ca7ae28c6997f61b72cc599aac55838d082d2b2b551bd7a228424c350ddea5d41599b8ca58d444a2cd46c9206ea91 WHIRLPOOL 6486c48b73a4f79760b443cfd397b704eca0fd32b72304ae7e7cfa0f43583b0af15c7384548b5215ae57513ed8366c8f3a74630ab466ba19a63b346af8c5eaca -DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 SHA256 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a WHIRLPOOL a5156d06323699d2cbf539f14f5f44f54ebf33e86c7f14e98acd4c6e29c3e496f91dd6792401148ffa32e3dcb1cd4f087ed804e306b241cef86de0aa347d25d4 -DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f WHIRLPOOL 8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4 -DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c -DIST ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz 12735186 SHA256 dc6445d2c0445e5536010b80bd811adda6741ed82b288fe831d5be9902457941 SHA512 a8c39d205051a8f8abaecb7a6fdc0c2c37baf5eee2a082af8819555f442dab525649b86cae569048357eb1e6e651deff4b62183de417e15b403e1ac09c40ba7b WHIRLPOOL fd9b6bbd214113334d3d5e542bbc9b70d5a9505281454e7f4447c6c73af733e10b007a2d4225acb39db0fc17401c2ae36b6628c59d31f09bec485f4cfc009eb5 -DIST libreoffice-4.0.4.2.tar.xz 104213468 SHA256 5336734757f721139d6615eefed0249be1461e428e2e64f592ce3c36a661b154 SHA512 4d9c14df08e713b7928660983243354afa524f0f24b9c6b7b40f4711396418d960103519851f3dbc4288576ec7276d4c8acfd1d5bb60a2663a663f008f274596 WHIRLPOOL e432c4a6b6a27a621578154aff607a077e8f1ae32743d3ea45565b0e5d08a1b57b975c631c807c3fb496b4e88a0859a3c2bd0dac60b80dc2ccdc6452a8808a5a -DIST libreoffice-4.1.2.2.tar.xz 121772464 SHA256 a8e88b511575efbf5e30cc356e4de6c2a5d8578815c1ff316208a64a1f9a43e0 SHA512 e161bd203e96adc7d0499f1a6bb5537db887e5266013f4cc608778c8c9da8bf9f8ebaf8c58ae871cadb06160e15664d9f29d5be348a5b4d7300df07695dbd260 WHIRLPOOL 5cbdd2a8afd72851383ac907f9510d54472a3a09cf2a4d6089ab8970fef5ddd740a1fbf8bb46c915eba88cb3d5ae0b946b9512c0abee84d485cdb9a1eaf75324 -DIST libreoffice-4.1.2.3.tar.xz 121781100 SHA256 29ee22adeb46333d86e5f621ceccfc66119b0c066cb20562303f1a7733a459f0 SHA512 7732fdc77cad442c0113c663d76da09dc36926c70c992a8afb625fe5658f7e2495ceaa10ce7d7d75ebadb4e7819d5cc17e3f9eeac9059647419a8c187f10ce60 WHIRLPOOL 87a78dbd45557a80309dc9af2d9c24e1687c0565163d5a8dda78c7ef06e4a93a3f4b01e4b92768142b3f1cec2b03408a882ecce20a359c9154f4f4dd04604a51 -DIST libreoffice-branding-gentoo-0.7.tar.xz 72556 SHA256 57912157fe8874f9d628dd971cb68941ad605f2d8beba05327e7ce7a721080be SHA512 fdfd8190c1155e95a8874f07d6893d94e28dd7482b195e22f704f4b1621ef76ee99e5ae1fcdb41c392d2e37e05da32830c42d47b4e62e14a9526d67ffd2d279f WHIRLPOOL 6c1886dfc31b918180b78797a41c0dff042ef4ddab50f284d9f9ee7aca7733dc73795dcad35262cf6c5608a5f99cf8d85a3a0d23316e15bb6650bdc437a4226b -DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538 -DIST libreoffice-help-4.0.4.2.tar.xz 1855588 SHA256 9d7f732760b24b6916266903913d7684d9b933640174b1e041d729914beb5a4e SHA512 848329df801dfba2b06006325371e7a51354bebe0e99ba98aca14d3e3882de0ccde902b440cb1e47984585350f7e4f48b779b36281d9844251e802245633bd30 WHIRLPOOL a7048fbddaa81eb0c97f86902054195c66f84babe42ac1e088338ba019b07283a9049b70554800224ad50ee9097b2e57b4493527177a9599d9251c42894da20f -DIST libreoffice-help-4.1.2.2.tar.xz 1847828 SHA256 bd9d53a76e460f5d17ab8be230bfb48fea7f63a1e3178fec9cbe3702f4741f2a SHA512 0c8fa862bcf6e59036d2a1420cb2c245e2fe134a9e21130e04f1e5fdf7c1071a8ee1e26a3033e68abd3e15412a17759ba52aa70ee3d4a0178017ff6d25086ed3 WHIRLPOOL e271ff2f217714fc11625040d474c16739fad33469abc14192180d92c18c289243dc5615f438f8713851daff5c038ff49384aec84e08fe0ea350519edc28c9a7 -DIST libreoffice-help-4.1.2.3.tar.xz 1847696 SHA256 97724d05de5e8d22a3c248c0900d35031e9bd7757476c02b561e15e122822fe9 SHA512 76d178890bf28d47418123e0d6a3da6d5171af489e3fcf8df911df2fdbb8919407ab961f8ebffb7200ccee6da693f4258dc58fd7130bfe40e73ac349a5024bad WHIRLPOOL fcbc6c9ada537587d9ca93d48ca9453f1ea1f00bc838cbd3e18b436e8ffe24b1f08e2a3abd087e6aa9d616faac2cf58a69913cbf5b6211af4ec9b51107480bbb -EBUILD libreoffice-4.0.4.2.ebuild 17574 SHA256 e3ecc2b8082aedfc973917d290289c220e9ea2c9b629367bb5d6a94f6038d8dc SHA512 dc97d984260f657f6bebbf0f2fd0bf26611746381a00d68fcc118481ba438cdd16ca5b12f92648978eb486940a45d0858af2a1111cfb1a6957bd71b16e13a999 WHIRLPOOL 9d0fa5e6e6bd772d9cfc99c41e4bd38f33cef0ee66a84fcfb7b06c65a43ab71adcd2b5cb5b64148e78b7c18a66e81531ff8212f5094547a7f3c38993ee92e882 -EBUILD libreoffice-4.1.2.2-r1.ebuild 18069 SHA256 0660b6e0dcab37815d7a6ea3a9bb33cce26cdc2d295f3f5c12b0d6cc36c2dff5 SHA512 b85db9f241ecbf68a2827537e1e78ef8da210a6aed0cc059aeac452d776d32c304c10701cd6bab04f4e3a3f856b1e9abfc3db680421b65c404fcb27f036197fc WHIRLPOOL ce2e6e3eeaa24a53b8503dd3b6b8db28cc4f61db5c093508693747e2d353d24fdd5a500eb68f82121becb6119971c9430627096f1487861aba3b1150fb3ae3d4 -EBUILD libreoffice-4.1.2.3.ebuild 18016 SHA256 31defb7e0f35a2d8461ac035857457c07e65aa95e5881e0a9e5f337b08a57e66 SHA512 b071609f1a08b383ab5b9688c6b26b172cc0283f6dd2cf968f8248ac765c8eee20ff41fd41bdcf5849160f97d16b781730c9eee9f2b2c8d8281d0cdf6fe2a0ae WHIRLPOOL a64e069af4458c93d4ec32483a13a747f101c4d8d6c3b9c795443c4340a40326bb6c47e963a5136a7a1109710721e1d641b48e255634973caae6e49c164ef9f2 -MISC metadata.xml 1146 SHA256 3843bebbfd99d50aace09728a59b120493877fb4955e8593a06c80a8948c82ad SHA512 4922de602185c8e7e6c6e163d4c4afac09a0172f9c7816248478574d675cc3b389405a0ca32ebff4dd30d1f6515f86b94813d6e794435f5c7c18b8295b64f816 WHIRLPOOL 30619f4e9983ce11ce7a82352c1efa2c2308fb9c74a945a0c1385f42d341a8f1556b33c587a3e3f3942eaa07745abf5836aaa3ed28d30085db7048284f0e49c9 diff --git a/app-office/libreoffice/files/Make-the-SAL_STREAM-thing-compile.patch b/app-office/libreoffice/files/Make-the-SAL_STREAM-thing-compile.patch deleted file mode 100644 index 8dab36b..0000000 --- a/app-office/libreoffice/files/Make-the-SAL_STREAM-thing-compile.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 691b6ea8e100fc55f0ff70a82511722733113a07 Mon Sep 17 00:00:00 2001 -From: Tor Lillqvist <tml@iki.fi> -Date: Tue, 28 May 2013 05:43:57 +0000 -Subject: Make the SAL_STREAM thing compile with clang++ -std=c++11 -stdlib=libc++ - -Avoid error: dynamic_cast from rvalue to reference type -'::std::ostringstream &'. - -Change-Id: If5ba1ee79616e81b12f9db67c61b4f085b30a08e ---- -(limited to 'include/sal/log.hxx') - -diff --git a/include/sal/log.hxx b/include/sal/log.hxx -index 80721d0..ca3bb5e 100644 ---- a/include/sal/log.hxx -+++ b/include/sal/log.hxx -@@ -158,8 +158,7 @@ inline char const * unwrapStream(SAL_UNUSED_PARAMETER StreamIgnore const &) { - @since LibreOffice 3.5 - */ - #define SAL_STREAM(stream) \ -- (dynamic_cast< ::std::ostringstream & >(::std::ostringstream() << stream). \ -- str()) -+ (::std::ostringstream() << stream).str() - - /** - @page sal_log Basic logging functionality. --- -cgit v0.9.0.2-2-gbebe diff --git a/app-office/libreoffice/files/Nah-we-still-need-the-dynamic_cast.patch b/app-office/libreoffice/files/Nah-we-still-need-the-dynamic_cast.patch deleted file mode 100644 index 47e016e..0000000 --- a/app-office/libreoffice/files/Nah-we-still-need-the-dynamic_cast.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b2a50c70072d55d0055d41e6862138a6a06cb08d Mon Sep 17 00:00:00 2001 -From: Tor Lillqvist <tml@iki.fi> -Date: Tue, 28 May 2013 06:12:27 +0000 -Subject: Nah, we still need the dynamic_cast in SAL_STREAM for gcc/libstdc++ - -Not sure if MSVC would accept also the simpler thing, but anyway, the -dynamic_cast works for it, too. - -Change-Id: I2dfa1e70b75bc17d38b5e95be0a0f1dd66767bf1 ---- -(limited to 'include/sal/log.hxx') - -diff --git a/include/sal/log.hxx b/include/sal/log.hxx -index ca3bb5e..23ea6f3 100644 ---- a/include/sal/log.hxx -+++ b/include/sal/log.hxx -@@ -157,8 +157,13 @@ inline char const * unwrapStream(SAL_UNUSED_PARAMETER StreamIgnore const &) { - - @since LibreOffice 3.5 - */ -+#ifdef _LIBCPP_VERSION - #define SAL_STREAM(stream) \ - (::std::ostringstream() << stream).str() -+#else -+#define SAL_STREAM(stream) \ -+ (dynamic_cast< ::std::ostringstream & >(::std::ostringstream() << stream).str()) -+#endif - - /** - @page sal_log Basic logging functionality. --- -cgit v0.9.0.2-2-gbebe diff --git a/app-office/libreoffice/files/No-need-for-a-buggy-rewrite.patch b/app-office/libreoffice/files/No-need-for-a-buggy-rewrite.patch deleted file mode 100644 index 51a4367..0000000 --- a/app-office/libreoffice/files/No-need-for-a-buggy-rewrite.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 12dc490c3af9ec0f34b513609f3b14effd5a2906 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <sbergman@redhat.com> -Date: Fri, 14 Jun 2013 12:18:11 +0000 -Subject: No need for a buggy rewrite - -... see 08bb8fca4144608237418d64b1479840c408256f "#i122208# replace the -binaryurp cache for improved C++ compatibility" and -059f041dfdffe0630ec573fb444c51cc463b90b1 "cppcheck: fix duplicateExpression," -when the only improvement is to not needlessly acquire/release raw rtl_uString -instances. - -Change-Id: I734304b231d69f8089cbf1d35a3deda75f771c78 ---- -(limited to 'binaryurp/source') - -diff --git a/binaryurp/source/lessoperators.cxx b/binaryurp/source/lessoperators.cxx -index 3a515f5..6d8952d 100644 ---- a/binaryurp/source/lessoperators.cxx -+++ b/binaryurp/source/lessoperators.cxx -@@ -32,16 +32,14 @@ - - namespace com { namespace sun { namespace star { namespace uno { - --bool operator<( const TypeDescription& rLeft, const TypeDescription& rRight) { -- assert( rLeft.is() && rRight.is()); -- const typelib_TypeDescription& rA = *rLeft.get(); -- const typelib_TypeDescription& rB = *rRight.get(); -- if( rA.eTypeClass != rB.eTypeClass) -- return (rA.eTypeClass < rB.eTypeClass); -- const sal_Int32 nCmp = rtl_ustr_compare_WithLength( -- rA.pTypeName->buffer, rA.pTypeName->length, -- rB.pTypeName->buffer, rB.pTypeName->length); -- return (nCmp < 0); -+bool operator <(TypeDescription const & left, TypeDescription const & right) { -+ assert(left.is() && right.is()); -+ typelib_TypeClass tc1 = left.get()->eTypeClass; -+ typelib_TypeClass tc2 = right.get()->eTypeClass; -+ return tc1 < tc2 || -+ (tc1 == tc2 && -+ (OUString::unacquired(&left.get()->pTypeName) < -+ OUString::unacquired(&right.get()->pTypeName))); - } - - bool TypeDescEqual::operator()( const TypeDescription& rLeft, const TypeDescription& rRight) const --- -cgit v0.9.0.2-2-gbebe diff --git a/app-office/libreoffice/files/cppcheck-fix-duplicateExpression.patch b/app-office/libreoffice/files/cppcheck-fix-duplicateExpression.patch deleted file mode 100644 index 4961156..0000000 --- a/app-office/libreoffice/files/cppcheck-fix-duplicateExpression.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 059f041dfdffe0630ec573fb444c51cc463b90b1 Mon Sep 17 00:00:00 2001 -From: Julien Nabet <serval2412@yahoo.fr> -Date: Thu, 13 Jun 2013 19:27:26 +0000 -Subject: cppcheck: fix duplicateExpression - -Change-Id: If3b7b1faab858afa82d4c665ee1a5036190e69aa -Reviewed-on: https://gerrit.libreoffice.org/4278 -Reviewed-by: Tomáš Chvátal <tchvatal@suse.cz> -Tested-by: Tomáš Chvátal <tchvatal@suse.cz> ---- -(limited to 'binaryurp/source') - -diff --git a/binaryurp/source/lessoperators.cxx b/binaryurp/source/lessoperators.cxx -index 55f3a49..3a515f5 100644 ---- a/binaryurp/source/lessoperators.cxx -+++ b/binaryurp/source/lessoperators.cxx -@@ -36,7 +36,7 @@ bool operator<( const TypeDescription& rLeft, const TypeDescription& rRight) { - assert( rLeft.is() && rRight.is()); - const typelib_TypeDescription& rA = *rLeft.get(); - const typelib_TypeDescription& rB = *rRight.get(); -- if( rA.eTypeClass != rA.eTypeClass) -+ if( rA.eTypeClass != rB.eTypeClass) - return (rA.eTypeClass < rB.eTypeClass); - const sal_Int32 nCmp = rtl_ustr_compare_WithLength( - rA.pTypeName->buffer, rA.pTypeName->length, --- -cgit v0.9.0.2-2-gbebe diff --git a/app-office/libreoffice/files/disable-uno-test.patch b/app-office/libreoffice/files/disable-uno-test.patch deleted file mode 100644 index 8e92728..0000000 --- a/app-office/libreoffice/files/disable-uno-test.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/libreoffice-4.1.0.1/testtools/Module_testtools.mk 2013-07-13 22:04:00.717824708 +0200 -+++ b/libreoffice-4.1.0.1/testtools/Module_testtools.mk 2013-07-13 22:03:17.520527883 +0200 -@@ -34,10 +33,6 @@ - )) - endif - --$(eval $(call gb_Module_add_check_targets,testtools,\ -- CustomTarget_uno_test \ --)) -- - endif - - # vim:set noet sw=4 ts=4: - diff --git a/app-office/libreoffice/files/eliminate-type-ambiguity-for-std-accumulate.patch b/app-office/libreoffice/files/eliminate-type-ambiguity-for-std-accumulate.patch deleted file mode 100644 index 49d9d19..0000000 --- a/app-office/libreoffice/files/eliminate-type-ambiguity-for-std-accumulate.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 982462ac5c6df0c85ba6a0b3fbdaa80b38a94882 Mon Sep 17 00:00:00 2001 -From: Herbert Dürr <hdu@apache.org> -Date: Tue, 16 Apr 2013 11:41:34 +0000 -Subject: eliminate type ambiguity for std::accumulate() invocation - -else clang/libc++ cannot decide between bool and a reference into a bit-vector -specialization - -(cherry picked from commit 6a88a21257124d953637c4b8ead9c9771e15b899) - -Change-Id: I694bbad82b1a05ebe86c5c941f3ac85c71f5fc9e ---- -(limited to 'slideshow/source/engine/activities/activitiesfactory.cxx') - -diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx -index 2354e51..530a8fe 100644 ---- a/slideshow/source/engine/activities/activitiesfactory.cxx -+++ b/slideshow/source/engine/activities/activitiesfactory.cxx -@@ -557,7 +557,7 @@ public: - // interpolate between nIndex and nIndex+1 values - (*mpAnim)( - getPresentationValue( -- accumulate( maValues.back(), -+ accumulate<ValueType>( maValues.back(), - mbCumulative ? nRepeatCount : 0, - maInterpolator( maValues[ nIndex ], - maValues[ nIndex+1 ], -@@ -577,7 +577,7 @@ public: - // this is discrete, thus no lerp here. - (*mpAnim)( - getPresentationValue( -- accumulate( maValues.back(), -+ accumulate<ValueType>( maValues.back(), - mbCumulative ? nRepeatCount : 0, - maValues[ nFrame ] ) ) ); - } --- -cgit v0.9.0.2-2-gbebe diff --git a/app-office/libreoffice/files/fake-exception-name2.patch b/app-office/libreoffice/files/fake-exception-name2.patch deleted file mode 100644 index 4889a0a..0000000 --- a/app-office/libreoffice/files/fake-exception-name2.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/libreoffice-4.1.0.1/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx 2013-07-13 22:34:02.259338619 +0200 -+++ b/libreoffice-4.1.0.1/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx 2013-07-13 22:33:59.621322848 +0200 -@@ -94,23 +94,25 @@ - #endif - - // example: N3com3sun4star4lang24IllegalArgumentExceptionE -+ //char const *p2 = "N3com3sun4star4lang24IllegalArgumentExceptionE"; -+ char const *p2 = "N3com3sun4star4lang24IllegalArgumentExcepti00E"; - - OUStringBuffer buf( 64 ); -- OSL_ASSERT( 'N' == *p ); -- ++p; // skip N -+ OSL_ASSERT( 'N' == *p2 ); -+ ++p2; // skip N - -- while ('E' != *p) -+ while ('E' != *p2) - { - // read chars count -- long n = (*p++ - '0'); -- while ('0' <= *p && '9' >= *p) -+ long n = (*p2++ - '0'); -+ while ('0' <= *p2 && '9' >= *p2) - { - n *= 10; -- n += (*p++ - '0'); -+ n += (*p2++ - '0'); - } -- buf.appendAscii( p, n ); -- p += n; -- if ('E' != *p) -+ buf.appendAscii( p2, n ); -+ p2 += n; -+ if ('E' != *p2) - buf.append( (sal_Unicode)'.' ); - } - -@@ -327,7 +329,8 @@ - } - - typelib_TypeDescription * pExcTypeDescr = 0; -- OUString unoName( toUNOname( header->exceptionType->name() ) ); -+ //OUString unoName( toUNOname( header->exceptionType->name() ) ); -+ OUString unoName( toUNOname( "N3Xom3sun4star4lang24UnknownArgumentExcepti01E" ) ); - #if OSL_DEBUG_LEVEL > 1 - OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() ); - diff --git a/app-office/libreoffice/files/i122208-replace-the-binaryurp-cache.patch b/app-office/libreoffice/files/i122208-replace-the-binaryurp-cache.patch deleted file mode 100644 index b334456..0000000 --- a/app-office/libreoffice/files/i122208-replace-the-binaryurp-cache.patch +++ /dev/null @@ -1,234 +0,0 @@ -From 08bb8fca4144608237418d64b1479840c408256f Mon Sep 17 00:00:00 2001 -From: Herbert Dürr <hdu@apache.org> -Date: Wed, 08 May 2013 17:26:08 +0000 -Subject: #i122208# replace the binaryurp cache for improved C++ compatibility - -Failing to instantiatie incomplete types like the Map::iterator in -binaryurp Cache's Entry members is allowed by the C++ standard. -The rewrite makes it more compliant with other C++ compilers/STLs. -And interesting alternative would be to use boost's multi_index_container. - -git-svn-id: http://svn.apache.org/repos/asf/openoffice/branches/rejuvenate01@1480367 13f79535-47bb-0310-9956-ffa450edef68 ---- -(limited to 'binaryurp/source') - -diff --git a/binaryurp/source/cache.hxx b/binaryurp/source/cache.hxx -index 05c0069..7e5ba89 100644 ---- a/binaryurp/source/cache.hxx -+++ b/binaryurp/source/cache.hxx -@@ -25,6 +25,7 @@ - #include <cassert> - #include <cstddef> - #include <map> -+#include <list> - - #include "boost/noncopyable.hpp" - #include "sal/types.h" -@@ -37,88 +38,57 @@ enum { size = 256, ignore = 0xFFFF }; - - } - --template< typename T > class Cache: private boost::noncopyable { -+template< typename T > class Cache : private boost::noncopyable { - public: -+ typedef sal_uInt16 IdxType; -+ - explicit Cache(std::size_t size): -- size_(size), first_(map_.end()), last_(map_.end()) -+ size_(size) - { - assert(size < cache::ignore); - } - -- sal_uInt16 add(T const & content, bool * found) { -- assert(found != 0); -- typename Map::iterator i(map_.find(content)); -- *found = i != map_.end(); -- if (i == map_.end()) { -- typename Map::size_type n = map_.size(); -- if (n < size_) { -- i = -- (map_.insert( -- typename Map::value_type( -- content, -- Entry( -- static_cast< sal_uInt16 >(n), map_.end(), -- first_)))). -- first; -- if (first_ == map_.end()) { -- last_ = i; -- } else { -- first_->second.prev = i; -- } -- first_ = i; -- } else if (last_ != map_.end()) { -- i = -- (map_.insert( -- typename Map::value_type( -- content, -- Entry(last_->second.index, map_.end(), first_)))). -- first; -- first_->second.prev = i; -- first_ = i; -- typename Map::iterator j(last_); -- last_ = last_->second.prev; -- last_->second.next = map_.end(); -- map_.erase(j); -- } else { -- // Reached iff size_ == 0: -- return cache::ignore; -- } -- } else if (i != first_) { -- // Move to front (reached only if size_ > 1): -- i->second.prev->second.next = i->second.next; -- if (i->second.next == map_.end()) { -- last_ = i->second.prev; -- } else { -- i->second.next->second.prev = i->second.prev; -- } -- i->second.prev = map_.end(); -- i->second.next = first_; -- first_->second.prev = i; -- first_ = i; -- } -- return i->second.index; -+ IdxType add( const T& rContent, bool* pbFound) { -+ assert( pbFound != NULL); -+ if( !size_) { -+ *pbFound = false; -+ return cache::ignore; -+ } -+ // try to insert into the map -+ list_.push_front( rContent); // create a temp entry -+ typedef std::pair<typename LruList::iterator, IdxType> MappedType; -+ typedef std::pair<typename LruItMap::iterator,bool> MapPair; -+ MapPair aMP = map_.insert( MappedType( list_.begin(), 0)); -+ *pbFound = !aMP.second; -+ -+ if( !aMP.second) { // insertion not needed => found the entry -+ list_.pop_front(); // remove the temp entry -+ list_.splice( list_.begin(), list_, aMP.first->first); // the found entry is moved to front -+ return aMP.first->second; -+ } -+ -+ // test insertion successful => it was new so we keep it -+ IdxType n = static_cast<IdxType>( map_.size() - 1); -+ if( n >= size_) { // cache full => replace the LRU entry -+ // find the least recently used element in the map -+ typename LruItMap::iterator it = map_.find( --list_.end()); -+ n = it->second; -+ map_.erase( it); // remove it from the map -+ list_.pop_back(); // remove from the list -+ } -+ aMP.first->second = n; -+ return n; - } - - private: -- struct Entry; -- -- typedef std::map< T, Entry > Map; -- -- struct Entry { -- sal_uInt16 index; -- typename Map::iterator prev; -- typename Map::iterator next; -- -- Entry( -- sal_uInt16 theIndex, typename Map::iterator thePrev, -- typename Map::iterator theNext): -- index(theIndex), prev(thePrev), next(theNext) {} -- }; -+ typedef std::list<T> LruList; // last recently used list -+ typedef typename LruList::iterator LruListIt; -+ struct CmpT{ bool operator()( const LruListIt& rA, const LruListIt& rB) const { return (*rA<*rB);}}; -+ typedef ::std::map< LruListIt, IdxType, CmpT > LruItMap; // a map into a LruList - - std::size_t size_; -- Map map_; -- typename Map::iterator first_; -- typename Map::iterator last_; -+ LruItMap map_; -+ LruList list_; - }; - - } -diff --git a/binaryurp/source/lessoperators.cxx b/binaryurp/source/lessoperators.cxx -index b0031e7..55f3a49 100644 ---- a/binaryurp/source/lessoperators.cxx -+++ b/binaryurp/source/lessoperators.cxx -@@ -32,14 +32,38 @@ - - namespace com { namespace sun { namespace star { namespace uno { - --bool operator <(TypeDescription const & left, TypeDescription const & right) { -- assert(left.is() && right.is()); -- typelib_TypeClass tc1 = left.get()->eTypeClass; -- typelib_TypeClass tc2 = right.get()->eTypeClass; -- return tc1 < tc2 || -- (tc1 == tc2 && -- (OUString(left.get()->pTypeName) < -- OUString(right.get()->pTypeName))); -+bool operator<( const TypeDescription& rLeft, const TypeDescription& rRight) { -+ assert( rLeft.is() && rRight.is()); -+ const typelib_TypeDescription& rA = *rLeft.get(); -+ const typelib_TypeDescription& rB = *rRight.get(); -+ if( rA.eTypeClass != rA.eTypeClass) -+ return (rA.eTypeClass < rB.eTypeClass); -+ const sal_Int32 nCmp = rtl_ustr_compare_WithLength( -+ rA.pTypeName->buffer, rA.pTypeName->length, -+ rB.pTypeName->buffer, rB.pTypeName->length); -+ return (nCmp < 0); -+} -+ -+bool TypeDescEqual::operator()( const TypeDescription& rLeft, const TypeDescription& rRight) const -+{ -+ assert( rLeft.is() && rRight.is()); -+ const typelib_TypeDescription& rA = *rLeft.get(); -+ const typelib_TypeDescription& rB = *rRight.get(); -+ if( rA.eTypeClass != rB.eTypeClass) -+ return false; -+ const sal_Int32 nCmp = rtl_ustr_compare_WithLength( -+ rA.pTypeName->buffer, rA.pTypeName->length, -+ rB.pTypeName->buffer, rB.pTypeName->length); -+ return (nCmp == 0); -+} -+ -+sal_Int32 TypeDescHash::operator()( const TypeDescription& rTD) const -+{ -+ assert( rTD.is()); -+ const typelib_TypeDescription& rA = *rTD.get(); -+ sal_Int32 h = rtl_ustr_hashCode_WithLength( rA.pTypeName->buffer, rA.pTypeName->length); -+ h ^= static_cast<sal_Int32>(rA.eTypeClass); -+ return h; - } - - } } } } -@@ -47,8 +71,8 @@ bool operator <(TypeDescription const & left, TypeDescription const & right) { - namespace rtl { - - bool operator <(ByteSequence const & left, ByteSequence const & right) { -- for (sal_Int32 i = 0; i != std::min(left.getLength(), right.getLength()); -- ++i) -+ const sal_Int32 nLen = std::min( left.getLength(), right.getLength()); -+ for( sal_Int32 i = 0; i < nLen; ++i ) - { - if (left[i] < right[i]) { - return true; -diff --git a/binaryurp/source/lessoperators.hxx b/binaryurp/source/lessoperators.hxx -index f3202b5..317e76a 100644 ---- a/binaryurp/source/lessoperators.hxx -+++ b/binaryurp/source/lessoperators.hxx -@@ -31,6 +31,10 @@ namespace com { namespace sun { namespace star { namespace uno { - - bool operator <(TypeDescription const & left, TypeDescription const & right); - -+struct TypeDescHash { sal_Int32 operator()( const TypeDescription&) const; }; -+ -+struct TypeDescEqual { bool operator()( const TypeDescription&, const TypeDescription&) const; }; -+ - } } } } - - namespace rtl { --- -cgit v0.9.0.2-2-gbebe diff --git a/app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch b/app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch deleted file mode 100644 index dbeb503..0000000 --- a/app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/Makefile.top b/Makefile.top -index 9e67a71..64a7b6c 100644 ---- a/Makefile.top -+++ b/Makefile.top -@@ -244,7 +244,7 @@ stlport\ - sysui\ - xpdf\ - --export gb_TAILBUILDTARGET=all slowcheck -+export gb_TAILBUILDTARGET=all - - define gbuild_module_rules - .PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).subsequentcheck $(1).deliver -@@ -546,7 +546,7 @@ findunusedcode: - | grep -v ^WSObject \ - > unusedcode.easy - --check: dev-install subsequentcheck -+check: unitcheck slowcheck dev-install subsequentcheck - - subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install) - $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@ -diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl -index c8e62ee..11a9069 100755 ---- a/solenv/bin/build.pl -+++ b/solenv/bin/build.pl -@@ -1902,7 +1902,7 @@ sub run_job { - return 1 if (! $path =~ /prj$/ ); - mkpath("$workdir/Logs"); - my $gbuild_flags = '-j' . $ENV{PARALLELISM}; -- my $gbuild_target = 'all slowcheck'; -+ my $gbuild_target = 'all'; - if ($registered_name =~ /tail_build\/prj$/ ) - { - $gbuild_target = $ENV{gb_TAILBUILDTARGET}; -diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk -index 97f1a81..c7ae7f4 100644 ---- a/solenv/gbuild/Module.mk -+++ b/solenv/gbuild/Module.mk -@@ -139,7 +139,7 @@ gb_Module_DEVINSTALLHINT= - debugrun :| build - endif - --all : build unitcheck -+all : build - $(info $(gb_Module_BUILDHINT)) - - build : diff --git a/app-office/libreoffice/files/libreoffice-3.7-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-3.7-system-pyuno.patch deleted file mode 100644 index fe93728..0000000 --- a/app-office/libreoffice/files/libreoffice-3.7-system-pyuno.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh -index a259bf6..672fa23 100755 ---- a/desktop/scripts/soffice.sh -+++ b/desktop/scripts/soffice.sh -@@ -129,6 +129,9 @@ if echo "$checks" | grep -q "cc" ; then - exit 1; - fi - -+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH} -+export PYTHONPATH -+ - case "`uname -s`" in - NetBSD|OpenBSD|FreeBSD|DragonFly) - # this is a temporary hack until we can live with the default search paths -diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py -index 4ff2606..6a05eed 100644 ---- a/pyuno/source/module/uno.py -+++ b/pyuno/source/module/uno.py -@@ -16,8 +16,12 @@ - # except in compliance with the License. You may obtain a copy of - # the License at http://www.apache.org/licenses/LICENSE-2.0 . - # -+import os - import sys - -+sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program') -+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: -+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc" - import pyuno - - try: -diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py -index 99d3b03..704edab 100755 ---- a/scripting/source/pyprov/officehelper.py -+++ b/scripting/source/pyprov/officehelper.py -@@ -44,7 +44,7 @@ def bootstrap(): - if "UNO_PATH" in os.environ: - sOffice = os.environ["UNO_PATH"] - else: -- sOffice = "" # lets hope for the best -+ sOffice = "%eprefix%/usr/%libdir%/libreoffice/program" - sOffice = os.path.join(sOffice, "soffice") - if platform.startswith("win"): - sOffice += ".exe" diff --git a/app-office/libreoffice/files/libreoffice-4.1.0.4-neon-build.patch b/app-office/libreoffice/files/libreoffice-4.1.0.4-neon-build.patch deleted file mode 100644 index 94e858b..0000000 --- a/app-office/libreoffice/files/libreoffice-4.1.0.4-neon-build.patch +++ /dev/null @@ -1,51 +0,0 @@ -From b74bf4146e866fbcd41ad075296c9a4eee16c829 Mon Sep 17 00:00:00 2001 -From: David Tardon <dtardon@redhat.com> -Date: Mon, 12 Aug 2013 09:39:59 +0200 -Subject: [PATCH] only use the SSPI support with internal neon - -neon 0.30.0 has added support for SSPI (author of the commit is kso, -which sounds familiar :-), so NE_FEATURE_SSPI is defined, but the -signature of ne_auth_creds remains the same as before. That means that -build with system neon 0.30.0 fails... ---- - RepositoryExternal.mk | 1 + - ucb/source/ucp/webdav-neon/NeonSession.cxx | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk -index f866957..8c19c27 100644 ---- a/RepositoryExternal.mk -+++ b/RepositoryExternal.mk -@@ -867,6 +867,7 @@ ifeq ($(SYSTEM_NEON),YES) - define gb_LinkTarget__use_neon - $(call gb_LinkTarget_add_defs,$(1),\ - -DNEON_VERSION=0x$(NEON_VERSION) \ -+ -DSYSTEM_NEON \ - ) - $(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ -diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx -index 34a1937..cee643a 100644 ---- a/ucb/source/ucp/webdav-neon/NeonSession.cxx -+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx -@@ -228,7 +228,7 @@ extern "C" int NeonSession_ResponseBlockWriter( void * inUserData, - } - - extern "C" int NeonSession_NeonAuth( void * inUserData, --#ifdef NE_FEATURE_SSPI -+#if defined NE_FEATURE_SSPI && ! defined SYSTEM_NEON - const char * inAuthProtocol, - #endif - const char * inRealm, -@@ -297,7 +297,7 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, - - bool bCanUseSystemCreds = false; - --#ifdef NE_FEATURE_SSPI -+#if defined NE_FEATURE_SSPI && ! defined SYSTEM_NEON - bCanUseSystemCreds - = (attempt == 0) && // avoid endless loops - ne_has_support( NE_FEATURE_SSPI ) && // Windows-only feature. --- -1.7.12.4 - diff --git a/app-office/libreoffice/files/libreoffice-4.1.2.2-idfattrib.patch b/app-office/libreoffice/files/libreoffice-4.1.2.2-idfattrib.patch deleted file mode 100644 index 9402b6b..0000000 --- a/app-office/libreoffice/files/libreoffice-4.1.2.2-idfattrib.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/sc/inc/global.hxx 2013-09-17 19:27:21.000000000 +0300 -+++ b/sc/inc/global.hxx 2013-09-24 23:12:34.277966796 +0300 -@@ -190,7 +190,7 @@ const sal_uInt16 IDF_HARDATTR = 0x0020 - const sal_uInt16 IDF_OUTLINE = 0x0800; /// Sheet / outlining (grouping) information - const sal_uInt16 IDF_NOCAPTIONS = 0x0200; /// Internal use only (undo etc.): do not copy/delete caption objects of cell notes. - const sal_uInt16 IDF_ADDNOTES = 0x0400; /// Internal use only (copy from clip): do not delete existing cell contents when pasting notes. - const sal_uInt16 IDF_SPECIAL_BOOLEAN = 0x1000; --const sal_uInt16 IDF_ATTRIB = IDF_HARDATTR | IDF_STYLES | IDF_OUTLINE; -+const sal_uInt16 IDF_ATTRIB = IDF_HARDATTR | IDF_STYLES; - const sal_uInt16 IDF_CONTENTS = IDF_VALUE | IDF_DATETIME | IDF_STRING | IDF_NOTE | IDF_FORMULA | IDF_OUTLINE; - const sal_uInt16 IDF_ALL = IDF_CONTENTS | IDF_ATTRIB | IDF_OBJECTS; -otes. - - /// Copy flags for auto/series fill functions: do not touch notes and drawing objects. - const sal_uInt16 IDF_AUTOFILL = IDF_ALL & ~(IDF_NOTE | IDF_OBJECTS); diff --git a/app-office/libreoffice/files/stop-messing-with-stdlib-internals.patch b/app-office/libreoffice/files/stop-messing-with-stdlib-internals.patch deleted file mode 100644 index b9f8d31..0000000 --- a/app-office/libreoffice/files/stop-messing-with-stdlib-internals.patch +++ /dev/null @@ -1,61 +0,0 @@ -much from <http://cgit.freedesktop.org/libreoffice/core/tree/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx> -diff -ur a-libreoffice-4.1.0.1/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx libreoffice-4.1.0.1/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx ---- a-libreoffice-4.1.0.1/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx 2013-06-20 09:13:52.000000000 +0200 -+++ libreoffice-4.1.0.1/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx 2013-07-11 14:16:40.998562174 +0200 -@@ -53,6 +53,38 @@ - - namespace CPPU_CURRENT_NAMESPACE - { -+struct FAKE_type_info: public std::type_info { -+ FAKE_type_info(char const * name): type_info(name) {} -+}; -+struct FAKE_si_class_type_info: public FAKE_type_info { -+ FAKE_si_class_type_info(char const * name, std::type_info const * theBase): -+ FAKE_type_info(name), base(theBase) {} -+ -+ std::type_info const * base; -+ // actually a __cxxabiv1::__class_type_info pointer -+}; -+struct Base {}; -+struct Derived: Base {}; -+ -+std::type_info * create_FAKE_class_type_info(char const * name) { -+ std::type_info * p = new FAKE_type_info(name); -+ // cxxabiv1::__class_type_info has no data members in addition to -+ // std::type_info -+ *reinterpret_cast< void ** >(p) = *reinterpret_cast< void * const * >( -+ &typeid(Base)); -+ // copy correct __cxxabiv1::__class_type_info vtable into place -+ return p; -+} -+ -+std::type_info * create_FAKE_si_class_type_info( -+ char const * name, std::type_info const * base) -+{ -+ std::type_info * p = new FAKE_si_class_type_info(name, base); -+ *reinterpret_cast< void ** >(p) = *reinterpret_cast< void * const * >( -+ &typeid(Derived)); -+ // copy correct __cxxabiv1::__si_class_type_info vtable into place -+ return p; -+} - - //================================================================================================== - static OUString toUNOname( char const * p ) SAL_THROW(()) -@@ -180,13 +212,13 @@ - // ensure availability of base - type_info * base_rtti = getRTTI( - (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription ); -- rtti = new __si_class_type_info( -- strdup( rttiName ), (__class_type_info *)base_rtti ); -+ rtti = create_FAKE_si_class_type_info( -+ strdup( rttiName ), base_rtti ); - } - else - { - // this class has no base class -- rtti = new __class_type_info( strdup( rttiName ) ); -+ rtti = create_FAKE_class_type_info( strdup( rttiName ) ); - } - - pair< t_rtti_map::iterator, bool > insertion ( - diff --git a/app-office/libreoffice/files/stop-messing-with-stdlib-internals2.patch b/app-office/libreoffice/files/stop-messing-with-stdlib-internals2.patch deleted file mode 100644 index 31c27ba..0000000 --- a/app-office/libreoffice/files/stop-messing-with-stdlib-internals2.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- a/libreoffice-4.1.0.1/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx 2013-07-13 22:47:29.146836141 +0200 -+++ b/libreoffice-4.1.0.1/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx 2013-07-13 22:47:24.428793311 +0200 -@@ -53,38 +53,6 @@ - - namespace CPPU_CURRENT_NAMESPACE - { --struct FAKE_type_info: public std::type_info { -- FAKE_type_info(char const * name): type_info(name) {} --}; --struct FAKE_si_class_type_info: public FAKE_type_info { -- FAKE_si_class_type_info(char const * name, std::type_info const * theBase): -- FAKE_type_info(name), base(theBase) {} -- -- std::type_info const * base; -- // actually a __cxxabiv1::__class_type_info pointer --}; --struct Base {}; --struct Derived: Base {}; -- --std::type_info * create_FAKE_class_type_info(char const * name) { -- std::type_info * p = new FAKE_type_info(name); -- // cxxabiv1::__class_type_info has no data members in addition to -- // std::type_info -- *reinterpret_cast< void ** >(p) = *reinterpret_cast< void * const * >( -- &typeid(Base)); -- // copy correct __cxxabiv1::__class_type_info vtable into place -- return p; --} -- --std::type_info * create_FAKE_si_class_type_info( -- char const * name, std::type_info const * base) --{ -- std::type_info * p = new FAKE_si_class_type_info(name, base); -- *reinterpret_cast< void ** >(p) = *reinterpret_cast< void * const * >( -- &typeid(Derived)); -- // copy correct __cxxabiv1::__si_class_type_info vtable into place -- return p; --} - - //================================================================================================== - static OUString toUNOname( char const * p ) SAL_THROW(()) -@@ -202,30 +170,8 @@ - t_rtti_map::const_iterator iFind2( m_generatedRttis.find( unoName ) ); - if (iFind2 == m_generatedRttis.end()) - { -- // we must generate it ! -- // symbol and rtti-name is nearly identical, -- // the symbol is prefixed with _ZTI -- char const * rttiName = symName.getStr() +4; --#if OSL_DEBUG_LEVEL > 1 -- fprintf( stderr,"generated rtti for %s\n", rttiName ); --#endif -- if (pTypeDescr->pBaseTypeDescription) -- { -- // ensure availability of base -- type_info * base_rtti = getRTTI( -- (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription ); -- rtti = create_FAKE_si_class_type_info( -- strdup( rttiName ), base_rtti ); -- } -- else -- { -- // this class has no base class -- rtti = create_FAKE_class_type_info( strdup( rttiName ) ); -- } -- -- pair< t_rtti_map::iterator, bool > insertion ( -- m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) ); -- SAL_WARN_IF( !insertion.second, "bridges", "key " << unoName << " already in generated rtti map" ); -+ OSL_FAIL("Cannot generate type_infos with libc++, sigh"); -+ return NULL; - } - else // taking already generated rtti - { - diff --git a/app-office/libreoffice/libreoffice-4.0.4.2.ebuild b/app-office/libreoffice/libreoffice-4.0.4.2.ebuild deleted file mode 100644 index 49586f3..0000000 --- a/app-office/libreoffice/libreoffice-4.0.4.2.ebuild +++ /dev/null @@ -1,582 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.4.2.ebuild,v 1.7 2013/08/27 16:06:04 kensington Exp $ - -EAPI=5 - -KDE_REQUIRED="optional" -QT_MINIMAL="4.7.4" -KDE_SCM="git" -CMAKE_REQUIRED="never" - -PYTHON_COMPAT=( python2_7 python3_3 ) -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.7.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}" - -# Help is used for the image generator -# We can also build translations and others if needed. -# Core must be first -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 - # core is now packed without it in the name, git reponame stay - 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}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.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 gnome gstreamer +gtk -jemalloc kde mysql odk opengl postgres telepathy test +vba +webdav" - -LO_EXTS="nlpsolver presenter-minimizer 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: -# report-builder: missing java packages -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 ~x86" - -COMMON_DEPEND=" - ${PYTHON_DEPS} - app-arch/zip - app-arch/unzip - >=app-text/hunspell-1.3.2-r3 - app-text/mythes - >=app-text/libexttextcat-3.2 - app-text/liblangtag - app-text/libmspub - app-text/libwpd:0.9[tools] - app-text/libwpg:0.2 - >=app-text/libwps-0.2.2 - >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] - >=dev-cpp/clucene-2.3.3.4-r2 - >=dev-cpp/libcmis-0.3.1:0.3 - dev-db/unixODBC - dev-libs/expat - >=dev-libs/hyphen-2.7.1 - >=dev-libs/icu-4.8.1.1:= - =dev-libs/liborcus-0.3* - >=dev-libs/nspr-4.8.8 - >=dev-libs/nss-3.12.9 - >=dev-lang/perl-5.0 - >=dev-libs/openssl-1.0.0d - >=dev-libs/redland-1.0.14[ssl] - media-gfx/graphite2 - >=media-libs/fontconfig-2.8.0 - media-libs/freetype:2 - media-libs/lcms:2 - >=media-libs/libpng-1.4 - >=media-libs/libcdr-0.0.5 - media-libs/libvisio - >=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 ) - gnome? ( gnome-base/gconf:2 ) - gtk? ( - x11-libs/gdk-pixbuf[X] - >=x11-libs/gtk+-2.24:2 - ) - 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-base-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 - !<app-office/openoffice-bin-3.4.0-r1 - !app-office/openoffice - media-fonts/libertine-ttf - media-fonts/liberation-fonts - media-fonts/urw-fonts - java? ( >=virtual/jre-1.6 ) -" - -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/boost-1.46 - >=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.8.0 - 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 ) - test? ( dev-util/cppunit ) -" - -PATCHES=( - # not upstreamable stuff - "${FILESDIR}/${PN}-3.7-system-pyuno.patch" - "${FILESDIR}/${PN}-3.7-separate-checks.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 [[ "${CHECK_ME_HARDER}" != no ]]; then - 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 - if use postgres && has_version dev-db/postgresql-base; 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 - fi -} - -pkg_setup() { - java-pkg-opt-2_pkg_setup - nonfatal 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() { - # fixed in master, flags order in bridges compilation - filter-flags -fomit-frame-pointer - - # optimization flags - export ARCH_FLAGS="${CXXFLAGS}" - export LINKFLAGSOPTIMIZE="${LDFLAGS}" - export GMAKE_OPTIONS="${MAKEOPTS}" - # System python 2.7 enablement: - export PYTHON="${PYTHON}" - 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 - - 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-java-target-version=$(java-pkg_get-target) - --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/" - " - - 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-unix-qstart-libpng: use libpng splashscreen that is faster - # --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-pch: precompiled headers cause build crashes - # --disable-rpath: relative runtime path is not desired - # --disable-systray: quickstarter does not actually work at all so do not - # promote it - # --disable-zenity: disable build icon - # --enable-extension-integration: enable any extension integration support - # --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs - # --disable-ext-report-builder: too much java packages pulled in - 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 \ - --enable-unix-qstart-libpng \ - --enable-hardlink-deliver \ - --disable-ccache \ - --disable-crashdump \ - --disable-dependency-tracking \ - --disable-epm \ - --disable-fetch-external \ - --disable-gnome-vfs \ - --disable-gstreamer-0-10 \ - --disable-ext-report-builder \ - --disable-kdeab \ - --disable-kde \ - --disable-online-update \ - --disable-pch \ - --disable-rpath \ - --disable-systray \ - --disable-zenity \ - --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-unix-wrapper=libreoffice \ - --with-vendor="Gentoo Foundation" \ - --with-x \ - --without-afms \ - --without-fonts \ - --without-myspell-dicts \ - --without-system-mozilla \ - --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 gnome gconf) \ - $(use_enable gnome gio) \ - $(use_enable gnome lockdown) \ - $(use_enable gtk) \ - $(use_enable kde kde4) \ - $(use_enable mysql ext-mysql-connector) \ - $(use_enable odk) \ - $(use_enable opengl) \ - $(use_enable postgres postgresql-sdbc) \ - $(use_enable telepathy) \ - $(use_enable test linkoo) \ - $(use_enable vba) \ - $(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="${SOLARVER}/${INPATH}/res/img" - 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." - ) - - # this is not a proper make script - make build || 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 - 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/ -} - -pkg_preinst() { - # Cache updates - all handled by kde eclass for all environments - kde4-base_pkg_preinst -} - -pkg_postinst() { - kde4-base_pkg_postinst - - pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin - pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin - - 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.1.2.2-r1.ebuild b/app-office/libreoffice/libreoffice-4.1.2.2-r1.ebuild deleted file mode 100644 index 8c77ce3..0000000 --- a/app-office/libreoffice/libreoffice-4.1.2.2-r1.ebuild +++ /dev/null @@ -1,598 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.2.2-r1.ebuild,v 1.1 2013/09/27 20:45:40 dilfridge Exp $ - -EAPI=5 - -KDE_REQUIRED="optional" -QT_MINIMAL="4.7.4" -KDE_SCM="git" -CMAKE_REQUIRED="never" - -PYTHON_COMPAT=( python2_7 python3_3 ) -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}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.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 gnome gstreamer +gtk -gtk3 jemalloc kde libcxx mysql odk opengl postgres telepathy test +vba +webdav" - -LO_EXTS="nlpsolver presenter-minimizer 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 ~x86" - -COMMON_DEPEND=" - ${PYTHON_DEPS} - app-arch/zip - app-arch/unzip - >=app-text/hunspell-1.3.2-r3 - app-text/mythes - >=app-text/libexttextcat-3.2 - app-text/liblangtag - app-text/libmspub - >=app-text/libmwaw-0.1.7 - app-text/libodfgen - app-text/libwpd:0.9[tools] - app-text/libwpg:0.2 - >=app-text/libwps-0.2.2 - >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] - >=dev-cpp/clucene-2.3.3.4-r2 - >=dev-cpp/libcmis-0.3.1:0.3 - 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.1:= - >=dev-libs/nspr-4.8.8 - >=dev-libs/nss-3.12.9 - >=dev-lang/perl-5.0 - >=dev-libs/openssl-1.0.0d - >=dev-libs/redland-1.0.16[ssl] - media-gfx/graphite2 - >=media-libs/fontconfig-2.8.0 - media-libs/freetype:2 - >=media-libs/harfbuzz-0.9.10:=[icu(+)] - media-libs/lcms:2 - >=media-libs/libpng-1.4 - >=media-libs/libcdr-0.0.5 - media-libs/libvisio - >=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 ) - 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-base-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 - !<app-office/openoffice-bin-3.4.0-r1 - !app-office/openoffice - media-fonts/libertine-ttf - media-fonts/liberation-fonts - media-fonts/urw-fonts - java? ( >=virtual/jre-1.6 ) -" - -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/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.8*:= - 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 ) - test? ( dev-util/cppunit ) -" - -PATCHES=( - # not upstreamable stuff - "${FILESDIR}/${PN}-3.7-system-pyuno.patch" - # bug 485862 - "${FILESDIR}/${P}-idfattrib.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" - [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]] && die "Too old gcc found." - fi - fi - - # ensure pg version - if use postgres && has_version dev-db/postgresql-base; 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 - if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then - kde4-base_pkg_setup - else - nonfatal kde4-base_pkg_setup - fi - 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 - - if use libcxx; then - epatch "${FILESDIR}"/Make-the-SAL_STREAM-thing-compile.patch - epatch "${FILESDIR}"/Nah-we-still-need-the-dynamic_cast.patch - - epatch "${FILESDIR}"/i122208-replace-the-binaryurp-cache.patch - epatch "${FILESDIR}"/eliminate-type-ambiguity-for-std-accumulate.patch - - ## by eroen - epatch "${FILESDIR}"/stop-messing-with-stdlib-internals.patch - epatch "${FILESDIR}"/fake-exception-name2.patch - epatch "${FILESDIR}"/stop-messing-with-stdlib-internals2.patch - epatch "${FILESDIR}"/disable-uno-test.patch - 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/$(get_libdir)/" - " - - 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-rpath: relative runtime path is not desired - # --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 \ - --enable-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-rpath \ - --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 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 test linkoo) \ - $(use_enable vba) \ - $(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="${SOLARVER}/${INPATH}/res/img" - 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 - 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/ -} - -pkg_preinst() { - # Cache updates - all handled by kde eclass for all environments - kde4-base_pkg_preinst -} - -pkg_postinst() { - kde4-base_pkg_postinst - - pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin - pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin - - 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.1.2.3.ebuild b/app-office/libreoffice/libreoffice-4.1.2.3.ebuild deleted file mode 100644 index a6cfc19..0000000 --- a/app-office/libreoffice/libreoffice-4.1.2.3.ebuild +++ /dev/null @@ -1,596 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.2.3.ebuild,v 1.1 2013/10/04 19:34:11 dilfridge Exp $ - -EAPI=5 - -KDE_REQUIRED="optional" -QT_MINIMAL="4.7.4" -KDE_SCM="git" -CMAKE_REQUIRED="never" - -PYTHON_COMPAT=( python2_7 python3_3 ) -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}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.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 gnome gstreamer +gtk -gtk3 jemalloc kde libcxx mysql odk opengl postgres telepathy test +vba +webdav" - -LO_EXTS="nlpsolver presenter-minimizer 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 ~x86" - -COMMON_DEPEND=" - ${PYTHON_DEPS} - app-arch/zip - app-arch/unzip - >=app-text/hunspell-1.3.2-r3 - app-text/mythes - >=app-text/libexttextcat-3.2 - app-text/liblangtag - app-text/libmspub - >=app-text/libmwaw-0.1.7 - app-text/libodfgen - app-text/libwpd:0.9[tools] - app-text/libwpg:0.2 - >=app-text/libwps-0.2.2 - >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] - >=dev-cpp/clucene-2.3.3.4-r2 - >=dev-cpp/libcmis-0.3.1:0.3 - 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.1:= - >=dev-libs/nspr-4.8.8 - >=dev-libs/nss-3.12.9 - >=dev-lang/perl-5.0 - >=dev-libs/openssl-1.0.0d - >=dev-libs/redland-1.0.16[ssl] - media-gfx/graphite2 - >=media-libs/fontconfig-2.8.0 - media-libs/freetype:2 - >=media-libs/harfbuzz-0.9.10:=[icu(+)] - media-libs/lcms:2 - >=media-libs/libpng-1.4 - >=media-libs/libcdr-0.0.5 - media-libs/libvisio - >=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 ) - 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-base-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 - !<app-office/openoffice-bin-3.4.0-r1 - !app-office/openoffice - media-fonts/libertine-ttf - media-fonts/liberation-fonts - media-fonts/urw-fonts - java? ( >=virtual/jre-1.6 ) -" - -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/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.8*:= - 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 ) - test? ( dev-util/cppunit ) -" - -PATCHES=( - # not upstreamable stuff - "${FILESDIR}/${PN}-3.7-system-pyuno.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" - [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]] && die "Too old gcc found." - fi - fi - - # ensure pg version - if use postgres && has_version dev-db/postgresql-base; 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 - if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then - kde4-base_pkg_setup - else - nonfatal kde4-base_pkg_setup - fi - 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 - - if use libcxx; then - epatch "${FILESDIR}"/Make-the-SAL_STREAM-thing-compile.patch - epatch "${FILESDIR}"/Nah-we-still-need-the-dynamic_cast.patch - - epatch "${FILESDIR}"/i122208-replace-the-binaryurp-cache.patch - epatch "${FILESDIR}"/eliminate-type-ambiguity-for-std-accumulate.patch - - ## by eroen - epatch "${FILESDIR}"/stop-messing-with-stdlib-internals.patch - epatch "${FILESDIR}"/fake-exception-name2.patch - epatch "${FILESDIR}"/stop-messing-with-stdlib-internals2.patch - epatch "${FILESDIR}"/disable-uno-test.patch - 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/$(get_libdir)/" - " - - 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-rpath: relative runtime path is not desired - # --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 \ - --enable-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-rpath \ - --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 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 test linkoo) \ - $(use_enable vba) \ - $(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="${SOLARVER}/${INPATH}/res/img" - 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 - 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/ -} - -pkg_preinst() { - # Cache updates - all handled by kde eclass for all environments - kde4-base_pkg_preinst -} - -pkg_postinst() { - kde4-base_pkg_postinst - - pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin - pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin - - 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/metadata.xml b/app-office/libreoffice/metadata.xml deleted file mode 100644 index 49b91ab..0000000 --- a/app-office/libreoffice/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>openoffice</herd> - <longdescription>LibreOffice is a fork of OpenOffice.org. -This ebuild allows you to compile it yourself. Unfortunately this -compilation can take up to a day depending on the speed of your -computer. It will however make a snappier openoffice than the binary -version</longdescription> - <use> - <flag name="gtk3">Enable highly experimental gtk3 frontend</flag> - <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag> - <flag name="libcxx">Apply patches to build against <pkg>sys-libs/libcxx</pkg></flag> - <flag name="odk">Build the Office Development Kit</flag> - <flag name="telepathy">Enable document colaboration features using telepathy communication framework.</flag> - <flag name="vba">Enable support for VBA compatibility and ActiveX embedding</flag> - <flag name="vlc">Use <pkg>media-video/vlc</pkg> for video embedding</flag> - <flag name="webdav">Adds support for HTTP content adding via <pkg>net-libs/neon</pkg></flag> - </use> -</pkgmetadata> |