From 4e60a7e3d3dd7b262e728ec35c352ec352780284 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20H=C3=BCttel?= Date: Sun, 28 Dec 2014 17:12:47 +0000 Subject: [PATCH] Version bump by Andreas Sturmlechner, bug 533160 Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x84AD142F --- app-office/libreoffice/ChangeLog | 12 +- app-office/libreoffice/Manifest | 28 +- ...3.5.2-detect-KDE5-fallback-to-KDE4UI.patch | 62 ++ ....2-return-IsUserDefined-w-o-negation.patch | 41 ++ ...breoffice-4.3.5.2-system-opencollada.patch | 157 +++++ .../libreoffice/libreoffice-4.3.5.2.ebuild | 618 ++++++++++++++++++ .../libreoffice/libreoffice-4.3.9999.ebuild | 23 +- .../libreoffice/libreoffice-9999-r2.ebuild | 10 +- 8 files changed, 934 insertions(+), 17 deletions(-) create mode 100644 app-office/libreoffice/files/libreoffice-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch create mode 100644 app-office/libreoffice/files/libreoffice-4.3.5.2-return-IsUserDefined-w-o-negation.patch create mode 100644 app-office/libreoffice/files/libreoffice-4.3.5.2-system-opencollada.patch create mode 100644 app-office/libreoffice/libreoffice-4.3.5.2.ebuild diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index f2d58493d3cd..5effce8c0645 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.596 2014/12/28 14:57:43 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.597 2014/12/28 17:12:34 dilfridge Exp $ + +*libreoffice-4.3.5.2 (28 Dec 2014) + + 28 Dec 2014; Andreas K. Huettel + +libreoffice-4.3.5.2.ebuild, libreoffice-4.3.9999.ebuild, + libreoffice-9999-r2.ebuild, + +files/libreoffice-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch, + +files/libreoffice-4.3.5.2-return-IsUserDefined-w-o-negation.patch, + +files/libreoffice-4.3.5.2-system-opencollada.patch: + Version bump by Andreas Sturmlechner, bug 533160 28 Dec 2014; Aaron W. Swenson libreoffice-4.2.6.3.ebuild, libreoffice-4.2.9999.ebuild, diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 8a58db3a0bb4..9bf246e6e433 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -14,6 +14,9 @@ AUX libreoffice-4.3.1.2-implement--with-system-coinmp.patch 2854 SHA256 5de29eb4 AUX libreoffice-4.3.1.2-implement--with-system-gltf.patch 4983 SHA256 c61e8dd67a6299555fe1ccc0f31263cd3b15b921bf844dacd1f09905ca60734f SHA512 af251ff2e10c3c6e096de4c866e05e22b8763a01cac1f66bcad597615f387daeba18348e45f49a8aacb2b0855e9d3240e373be59d33c821dbef6c79b2d047f40 WHIRLPOOL 4ac552215e634f5cc1bf2f3a253cff9f48032b3ad485942c49a2923c265d6fd0ae45050bc876c422ef95b74e699af182483b6b276319f26f0b35728eb4e05d77 AUX libreoffice-4.3.1.2-upgrade-to-libgltf-0.0.1.patch 15709 SHA256 22551358fa6e161c2ecdd267bae3de1245fb671eda8b592efa48e7939e9353f2 SHA512 c29b18c5d9b14f2d9a0c08618e274e1fa3bae540b68569fcd0ff216aef4942e7aa5fe89184cadbcb3d6ea04316a5ae9876f3fae085727b13247bb5e0499b10a8 WHIRLPOOL 2d3ee1e39a965cf28e6b633dd5f62dd7aca3dbf4a583aa48cade71cfb8814c93fdfa54099db7774d5db62e2b21d61017dd279fb2cdf1b0fc7633ad3323d2fceb AUX libreoffice-4.3.4.1-boost-1.56.0.patch 10696 SHA256 47700e383c40679809cf3577798fd9211458b0814b8b360f49847491c4bc9ca0 SHA512 d8d84a9106aabfb06f64b2101de9d9767828e6349f948732f017d7972d02bd6a64cad1b5dee44fa2fbcaa6b2dc9df9caf77070168091e0798911d07a21550b56 WHIRLPOOL edf37dbd8a6f5858fd3583551cbcdca590122436406a0f6016402c1b7423ed99c26d64a7116ff2575f112e3fdbf698f04357e33daba76016b3c4ef778d4cddef +AUX libreoffice-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch 2123 SHA256 f424034d9af92f1ca281dc68b484d28503c261705791409f813c2359874b455d SHA512 1621411ad99d9d43abd2363b86ce892f14e25bc236f6b04a55b9765252ec2904af295475d70d09eb3fe9278dda08c8944a08dd9aae81d426da7d6cb0ece47295 WHIRLPOOL 59655dff3ff8491ce7b6a61cc6ca5a5469fcad2e530cfd5c36b50031dce591730ff20dab9eac173c04e09093740341eba86c324f857b19716c8f994272ad9878 +AUX libreoffice-4.3.5.2-return-IsUserDefined-w-o-negation.patch 1379 SHA256 f64326c3089189520683b8def52dadd73225abf259212ff22cd8e0f5ef183767 SHA512 1366e3914d78ddc22c2dd324b53478c5d76fc8d563f46d02f83b09cceded2e71ea19311e29e6fa23ce230d3bec8f3a56c5ff18572050c6e5a4e03a975d54c38e WHIRLPOOL 2d16b6f90e6bb16de3a53a38e146930eb15685e306558c362e08ffe8c3b410a5124860e22475410f8db6e71fedbed4098b292c8efddfeb8570158046c5736f8a +AUX libreoffice-4.3.5.2-system-opencollada.patch 5810 SHA256 5ae98f04551520db1118a873a8cb02c0b3306db0d55e3d5b863729e5393c280e SHA512 6749be7d372d2e92ba16697c3bf90be4bdda01d759100a13fcfe89c935e5291715e8556bc42ab8ce5fa47b6dced95f750c7c497051bdf140e8e504e281e2fe58 WHIRLPOOL 47f02ce1e5ca88cef50c75b339206ee0768a0e74862ab37040be7260c35b6c1d5c56a16fe9f2ca077ab457f1bec3b166c8ee031722eb9711cd63e9222e20a33f AUX libreoffice-9999-curl-config.patch 2483 SHA256 ae1de898a921089932da214f667d979f7057d7e99c8f8f08fa21b7a827cb8f2e SHA512 ab10307f099368e71684d22a92b70703ebce5755ec618016393df014d1054fa723b5ebed031575ffd8bbbaa2449582c44646ed389bda16adda9c1df90f13f2f9 WHIRLPOOL 4ab824d86abe300c4c863e4162f3646ec499a4b0f519bc3d6a77bc702bd307b5b4b642d24d3921f52c8da6d96613afa85cb5fd6310d0ede61612a6b437eca6b6 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5 @@ -26,20 +29,33 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51 DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0 DIST libreoffice-4.2.6.3.tar.xz 123839476 SHA256 d954b9fd0df1e51d5441254ae932262b3f4a06ff3275f1a97dea1b369d4f8f9a SHA512 689bb422285bc4db479d940d87e8cc12a2aeb7c410a9928f12ec853ad05b89729b7a893f546318c68c30eb6759db081a194746a5baa7185ddf4074465503629f WHIRLPOOL cdb9a91b71cd04e3d9d8744c0ac433cb49c720ae36000ef107f0bd4e1ce0ef83589413f63dcb13f7484b6aa4428e1c714893a9158aaab152e51c6019cbda1ad9 DIST libreoffice-4.3.4.1.tar.xz 152803160 SHA256 a2413419dd635eccac20b4f9bf359661e218583af5d8a8c974fd02dc84975775 SHA512 b44b14f025756676e36419a82f30a700c0f5ab6edb995a0b59e87ff313eb1ae869f9794027279bfb443fb99d617cb9466ae0446e2da1e5fc0807a5be470a8662 WHIRLPOOL d19c85350b683c8f6d1229d41661026fcd12f30bb7de1c2522b5772b3549f2ad88ec1b92442e6bd1a66eebfa6e3faf72e30c8d908d6fc8652251112cf6ea9448 +DIST libreoffice-4.3.5.2.tar.xz 152786724 SHA256 78e6821a69f37b6c0c2c8d436aef24810d0a76b5d087ef95f6107a6bdbef2637 SHA512 4dd9737c53b080413458fe63e86c43514c0c44f77bc5eb680f615af584a3de4f4733644658d8e53b2b20002e7ea003c2116b6ba3a58f3e581f9fffbd6b7444a9 WHIRLPOOL cb7c74e5f282e92bb715848f904ba155015d91514edff3151aac0f3ff0a14592a31b002e629ddccdd79951b8f18c3174578cd25dcad57a93d5d74edb63c978e4 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538 DIST libreoffice-help-4.2.6.3.tar.xz 1855444 SHA256 892a78b667f5b1d771920c71bb010a7b1e537d965007591288094ae1e37bf21f SHA512 7eb441bd8e07485a3f003a3317a050c2a9a623d63b42ccbd1dd8e8fa387ab3ea8155e6a2ee135c829a851517a2bfe1ca78d89927ba4afe2f5cc6a59d14e5de80 WHIRLPOOL 217b634e51695465f4ff8e78145a7b4030b634c37f7daf0f8c46fc13db72dc9fdbb9ea8c4b669fd0c7a61fa5a1b75386cf966e3f351534a33691a817baac9e6e DIST libreoffice-help-4.3.4.1.tar.xz 1854700 SHA256 a9ab46e2f775a8914fd4377e4859da87344c05ad1ec928646cc40021717c71a3 SHA512 6f9572f785975c014ba6ce589a7f5274c7fe157e9950a7f5ab34d7df0b085737ca2dfa13715e8df93af758c256d7f5bc8b4f0a27dc6abd4421b79e7cca364416 WHIRLPOOL 688180f8d98e1355ac144b2c2565a58c9cbd1f599b043aeed4c217f38638260cc5a1f6856bbf2a2d7716968ace480df0a1db76e7d3794226fab5ee7830e6c8dd +DIST libreoffice-help-4.3.5.2.tar.xz 1852412 SHA256 78b586931d8e085aa18d137711e7c878f858ea386a80ee673b0a787953836d92 SHA512 8525cc1bef1ac95a89c3100e137793bdea9ac05a85468e0ec96c6a360ce65baf3dfef7e634d9e8dbc644dec138df2b979cdb8a636ff27cdb7ee652ddee114236 WHIRLPOOL f5bd7d1da705e20def1cc6bff3dd3902ce6d77e2b5fb977860a4fbf9748a6ffec3524fe9ab0e2c539ece015082aadcf9f7392a145862ebb20f4abc117667b25e EBUILD libreoffice-4.2.6.3.ebuild 17880 SHA256 26eb626446d4ec726494d800da0e6c8c7635a8736d9e7f338dd2d11f24f27494 SHA512 ff97a67d4967cca0fd067f33f5fd0853d7a029ef84c65792d757e3e2308991a6243ab06430238df7d7fef779b4c36227d6e7f56f6406c3666981cd7a57e04ed4 WHIRLPOOL f5c97112b6d311a33390fcf0dd36a0d7e085618272e59a603516a83005a3d17c393d4e733ea4390da5ac7ff9d2ea82411072c087b11d3866f4616dc71d32571f EBUILD libreoffice-4.2.9999.ebuild 17883 SHA256 f95a82baef7635df697688e80184869ce3499da7b9261ee2312a3729bfef5003 SHA512 c222fd3fcd41441547b59246394f09cf53436c0a59d7f239ee9ef8892bfc8f495610965029eb0fb0486661c04484d7d1de4d3758f582fc0ba223e0436a0b74b2 WHIRLPOOL 85cdac5976a83a54bfaef4fa3293d96e2ad974f9ec9577c04f7854610bbffdd8df487850beac5d09d6b710c646ea89b39d2c6591915f6e71440536a01b1de059 EBUILD libreoffice-4.3.4.1.ebuild 18317 SHA256 9531e640da61f61fbf375361bbbbcdec8d1c0e4d15c2198ae1b5d6bb66abd5d9 SHA512 5d62a730205ac258396f590e6808b75c562e5e6a734086ef32ea74c06f6ee6801c6540c927e71b5024a76808227c35e39d818bda242e7dcf66be3fd5c7d34a95 WHIRLPOOL 969dd87dceeabd12512d542c000acb28d577f77a95d7c4cd2bc8e133ab169fa7fdf3a1aec148c2a54d646e3550bf5eb441188cc5609a492d49213aa2239dd50f -EBUILD libreoffice-4.3.9999.ebuild 18323 SHA256 d37645127aa9d432a259cfa69d129be9dfc7525aa5f9243c9d5df887a4ddde9c SHA512 dd068e113157844ea68f07c07564417d47699d01d3603f00b54a239f785278ef0aad407b2e2855c7720e5d7460eb11fba7a3ddc4602dbe295d1bcf5ff7144b30 WHIRLPOOL 91c2594a850b74798b3dce7593d8d455ef01aa8bfd2b8502cf320ec770aead31d8b8e73763ca9f6ea64c90d22e27c6af2166a224fb481b7819afc5b6ad23a732 -EBUILD libreoffice-9999-r2.ebuild 18315 SHA256 0ef3ea83961837101de5b2ec1ada2981cdfeb507effae33841efbfa2722e6391 SHA512 10ec4f86f2380c1fc6a19938a21cd046762577ed86866583e206b1a0740958742a961f1fe90dfd3a817ca4b9a07dbcc6f8c56df40f3e7f8ba7c9e1b25fa3c26c WHIRLPOOL 67088bb47f59803db7781ed85b3a12bec561295533cb4842df7a18a517c9822b1432a75b3038572b978cffff72c4fdec3a5176595c1560a6277b76b2530f5d93 -MISC ChangeLog 108422 SHA256 153e71ed97ad2c981ec9e69f747455c58f9405d415eebed2b67ef6b85ee8c8d5 SHA512 28c6bb83040bfe2e70b747c4070ca443ad186a1be292c63e51bb3a26c7103a126de32773c93abf23e22792d83ca03d2406c25759736737c2998207361963af16 WHIRLPOOL de0d0d3da9110a8e87f8ad730b0d050cb6c8e9f9bc0400e45b2fbf3e0b07a140e7ea1bc52acbb7b9da9e4dcc817a265929335b2e3fb4de09a4d91aeb22da50ec +EBUILD libreoffice-4.3.5.2.ebuild 18924 SHA256 47866c540522bfc4c6268cd1c7a961001241f259a09112a5fe0bfbdd5effa03f SHA512 a1efc99f4143ea468e7354920181cda66bec7ea19f6016caeaddffe83382085cb48eb82c1faed01a96cc4f8f267f47644a1d4d25206721675b4ecbebc7bac07c WHIRLPOOL 4041ccfcb9cd3017cbbbdaa505faae58fcc084e982befd85c8bfbbec8061251dabe0872e0c3f8523332b3c916b097cdad9027cd0cfbbacdd07e1435354a5ab43 +EBUILD libreoffice-4.3.9999.ebuild 18828 SHA256 6f06153754460c8600dd977a75a8ce8e9cbcac42d2d59c27236569290b0e30a0 SHA512 27011e103313dec19704e5ef2458db75c1fa96ea496ab072f8a163efff8dac40c1bc434c6199fa6e532c19d24ada5fee8ade932a549a96f8f11d785d9509e6e1 WHIRLPOOL 44731dfc071f663d6ed911cc1be07a97ca2128d74f07ddd3fec60c4d089b5da65db1d45d3de7cf48a5b4d6e88a730f1dd3fbd6ce2b447a4b7574262cf3d23ee6 +EBUILD libreoffice-9999-r2.ebuild 18422 SHA256 7e374cbda7aab3a6fe75a0288d2ff2c1c47b62f6ffb3fdb4d0c1b046f71a6541 SHA512 1fa4269b9f01eeef516df0e13567b59f57ba0687176e14cf1584dab66c3a73227d782995256b387f366230452706e1f93540e5d02543a77cd30ab915a12a1d48 WHIRLPOOL b5163e894b5b44c4710d13e85bc7ac864e3180fa16d23c507ed28e6ed3846f3b347e4fb0f909c2102c6670019285af7dbff7c49fd5ede6a6740e68df08ad203e +MISC ChangeLog 108848 SHA256 87730bb7527438b000937ed3f549ebe5bb6d5cf6cc917ad6cd325a042f333711 SHA512 c94984ff0393940c176429151210df7e354eda2a1fb8cad0c274d5f56b14f0bad24092046a872d6518c9286180dcc84f5ee547f0652bbc817b39a82393a024da WHIRLPOOL bd3406aa36179171e6ae551c51eaa0f0cf72fae671fad3093f4aa7d81d16955ee7549a9dc9012337ca8e39c4018f099f952034a4a9f2a9afb12f5f661507313b MISC metadata.xml 1354 SHA256 bf91c27f941b42e977112a3ea9465babd4c4d94dde3f8308d6db1ccd56bc65b9 SHA512 636da2f295d3055de61b52b2a1d371a25101efdc55014ba2e5a7446bb55b30dca1bb58cc2a84873fb862e40f60de10122c55dba19ba9e5d058eab36f7c33aad6 WHIRLPOOL 4aa957484052955572b2bdca42a7d32f5a89f3916a646e92cca940ce2f4e5c8dec824c75150bf80455dcbc2e13f550d1158c418ca38cecac5ac3090419a52f5e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlSgGmwACgkQVxOqA9G7/aCdhwD/Uk8TevnaGjMmhGJRagIIu3yQ -gOD9XSgkOEb1aiwOQTcA/jM7zvqPD4kE7a8rvbn+yTJNd9yQEbpXZjhft+Gc4+Bt -=VQck +iQIcBAEBCAAGBQJUoDpgAAoJEJS/30SErRQvjVoP/i5rleJHQc5nCChe0cYW7xUy +IlcJWkREzjrUL2CmwJugDQjdTazSjTAsTp23Dmt9JmXQ6XnX2REK50IlniIMm/P/ +9342LJDMoktKNngsnN7VxBVhXP+ALoAH1V7T272odX30GyzrEwLU8F6us2ABaeTN +evkYP9VgRi+C9JfsF4qIpmPOKASpjg72PZCSdqJg9F+CSMb9GRD739/T15sx6NTo +S8ln9OcbXWLNhE04SBm76Cmkuf9ggoWKuarg6/kOgCRoxNyptm4WABYIt6VbIyYk +dV6Vq3kcgNsLWD/lPRcQ/+u52uJ0dEXBbPvljYo9B+/HxfThC6qhgoLvAN8zy9Ha +vx51x9rqhPR+hEchrr+NBuvF+Vj8abkqy4OSY0stzBpA94BQ9l418etA2Tq4rXhA +bJTxtWJotDRCcOGY3f6KXsaIRsZOlfUT2Xp2l1LPpuqPGDUigdrRHYGUA4l0Obws +KG1OlfMWxPD6qiCmbGQAe5NeTy8i7uSoq3UWa7YsKrXvAMUDFpz3w7obEzzEt7Iv +l11j2el3SQxwb28F8h9+9Mupoqhhc8m+lYlSDTPvv3Ct+zoJKhJvkYBH3iksInUP +jwL71Eh/HV1yAoCKXR7wHGHnWIXbPjZwEwpSWewYBtGNxlxIzFg8wvvEkf+ESWQY +7WWlYZJJ8FSQ0Bp7ov/P +=Xec2 -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/files/libreoffice-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch b/app-office/libreoffice/files/libreoffice-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch new file mode 100644 index 000000000000..c7422d233410 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch @@ -0,0 +1,62 @@ +From e04b8afe7aef5db535311630834bc25316433dae Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= +Date: Mon, 3 Nov 2014 10:01:52 +0100 +Subject: [PATCH] Detect KDE5 and fallback to KDE4UI there + +Change-Id: I8da53d7b81d28b0051be96c0c4ee0a29d8ed8360 +Reviewed-on: https://gerrit.libreoffice.org/12209 +Reviewed-by: Samuel Mehrbrodt +Tested-by: Samuel Mehrbrodt +--- + vcl/unx/generic/desktopdetect/desktopdetector.cxx | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx +index 163d48e..e1f253d 100644 +--- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx ++++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx +@@ -272,6 +272,23 @@ static bool is_kde4_desktop( Display* pDisplay ) + return false; + } + ++static bool is_kde5_desktop( Display* pDisplay ) ++{ ++ if ( NULL != getenv( "KDE_FULL_SESSION" ) ) ++ { ++ OUString aVer( "5" ); ++ ++ const char *pVer = getenv( "KDE_SESSION_VERSION" ); ++ if ( pVer && aVer.equalsIgnoreAsciiCaseAscii( pVer ) ) ++ return true; ++ } ++ ++ if ( KDEVersion( pDisplay ) == 5 ) ++ return true; ++ ++ return false; ++} ++ + extern "C" + { + +@@ -285,6 +302,8 @@ DESKTOP_DETECTOR_PUBLIC DesktopType get_desktop_environment() + + if ( aOver.equalsIgnoreAsciiCase( "tde" ) ) + return DESKTOP_TDE; ++ if ( aOver.equalsIgnoreAsciiCase( "kde5" ) ) ++ return DESKTOP_KDE4; + if ( aOver.equalsIgnoreAsciiCase( "kde4" ) ) + return DESKTOP_KDE4; + if ( aOver.equalsIgnoreAsciiCase( "gnome" ) ) +@@ -371,6 +390,8 @@ DESKTOP_DETECTOR_PUBLIC DesktopType get_desktop_environment() + + // these guys can be slower, with X property fetches, + // round-trips etc. and so are done later. ++ else if ( is_kde5_desktop( pDisplay ) ) ++ ret = DESKTOP_KDE4; + else if ( is_kde4_desktop( pDisplay ) ) + ret = DESKTOP_KDE4; + else if ( is_gnome_desktop( pDisplay ) ) +-- +2.2.1 + diff --git a/app-office/libreoffice/files/libreoffice-4.3.5.2-return-IsUserDefined-w-o-negation.patch b/app-office/libreoffice/files/libreoffice-4.3.5.2-return-IsUserDefined-w-o-negation.patch new file mode 100644 index 000000000000..41b2bdd86301 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-4.3.5.2-return-IsUserDefined-w-o-negation.patch @@ -0,0 +1,41 @@ +From ec8beb2fa279b8d7b1efbd9f5414895b17dfbe8b Mon Sep 17 00:00:00 2001 +From: Katarina Behrens +Date: Fri, 5 Sep 2014 14:11:15 +0200 +Subject: [PATCH] fdo#82681: return IsUserDefined w/o negation + +when the predicate is called StyleSheetIsUserDefinedPredicate + +Returning negation thereof somewhere, somehow, corrupts one of +SfxItem pools. Thus, invalid read happens and crashes Impress +and Draw. + +Now the loop in SdStyleSheetPool::UpdateStdNames does nothing +(it iterates through user-defined styles, but its body does +something for non-user-defined styles), so more investigation +here is needed. + +This is partial revert of commit 3440766f0ad43454287a874b5fd34b6f2af6bdf1 + +Change-Id: I06f0da320c49674dac2adf43b7c374babbdadb57 +(cherry picked from commit a784c33fd48eeb3394dc63610e384cf866233093) +Signed-off-by: Andras Timar +--- + sd/source/core/stlpool.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx +index 17ca4f0..c98dff7 100644 +--- a/sd/source/core/stlpool.cxx ++++ b/sd/source/core/stlpool.cxx +@@ -943,7 +943,7 @@ struct StyleSheetIsUserDefinedPredicate : svl::StyleSheetPredicate + + bool Check(const SfxStyleSheetBase& sheet) SAL_OVERRIDE + { +- return !sheet.IsUserDefined(); ++ return sheet.IsUserDefined(); + } + }; + } +-- +2.2.1 + diff --git a/app-office/libreoffice/files/libreoffice-4.3.5.2-system-opencollada.patch b/app-office/libreoffice/files/libreoffice-4.3.5.2-system-opencollada.patch new file mode 100644 index 000000000000..098680da63d9 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-4.3.5.2-system-opencollada.patch @@ -0,0 +1,157 @@ +From f24c60870531689d95c056037e48cd29ad1d17bb Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Mon, 20 Oct 2014 14:21:22 +0200 +Subject: [PATCH] allow to build with system opencollada + +Change-Id: I6101099c57d429987e06bca0652c843f4a94f8cc +--- + Makefile.fetch | 2 +- + RepositoryExternal.mk | 16 ++++++++++++++++ + config_host.mk.in | 4 +++- + configure.ac | 35 +++++++++++++++++++++++++++++++++++ + external/Module_external.mk | 2 +- + 5 files changed, 56 insertions(+), 3 deletions(-) + +diff --git a/Makefile.fetch b/Makefile.fetch +index e8ccf5b..18b12be 100644 +--- a/Makefile.fetch ++++ b/Makefile.fetch +@@ -184,7 +184,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) + $(call fetch_Optional,NSS,NSS_TARBALL) \ + $(call fetch_Optional_pack,NUMBERTEXT_EXTENSION_PACK) \ + $(call fetch_Optional,ODFGEN,ODFGEN_TARBALL) \ +- $(call fetch_Optional,COLLADA2GLTF,OPENCOLLADA_TARBALL) \ ++ $(call fetch_Optional,OPENCOLLADA,OPENCOLLADA_TARBALL) \ + $(call fetch_Optional,OPENLDAP,OPENLDAP_TARBALL) \ + $(call fetch_Optional,OPENSSL,OPENSSL_TARBALL) \ + $(call fetch_Optional,ORCUS,ORCUS_TARBALL) \ +diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk +index 5277aea..911dab1 100644 +--- a/RepositoryExternal.mk ++++ b/RepositoryExternal.mk +@@ -3371,6 +3371,20 @@ endif # SYSTEN_LIBGLTF + + ifeq ($(ENABLE_COLLADA),TRUE) + ++ifeq ($(SYSTEM_OPENCOLLADA),TRUE) ++ ++define gb_LinkTarget__use_opencollada_parser ++$(call gb_LinkTarget_set_include,$(1),\ ++ $$(INCLUDE) \ ++ $(OPENCOLLADA_CFLAGS) \ ++) ++ ++$(call gb_LinkTarget_add_libs,$(1),$(OPENCOLLADA_LIBS)) ++ ++endef ++ ++else # !SYSTEM_OPENCOLLADA ++ + define gb_LinkTarget__use_opencollada_parser + $(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADABaseUtils/include \ +@@ -3385,6 +3399,8 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ + ) + endef + ++endif # SYSTEM_OPENCOLLADA ++ + define gb_LinkTarget__use_collada2gltf + $(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,collada2gltf) \ +diff --git a/config_host.mk.in b/config_host.mk.in +index 0fefbb0..738c80c 100644 +--- a/config_host.mk.in ++++ b/config_host.mk.in +@@ -431,7 +431,8 @@ export OOOP_SAMPLES_PACK=@OOOP_SAMPLES_PACK@ + export OOOP_TEMPLATES_PACK=@OOOP_TEMPLATES_PACK@ + export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@ + export OOO_VENDOR=@OOO_VENDOR@ +-export OPENSSL_CFLAGS=$(gb_SPACE)@OPENSSL_CFLAGS@ ++export OPENCOLLADA_CFLAGS=$(gb_SPACE)@OPENCOLLADA_CFLAGS@ ++export OPENCOLLADA_LIBS=$(gb_SPACE)@OPENCOLLADA_LIBS@ + export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@ + export ORCUS_CFLAGS=$(gb_SPACE)@ORCUS_CFLAGS@ + export ORCUS_LIBS=$(gb_SPACE)@ORCUS_LIBS@ +@@ -558,6 +559,7 @@ export SYSTEM_NPAPI_HEADERS=@SYSTEM_NPAPI_HEADERS@ + export SYSTEM_NSS=@SYSTEM_NSS@ + export SYSTEM_ODBC_HEADERS=@SYSTEM_ODBC_HEADERS@ + export SYSTEM_ODFGEN=@SYSTEM_ODFGEN@ ++export SYSTEM_OPENCOLLADA=@SYSTEM_OPENCOLLADA@ + export SYSTEM_OPENLDAP=@SYSTEM_OPENLDAP@ + export SYSTEM_OPENSSL=@SYSTEM_OPENSSL@ + export SYSTEM_PAGEMAKER=@SYSTEM_PAGEMAKER@ +diff --git a/configure.ac b/configure.ac +index 17feb1a..5d2198b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1641,6 +1641,11 @@ AC_ARG_WITH(system-ucpp, + [Use ucpp already on system.]),, + []) + ++AC_ARG_WITH(system-opencollada, ++ AS_HELP_STRING([--with-system-opencollada], ++ [Use openCOLLADA already on system.]),, ++ [with_system_opencollada=no]) ++ + AC_ARG_WITH(system-openldap, + AS_HELP_STRING([--with-system-openldap], + [Use the OpenLDAP LDAP SDK already on system.]),, +@@ -10342,11 +10347,41 @@ if test "$enable_collada" != "no" -a "$ENABLE_GLTF" = "TRUE"; then + AC_MSG_RESULT([yes]) + ENABLE_COLLADA=TRUE + AC_DEFINE(HAVE_FEATURE_COLLADA,1) ++ AC_MSG_CHECKING([which OPENCOLLADA to use]) ++ if test "$with_system_opencollada" = "yes"; then ++ AC_MSG_RESULT([external]) ++ SYSTEM_OPENCOLLADA=TRUE ++ AS_IF([test -n "$OPENCOLLADA_CFLAGS"],[],[AC_MSG_ERROR([export OPENCOLLADA_CFLAGS])]) ++ AS_IF([test -n "$OPENCOLLADA_LIBS"],[],[AC_MSG_ERROR([export OPENCOLLADA_LIBS])]) ++ AC_LANG_PUSH([C++]) ++ save_CXXFLAGS=$CXXFLAGS ++ save_CPPFLAGS=$CPPFLAGS ++ CXXFLAGS="$CXXFLAGS $OPENCOLLADA_CFLAGS" ++ CPPFLAGS="$CPPFLAGS $OPENCOLLADA_CFLAGS" ++ AC_CHECK_HEADERS( ++ COLLADABU.h \ ++ COLLADAFW.h \ ++ COLLADASaxFWLLoader.h \ ++ GeneratedSaxParser.h, ++ [], ++ [AC_MSG_ERROR([openCOLLADA headers not found. Install openCOLLADA])], ++ []) ++ CXXFLAGS=$save_CXXFLAGS ++ CPPFLAGS=$save_CPPFLAGS ++ AC_LANG_POP([C++]) ++ OPENCOLLADA_CFLAGS=$(printf '%s' "$OPENCOLLADA_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") ++ else ++ AC_MSG_RESULT([internal]) ++ BUILD_TYPE="$BUILD_TYPE OPENCOLLADA" ++ fi + BUILD_TYPE="$BUILD_TYPE COLLADA2GLTF" + else + AC_MSG_RESULT([no]) + fi + AC_SUBST(ENABLE_COLLADA) ++AC_SUBST([OPENCOLLADA_CFLAGS]) ++AC_SUBST([OPENCOLLADA_LIBS]) ++AC_SUBST([SYSTEM_OPENCOLLADA]) + + # pdf import? + AC_MSG_CHECKING([whether to build the PDF import feature]) +diff --git a/external/Module_external.mk b/external/Module_external.mk +index c95ea20..688e335 100644 +--- a/external/Module_external.mk ++++ b/external/Module_external.mk +@@ -75,7 +75,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ + $(call gb_Helper_optional,NEON,neon) \ + $(call gb_Helper_optional,NSS,nss) \ + $(call gb_Helper_optional,ODFGEN,libodfgen) \ +- $(call gb_Helper_optional,COLLADA2GLTF,opencollada) \ ++ $(call gb_Helper_optional,OPENCOLLADA,opencollada) \ + $(call gb_Helper_optional,OPENLDAP,openldap) \ + $(call gb_Helper_optional,OPENSSL,openssl) \ + $(call gb_Helper_optional,ORCUS,liborcus) \ +-- +2.2.1 + diff --git a/app-office/libreoffice/libreoffice-4.3.5.2.ebuild b/app-office/libreoffice/libreoffice-4.3.5.2.ebuild new file mode 100644 index 000000000000..01ce5650c9c0 --- /dev/null +++ b/app-office/libreoffice/libreoffice-4.3.5.2.ebuild @@ -0,0 +1,618 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.5.2.ebuild,v 1.1 2014/12/28 17:12:34 dilfridge Exp $ + +EAPI=5 + +KDE_REQUIRED="optional" +QT_MINIMAL="4.7.4" +KDE_SCM="git" +CMAKE_REQUIRED="never" + +PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) +PYTHON_REQ_USE="threads,xml" + +# experimental ; release ; old +# Usually the tarballs are moved a lot so this should make +# everyone happy. +DEV_URI=" + http://dev-builds.libreoffice.org/pre-releases/src + http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/ + http://download.documentfoundation.org/libreoffice/old/${PV}/ +" +EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice" +ADDONS_URI="http://dev-www.libreoffice.org/src/" + +BRANDING="${PN}-branding-gentoo-0.8.tar.xz" +# PATCHSET="${P}-patchset-01.tar.xz" + +[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2" +inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS} +unset SCM_ECLASS + +DESCRIPTION="LibreOffice, a full office productivity suite" +HOMEPAGE="http://www.libreoffice.org" +SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" +[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}" + +# Split modules following git/tarballs +# Core MUST be first! +# Help is used for the image generator +MODULES="core help" +# Only release has the tarballs +if [[ ${PV} != *9999* ]]; then + for i in ${DEV_URI}; do + for mod in ${MODULES}; do + if [[ ${mod} == core ]]; then + SRC_URI+=" ${i}/${P}.tar.xz" + else + SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz" + fi + done + unset mod + done + unset i +fi +unset DEV_URI + +# Really required addons +# These are bundles that can't be removed for now due to huge patchsets. +# If you want them gone, patches are welcome. +ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz" +ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code +ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )" +ADDONS_SRC+=" collada? ( ${ADDONS_URI}/OpenCOLLADA-master-6509aa13af.tar.bz2 )" +ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" +ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it? +ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all +ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino +ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable +SRC_URI+=" ${ADDONS_SRC}" + +unset ADDONS_URI +unset EXT_URI +unset ADDONS_SRC + +IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer ++gtk gtk3 jemalloc kde mysql odk opengl postgres telepathy test vlc" + +LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" +# Unpackaged separate extensions: +# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf? +# hunart: only on ooo extensions -> fubared download path somewhere on sf +# numbertext, typo, validator, watch-window: ^^ +# oooblogger: no homepage or anything +# Extensions that need extra work: +for lo_xt in ${LO_EXTS}; do + IUSE+=" libreoffice_extensions_${lo_xt}" +done +unset lo_xt + +LICENSE="|| ( LGPL-3 MPL-1.1 )" +SLOT="0" +[[ ${PV} == *9999* ]] || \ +KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" + +# FIXME: collada? ( media-libs/opencollada ) +# how to configure system-collada? +COMMON_DEPEND=" + ${PYTHON_DEPS} + app-arch/zip + app-arch/unzip + >=app-text/hunspell-1.3.2-r3 + app-text/mythes + >=app-text/libabw-0.1.0 + >=app-text/libexttextcat-3.2 + >=app-text/libebook-0.1.1 + >=app-text/libetonyek-0.1.1 + app-text/liblangtag + >=app-text/libmspub-0.1.0 + >=app-text/libmwaw-0.3.1 + >=app-text/libodfgen-0.1.0 + app-text/libwpd:0.10[tools] + app-text/libwpg:0.3 + >=app-text/libwps-0.3.0 + >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] + >=dev-cpp/clucene-2.3.3.4-r2 + dev-cpp/libcmis:0.4 + dev-db/unixODBC + >=dev-libs/boost-1.46:= + dev-libs/expat + >=dev-libs/hyphen-2.7.1 + >=dev-libs/icu-4.8.1.1:= + >=dev-libs/liborcus-0.7.0 + >=dev-libs/librevenge-0.0.1 + >=dev-libs/nspr-4.8.8 + >=dev-libs/nss-3.12.9 + >=dev-lang/perl-5.0 + >=dev-libs/openssl-1.0.0d:0 + >=dev-libs/redland-1.0.16 + media-gfx/graphite2 + >=media-libs/fontconfig-2.8.0 + media-libs/freetype:2 + >=media-libs/glew-1.10 + >=media-libs/harfbuzz-0.9.18:=[icu(+)] + media-libs/lcms:2 + >=media-libs/libpng-1.4 + >=media-libs/libcdr-0.1.0 + >=media-libs/libfreehand-0.1.0 + >=media-libs/libvisio-0.1.0 + >=net-misc/curl-7.21.4 + net-libs/neon + net-nds/openldap + sci-mathematics/lpsolve + virtual/jpeg:0 + >=x11-libs/cairo-1.10.0[X] + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + bluetooth? ( net-wireless/bluez ) + coinmp? ( sci-libs/coinor-mp ) + cups? ( net-print/cups ) + dbus? ( >=dev-libs/dbus-glib-0.92 ) + eds? ( gnome-extra/evolution-data-server ) + firebird? ( >=dev-db/firebird-2.5 ) + gltf? ( media-libs/libgltf ) + gnome? ( gnome-base/gconf:2 ) + gtk? ( + x11-libs/gdk-pixbuf[X] + >=x11-libs/gtk+-2.24:2 + ) + gtk3? ( >=x11-libs/gtk+-3.2:3 ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + ) + jemalloc? ( dev-libs/jemalloc ) + libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) + libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) + libreoffice_extensions_wiki-publisher? ( + dev-java/commons-codec:0 + dev-java/commons-httpclient:3 + dev-java/commons-lang:2.1 + dev-java/commons-logging:0 + dev-java/tomcat-servlet-api:3.0 + ) + mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) + opengl? ( + virtual/glu + virtual/opengl + ) + postgres? ( >=dev-db/postgresql-9.0[kerberos] ) + telepathy? ( + dev-libs/glib:2 + >=net-libs/telepathy-glib-0.18.0 + >=x11-libs/gtk+-2.24:2 + ) +" + +RDEPEND="${COMMON_DEPEND} + !app-office/libreoffice-bin + !app-office/libreoffice-bin-debug + !=virtual/jre-1.6 ) + vlc? ( media-video/vlc ) +" + +if [[ ${PV} != *9999* ]]; then + PDEPEND="~app-office/libreoffice-l10n-${PV}" +else + # Translations are not reliable on live ebuilds + # rather force people to use english only. + PDEPEND="!app-office/libreoffice-l10n" +fi + +# FIXME: cppunit should be moved to test conditional +# after everything upstream is under gbuild +# as dmake execute tests right away +DEPEND="${COMMON_DEPEND} + >=dev-libs/libatomic_ops-7.2d + >=dev-libs/libxml2-2.7.8 + dev-libs/libxslt + dev-perl/Archive-Zip + dev-util/cppunit + >=dev-util/gperf-3 + dev-util/intltool + >=dev-util/mdds-0.10.3:= + media-libs/glm + net-misc/npapi-sdk + >=sys-apps/findutils-4.4.2 + sys-devel/bison + sys-apps/coreutils + sys-devel/flex + sys-devel/gettext + >=sys-devel/make-3.82 + sys-devel/ucpp + sys-libs/zlib + virtual/pkgconfig + x11-libs/libXt + x11-libs/libXtst + x11-proto/randrproto + x11-proto/xextproto + x11-proto/xineramaproto + x11-proto/xproto + java? ( + >=virtual/jdk-1.6 + >=dev-java/ant-core-1.7 + ) + odk? ( >=app-doc/doxygen-1.8.4 ) + test? ( dev-util/cppunit ) +" + +PATCHES=( + # not upstreamable stuff + "${FILESDIR}/${PN}-3.7-system-pyuno.patch" + + # from 4.3 branch + "${FILESDIR}/${PN}-4.3.5.2-return-IsUserDefined-w-o-negation.patch" # bug 524770 + + # from 4.4 branch + "${FILESDIR}/${PN}-4.3.1.2-implement--with-system-coinmp.patch" + "${FILESDIR}/${PN}-4.3.4.1-boost-1.56.0.patch" # bug 522178 + "${FILESDIR}/${PN}-4.3.5.2-system-opencollada.patch" + "${FILESDIR}/${PN}-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch" + + # from master branch +) + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + bluetooth? ( dbus ) + collada? ( gltf ) + gnome? ( gtk ) + eds? ( gnome ) + telepathy? ( gtk ) + libreoffice_extensions_nlpsolver? ( java ) + libreoffice_extensions_scripting-beanshell? ( java ) + libreoffice_extensions_scripting-javascript? ( java ) + libreoffice_extensions_wiki-publisher? ( java ) +" + +CHECKREQS_MEMORY="512M" +CHECKREQS_DISK_BUILD="6G" + +pkg_pretend() { + local pgslot + + if [[ ${MERGE_TYPE} != binary ]]; then + check-reqs_pkg_pretend + + if [[ $(gcc-major-version) -lt 4 ]] || \ + ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \ + ; then + eerror "Compilation with gcc older than 4.6 is not supported" + die "Too old gcc found." + fi + fi + + # Ensure pg version but we have to be sure the pg is installed (first + # install on clean system) + if use postgres && has_version dev-db/postgresql; then + pgslot=$(postgresql-config show) + if [[ ${pgslot//.} < 90 ]] ; then + eerror "PostgreSQL slot must be set to 9.0 or higher." + eerror " postgresql-config set 9.0" + die "PostgreSQL slot is not set to 9.0 or higher." + fi + fi +} + +pkg_setup() { + java-pkg-opt-2_pkg_setup + kde4-base_pkg_setup + python-single-r1_pkg_setup + + [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup +} + +src_unpack() { + local mod mod2 dest tmplfile tmplname mypv + + [[ -n ${PATCHSET} ]] && unpack ${PATCHSET} + use branding && unpack "${BRANDING}" + + if [[ ${PV} != *9999* ]]; then + unpack "${P}.tar.xz" + for mod in ${MODULES}; do + [[ ${mod} == core ]] && continue + unpack "${PN}-${mod}-${PV}.tar.xz" + done + else + for mod in ${MODULES}; do + mypv=${PV/.9999} + [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}" + EGIT_PROJECT="${PN}/${mod}" + EGIT_SOURCEDIR="${WORKDIR}/${P}" + [[ ${mod} != core ]] && EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}" + EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}" + EGIT_NOUNPACK="true" + git-2_src_unpack + if [[ ${mod} != core ]]; then + mod2=${mod} + # mapping does not match on help + [[ ${mod} == help ]] && mod2="helpcontent2" + mkdir -p "${S}/${mod2}/" || die + mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die + rm -rf "${WORKDIR}/${PN}-${mod}-${PV}" + fi + done + unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH + fi +} + +src_prepare() { + # optimization flags + export GMAKE_OPTIONS="${MAKEOPTS}" + # System python 2.7 enablement: + export PYTHON_CFLAGS=$(python_get_CFLAGS) + export PYTHON_LIBS=$(python_get_LIBS) + + # patchset + if [[ -n ${PATCHSET} ]]; then + EPATCH_FORCE="yes" \ + EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \ + EPATCH_SUFFIX="patch" \ + epatch + fi + + base_src_prepare + + AT_M4DIR="m4" eautoreconf + # hack in the autogen.sh + touch autogen.lastrun + + # system pyuno mess + sed \ + -e "s:%eprefix%:${EPREFIX}:g" \ + -e "s:%libdir%:$(get_libdir):g" \ + -i pyuno/source/module/uno.py \ + -i scripting/source/pyprov/officehelper.py || die + # sed in the tests + sed -i \ + -e 's#all : build unitcheck#all : build#g' \ + solenv/gbuild/Module.mk || die + sed -i \ + -e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \ + -e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \ + Makefile.in || die + + if use branding; then + # hack... + mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die + fi +} + +src_configure() { + local java_opts + local internal_libs + local lo_ext + local ext_opts + local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}") + + # recheck that there is some value in jobs + [[ -z ${jbs} ]] && jbs="1" + + # sane: just sane.h header that is used for scan in writer, not + # linked or anything else, worthless to depend on + # vigra: just uses templates from there + # it is serious pain in the ass for packaging + # should be replaced by boost::gil if someone interested + internal_libs+=" + --without-system-sane + --without-system-vigra + " + + # libreoffice extensions handling + for lo_xt in ${LO_EXTS}; do + if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then + ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})" + else + ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})" + fi + done + + if use java; then + # hsqldb: system one is too new + java_opts=" + --without-junit + --without-system-hsqldb + --with-ant-home="${ANT_HOME}" + --with-jdk-home=$(java-config --jdk-home 2>/dev/null) + --with-jvm-path="${EPREFIX}/usr/lib/" + " + + use libreoffice_extensions_scripting-beanshell && \ + java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" + + use libreoffice_extensions_scripting-javascript && \ + java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)" + + if use libreoffice_extensions_wiki-publisher; then + java_opts+=" + --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar) + --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar) + --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar) + --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar) + --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar) + " + fi + fi + + # system headers/libs/...: enforce using system packages + # --enable-cairo: ensure that cairo is always required + # --enable-graphite: disabling causes build breakages + # --enable-*-link: link to the library rather than just dlopen on runtime + # --enable-release-build: build the libreoffice as release + # --disable-fetch-external: prevent dowloading during compile phase + # --disable-gnome-vfs: old gnome virtual fs support + # --disable-kdeab: kde3 adressbook + # --disable-kde: kde3 support + # --disable-systray: quickstarter does not actually work at all so do not + # promote it + # --enable-extension-integration: enable any extension integration support + # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs + # --disable-report-builder: too much java packages pulled in without pkgs + # FIXME: $(use_with collada system-opencollada) + 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-neon \ + --enable-python=system \ + --enable-randr \ + --enable-randr-link \ + --enable-release-build \ + --disable-hardlink-deliver \ + --disable-ccache \ + --disable-crashdump \ + --disable-dependency-tracking \ + --disable-epm \ + --disable-fetch-external \ + --disable-gnome-vfs \ + --disable-gstreamer-0-10 \ + --disable-mergelibs \ + --disable-report-builder \ + --disable-kdeab \ + --disable-kde \ + --disable-online-update \ + --disable-systray \ + --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \ + --with-build-version="Gentoo official package" \ + --enable-extension-integration \ + --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \ + --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \ + --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \ + --with-external-tar="${DISTDIR}" \ + --with-lang="" \ + --with-parallelism=${jbs} \ + --with-system-ucpp \ + --with-vendor="Gentoo Foundation" \ + --with-x \ + --without-fonts \ + --without-myspell-dicts \ + --without-help \ + --with-helppack-integration \ + --without-sun-templates \ + $(use_enable bluetooth sdremote-bluetooth) \ + $(use_enable coinmp) \ + $(use_enable collada) \ + $(use_enable cups) \ + $(use_enable debug) \ + $(use_enable dbus) \ + $(use_enable eds evolution2) \ + $(use_enable firebird firebird-sdbc) \ + $(use_enable gltf) \ + $(use_enable gnome gconf) \ + $(use_enable gnome gio) \ + $(use_enable gnome lockdown) \ + $(use_enable gstreamer) \ + $(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 vlc) \ + $(use_with coinmp system-coinmp) \ + $(use_with gltf system-libgltf) \ + $(use_with java) \ + $(use_with mysql system-mysql-cppconn) \ + $(use_with odk doxygen) \ + ${internal_libs} \ + ${java_opts} \ + ${ext_opts} +} + +src_compile() { + # hack for offlinehelp, this needs fixing upstream at some point + # it is broken because we send --without-help + # https://bugs.freedesktop.org/show_bug.cgi?id=46506 + ( + grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" + source "${T}/config_host.mk" 2&> /dev/null + + local path="${WORKDIR}/helpcontent2/source/auxiliary/" + mkdir -p "${path}" || die + + echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\"" + perl "${S}/helpcontent2/helpers/create_ilst.pl" \ + -dir=icon-themes/galaxy/res/helpimg \ + > "${path}/helpimg.ilst" + [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug." + ) + + local target + use test && target="build" || target="build-nocheck" + + # this is not a proper make script + make ${target} || die +} + +src_test() { + make unitcheck || die + make slowcheck || die +} + +src_install() { + # This is not Makefile so no buildserver + make DESTDIR="${D}" distro-pack-install -o build -o check || die + + # Fix bash completion placement + newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} + bashcomp_alias \ + libreoffice \ + unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice + rm -rf "${ED}"/etc/ || die + + if use branding; then + insinto /usr/$(get_libdir)/${PN}/program + newins "${WORKDIR}/branding-sofficerc" sofficerc + echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} + fi + + # symlink the nsplugin to proper location + # use gtk && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so + + # Hack for offlinehelp, this needs fixing upstream at some point. + # It is broken because we send --without-help + # https://bugs.freedesktop.org/show_bug.cgi?id=46506 + insinto /usr/$(get_libdir)/libreoffice/help + doins xmlhelp/util/*.xsl + + # Remove desktop files for support to old installs that can't parse mime + rm -rf "${ED}"/usr/share/mimelnk/ + + # FIXME: Hack add missing file + insinto /usr/$(get_libdir)/${PN}/program + doins "${S}"/instdir/program/libsaxlo.so + + pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin + pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin +} + +pkg_preinst() { + # Cache updates - all handled by kde eclass for all environments + kde4-base_pkg_preinst +} + +pkg_postinst() { + kde4-base_pkg_postinst + + use java || \ + ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.' +} + +pkg_postrm() { + kde4-base_pkg_postrm +} diff --git a/app-office/libreoffice/libreoffice-4.3.9999.ebuild b/app-office/libreoffice/libreoffice-4.3.9999.ebuild index a81b24913a54..ffcb51207d4e 100644 --- a/app-office/libreoffice/libreoffice-4.3.9999.ebuild +++ b/app-office/libreoffice/libreoffice-4.3.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild,v 1.8 2014/12/28 14:57:43 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild,v 1.9 2014/12/28 17:12:34 dilfridge Exp $ EAPI=5 @@ -60,6 +60,8 @@ unset DEV_URI # If you want them gone, patches are welcome. ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz" ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code +ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )" +ADDONS_SRC+=" collada? ( ${ADDONS_URI}/OpenCOLLADA-master-6509aa13af.tar.bz2 )" ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it? ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all @@ -72,7 +74,7 @@ unset EXT_URI unset ADDONS_SRC IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer -+gtk gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba vlc" ++gtk gtk3 jemalloc kde mysql odk opengl postgres telepathy test vlc" LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" # Unpackaged separate extensions: @@ -91,6 +93,8 @@ SLOT="0" [[ ${PV} == *9999* ]] || \ KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" +# FIXME: collada? ( media-libs/opencollada ) +# how to configure system-collada? COMMON_DEPEND=" ${PYTHON_DEPS} app-arch/zip @@ -144,7 +148,6 @@ COMMON_DEPEND=" x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) - collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) @@ -244,9 +247,13 @@ PATCHES=( # not upstreamable stuff "${FILESDIR}/${PN}-3.7-system-pyuno.patch" - # from master branch + # from 4.4 branch "${FILESDIR}/${PN}-4.3.1.2-implement--with-system-coinmp.patch" - "${FILESDIR}/${PN}-4.3.4.1-boost-1.56.0.patch" # bug 522178 + "${FILESDIR}/${PN}-4.3.4.1-boost-1.56.0.patch" # bug 522178 + "${FILESDIR}/${PN}-4.3.5.2-system-opencollada.patch" + "${FILESDIR}/${PN}-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch" + + # from master branch ) REQUIRED_USE=" @@ -446,6 +453,7 @@ src_configure() { # --enable-extension-integration: enable any extension integration support # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs # --disable-report-builder: too much java packages pulled in without pkgs + # FIXME: $(use_with collada system-opencollada) econf \ --docdir="${EPREFIX}/usr/share/doc/${PF}/" \ --with-system-headers \ @@ -512,7 +520,6 @@ src_configure() { $(use_enable opengl) \ $(use_enable postgres postgresql-sdbc) \ $(use_enable telepathy) \ - $(use_enable vba) \ $(use_enable vlc) \ $(use_with coinmp system-coinmp) \ $(use_with gltf system-libgltf) \ @@ -583,6 +590,10 @@ src_install() { # Remove desktop files for support to old installs that can't parse mime rm -rf "${ED}"/usr/share/mimelnk/ + # FIXME: Hack add missing file + insinto /usr/$(get_libdir)/${PN}/program + doins "${S}"/instdir/program/libsaxlo.so + pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin } diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild index ab92a5e2f9a8..c7a0db47e154 100644 --- a/app-office/libreoffice/libreoffice-9999-r2.ebuild +++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.233 2014/12/28 14:57:43 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.234 2014/12/28 17:12:34 dilfridge Exp $ EAPI=5 @@ -74,7 +74,7 @@ unset EXT_URI unset ADDONS_SRC IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer -+gtk gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba vlc" ++gtk gtk3 jemalloc kde mysql odk opengl postgres telepathy test vlc" LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" # Unpackaged separate extensions: @@ -93,6 +93,8 @@ SLOT="0" [[ ${PV} == *9999* ]] || \ KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" +# FIXME: collada? ( media-libs/opencollada ) +# how to configure system-collada? COMMON_DEPEND=" ${PYTHON_DEPS} app-arch/zip @@ -443,6 +445,7 @@ src_configure() { # --enable-extension-integration: enable any extension integration support # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs # --disable-report-builder: too much java packages pulled in without pkgs + # FIXME: $(use_with collada system-opencollada) econf \ --docdir="${EPREFIX}/usr/share/doc/${PF}/" \ --with-system-headers \ @@ -452,6 +455,7 @@ src_configure() { --enable-cairo-canvas \ --enable-graphite \ --enable-largefile \ + --enable-mergelibs \ --enable-neon \ --enable-python=system \ --enable-randr \ @@ -468,7 +472,6 @@ src_configure() { --disable-report-builder \ --disable-kdeab \ --disable-kde \ - --disable-mergelibs \ --disable-online-update \ --disable-systray \ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \ @@ -509,7 +512,6 @@ src_configure() { $(use_enable opengl) \ $(use_enable postgres postgresql-sdbc) \ $(use_enable telepathy) \ - $(use_enable vba) \ $(use_enable vlc) \ $(use_with coinmp system-coinmp) \ $(use_with gltf system-libgltf) \ -- 2.26.2