diff options
| author |   Andreas Hüttel <dilfridge@gentoo.org> | 2014-09-16 09:14:20 +0000 |
|---|---|---|
| committer | Andreas Hüttel <dilfridge@gentoo.org> | 2014-09-16 09:14:20 +0000 |
| commit | 3de64462790e80041d50e3b24f3c539915e913ac (patch) | |
| tree | 164188ef8bfed424b5ddeefae60ccd1f9b7ecee8 /app-office | |
| parent | Stable for x86, wrt bug #522772 (diff) | |
| download | historical-3de64462790e80041d50e3b24f3c539915e913ac.tar.gz historical-3de64462790e80041d50e3b24f3c539915e913ac.tar.bz2 historical-3de64462790e80041d50e3b24f3c539915e913ac.zip | |
Version bump, thanks to Andreas Sturmlechner
Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F
Diffstat (limited to 'app-office')
10 files changed, 2155 insertions, 29 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index a6a87d1d6e6f..273ea9fa10e2 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,18 @@ # 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.581 2014/09/14 09:11:47 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.582 2014/09/16 09:14:01 dilfridge Exp $ + +*libreoffice-4.3.9999 (16 Sep 2014) +*libreoffice-4.3.1.2 (16 Sep 2014) + + 16 Sep 2014; Andreas K. Huettel <dilfridge@gentoo.org> + +libreoffice-4.3.1.2.ebuild, +libreoffice-4.3.9999.ebuild, + libreoffice-9999-r2.ebuild, + +files/libreoffice-4.3.1.2-handle-collada-libs-seperately.patch, + +files/libreoffice-4.3.1.2-implement--with-system-coinmp.patch, + +files/libreoffice-4.3.1.2-implement--with-system-gltf.patch, + +files/libreoffice-4.3.1.2-upgrade-to-libgltf-0.0.1.patch: + Version bump, thanks to Andreas Sturmlechner 14 Sep 2014; Andreas K. Huettel <dilfridge@gentoo.org> libreoffice-4.2.5.2.ebuild, libreoffice-4.2.6.3.ebuild, diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 6c2e618aacfd..762a837b5055 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -8,39 +8,49 @@ AUX libreoffice-4.1.4.2-curl-config.patch 2201 SHA256 d8c15dffb4448d326bcc8fad3c AUX libreoffice-4.2.0.4-curl-config.patch 2192 SHA256 0501a9cd9f98e788cf52c2c249de94cdf8b532516bd535351a646cc0aaeb153e SHA512 3698208c100aeac31a8e92c3fe826ebcf9b88e8cde655ecedf6922f2dd0b7489e34833fb8252bcd0fa2112c6a490df199a62a87e6bad4838c635958e8b5337fc WHIRLPOOL 8d13a44899509c2bdd95493a668032185c987414c1a52cb236c499e339018b447adcc137765cb419478b53b3bfee2e54fa2b043f47e270fd652dbd5d733c5b9b AUX libreoffice-4.2.3.3-kde4-startup.patch 2369 SHA256 9bed1863450f65a5f11c6ebb8bc3f8585793373b6e37f9486eaa76f269f3dcde SHA512 ddd2e9b6d7de87e9eca45780e5458b1b93c60c4768e2463f97e0770074d5a4f8787f3e645411754fc247cb9e95e24dc1433d3a1555ae9582947808549be139d6 WHIRLPOOL fe0fc1cd9c1f281eb7f300ac683ad7c360a6c24a1e2b74e9fc34cbc00f19f5ba724fe08650bb214f66c4bf3b79c2bc8615244a4332e1532639c1e7a8fd2f1ec6 AUX libreoffice-4.2.3.3-kde4-timer-mutex.patch 1152 SHA256 23621bb7d0480520889cfb9bc4fe65b8a42d3301b90df64a00504b2a25ca162f SHA512 633fbddbe64d8b463dd7012dd460d69009dd64e2bd64b1a9257840d66d94370af910ee82d455cb3964ea43510cbdbe4bbfe60b389f2d6a796f7bad2cf531d92a WHIRLPOOL 8aa52115bcf1e1e4c17f721ae9db3fabf4228f147b7ea59a2204227005f339c02cbb033ef4f96828c5e1b3d691be1f56c4c942e90b5e15d64b57a0f51108638b +AUX libreoffice-4.3.1.2-handle-collada-libs-seperately.patch 7384 SHA256 6c37667a7db1a5a6177a11ac874065e492a1f8004de5183057572e8120697207 SHA512 2cff4fece0d3b6315699374ce244fc410be635350347ad1b84edb39f71138d611964c7290b49fa11b42e9597e66f0180c896bba950fb0100fff15a9ba7f82d78 WHIRLPOOL ea6a7255fd82c907d05bdfece8e8e5df7922b2cb00d74e44f0242239ff4fd56b5c34f9194412067e2d9cec783f0f185b07bf75d9545d8643fdb4a3dd4e69ae48 +AUX libreoffice-4.3.1.2-implement--with-system-coinmp.patch 2854 SHA256 5de29eb41dcd774379483a750f9eb55f44faebed929a7ed2e46f7493efecf8eb SHA512 900e4ecb148133f9cd8900b60d2b837d7ede09e1a0ce55fc3540783110fac4a8ff4f9c8ecab0deda9715478c3e56642644fc0f604a3295f531232a624cd3428c WHIRLPOOL ce4e85e48b669be73df12f237f326da3105bb54d75a127f73b58ded7583cf85cc60b4fbc019dbf536b6e1de4eb7691b71114684a8e19f11cce15f12066c927f1 +AUX libreoffice-4.3.1.2-implement--with-system-gltf.patch 4983 SHA256 c61e8dd67a6299555fe1ccc0f31263cd3b15b921bf844dacd1f09905ca60734f SHA512 af251ff2e10c3c6e096de4c866e05e22b8763a01cac1f66bcad597615f387daeba18348e45f49a8aacb2b0855e9d3240e373be59d33c821dbef6c79b2d047f40 WHIRLPOOL 4ac552215e634f5cc1bf2f3a253cff9f48032b3ad485942c49a2923c265d6fd0ae45050bc876c422ef95b74e699af182483b6b276319f26f0b35728eb4e05d77 +AUX libreoffice-4.3.1.2-upgrade-to-libgltf-0.0.1.patch 15709 SHA256 22551358fa6e161c2ecdd267bae3de1245fb671eda8b592efa48e7939e9353f2 SHA512 c29b18c5d9b14f2d9a0c08618e274e1fa3bae540b68569fcd0ff216aef4942e7aa5fe89184cadbcb3d6ea04316a5ae9876f3fae085727b13247bb5e0499b10a8 WHIRLPOOL 2d3ee1e39a965cf28e6b633dd5f62dd7aca3dbf4a583aa48cade71cfb8814c93fdfa54099db7774d5db62e2b21d61017dd279fb2cdf1b0fc7633ad3323d2fceb 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 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 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555291 SHA256 b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb SHA512 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8 WHIRLPOOL d809712c3fcaca922d64f67a14d9dc3e750ecf359687c7ba0e8c6c7fc7750e43721a21ce29d5a3b0b87b83bfe7b71947e701ba4aed0a337ec35ecbb22d8dec34 DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f WHIRLPOOL 8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4 +DIST OpenCOLLADA-master-6509aa13af.tar.bz2 9691335 SHA256 8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4 SHA512 e24c14775c180f52dfaa08c499ce2577062a6617500318bf8e017cae3af32427b73e8ac97fbbaee408e6bb16dcff5cff3ed96f7175ae1b8617ad18b73e45c830 WHIRLPOOL c9b7bdebaa1daca2b6d855133b4b140756d29a8d79e36990826c81821d02339440eb32a77062a9234e3d2966a05f0412c853ed437b14ac5c2e7d1221d15aa444 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0 DIST libreoffice-4.2.5.2.tar.xz 123615344 SHA256 4bf7898d7d0ba918a8f6668eff0904a549e5a2de837854716e6d996f121817d5 SHA512 e08aab26f79fdebbaac542a12f19e9eaa6b515802b12e9fb866036f6002b60503bc0fddd443a232c92c14d1e1fbbf7e9cc684142af5ac7558ff1907881ee7d7c WHIRLPOOL 3d43fdca47a16d2d5d8a4df955b89d69c6107453e8321219ce513ef741e6ce6ba329d84914f83f328ef2421df6e7d3dff6c5dbca3bc2b34abdc795cf67309601 DIST libreoffice-4.2.6.3.tar.xz 123839476 SHA256 d954b9fd0df1e51d5441254ae932262b3f4a06ff3275f1a97dea1b369d4f8f9a SHA512 689bb422285bc4db479d940d87e8cc12a2aeb7c410a9928f12ec853ad05b89729b7a893f546318c68c30eb6759db081a194746a5baa7185ddf4074465503629f WHIRLPOOL cdb9a91b71cd04e3d9d8744c0ac433cb49c720ae36000ef107f0bd4e1ce0ef83589413f63dcb13f7484b6aa4428e1c714893a9158aaab152e51c6019cbda1ad9 +DIST libreoffice-4.3.1.2.tar.xz 152392464 SHA256 a53d3af47d0fccf8b33de31c00158a89dc137a8edfe2b546c9c379f7822f3268 SHA512 62bedc21e18fffa4a345e5840bc349381d00991714ca023561cadbc0e306a141b062fc882d8ccfb32e6b48b453140976366c428e84830df77797eeb3c32508ea WHIRLPOOL bbcfa9c3b69e4ac015d84ead7bd8438d487e956009aaa2b0a70f6f04d47aa981ec7b19ecf0899c66c317f291b65d6a34f1a692b3d2f15ac18fceec682b000d04 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538 DIST libreoffice-help-4.2.5.2.tar.xz 1855424 SHA256 bb306643a337c6184cf1663afa8bd0f891ae28b5db6c0290c0eea5819f6d73cd SHA512 ba3e350736e3c51b7dd7a8f8c3f819eb19728bbd73eeb031375ca43bee3dfc0aacba19e919c9bf8f9ff2ac82f4fb82ded90d23c3a30912412564913315f7e24a WHIRLPOOL 1c047f8c98cb252fa28b5f67f7a13244f2112e9bdde06af58796657f228ec315d8ca42a6b91433cbf5c997a6f0660c7187634333ef3f11941817da97e5da6862 DIST libreoffice-help-4.2.6.3.tar.xz 1855444 SHA256 892a78b667f5b1d771920c71bb010a7b1e537d965007591288094ae1e37bf21f SHA512 7eb441bd8e07485a3f003a3317a050c2a9a623d63b42ccbd1dd8e8fa387ab3ea8155e6a2ee135c829a851517a2bfe1ca78d89927ba4afe2f5cc6a59d14e5de80 WHIRLPOOL 217b634e51695465f4ff8e78145a7b4030b634c37f7daf0f8c46fc13db72dc9fdbb9ea8c4b669fd0c7a61fa5a1b75386cf966e3f351534a33691a817baac9e6e +DIST libreoffice-help-4.3.1.2.tar.xz 1855104 SHA256 dfb567c42a9943888454594b91ef587cc68c9825d974d6cd979f98a3a8fb1be0 SHA512 d99be6a5229d92c86aa301962a301ffb1b560a3e518979b7eab4bfa50e32b82c68f13630384abea63ba884335d8782d6518f76e73f5e8adeda6912214851e339 WHIRLPOOL fe27e6744e0072d9aa58c5defcca4c62bbbffaa62ccfafe7204427126a88c0730caafc02137bc77ffa6f8d1b2286c4bf9f1582f486348a92bcd7790516e60da7 EBUILD libreoffice-4.2.5.2.ebuild 17789 SHA256 78488f2c7c2f26a3c899655d927feaf38f7e2a4e8f1ca0db66fe24d219c46b89 SHA512 83c32ae37ca445a9be7a3076b41f4fe2c8785b51be83aa68b6781a6e939046a8efea43643053f1ea1154d259871247e6827bed020d4c214903343d0d5cd4e0e5 WHIRLPOOL 513418c5e96f21cf5b03431d7f171f3f6253b02774f2819efae7eb5ffc37900e5c36ba2d051d5230855a90595283f24f6503ce6b4d5fc91cb3e6d0e3dff9d357 EBUILD libreoffice-4.2.6.3.ebuild 17790 SHA256 519d9b06c3f1d5aa121c5f0215fdda75a3e90d1286ec884958e0c5f67aec78d3 SHA512 db0d27275c5bc0f3f2b33257a02882d4718d72dfbff9877f1b33b5f6029e5dd3f5f3a23f246c92cc968a743f980921371585c31a734562e76331a6abbf186497 WHIRLPOOL 994ded52d9cdca69c7e5eef9d13681b5790d1aed53b8f922c51cb6c102f09a42bc86b3d31e35bf76284d0268de18a80cd89bd16cecf3f07fb2899a1852ba7c42 EBUILD libreoffice-4.2.9999.ebuild 17792 SHA256 2a8af4c102e51664203572b932909f49f2fb8637eb3593e3f0291ab065feab48 SHA512 dea36fc6b2087893395cca92d428f4a00d6e8707861fcc5681c568ed1bd51a2db4019026359776f1735288494bdb37c38ec203d16a268c0ddb87879b8b34864f WHIRLPOOL b043b3f9a0bad8cc9abc712641cb25e9050175c9ed1a295fb7b31ad4da5a6af329cd3981fc6184801bf362095e1ef60904088facf7826fba72a95d9d22ced6fc -EBUILD libreoffice-9999-r2.ebuild 17734 SHA256 a38a63335b17aad59290ad975e0c5dd6d4b2a38d27657994473fc3bc881ef9e2 SHA512 728938f8d39e43df40d5f98e4c81d201df11a127f8951c2f23222deac1cb6f8a27d0e1952b9cea4beb3272a61f86402f823b908f466ef3f658d74847dc318d10 WHIRLPOOL 5b27f4f084f76528b5bfafbfafbaf19e49f5b0bc41f2c8009735ee4d45ad08c5d2f72c236b0432bc7467a72a563c2d5c6378321146b2c6ac2db4df9cc66e15ee -MISC ChangeLog 105310 SHA256 0f2a36d4c7b8075c35b2772f2852254a3d04df68eb1a4b020063c4e3703738d3 SHA512 fe394fa95829f531b5525c35545976386191aa8e8864f7d46f6ca171e7d7c87618651da581cc69eabc382af48c9520f00c358e492a6cf8c9a048703e93c60628 WHIRLPOOL 3976831c94b6cab1e460d2d13555c474389f9989589794e39534b76eec40a3d79d7b3dd0666d76e243291b9e7b980d9c9177d6e4f00099287551d52e9611a2d2 -MISC metadata.xml 1057 SHA256 fae4981111eeb4ca46bc24106d32559f0ae4372e60b38433b4eebf748fead545 SHA512 d249cec1b2ce6e600d34034fa961ffbcef9bd5b0d614dfe043b414ba105e477681bbe0c9b98f982ccfc075f98d409c3897f76b6eec0aaaafb7f3d841442bd355 WHIRLPOOL 73de668873d556236dfc7b86cc197f8426c4e1617e860df1f60dac51cb68e620b01d335fa6d9553927adfb0aba3a349fe6f4baff0e994ce078833b2bbd17b682 +EBUILD libreoffice-4.3.1.2.ebuild 18503 SHA256 0cc9aa9d8539a395ce719c1c42cf1bdedb4227626341c7e0b1e0a018d12c5b6d SHA512 2df47f63ace05b5b907b0630127316b7649f77ff9d6564e6a0ecfb1f842a267a16994239b16faa1953d874a9021642641f3fe2f88df040ea1ef9d5a4e1b30dd2 WHIRLPOOL 458546bf8275f7b8af0c90f921c34a4b2546b85223c1a683a2078750ed43dc2d6049392094bf7adfc3bc68d54587ad3e45cc95b2fe505d0269fa822d7598f233 +EBUILD libreoffice-4.3.9999.ebuild 18317 SHA256 a3f3a24c221f7f407fb9347153dbbc9068aa50d3014af6851ae7238620e3e149 SHA512 bfd40e3a445c76cc04f3f7c4e16b270b23aa1ccb6c00e215d3cc3235b62d072ae425b450a3e398d535de060d0258dd95665d5d2f7da671a7a643697809b8c0c2 WHIRLPOOL 6b9f8aa91640ea7e7d43e36fb3bfca5d4fab9281d31f3c6a85ea9749c9279e9f6cf8ca6a0565600ac7c30ae5adabad5c3cd6e86ec20247569d2ed01e310026a2 +EBUILD libreoffice-9999-r2.ebuild 18230 SHA256 697090647cc2f85ad4b970fc77e207519cb7e73df2b0917b272aa60e320f3aa7 SHA512 145585e1ac25ebe6c5bf58ccea2486a0130fb655495283f666f4566b438bce6adc55279d80568ccb8f2ea0f4a9ce914fa797f9ef7eabf8a1bc750d872a517687 WHIRLPOOL d6989d4608084ea395e812779cd618aa193716dcc89739fe04dd52873ea3b65ee5a4b408e78d722277435ed8d040c8e55693e2e2e0c77a351263beb8ce798a3d +MISC ChangeLog 105836 SHA256 5ff3206fa43d8103be05cb7811f019612cb5164172515bcfe357af3acdd54eb2 SHA512 2b4a75e87f6f0ddf029fcd54900e3d8be0cc9720241a1010e3711f540f5ed49671387d9596ba777704f9ee44890e7283e2d98d367ddf90d2c821bdd9c8ae14c4 WHIRLPOOL d2eb91a4362dcc92b79798c44d34c4556584cdac8dd774e7cb6fa13022b4b1bd85b3ab25109752f3ba4440a7b167515022ac3692739b63eb28ebb91007bdd8d8 +MISC metadata.xml 1354 SHA256 bf91c27f941b42e977112a3ea9465babd4c4d94dde3f8308d6db1ccd56bc65b9 SHA512 636da2f295d3055de61b52b2a1d371a25101efdc55014ba2e5a7446bb55b30dca1bb58cc2a84873fb862e40f60de10122c55dba19ba9e5d058eab36f7c33aad6 WHIRLPOOL 4aa957484052955572b2bdca42a7d32f5a89f3916a646e92cca940ce2f4e5c8dec824c75150bf80455dcbc2e13f550d1158c418ca38cecac5ac3090419a52f5e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUFVvhAAoJEJS/30SErRQvuUIP/1etLMcPd34ZCRPfxf/vvdPJ -aJE9rI8UyUuq7HCPqJRAgBtK2gy0Jp/b7ZcSRv/C7I5GmLiAR2ruB0wdZF3t0hyF -Xc2f91GsWXJwN26Tq1azFqdVzAO53ujg5ZLV0keUvqK8DnjJ/oNidE/n/74S5UYr -2j8At/+7gCUL5teU/ichJfry35jQ23UhoieUdKLU72e8ehnLulvK1wFqI7KfdFjn -c9ZfFgxauW17DD79YjaAMleGDDEOq29jmTD2bAR5gW1AfZKh5md41qUbjHqSh9hK -lQBOJMOhJoL/wcU+OmYkTi/QAgLk1oZUXpH8y19nMt7BoBU5D+0VJkeodIRN7AHr -8n8N8J0M5ERwnlfLj35SEmQ/gXloQOjzUaKqAzVWpXRhoaslQe63skJ+xXK1k9d7 -p1P69lBW+BONKGuA0Swu9Rco2ERymbGYj4gzk72aEnCoOAvgDezE3XQ4mjb0DynG -1OgO7UKWGSu0z7mL3f4zsBs0ozYodgn/ZI55NRvy4/c4brvKlZz14Nmg84RefCdR -0Qr1yCZJew2eCktso3OnoHMYo5a4gcf4p43ljVnlZtdG9pWR9v3QCIgO7B+tSWGZ -4aI+W3DZ484QK1xUywVkppP03BEQ2Jc/NZNMXYCVw0GzoSC2JUw3bIsnv1M+pxPi -7ksbGDs5IYVjU6OzcbBj -=avSA +iQIcBAEBCAAGBQJUF/9oAAoJEJS/30SErRQvYr4P/0aUoEGy7FxMLSO213+WU3KZ +GJeK6qYlbcLfUiZ3JPvheioGn2etxpRrMu1zjz8QcHpKIf+whs4lQdbu6NVVC7zY +aH8q5YApv5N47OJ6DITsyIRbF0Fz0UOwfG572dmGJL9JcbuMAfq6+41wfIkYR55/ +VBMtR1Y80WldrYQVhWOrTHju/X/IpUjIKi9JmzA52XI2QQxfx8hdKwQaOly8xT8L +JIPH3tbZuBf84zdxyrwXrq3VVAZPmiHKpRGwEBkNS2XiV3YOfpzl9D85aSD4Ld0J +MaXQBqQOTpTxzs1TZ3rSlTypS00f41Jf2gNWjHU92U/PVxuCOdjs0E5go1sr70TQ +DJVUeHaHsLlr3U0j4hRQpKNgDMREeLJUjaYetlzkVI/q3judTrDYONz5EgLIX4Tq +4L5ag2AyEyHWjBnLlzt3oay4XX/IvYtm6dOCXtaIj9ckt3LNYPfFMD0r9FKPUGMg +XX8wGAShfgXnik4B8de6LOGQI1ID6lw+iimuuJO0ZBteNdnoc7K5kgGVgzDhrdZn +EXoSFHwk2nB4Q/5uiP3c0Ph3LdaYfmXZ+QDrhfdctZx2myAeADz9WGN1vugeWwhO +NJjZTg82k92IcDsO39946eUErQPeFAFUeiPF67J8a1mCEaIxmbY/tb3hugq2zUqJ +UWsBAHP5tamoUvwAd+JX +=meye -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/files/libreoffice-4.3.1.2-handle-collada-libs-seperately.patch b/app-office/libreoffice/files/libreoffice-4.3.1.2-handle-collada-libs-seperately.patch new file mode 100644 index 000000000000..d7166f375a3b --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-4.3.1.2-handle-collada-libs-seperately.patch @@ -0,0 +1,228 @@ +From 6d239ee19a4b1d9068fbd04b5a692c859142f613 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolnai=20Tam=C3=A1s?= <tamas.zolnai@collabora.com> +Date: Fri, 29 Aug 2014 14:14:31 +0200 +Subject: [PATCH] Handle collada libraries seperately: --disable-collada + +Depends on gltf support. + +(cherry picked from commit 191f0944fd8fc30493eda58c7adfdfa0b538f507) + +Conflicts: + config_host.mk.in + sd/source/ui/func/fuinsert.cxx + +Change-Id: Ief0452da3d03b0ddbca45272e5f5cd268691aeca +Reviewed-on: https://gerrit.libreoffice.org/11193 +Tested-by: Rene Engelhard <rene@debian.org> +Reviewed-by: Rene Engelhard <rene@debian.org> +--- + RepositoryExternal.mk | 6 +++++- + avmedia/Library_avmedia.mk | 5 +---- + avmedia/source/framework/modeltools.cxx | 9 ++++++--- + config_host.mk.in | 1 + + config_host/config_features.h.in | 5 +++++ + configure.ac | 23 +++++++++++++++++++---- + include/avmedia/modeltools.hxx | 4 ++++ + sd/source/ui/func/fuinsert.cxx | 9 +++++++++ + 8 files changed, 50 insertions(+), 12 deletions(-) + +diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk +index b42dce2..cd99108 100644 +--- a/RepositoryExternal.mk ++++ b/RepositoryExternal.mk +@@ -3324,6 +3324,8 @@ endef + + endif # SYSTEN_LIBGLTF + ++ifeq ($(ENABLE_COLLADA),TRUE) ++ + define gb_LinkTarget__use_opencollada_parser + $(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADABaseUtils/include \ +@@ -3354,7 +3356,9 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ + ) + endef + +-endif ++endif # ENABLE_COLLADA ++ ++endif # ENABLE_GLTF + + ### Jars ############################################################ + +diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk +index 184c66c..7cc08fa 100644 +--- a/avmedia/Library_avmedia.mk ++++ b/avmedia/Library_avmedia.mk +@@ -52,7 +52,7 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\ + )) + endif + +-ifneq (,$(filter COLLADA2GLTF,$(BUILD_TYPE))) ++ifeq ($(ENABLE_COLLADA),TRUE) + $(eval $(call gb_Library_set_warnings_not_errors,avmedia)) + + ifeq ($(OS),LINUX) +@@ -68,9 +68,6 @@ $(eval $(call gb_Library_use_externals,avmedia,\ + png \ + )) + +-$(eval $(call gb_Library_add_defs,avmedia,\ +- -DENABLE_COLLADA2GLTF \ +-)) + endif + + $(eval $(call gb_Library_add_exception_objects,avmedia,\ +diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx +index 6119cb7..8c4251e 100644 +--- a/avmedia/source/framework/modeltools.cxx ++++ b/avmedia/source/framework/modeltools.cxx +@@ -29,7 +29,9 @@ + #include <boost/foreach.hpp> + #include <boost/optional.hpp> + +-#ifdef ENABLE_COLLADA2GLTF ++#include <config_features.h> ++ ++#if HAVE_FEATURE_COLLADA + #include <COLLADA2GLTFWriter.h> + #include <GLTFAsset.h> + #endif +@@ -42,7 +44,7 @@ using namespace boost::property_tree; + + namespace avmedia { + +-#ifdef ENABLE_COLLADA2GLTF ++#if HAVE_FEATURE_COLLADA + + static void lcl_UnzipKmz(const OUString& rSourceURL, const OUString& rOutputFolderURL, OUString& o_rDaeFileURL) + { +@@ -242,7 +244,8 @@ bool Embed3DModel( const uno::Reference<frame::XModel>& xModel, + const OUString& rSourceURL, OUString& o_rEmbeddedURL) + { + OUString sSource = rSourceURL; +-#ifdef ENABLE_COLLADA2GLTF ++ ++#if HAVE_FEATURE_COLLADA + if( !rSourceURL.endsWithIgnoreAsciiCase(".json") ) + KmzDae2Gltf(rSourceURL, sSource); + #endif +diff --git a/config_host.mk.in b/config_host.mk.in +index aec0fa5..36a6866 100644 +--- a/config_host.mk.in ++++ b/config_host.mk.in +@@ -109,6 +109,7 @@ export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@ + export ENABLE_CHART_TESTS=@ENABLE_CHART_TESTS@ + export ENABLE_CMIS=@ENABLE_CMIS@ + export ENABLE_COINMP=@ENABLE_COINMP@ ++export ENABLE_COLLADA=@ENABLE_COLLADA@ + export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@ + export ENABLE_CUPS=@ENABLE_CUPS@ + export ENABLE_CURL=@ENABLE_CURL@ +diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in +index 3fd1da5..f87ee27 100644 +--- a/config_host/config_features.h.in ++++ b/config_host/config_features.h.in +@@ -142,4 +142,9 @@ + */ + #define HAVE_FEATURE_GLTF 0 + ++/* ++ * Whether we have COLLADA support. ++ */ ++#define HAVE_FEATURE_COLLADA 0 ++ + #endif +diff --git a/configure.ac b/configure.ac +index 63e067b..b6e8124 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1395,6 +1395,10 @@ AC_ARG_ENABLE(gltf, + AS_HELP_STRING([--disable-gltf], + [Determines whether to build libraries related to glTF 3D model rendering.])) + ++AC_ARG_ENABLE(collada, ++ AS_HELP_STRING([--disable-collada], ++ [Disable collada support (Rendering 3D models stored in *.dae and *.kmz format).])) ++ + dnl =================================================================== + dnl Optional Packages (--with/without-) + dnl =================================================================== +@@ -10572,10 +10576,6 @@ if test "x$enable_gltf" != "xno" -a $_os != Darwin -a $_os != iOS -a $_os != And + else + BUILD_TYPE="$BUILD_TYPE LIBGLTF" + fi +- # otherwise build fails in collada2gltf external because of std::shared_ptr +- if test "$have_std_shared_ptr" = "yes"; then +- BUILD_TYPE="$BUILD_TYPE COLLADA2GLTF" +- fi + else + AC_MSG_RESULT([no]) + fi +@@ -10584,6 +10584,21 @@ AC_SUBST(SYSTEM_LIBGLTF) + AC_SUBST(LIBGLTF_CFLAGS) + AC_SUBST(LIBGLTF_LIBS) + ++dnl =================================================================== ++dnl Check whether to enable COLLADA support ++dnl =================================================================== ++AC_MSG_CHECKING([whether to enable COLLADA support]) ++ENABLE_COLLADA= ++if test "$enable_collada" != "no" -a "$ENABLE_GLTF" = "TRUE" -a "$have_std_shared_ptr" = "yes"; then ++ AC_MSG_RESULT([yes]) ++ ENABLE_COLLADA=TRUE ++ AC_DEFINE(HAVE_FEATURE_COLLADA,1) ++ BUILD_TYPE="$BUILD_TYPE COLLADA2GLTF" ++else ++ AC_MSG_RESULT([no]) ++fi ++AC_SUBST(ENABLE_COLLADA) ++ + # pdf import? + AC_MSG_CHECKING([whether to build the PDF import feature]) + ENABLE_PDFIMPORT= +diff --git a/include/avmedia/modeltools.hxx b/include/avmedia/modeltools.hxx +index ed2de44..526b240 100644 +--- a/include/avmedia/modeltools.hxx ++++ b/include/avmedia/modeltools.hxx +@@ -11,9 +11,13 @@ + #include <com/sun/star/frame/XModel.hpp> + #include <avmedia/avmediadllapi.h> + ++#include <config_features.h> ++ + namespace avmedia { + ++#if HAVE_FEATURE_COLLADA + bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput); ++#endif + + bool AVMEDIA_DLLPUBLIC Embed3DModel( + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& xModel, +diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx +index cd03700..9c1c4ad 100644 +--- a/sd/source/ui/func/fuinsert.cxx ++++ b/sd/source/ui/func/fuinsert.cxx +@@ -789,10 +789,19 @@ void FuInsert3DModel::DoExecute( SfxRequest& ) + sfx2::FileDialogHelper aDlg( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); + + aDlg.SetTitle( "Insert 3D Model" ); ++ ++#if HAVE_FEATURE_COLLADA + aDlg.AddFilter( "All supported formats", "*.json;*.dae;*.kmz" ); ++#else ++ aDlg.AddFilter( "All supported formats", "*.json" ); ++#endif ++ + aDlg.AddFilter( "JSON - GL Transmission Format", "*.json" ); ++ ++#if HAVE_FEATURE_COLLADA + aDlg.AddFilter( "DAE - COLLADA", "*.dae" ); + aDlg.AddFilter( "KMZ - Keyhole Markup language Zipped", "*.kmz" ); ++#endif + + OUString sURL; + if( aDlg.Execute() == ERRCODE_NONE ) +-- +2.1.0 + diff --git a/app-office/libreoffice/files/libreoffice-4.3.1.2-implement--with-system-coinmp.patch b/app-office/libreoffice/files/libreoffice-4.3.1.2-implement--with-system-coinmp.patch new file mode 100644 index 000000000000..68942e54b13b --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-4.3.1.2-implement--with-system-coinmp.patch @@ -0,0 +1,98 @@ +From d85f513934bb5735a2c0c343fbe7dc2b9c11af3e Mon Sep 17 00:00:00 2001 +From: Rene Engelhard <rene@debian.org> +Date: Wed, 6 Aug 2014 00:03:21 +0200 +Subject: [PATCH] implement --with-system-coinmp + +Change-Id: I02928097f049e8f3cbefbc872b570b2d2b072658 +--- + RepositoryExternal.mk | 15 +++++++++++++++ + config_host.mk.in | 3 +++ + configure.ac | 16 ++++++++++++++-- + 3 files changed, 32 insertions(+), 2 deletions(-) + +diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk +index a9c9e53..1961829 100644 +--- a/RepositoryExternal.mk ++++ b/RepositoryExternal.mk +@@ -2250,6 +2250,8 @@ endif # ENABLE_LPSOLVE + + ifneq ($(ENABLE_COINMP),) + ++ifneq ($(SYSTEM_COINMP),TRUE) ++ + define gb_LinkTarget__use_coinmp + $(call gb_LinkTarget_use_package,$(1),coinmp) + ifeq ($(COM),MSC) +@@ -2279,6 +2281,19 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ + coinmp \ + )) + ++else # SYSTEM_COINMP ++ ++define gb_LinkTarget__use_coinmp ++$(call gb_LinkTarget_set_include,$(1),\ ++ $$(INCLUDE) \ ++ $(COINMP_CFLAGS) \ ++) ++$(call gb_LinkTarget_add_libs,$(1),$(COINMP_LIBS)) ++ ++endef ++ ++endif ++ + else + + gb_LinkTarget__use_coinmp := +diff --git a/config_host.mk.in b/config_host.mk.in +--- a/config_host.mk.in ++++ b/config_host.mk.in +@@ -109,6 +109,9 @@ export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@ + export ENABLE_CHART_TESTS=@ENABLE_CHART_TESTS@ + export ENABLE_CMIS=@ENABLE_CMIS@ + export ENABLE_COINMP=@ENABLE_COINMP@ ++export SYSTEM_COINMP=@SYSTEM_COINMP@ ++export COINMP_CFLAGS=@COINMP_CFLAGS@ ++export COINMP_LIBS=@COINMP_LIBS@ + export ENABLE_COLLADA=@ENABLE_COLLADA@ + export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@ + export ENABLE_CUPS=@ENABLE_CUPS@ +diff --git a/configure.ac b/configure.ac +index e91773f..3aadd12 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1867,6 +1867,11 @@ AC_ARG_WITH(system-lpsolve, + [Use lpsolve already on system.]),, + [with_system_lpsolve="$with_system_libs"]) + ++AC_ARG_WITH(system-coinmp, ++ AS_HELP_STRING([--with-system-coinmp], ++ [Use CoinMP already on system.]),, ++ [with_system_coinmp="$with_system_libs"]) ++ + AC_ARG_WITH(system-liblangtag, + AS_HELP_STRING([--with-system-liblangtag], + [Use liblangtag library already on system.]),, +@@ -9661,12 +9666,19 @@ AC_MSG_CHECKING([whether to build with CoinMP]) + if test "$enable_coinmp" != "no"; then + ENABLE_COINMP=TRUE + AC_MSG_RESULT([yes]) +- # Should we check for system CoinMP ? How to do that ? +- BUILD_TYPE="$BUILD_TYPE COINMP" ++ if test "$with_system_coinmp" = "yes"; then ++ SYSTEM_COINMP=TRUE ++ PKG_CHECK_MODULES( COINMP, coinmp ) ++ else ++ BUILD_TYPE="$BUILD_TYPE COINMP" ++ fi + else + AC_MSG_RESULT([no]) + fi + AC_SUBST(ENABLE_COINMP) ++AC_SUBST(SYSTEM_COINMP) ++AC_SUBST(COINMP_CFLAGS) ++AC_SUBST(COINMP_LIBS) + + ENABLE_LPSOLVE= + AC_MSG_CHECKING([whether to build with lpsolve]) +-- +1.7.1 diff --git a/app-office/libreoffice/files/libreoffice-4.3.1.2-implement--with-system-gltf.patch b/app-office/libreoffice/files/libreoffice-4.3.1.2-implement--with-system-gltf.patch new file mode 100644 index 000000000000..cf208b7e2144 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-4.3.1.2-implement--with-system-gltf.patch @@ -0,0 +1,157 @@ +From 2378f45d70c9ce4a093fd6b09216c1cd4563ebe2 Mon Sep 17 00:00:00 2001 +From: Rene Engelhard <rene@debian.org> +Date: Tue, 5 Aug 2014 20:05:35 +0200 +Subject: [PATCH] implement --with-system-gltf + +Change-Id: Ic842006b28f8043bcbbaa81ab5a20e15aa52ac82 +(cherry picked from commit 97bda8e081fd746e9ef743b165b5bf621fc21fbb) +--- + RepositoryExternal.mk | 18 ++++++++++++++++++ + avmedia/source/opengl/oglframegrabber.hxx | 4 ++++ + avmedia/source/opengl/oglplayer.hxx | 4 ++++ + avmedia/source/opengl/oglwindow.hxx | 4 ++++ + config_host.mk.in | 3 +++ + configure.ac | 15 ++++++++++++++- + 6 files changed, 47 insertions(+), 1 deletion(-) + +diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk +index ff50598..b42dce2 100644 +--- a/RepositoryExternal.mk ++++ b/RepositoryExternal.mk +@@ -3281,6 +3281,8 @@ endif # DESKTOP + + ifeq ($(ENABLE_GLTF),TRUE) + ++ifneq ($(SYSTEM_LIBGLTF),TRUE) ++ + define gb_LinkTarget__use_libgltf + $(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,libgltf)/inc \ +@@ -3306,6 +3308,22 @@ $(call gb_ExternalProject_use_external_project,$(1),libgltf) + + endef + ++else # SYSTEM_LIBGLTF ++ ++define gb_LinkTarget__use_libgltf ++$(call gb_LinkTarget_set_include,$(1),\ ++ $$(INCLUDE) \ ++ $(LIBGLTF_CFLAGS) \ ++) ++$(call gb_LinkTarget_add_libs,$(1),$(LIBGLTF_LIBS)) ++$(call gb_LinkTarget_add_defs,$(1),\ ++ -DSYSTEM_LIBGLTF \ ++) ++ ++endef ++ ++endif # SYSTEN_LIBGLTF ++ + define gb_LinkTarget__use_opencollada_parser + $(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADABaseUtils/include \ +diff --git a/avmedia/source/opengl/oglframegrabber.hxx b/avmedia/source/opengl/oglframegrabber.hxx +index 5beb15b..0d38224 100644 +--- a/avmedia/source/opengl/oglframegrabber.hxx ++++ b/avmedia/source/opengl/oglframegrabber.hxx +@@ -14,7 +14,11 @@ + #include <com/sun/star/lang/XServiceInfo.hpp> + #include <com/sun/star/media/XFrameGrabber.hpp> + ++#ifdef SYSTEM_LIBGLTF ++#include <libgltf/libgltf.h> ++#else + #include <libgltf.h> ++#endif + + namespace avmedia { namespace ogl { + +diff --git a/avmedia/source/opengl/oglplayer.hxx b/avmedia/source/opengl/oglplayer.hxx +index 03ad515..52aa395 100644 +--- a/avmedia/source/opengl/oglplayer.hxx ++++ b/avmedia/source/opengl/oglplayer.hxx +@@ -14,7 +14,11 @@ + #include <cppuhelper/basemutex.hxx> + #include <com/sun/star/lang/XServiceInfo.hpp> + #include <com/sun/star/media/XPlayer.hpp> ++#ifdef SYSTEM_LIBGLTF ++#include <libgltf/libgltf.h> ++#else + #include <libgltf.h> ++#endif + #include <vcl/opengl/OpenGLContext.hxx> + #include <vcl/timer.hxx> + +diff --git a/avmedia/source/opengl/oglwindow.hxx b/avmedia/source/opengl/oglwindow.hxx +index a68f667..ae86083 100644 +--- a/avmedia/source/opengl/oglwindow.hxx ++++ b/avmedia/source/opengl/oglwindow.hxx +@@ -17,7 +17,11 @@ + #include <com/sun/star/media/XPlayerWindow.hpp> + #include <com/sun/star/media/ZoomLevel.hpp> + ++#ifdef SYSTEM_LIBGLTF ++#include <libgltf/libgltf.h> ++#else + #include <libgltf.h> ++#endif + #include <vcl/opengl/OpenGLContext.hxx> + #include <vcl/syschild.hxx> + +diff --git a/config_host.mk.in b/config_host.mk.in +index b7e5b6c..aec0fa5 100644 +--- a/config_host.mk.in ++++ b/config_host.mk.in +@@ -127,6 +127,9 @@ export ENABLE_GRAPHITE=@ENABLE_GRAPHITE@ + export ENABLE_ORCUS=@ENABLE_ORCUS@ + export ENABLE_HARFBUZZ=@ENABLE_HARFBUZZ@ + export ENABLE_GLTF=@ENABLE_GLTF@ ++export SYSTEM_LIBGLTF=@SYSTEM_LIBGLTF@ ++export LIBGLTF_CFLAGS=@LIBGLTF_CFLAGS@ ++export LIBGLTF_LIBS=@LIBGLTF_LIBS@ + export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@ + export ENABLE_GSTREAMER_0_10=@ENABLE_GSTREAMER_0_10@ + export ENABLE_GTK3=@ENABLE_GTK3@ +diff --git a/configure.ac b/configure.ac +index 02791ca..63e067b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1552,6 +1552,11 @@ AC_ARG_WITH(system-jpeg, + [Use jpeg already on system.]),, + [with_system_jpeg=auto]) + ++AC_ARG_WITH(system-libgltf, ++ AS_HELP_STRING([--with-system-libgltf], ++ [Use libgltf already on system.]),, ++ [with_system_libgltf=auto]) ++ + AC_ARG_WITH(system-clucene, + AS_HELP_STRING([--with-system-clucene], + [Use clucene already on system.]),, +@@ -10561,7 +10566,12 @@ if test "x$enable_gltf" != "xno" -a $_os != Darwin -a $_os != iOS -a $_os != And + ENABLE_GLTF=TRUE + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_FEATURE_GLTF,1) +- BUILD_TYPE="$BUILD_TYPE LIBGLTF" ++ if test "$with_system_libgltf" = "yes"; then ++ SYSTEM_LIBGLTF=TRUE ++ PKG_CHECK_MODULES( LIBGLTF, libgltf-0.0 ) ++ else ++ BUILD_TYPE="$BUILD_TYPE LIBGLTF" ++ fi + # otherwise build fails in collada2gltf external because of std::shared_ptr + if test "$have_std_shared_ptr" = "yes"; then + BUILD_TYPE="$BUILD_TYPE COLLADA2GLTF" +@@ -10570,6 +10580,9 @@ else + AC_MSG_RESULT([no]) + fi + AC_SUBST(ENABLE_GLTF) ++AC_SUBST(SYSTEM_LIBGLTF) ++AC_SUBST(LIBGLTF_CFLAGS) ++AC_SUBST(LIBGLTF_LIBS) + + # pdf import? + AC_MSG_CHECKING([whether to build the PDF import feature]) +-- +2.1.0 + diff --git a/app-office/libreoffice/files/libreoffice-4.3.1.2-upgrade-to-libgltf-0.0.1.patch b/app-office/libreoffice/files/libreoffice-4.3.1.2-upgrade-to-libgltf-0.0.1.patch new file mode 100644 index 000000000000..aa73be42c6c4 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-4.3.1.2-upgrade-to-libgltf-0.0.1.patch @@ -0,0 +1,400 @@ +From d431986bd49081581e86444af124d1d2ce90a407 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolnai=20Tam=C3=A1s?= <tamas.zolnai@collabora.com> +Date: Fri, 29 Aug 2014 22:41:26 +0200 +Subject: [PATCH] Upgrade libgltf to 0.0.1 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +News in this version: +- Solve some limitations of walkthrough mode (fdo#81425) +- Multisampling (better rendering quality, mainly at the edges) +- Better error handling (no crash in case of invalid input file) + +Reviewed-on: https://gerrit.libreoffice.org/11179 +Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com> +Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com> + +Conflicts: + download.lst + external/libgltf/UnpackedTarball_libgltf.mk + external/libgltf/pathces/append_shader_version.patch + external/libgltf/pathces/missing_include.patch + vcl/source/opengl/OpenGLContext.cxx + +Change-Id: I46fdf56b00476614487fbcc04178e43e33a01794 +Reviewed-on: https://gerrit.libreoffice.org/11194 +Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> +Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> +--- + RepositoryExternal.mk | 8 ----- + avmedia/source/opengl/oglframegrabber.hxx | 4 --- + avmedia/source/opengl/oglplayer.cxx | 16 ++++++++-- + avmedia/source/opengl/oglplayer.hxx | 6 ++-- + avmedia/source/opengl/oglwindow.cxx | 36 +++++++++++---------- + avmedia/source/opengl/oglwindow.hxx | 6 +--- + configure.ac | 2 +- + download.lst | 4 +-- + external/libgltf/ExternalProject_libgltf.mk | 2 ++ + external/libgltf/UnpackedTarball_libgltf.mk | 2 -- + .../libgltf/pathces/append_shader_version.patch | 37 ---------------------- + external/libgltf/pathces/missing_include.patch | 11 ------- + include/vcl/opengl/OpenGLContext.hxx | 2 ++ + vcl/source/opengl/OpenGLContext.cxx | 5 +++ + 14 files changed, 48 insertions(+), 93 deletions(-) + delete mode 100644 external/libgltf/pathces/append_shader_version.patch + delete mode 100644 external/libgltf/pathces/missing_include.patch + +diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk +index cd99108..f194fcb 100644 +--- a/RepositoryExternal.mk ++++ b/RepositoryExternal.mk +@@ -3303,11 +3303,6 @@ $(call gb_LinkTarget_use_external_project,$(1),libgltf) + + endef + +-define gb_ExternalProject__use_libgltf +-$(call gb_ExternalProject_use_external_project,$(1),libgltf) +- +-endef +- + else # SYSTEM_LIBGLTF + + define gb_LinkTarget__use_libgltf +@@ -3316,9 +3311,6 @@ $(call gb_LinkTarget_set_include,$(1),\ + $(LIBGLTF_CFLAGS) \ + ) + $(call gb_LinkTarget_add_libs,$(1),$(LIBGLTF_LIBS)) +-$(call gb_LinkTarget_add_defs,$(1),\ +- -DSYSTEM_LIBGLTF \ +-) + + endef + +diff --git a/avmedia/source/opengl/oglframegrabber.hxx b/avmedia/source/opengl/oglframegrabber.hxx +index 0d38224..5beb15b 100644 +--- a/avmedia/source/opengl/oglframegrabber.hxx ++++ b/avmedia/source/opengl/oglframegrabber.hxx +@@ -14,11 +14,7 @@ + #include <com/sun/star/lang/XServiceInfo.hpp> + #include <com/sun/star/media/XFrameGrabber.hpp> + +-#ifdef SYSTEM_LIBGLTF +-#include <libgltf/libgltf.h> +-#else + #include <libgltf.h> +-#endif + + namespace avmedia { namespace ogl { + +diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx +index a052dc9..d2e600b 100644 +--- a/avmedia/source/opengl/oglplayer.cxx ++++ b/avmedia/source/opengl/oglplayer.cxx +@@ -269,6 +269,12 @@ uno::Reference< media::XPlayerWindow > SAL_CALL OGLPlayer::createPlayerWindow( c + return uno::Reference< media::XPlayerWindow >(); + } + ++ if( !m_aContext.supportMultiSampling() ) ++ { ++ SAL_WARN("avmedia.opengl", "Context does not support multisampling!"); ++ return uno::Reference< media::XPlayerWindow >(); ++ } ++ + if( !lcl_CheckOpenGLRequirements() ) + { + SAL_WARN("avmedia.opengl", "Your platform does not have the minimal OpenGL requiremenets!"); +@@ -287,7 +293,7 @@ uno::Reference< media::XPlayerWindow > SAL_CALL OGLPlayer::createPlayerWindow( c + releaseInputFiles(); + if( nRet != 0 ) + { +- SAL_WARN("avmedia.opengl", "Error occured while parsing *.json file! Error code: " << nRet); ++ SAL_WARN("avmedia.opengl", "Error occured while setting up the scene! Error code: " << nRet); + return uno::Reference< media::XPlayerWindow >(); + } + // The background color is white by default, but we need to separate the +@@ -309,6 +315,12 @@ uno::Reference< media::XFrameGrabber > SAL_CALL OGLPlayer::createFrameGrabber() + return uno::Reference< media::XFrameGrabber >(); + } + ++ if( !m_aContext.supportMultiSampling() ) ++ { ++ SAL_WARN("avmedia.opengl", "Context does not support multisampling!"); ++ return uno::Reference< media::XFrameGrabber >(); ++ } ++ + if( !lcl_CheckOpenGLRequirements() ) + { + SAL_WARN("avmedia.opengl", "Your platform does not have the minimal OpenGL requiremenets!"); +@@ -324,7 +336,7 @@ uno::Reference< media::XFrameGrabber > SAL_CALL OGLPlayer::createFrameGrabber() + releaseInputFiles(); + if( nRet != 0 ) + { +- SAL_WARN("avmedia.opengl", "Error occured while parsing *.json file! Error code: " << nRet); ++ SAL_WARN("avmedia.opengl", "Error occured while setting up the scene! Error code: " << nRet); + return uno::Reference< media::XFrameGrabber >(); + } + glClearColor(0.5f, 0.5f, 0.5f, 0.5f); +diff --git a/avmedia/source/opengl/oglplayer.hxx b/avmedia/source/opengl/oglplayer.hxx +index 52aa395..465ed6b 100644 +--- a/avmedia/source/opengl/oglplayer.hxx ++++ b/avmedia/source/opengl/oglplayer.hxx +@@ -14,11 +14,9 @@ + #include <cppuhelper/basemutex.hxx> + #include <com/sun/star/lang/XServiceInfo.hpp> + #include <com/sun/star/media/XPlayer.hpp> +-#ifdef SYSTEM_LIBGLTF +-#include <libgltf/libgltf.h> +-#else ++ + #include <libgltf.h> +-#endif ++ + #include <vcl/opengl/OpenGLContext.hxx> + #include <vcl/timer.hxx> + +diff --git a/avmedia/source/opengl/oglwindow.cxx b/avmedia/source/opengl/oglwindow.cxx +index a770ff5..1092483 100644 +--- a/avmedia/source/opengl/oglwindow.cxx ++++ b/avmedia/source/opengl/oglwindow.cxx +@@ -23,7 +23,6 @@ OGLWindow::OGLWindow( glTFHandle& rHandle, OpenGLContext& rContext, Window& rEve + , meZoomLevel( media::ZoomLevel_ORIGINAL ) + , m_aLastMousePos(Point(0,0)) + , m_bIsOrbitMode( false ) +- , m_fCameraDistance(0.0) + { + } + +@@ -267,15 +266,15 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, pEvent) + glm::vec3 vMove = vView-vEye; + vMove = glm::normalize(vMove); + vMove *= 25.0f; +- glm::vec3 vStrafe = glm::cross(vView-vEye, vUp); ++ glm::vec3 vStrafe = glm::cross(vMove, vUp); + vStrafe = glm::normalize(vStrafe); + vStrafe *= 25.0f; +- glm::vec3 vMup = glm::cross(vView-vEye,glm::vec3(1.0f,0.0f,0.0f) ); +- vMup = glm::normalize(vMup); +- vMup *= 25.0f; ++ glm::vec3 vMup = vUp * 25.0f; + + if( !m_bIsOrbitMode ) + { ++ if(nCode == KEY_E)vMoveBy += vMup*(0.0005f*fModelSize); ++ if(nCode == KEY_Q)vMoveBy -= vMup*(0.0005f*fModelSize); + if(nCode == KEY_W)vMoveBy += vMove*(0.0005f*fModelSize); + if(nCode == KEY_S)vMoveBy -= vMove*(0.0005f*fModelSize); + if(nCode == KEY_A)vMoveBy -= vStrafe*(0.0005f*fModelSize); +@@ -283,15 +282,24 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, pEvent) + } + else + { +- if(nCode == KEY_E)vMoveBy += vMove*(0.0005f*fModelSize); +- if(nCode == KEY_Q)vMoveBy -= vMove*(0.0005f*fModelSize); ++ bool bZoomIn = false; ++ bool bZoomOut = false; ++ if(nCode == KEY_E) ++ { ++ vMoveBy += vMove*(0.0005f*fModelSize); ++ bZoomIn = true; ++ } ++ if(nCode == KEY_Q) ++ { ++ vMoveBy -= vMove*(0.0005f*fModelSize); ++ bZoomOut = true; ++ } + + // Limit zooming in orbit mode +- m_fCameraDistance += vMoveBy.z; +- if ((m_fCameraDistance < 0.5 * fModelSize && vMoveBy.z < 0.0 ) || +- (m_fCameraDistance > 2 * fModelSize && vMoveBy.z > 0.0 )) ++ float fCameraDistFromModelGlobe = glm::length(vEye + vMoveBy - vView) - fModelSize / 2.0f; ++ if ((fCameraDistFromModelGlobe < 0.5 * fModelSize && bZoomIn ) || ++ (fCameraDistFromModelGlobe > 2 * fModelSize && bZoomOut )) + { +- m_fCameraDistance -= vMoveBy.z; + vMoveBy = glm::vec3(0.0); + } + } +@@ -333,12 +341,6 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, pEvent) + { + gltf_orbit_mode_start(&m_rHandle); + m_bIsOrbitMode = true; +- // Set default camera distance +- glm::vec3 vEye; +- glm::vec3 vView; +- glm::vec3 vUp; +- gltf_get_camera_pos(&m_rHandle, &vEye,&vView,&vUp); +- m_fCameraDistance = vEye.z - gltf_get_model_center_pos(&m_rHandle)->z - (gltf_get_model_size(&m_rHandle)/2.0); + } + } + else if(nCode == KEY_F) +diff --git a/avmedia/source/opengl/oglwindow.hxx b/avmedia/source/opengl/oglwindow.hxx +index ae86083..8b15813 100644 +--- a/avmedia/source/opengl/oglwindow.hxx ++++ b/avmedia/source/opengl/oglwindow.hxx +@@ -17,11 +17,8 @@ + #include <com/sun/star/media/XPlayerWindow.hpp> + #include <com/sun/star/media/ZoomLevel.hpp> + +-#ifdef SYSTEM_LIBGLTF +-#include <libgltf/libgltf.h> +-#else + #include <libgltf.h> +-#endif ++ + #include <vcl/opengl/OpenGLContext.hxx> + #include <vcl/syschild.hxx> + +@@ -77,7 +74,6 @@ private: + com::sun::star::media::ZoomLevel meZoomLevel; + Point m_aLastMousePos; + bool m_bIsOrbitMode; +- double m_fCameraDistance; + }; + + } // namespace ogl +diff --git a/configure.ac b/configure.ac +index b6e8124..9cd589b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -10572,7 +10572,7 @@ if test "x$enable_gltf" != "xno" -a $_os != Darwin -a $_os != iOS -a $_os != And + AC_DEFINE(HAVE_FEATURE_GLTF,1) + if test "$with_system_libgltf" = "yes"; then + SYSTEM_LIBGLTF=TRUE +- PKG_CHECK_MODULES( LIBGLTF, libgltf-0.0 ) ++ PKG_CHECK_MODULES( LIBGLTF, [libgltf-0.0 >= 0.0.1] ) + else + BUILD_TYPE="$BUILD_TYPE LIBGLTF" + fi +diff --git a/download.lst b/download.lst +index bc2b383..f413a57 100644 +--- a/download.lst ++++ b/download.lst +@@ -87,8 +87,8 @@ export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip + export LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548 + export LIBEOT_TARBALL := libeot-0.01.tar.bz2 + export LIBEXTTEXTCAT_TARBALL := ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2 +-export LIBGLTF_MD5SUM := ca5436e916bfe70694adfe2607782786 +-export LIBGLTF_TARBALL := libgltf-0.0.0.tar.bz2 ++export LIBGLTF_MD5SUM := 03821c9c827e647fb5fedb12496e0067 ++export LIBGLTF_TARBALL := libgltf-0.0.1.tar.bz2 + export LIBLANGTAG_TARBALL := 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 + export LIBXMLSEC_TARBALL := 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz + export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz +diff --git a/external/libgltf/ExternalProject_libgltf.mk b/external/libgltf/ExternalProject_libgltf.mk +index 548487b..62e25a3 100644 +--- a/external/libgltf/ExternalProject_libgltf.mk ++++ b/external/libgltf/ExternalProject_libgltf.mk +@@ -63,6 +63,8 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) : + export CPPFLAGS='$(libgltf_CPPFLAGS)' \ + && export PKG_CONFIG="" \ + && ./configure \ ++ --disable-shared \ ++ --enable-static \ + --with-pic \ + --disable-debug \ + --disable-werror \ +diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk +index 42c821b..176c1d1 100644 +--- a/external/libgltf/UnpackedTarball_libgltf.mk ++++ b/external/libgltf/UnpackedTarball_libgltf.mk +@@ -16,8 +16,6 @@ $(eval $(call gb_UnpackedTarball_set_patchflags,libgltf,--binary)) + $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1)) + + $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\ +- external/libgltf/pathces/missing_include.patch \ +- external/libgltf/pathces/append_shader_version.patch \ + )) + + # vim: set noet sw=4 ts=4: +diff --git a/external/libgltf/pathces/append_shader_version.patch b/external/libgltf/pathces/append_shader_version.patch +deleted file mode 100644 +index 27f0cc6..0000000 +--- a/external/libgltf/pathces/append_shader_version.patch ++++ /dev/null +@@ -1,37 +0,0 @@ +-diff -ur libgltf.org/src/Shaders.cpp libgltf/src/Shaders.cpp +---- libgltf.org/src/Shaders.cpp 2014-08-18 09:19:48.323955939 +0200 +-+++ libgltf/src/Shaders.cpp 2014-08-18 09:20:46.711953465 +0200 +-@@ -11,6 +11,7 @@ +- +- #include <GL/glew.h> +- #include <cstdio> +-+#include <cstring> +- +- namespace libgltf +- { +-@@ -166,7 +167,24 @@ +- unsigned int shaderId) +- { +- GLint iGLSize = iSize; +-- glShaderSource(shaderId, 1, &pShader, &iGLSize); +-+ if( strstr(pShader,"#version") == 0 ) +-+ { +-+ const GLchar* aSources[] = { +-+ "#version 130\n", +-+ pShader, +-+ }; +-+ +-+ const GLint aSizes[] = { +-+ strlen("#version 130\n"), +-+ iGLSize, +-+ }; +-+ +-+ glShaderSource(shaderId, 2, &aSources[0], &aSizes[0]); +-+ } +-+ else +-+ { +-+ glShaderSource(shaderId, 1, &pShader, &iGLSize); +-+ } +- glCompileShader(shaderId); +- int iStatus = 0; +- glGetShaderiv(shaderId, GL_COMPILE_STATUS, &iStatus); +diff --git a/external/libgltf/pathces/missing_include.patch b/external/libgltf/pathces/missing_include.patch +deleted file mode 100644 +index 8b05224..0000000 +--- a/external/libgltf/pathces/missing_include.patch ++++ /dev/null +@@ -1,11 +0,0 @@ +-diff -ur libgltf.org/src/Shaders.cpp libgltf/src/Shaders.cpp +---- libgltf.org/src/Shaders.cpp 2014-08-05 11:40:30.387537876 +0200 +-+++ libgltf/src/Shaders.cpp 2014-08-05 11:41:13.887536123 +0200 +-@@ -10,6 +10,7 @@ +- #include "Shaders.h" +- +- #include <GL/glew.h> +-+#include <cstdio> +- +- namespace libgltf +- { +diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx +index 8a7eb55..f1e0bd2 100644 +--- a/include/vcl/opengl/OpenGLContext.hxx ++++ b/include/vcl/opengl/OpenGLContext.hxx +@@ -166,6 +166,8 @@ public: + return mbInitialized; + } + ++ bool supportMultiSampling() const; ++ + static SystemWindowData generateWinData(Window* pParent); + private: + SAL_DLLPRIVATE bool initWindow(); +diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx +index 974f913..338edc3 100644 +--- a/vcl/source/opengl/OpenGLContext.cxx ++++ b/vcl/source/opengl/OpenGLContext.cxx +@@ -833,4 +833,9 @@ void OpenGLContext::show() + m_pWindow->Show(); + } + ++bool OpenGLContext::supportMultiSampling() const ++{ ++ return m_aGLWin.bMultiSampleSupported; ++} ++ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +-- +2.1.0 + diff --git a/app-office/libreoffice/libreoffice-4.3.1.2.ebuild b/app-office/libreoffice/libreoffice-4.3.1.2.ebuild new file mode 100644 index 000000000000..8d4747ec3b19 --- /dev/null +++ b/app-office/libreoffice/libreoffice-4.3.1.2.ebuild @@ -0,0 +1,606 @@ +# 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.1.2.ebuild,v 1.1 2014/09/16 09:14:01 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 +vba vlc +webdav" + +LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" +# Unpackaged separate extensions: +# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf? +# hunart: only on ooo extensions -> fubared download path somewhere on sf +# numbertext, typo, validator, watch-window: ^^ +# oooblogger: no homepage or anything +# Extensions that need extra work: +for lo_xt in ${LO_EXTS}; do + IUSE+=" libreoffice_extensions_${lo_xt}" +done +unset lo_xt + +LICENSE="|| ( LGPL-3 MPL-1.1 )" +SLOT="0" +[[ ${PV} == *9999* ]] || \ +KEYWORDS="~amd64 ~x86" + +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/libatomic_ops-7.2d + >=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-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-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 ) + 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/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 libreoffice-4-3 branch + "${FILESDIR}/${PN}-4.3.1.2-implement--with-system-gltf.patch" + "${FILESDIR}/${PN}-4.3.1.2-handle-collada-libs-seperately.patch" + "${FILESDIR}/${PN}-4.3.1.2-upgrade-to-libgltf-0.0.1.patch" + + # from master branch + "${FILESDIR}/${PN}-4.3.1.2-implement--with-system-coinmp.patch" +) + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + bluetooth? ( dbus ) + collada? ( gltf ) + gnome? ( gtk ) + eds? ( gnome ) + telepathy? ( gtk ) + libreoffice_extensions_nlpsolver? ( java ) + libreoffice_extensions_scripting-beanshell? ( java ) + libreoffice_extensions_scripting-javascript? ( java ) + libreoffice_extensions_wiki-publisher? ( java ) +" + +CHECKREQS_MEMORY="512M" +CHECKREQS_DISK_BUILD="6G" + +pkg_pretend() { + local pgslot + + if [[ ${MERGE_TYPE} != binary ]]; then + check-reqs_pkg_pretend + + if [[ $(gcc-major-version) -lt 4 ]] || \ + ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \ + ; then + eerror "Compilation with gcc older than 4.6 is not supported" + die "Too old gcc found." + fi + fi + + # Ensure pg version but we have to be sure the pg is installed (first + # install on clean system) + if use postgres && has_version dev-db/postgresql-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 + 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 + 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-python=system \ + --enable-randr \ + --enable-randr-link \ + --enable-release-build \ + --disable-hardlink-deliver \ + --disable-ccache \ + --disable-crashdump \ + --disable-dependency-tracking \ + --disable-epm \ + --disable-fetch-external \ + --disable-gnome-vfs \ + --disable-gstreamer-0-10 \ + --disable-report-builder \ + --disable-kdeab \ + --disable-kde \ + --disable-mergelibs \ + --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 vba) \ + $(use_enable vlc) \ + $(use_enable webdav neon) \ + $(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} + rm -rf "${ED}"/etc/ + + if use branding; then + insinto /usr/$(get_libdir)/${PN}/program + newins "${WORKDIR}/branding-sofficerc" sofficerc + echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} + fi + + # symlink the nsplugin to proper location + # use gtk && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so + + # Hack for offlinehelp, this needs fixing upstream at some point. + # It is broken because we send --without-help + # https://bugs.freedesktop.org/show_bug.cgi?id=46506 + insinto /usr/$(get_libdir)/libreoffice/help + doins xmlhelp/util/*.xsl + + # Remove desktop files for support to old installs that can't parse mime + rm -rf "${ED}"/usr/share/mimelnk/ + + pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin + pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin +} + +pkg_preinst() { + # Cache updates - all handled by kde eclass for all environments + kde4-base_pkg_preinst +} + +pkg_postinst() { + kde4-base_pkg_postinst + + use java || \ + ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.' +} + +pkg_postrm() { + kde4-base_pkg_postrm +} diff --git a/app-office/libreoffice/libreoffice-4.3.9999.ebuild b/app-office/libreoffice/libreoffice-4.3.9999.ebuild new file mode 100644 index 000000000000..d641c12fc078 --- /dev/null +++ b/app-office/libreoffice/libreoffice-4.3.9999.ebuild @@ -0,0 +1,601 @@ +# 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.1 2014/09/16 09:14:01 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 +vba vlc +webdav" + +LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" +# Unpackaged separate extensions: +# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf? +# hunart: only on ooo extensions -> fubared download path somewhere on sf +# numbertext, typo, validator, watch-window: ^^ +# oooblogger: no homepage or anything +# Extensions that need extra work: +for lo_xt in ${LO_EXTS}; do + IUSE+=" libreoffice_extensions_${lo_xt}" +done +unset lo_xt + +LICENSE="|| ( LGPL-3 MPL-1.1 )" +SLOT="0" +[[ ${PV} == *9999* ]] || \ +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" + +COMMON_DEPEND=" + ${PYTHON_DEPS} + app-arch/zip + app-arch/unzip + >=app-text/hunspell-1.3.2-r3 + app-text/mythes + >=app-text/libabw-0.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/libatomic_ops-7.2d + >=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-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-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 ) + 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/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 master branch + "${FILESDIR}/${PN}-4.3.1.2-implement--with-system-coinmp.patch" +) + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + bluetooth? ( dbus ) + collada? ( gltf ) + gnome? ( gtk ) + eds? ( gnome ) + telepathy? ( gtk ) + libreoffice_extensions_nlpsolver? ( java ) + libreoffice_extensions_scripting-beanshell? ( java ) + libreoffice_extensions_scripting-javascript? ( java ) + libreoffice_extensions_wiki-publisher? ( java ) +" + +CHECKREQS_MEMORY="512M" +CHECKREQS_DISK_BUILD="6G" + +pkg_pretend() { + local pgslot + + if [[ ${MERGE_TYPE} != binary ]]; then + check-reqs_pkg_pretend + + if [[ $(gcc-major-version) -lt 4 ]] || \ + ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \ + ; then + eerror "Compilation with gcc older than 4.6 is not supported" + die "Too old gcc found." + fi + fi + + # Ensure pg version but we have to be sure the pg is installed (first + # install on clean system) + if use postgres && has_version dev-db/postgresql-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 + 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 + 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-python=system \ + --enable-randr \ + --enable-randr-link \ + --enable-release-build \ + --disable-hardlink-deliver \ + --disable-ccache \ + --disable-crashdump \ + --disable-dependency-tracking \ + --disable-epm \ + --disable-fetch-external \ + --disable-gnome-vfs \ + --disable-gstreamer-0-10 \ + --disable-report-builder \ + --disable-kdeab \ + --disable-kde \ + --disable-mergelibs \ + --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 vba) \ + $(use_enable vlc) \ + $(use_enable webdav neon) \ + $(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} + rm -rf "${ED}"/etc/ + + if use branding; then + insinto /usr/$(get_libdir)/${PN}/program + newins "${WORKDIR}/branding-sofficerc" sofficerc + echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} + fi + + # symlink the nsplugin to proper location + # use gtk && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so + + # Hack for offlinehelp, this needs fixing upstream at some point. + # It is broken because we send --without-help + # https://bugs.freedesktop.org/show_bug.cgi?id=46506 + insinto /usr/$(get_libdir)/libreoffice/help + doins xmlhelp/util/*.xsl + + # Remove desktop files for support to old installs that can't parse mime + rm -rf "${ED}"/usr/share/mimelnk/ + + pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin + pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin +} + +pkg_preinst() { + # Cache updates - all handled by kde eclass for all environments + kde4-base_pkg_preinst +} + +pkg_postinst() { + kde4-base_pkg_postinst + + use java || \ + ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.' +} + +pkg_postrm() { + kde4-base_pkg_postrm +} diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild index 95830664ced3..e37e229f004e 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.227 2014/09/14 09:11:47 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.228 2014/09/16 09:14:01 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 @@ -71,8 +73,8 @@ unset ADDONS_URI unset EXT_URI unset ADDONS_SRC -IUSE="bluetooth +branding +cups dbus debug eds firebird gnome gstreamer +gtk -gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba vlc +webdav" +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 +webdav" LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" # Unpackaged separate extensions: @@ -100,11 +102,11 @@ COMMON_DEPEND=" >=app-text/libabw-0.1.0 >=app-text/libexttextcat-3.2 >=app-text/libebook-0.1.1 - app-text/libetonyek + >=app-text/libetonyek-0.1.1 app-text/liblangtag - app-text/libmspub - >=app-text/libmwaw-0.2 - >=app-text/libodfgen-0.0.3 + >=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 @@ -118,6 +120,7 @@ COMMON_DEPEND=" >=dev-libs/icu-4.8.1.1:= >=dev-libs/libatomic_ops-7.2d >=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 @@ -130,9 +133,9 @@ COMMON_DEPEND=" >=media-libs/harfbuzz-0.9.18:=[icu(+)] media-libs/lcms:2 >=media-libs/libpng-1.4 - >=media-libs/libcdr-0.1 - >=media-libs/libfreehand-0.1 - >=media-libs/libvisio-0.1 + >=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-nds/openldap sci-mathematics/lpsolve @@ -142,10 +145,12 @@ COMMON_DEPEND=" 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] @@ -244,6 +249,7 @@ PATCHES=( REQUIRED_USE=" ${PYTHON_REQUIRED_USE} bluetooth? ( dbus ) + collada? ( gltf ) gnome? ( gtk ) eds? ( gnome ) telepathy? ( gtk ) @@ -446,7 +452,6 @@ src_configure() { --enable-cairo-canvas \ --enable-graphite \ --enable-largefile \ - --enable-mergelibs \ --enable-python=system \ --enable-randr \ --enable-randr-link \ @@ -462,6 +467,7 @@ src_configure() { --disable-report-builder \ --disable-kdeab \ --disable-kde \ + --disable-mergelibs \ --disable-online-update \ --disable-systray \ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \ @@ -482,11 +488,14 @@ src_configure() { --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) \ @@ -502,6 +511,8 @@ src_configure() { $(use_enable vba) \ $(use_enable vlc) \ $(use_enable webdav neon) \ + $(use_with coinmp system-coinmp) \ + $(use_with gltf system-libgltf) \ $(use_with java) \ $(use_with mysql system-mysql-cppconn) \ $(use_with odk doxygen) \ diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml index ac78a7602692..3893f228eecd 100644 --- a/app-office/libreoffice/metadata.xml +++ b/app-office/libreoffice/metadata.xml @@ -8,12 +8,15 @@ 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="coinmp">Use sci-libs/coinor-mp as alternative solver</flag> + <flag name="collada">Enable Collada for rendering 3D models stored in *.dae and *.kmz format</flag> + <flag name="gltf">Use media-libs/libgltf for inserting 3D models in the glTF format into presentations</flag> <flag name="gtk3">Enable highly experimental gtk3 frontend</flag> <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</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="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> |