diff options
Diffstat (limited to 'app-office/libreoffice')
-rw-r--r-- | app-office/libreoffice/Manifest | 18 | ||||
-rw-r--r-- | app-office/libreoffice/files/libreoffice-5.4.4.2-gtk3-no-gtk-build.patch | 13 | ||||
-rw-r--r-- | app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch | 44 | ||||
-rw-r--r-- | app-office/libreoffice/files/libreoffice-5.4.7.2-glm-0.9.9.patch | 82 | ||||
-rw-r--r-- | app-office/libreoffice/files/libreoffice-6.0.5.2-enable-gio-w-gtk3.patch | 46 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-5.4.7.2.ebuild | 550 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild (renamed from app-office/libreoffice/libreoffice-6.0.5.2.ebuild) | 33 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-6.0.9999.ebuild | 28 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-6.1.9999.ebuild | 28 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-9999.ebuild | 28 | ||||
-rw-r--r-- | app-office/libreoffice/metadata.xml | 1 |
11 files changed, 105 insertions, 766 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 4f9c723c4b81..dcc11b847bdb 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -1,32 +1,28 @@ AUX libreoffice-5.2.5.1-glibc-2.24.patch 361 BLAKE2B d95ded4f051c77aed22ce99f6273b73ec0893190622f55a3d6d3c3e3e53c59a2f3ce3f645b011c1afa02b727ee803898c65f8feff723955a2fe1a69de6d24480 SHA512 b5ff4c6d3771bcdde21613ad15459120ac1d759b1b3b422b5cba3ee23f7ddf88fde274956f2c91f0a6a37cb36a8d90d8f90bd865e6c2d3ff7c2100e2b469dbd8 AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0ad4b57a3739d6d34a2941f2ea57d3a5c4ab65e3f3c2376243aa88c9c05b1038cf9bfb7605a370d11513bb4553de2d268010519 SHA512 2aa6d1fc96749b79b3291f6e27630c6cf59d2c743f0dd8603867ba8aec2c17f87b70e1dd031365013f7e9ea53c160e9cb3f48af592a587dc05f3ae4cc1b35df6 AUX libreoffice-5.4-system-pyuno.patch 1399 BLAKE2B d7516b0ac19509dae8eaaac94acad65e35c71b68ea0f2962c41d9422a89993dc90e76b1f7cd3d19f8f3860b443f063ee1c17024c7f56fd3b8470d2b690eb9c32 SHA512 41b57b857a294b8ac234aaf160dbd380008f716ffdf481b7c733f1dab8702876aad827ab9f1b8f2f26778f0b3a6dfdc9e3ae190188a484d9aeb4568df2e9b418 -AUX libreoffice-5.4.4.2-gtk3-no-gtk-build.patch 436 BLAKE2B 609d8867eee6830e79cbbbce96b260a9401b8b26385bb0af3a4627a8350f046282c9d8084787be03195bc36ed7cd91465b5017ca0801abaca8a0048cc8994bfb SHA512 d2d3e03c2962f4996839808a0c766d60ec897d764b3b1c8c588ba17da7d2d320083f88b8ade5709bbc359e3529ab5c4510806d7ec2a5aa79899b05da6f802851 -AUX libreoffice-5.4.4.2-poppler-0.62.patch 1556 BLAKE2B 73c6218c1b12308b80db6cf93c1cd3d5fa317b5a65832df942c521f931e9bc1b624b1a50b3f7a34e168dad2c4e8ea9db7169b3f3ee27787f3aa1815f771368bc SHA512 759fb125ac09309c4b7dee4ee2d57c4e275b95dd31dbf5df7ff25dec687fd473815ad307dc4dc500ace11823c9f2b2e7bddf5c986fdfa2eddd3051eee7240cae -AUX libreoffice-5.4.7.2-glm-0.9.9.patch 2905 BLAKE2B 6e7aed3698ddafbdd569e8bd0ba16641062c5e33e8672386da1079b8656b392270aeb4248f7e067a156629b3442c2192e009ecf363f7b26f55a310de3c17ab91 SHA512 722b1d4e8f323da2f78f3139156766d98c5ac4b66e5d02ea71b5f9ca19e19c6495293d5d1d2d4556fcd3776e47e3534719e4249dce78c22aa61544bc6ac9b5ca AUX libreoffice-6.0.3.2-disable-flaky-tests-1.patch 8928 BLAKE2B e5399e0e520dfe4ac5d0a02c3bf3372ccdc7725f073aabb74c36600a7cd09eb45a9e5d5486bf700ae374723206e3a421069b298137d14a9b05e17e70f2d9d3b4 SHA512 ca100dc389ed93a5eeed35f001d9e0f6f886782bfaa3dead3105b9bce91ca9e721354b55cd67fdb40c7d2d64966c530ebc6ba6a4e3c62b0e006759c7b64f1b29 AUX libreoffice-6.0.3.2-disable-flaky-tests-2.patch 1330 BLAKE2B bf038456e3012592e69e6448399160d146ab42a6ce641f9728a13ae9275342d2deb60bfa14b12919c712f0e8f67e2d061a789fad80711c758e80e4adcb6271fb SHA512 30ede2094102b2d6d95e5cd7d76d59a3c4c40e9bd7300681613aea78a23406e32b0bd23aae779d5f8d21102baaaab999a0915e9ef3d16b32463b55caf6867456 AUX libreoffice-6.0.3.2-poppler-0.64.patch 2617 BLAKE2B c7e9848012b40ace6cd42e7ba114bb03f137c88b25d895be4da3c962ffd2279e524b3b32ed9b24c605ede55920b664759cf321d241e5fd974651242f5c4f19e3 SHA512 ed6941b73fa49a1b520014fb92269a01f947a93bc80b7f6c8cb1c07572ae636154a1ab38a6d6de2d3129f16fad4c224b21aa9cf52e3f95343c882013b24f8b49 AUX libreoffice-6.0.3.2-testTdf108947.patch 638 BLAKE2B 38da9bf34a921d22002d45e650c738687706c77a67ac2748ee14efb48f47a328b1339712687b525a4f66a1ad0b36fc69c0613ef441067a206ea4df81754f4727 SHA512 a712fb653d86a74a96d568805ca48d183a7ec71f32ef34cfb98a4999cb7fead3f5cd11f5d8f8944041583d5221b0dbaeb3cdfc625a1958118e867569d0c56479 AUX libreoffice-6.0.4.2-glm-0.9.9.patch 1017 BLAKE2B 7a85f652d6a9c01157da37a9bcc72261849f8f5b64816a8b55b149a44c50e684102a63f0d758b69ed2199259a3a934fa4c47f56ca65b66a82558a72dca991084 SHA512 aca8b606c5ef7c7333938d489faa24f86f454f22797d40ff735653ef57b70874cb4b9d22f32099a8cbc45b23c6943dc1d9dbdda9b6a08052c63ef2ac99a3f1a1 +AUX libreoffice-6.0.5.2-enable-gio-w-gtk3.patch 2011 BLAKE2B ecbde1fcb3bbd6ee3d3be9a6b105684bf9b9e18b3c034cfcae216f0b41d8ad47a58838e75b9f20ec620ce2f6a60468d3d436871e71288e3df3dd8e7fd53ebd15 SHA512 ee543bb2825730e2fe5efa32f435e2895e7fc7b546e9844bb1f34b98a734abaa5b8751223fc14f9913a8ccb964666b20347832687157089345a5513159ee7f21 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a -DIST libreoffice-5.4.7.2.tar.xz 194486484 BLAKE2B 82c28025f20842dc6a1cf410e84953208ec36462e2018cc07edfcd9d1086c8e83ac93dcf75148df6b670c4b20cd8c1c7904851e3c7eb46c62c521781e013926e SHA512 712c66de9216b5b7fd48310610801b4f1f17465f8ff282cb7e070a50104ccdb4a5a71f6a58eedb828a7a58f7521b5c725745d5e0f6ece62596b7485161cf01f8 DIST libreoffice-6.0.3.2-patchset-01.tar.xz 39268 BLAKE2B 0bf5ad04323cbd2cf157dacc96aa9d3344d683f3303e5c284a83c0f8783d23881402393f2361d4db1270cf75424ff6f12e5b16540b3f7ccb624c29ccc8c71416 SHA512 f6632afe1c7bcdfb1ca82059d299f808e5eee982c176aa2cc5d728e11b833c3fe921c9c627847bc12128ae5e32c901cbbdfec0b71a22bb9a4b5041b645ed934f DIST libreoffice-6.0.3.2.tar.xz 203747760 BLAKE2B 8a666aa2e3e880b050ac8eed93a1c55ddbfa7ce74364b0dff4f5be446cf64c4fe347b164716a7d226c6cfbac01dbd3f11b89ecff75460ccd902ac44fe93d5daa SHA512 d1ec8982f185926d3f3040bcdef737e7c74fcf5b360a12a91983eac92843510553759ffa84c7d244df13036fc32149ffe13dd6a56fb1bda6f64fd5a318fd7879 DIST libreoffice-6.0.5.2-patchset-01.tar.xz 39820 BLAKE2B d8b436378b05a8a58156817b5d1e0323fd6fcfde9aa9fc4fc6a8056a06a16c84c5860ffe1ae715faddb707c5aa417b43e6c7f5c05821f86208edbb3778d830a1 SHA512 ec99a6358c0a20075abc0aa136ad6ccded4562fa0f25897efe2a8783fb33b97b92a2dd8041206b3344a79dfd10ebe98b79c8bf0b4e8539e45942978f0028dc59 +DIST libreoffice-6.0.5.2-patchset-02.tar.xz 43072 BLAKE2B bcd6406b06bef83ac26e227bc77fed76b67e11f0150a23015e8c83c7092b8efd6f35ec8bbac12bbfda6c597ebaa1782391a624b10a7af0bface6b480b6603802 SHA512 fe764e02cff85a064f8b25e34b3f3558a9fc65051da154e94654c2322e8f50487a97b699a6ab886ec9db00d31a8ca544aaf0b93794e03d17fbbe90b83b44124d DIST libreoffice-6.0.5.2.tar.xz 204795724 BLAKE2B d027e83dc5f3908af25975354f8d0ef9a4a9a4fb601dada54d04cdc5bc6d0a0dbedda89ac0cf5bbe88da29382431bddfd331e56b63b88e9f5a23b9299c65b61a SHA512 796ce4b54adc2b1b032f1f125425141a1c584a9f7dd145ed677916ba7a28c11e895a34ff8bf34cc208d15408cb3ea0c0942546300d1be6309bd9ad6544400684 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f -DIST libreoffice-help-5.4.7.2.tar.xz 2343112 BLAKE2B 690c147e8bfdea9d1860131ad8528e2e2eea64da7293c8b7c3a4ad07e771749573b69fb11bed8c8c171b5760ec67a0a3b30eab06e38e5a725ffc11d0959c71c6 SHA512 8abd0bbf70dcfd5cf0ad713c8d34be541ddd27cda98403cbb331b62a4099c08b14be784362b857a41b8b2c756d01e36f043b97bdd5062a2bddeae29b8b70f6a2 DIST libreoffice-help-6.0.3.2.tar.xz 2972952 BLAKE2B 90b62af89bbdec436e8ca5ede3aa8aa57109e22136d454850a108fd4aac1eace166432be8152d623b06ba9e04001a579b3200bbbd20caa1ac6c3b97026319dd3 SHA512 cb538553efd94c7a6f9059b6fb74351adba5449d7f4555558fd0337950528be2bbb7ddf7aaef4992eb18f432c42133d17bf8f0af9d3fe29eddd9d620ab847a40 DIST libreoffice-help-6.0.5.2.tar.xz 2972956 BLAKE2B cfe585fb690bc0a348b67aae1330daa61a0a08acc580fad147853d84c9496d0ad4c4b14598492d4aba9af4afe7fa65bff0161a77b1c0cae9089d50e2a542e0c1 SHA512 975c547e59280e08e554bc658642660fc17e5785b45254b40f969f4b42088d5a350dec72ae6b6f1aa60d7bc95bd9d2c2134f6b395ee86e6f9f5af09f52cc50e1 -EBUILD libreoffice-5.4.7.2.ebuild 16343 BLAKE2B dbcce05f885b808cf4417c888592e8373f71c821decf3dba25c312c23f21a237d050cadf8f235f844ee85bf58143fd450bf4686f9d9188421db6f3acad65d549 SHA512 43cf57add0881d82b0e542b6f33f325b308d7a6849cbbe87056e236428de653670df69c7525783cdc26e428065f139f5183f71ec2e9064ca19c11d3862f89c4e EBUILD libreoffice-6.0.3.2.ebuild 16953 BLAKE2B 9b17913bb18d607ac0141226e54199b1d48c5f88a66d9ba8a6bb40459e35c1301a57c0b111a23f12e03daba9e9e6b850e874d64e4d2a37bba809dbff24201eb8 SHA512 acd68e679413031897fe17a27b1da7c688522ca4e773174be5ab1595c588b62e0969f72fa758f1548d9adce54cca151ecd5edfee1193dcf568ec5fc4b8265a22 -EBUILD libreoffice-6.0.5.2.ebuild 16815 BLAKE2B dd47a31a2fc4565a7f2ba8918f278f456758a1a59753266d6248030d2e3e34dacb0f6b43635af07aeaf7e7b5903e86b64ecc96bd49e063b768b3b25ebfb733eb SHA512 8aa16c23bff368e704b215ccef8abf733fcc3e296f4e45976e644b084f795be562cb2e26081e3ed4c03368cfece9fe50d9a5da76742678d262e6bbee54e7c2e9 -EBUILD libreoffice-6.0.9999.ebuild 16824 BLAKE2B 08352bd94687e18fa60a2c5e23decb9fb028fa360cd5799f0d99232b58ea42b19a40923a645d37b6c60fcd44eeca7af427ecca448e6fccdf6a62cfdd51ca2182 SHA512 c1e873d754c8e34f42322ccb190e56a82f89dbaacd889a920b19ac06eb80dd170745880ca03ef9d153d10842143c156d39ef7d34f6d34f53ae7d66ba8141499b -EBUILD libreoffice-6.1.9999.ebuild 16605 BLAKE2B 61df63788a3b0e5d8010b8589a365b3be0fb7a78e6bbac25438c39f022f8a391e27249cf6d39aaddd2e5918f251796887cc64f6c939161374b615fb77ebf65e0 SHA512 38489e5873c89a39cf3c3c09e888eccbeaf3bfbe7d90dde996415647c20609a374775aea9efd21591ec0d963888095c50b11fb4b82c958805462e492c5e34d69 -EBUILD libreoffice-9999.ebuild 16600 BLAKE2B e497c832f22797d839d084195dc70d37dc3091b3d9d88f4688a7e1ab53e624e073f7f72baa7800fa0dc09da913242ce8f4c565df694911cd2fc0d2df363195c5 SHA512 c062f2a1b2b35285266b56039579d37b347edcd7b274ee825a28b008bf2cd3ac1be2bf7a73ed4d499803ac7901d1284f776de12b666c20630791e6f1e9711e88 -MISC metadata.xml 1153 BLAKE2B 831243a115825974190637c2c9615e41e44d50227ba6b8e4c7f9683d8d510e422b573ee18f886673df2a3bf30feb5fcdfc7f1e90ec215d39bcccd9a11098d57a SHA512 50b686f39b0113d96b8a2b14f36581be68c2384d13a963ea3c20973b3af874bb9d50c4b7d5d2f11b2e0ffaf9deb351b5314fe30f954f17351ba0c8c850680c1d +EBUILD libreoffice-6.0.5.2-r1.ebuild 16814 BLAKE2B 3f06b68e3d8dd43a549ca4358ce012f426f8ca5081df83035c187ccc29b14a6b6151e12ccc2a739dc5cb08583397bbc1dcfbd04c1366fe6ce5c6dc8a4bdfe4c9 SHA512 b95abbb02660b8d341fcecbc8e40beedf741b8d95e8817b8016e8bc94230e34c0d7e928d8df50dc45e4c164d28b03baa5954ac7275e816c3fa9ba906da61fc00 +EBUILD libreoffice-6.0.9999.ebuild 16752 BLAKE2B 85f7fea29bc3777cde350956ad73d064f3ef924996d9d1aaad608827d9b034fb5e0295e34d2e00d3004f78e1d70ea0161e77c347a2097f829dc063c933bbbf04 SHA512 43d1d010b55d33eb73897a8ace7f11ee062770f18c7c8961a9aa3e73b5d40bf5f5087115f47a70b3bc4a69f215603a4bcc58ff6d175edaa040d6089ed827e27d +EBUILD libreoffice-6.1.9999.ebuild 16533 BLAKE2B ac11c68340706f89e7e25dee5fb2e6ad2f1301c20ebc7883892fa78ba997225c48121ba4882eb2dc12399281dea013c024e6fd713ef84ee04da82069ee2aab4d SHA512 a370fafd44229c2df400754b53f261f3fc3388adf96bf8b2c1d6e408e7fe8a695487921e78621311f87506732841569c0e63161ae4f4d8ed8af4b95f941f5be7 +EBUILD libreoffice-9999.ebuild 16533 BLAKE2B ac11c68340706f89e7e25dee5fb2e6ad2f1301c20ebc7883892fa78ba997225c48121ba4882eb2dc12399281dea013c024e6fd713ef84ee04da82069ee2aab4d SHA512 a370fafd44229c2df400754b53f261f3fc3388adf96bf8b2c1d6e408e7fe8a695487921e78621311f87506732841569c0e63161ae4f4d8ed8af4b95f941f5be7 +MISC metadata.xml 1090 BLAKE2B b30fc707317ea0601859f327540712eae38a9fc7365675501fca648e17e2ee3b35c2391e76dc7878b53e5216ca4eb2618595fbac2e07d8680f8daeaa67aaeeeb SHA512 4ffa1f2d605bc5666e25ce126d3264f9ed272ae1b12b9dd17ae366462d58de4a64767ee63928b233c21a15a77b549eb5c574064e73164cb20b0adb6ce12a9ec2 diff --git a/app-office/libreoffice/files/libreoffice-5.4.4.2-gtk3-no-gtk-build.patch b/app-office/libreoffice/files/libreoffice-5.4.4.2-gtk3-no-gtk-build.patch deleted file mode 100644 index f0e2c55c9369..000000000000 --- a/app-office/libreoffice/files/libreoffice-5.4.4.2-gtk3-no-gtk-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -Fix build with USE="gtk3 -gtk" -https://bugs.gentoo.org/641812 - ---- a/vcl/unx/gtk3/gtk3gtkframe.cxx 2017-12-12 18:45:07.000000000 +0100 -+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx 2017-12-21 13:20:31.935843032 +0100 -@@ -21,6 +21,7 @@ - #include <unx/gtk/gtkdata.hxx> - #include <unx/gtk/gtkinst.hxx> - #include <unx/gtk/gtkgdi.hxx> -+#include <unx/gtk/gtksalmenu.hxx> - #include <vcl/help.hxx> - #include <vcl/keycodes.hxx> - #include <vcl/layout.hxx> diff --git a/app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch b/app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch deleted file mode 100644 index e6d7dff898df..000000000000 --- a/app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch +++ /dev/null @@ -1,44 +0,0 @@ -Fix build with >=poppler-0.62.0, cleanup ifdef and raise minimum poppler version. - ---- a/configure.ac 2017-12-12 18:45:07.000000000 +0100 -+++ b/configure.ac 2018-01-04 23:57:16.410999542 +0100 -@@ -10403,7 +10403,7 @@ - if test "$with_system_poppler" = "yes"; then - AC_MSG_RESULT([external]) - SYSTEM_POPPLER=TRUE -- PKG_CHECK_MODULES( POPPLER, poppler >= 0.12.0 ) -+ PKG_CHECK_MODULES( POPPLER, poppler >= 0.21.1 ) - AC_LANG_PUSH([C++]) - save_CXXFLAGS=$CXXFLAGS - save_CPPFLAGS=$CPPFLAGS ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2017-12-12 18:45:07.000000000 +0100 -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2018-01-05 00:29:16.541246738 +0100 -@@ -32,13 +32,11 @@ - #pragma warning(push, 1) - #endif - --// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1 - // FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1) - // because the internal poppler does not provide poppler-version.h and the macro always returns 0 --#if POPPLER_CHECK_VERSION(0, 21, 1) --#include "UTF8.h" --#elif POPPLER_CHECK_VERSION(0, 21, 0) --#include "UTF.h" -+// UTF8.h was renamed to UnicodeMapFuncs.h in poppler-0.62.0 -+#if POPPLER_CHECK_VERSION(0, 62, 0) -+#include "UnicodeMapFuncs.h" - #else - #include "UTF8.h" - #endif -@@ -918,7 +916,11 @@ - ); - - // silence spurious warning -+#if POPPLER_CHECK_VERSION(0, 62, 0) -+ (void)&mapUTF16; -+#else - (void)&mapUCS2; -+#endif - - char buf[9]; - for( int i=0; i<uLen; ++i ) diff --git a/app-office/libreoffice/files/libreoffice-5.4.7.2-glm-0.9.9.patch b/app-office/libreoffice/files/libreoffice-5.4.7.2-glm-0.9.9.patch deleted file mode 100644 index 28982d90c369..000000000000 --- a/app-office/libreoffice/files/libreoffice-5.4.7.2-glm-0.9.9.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 7984347b9a2fce74cdce0c1c5b27f6e2b55a2f49 Mon Sep 17 00:00:00 2001 -From: Rene Engelhard <rene@debian.org> -Date: Sun, 28 Jan 2018 19:48:25 +0100 -Subject: fix build with glm 0.9.9 - -In file included from /usr/include/glm/gtx/norm.hpp:18:0, - from /data/rene/git/LibreOffice/master/vcl/inc/opengl/VertexUti -ls.hxx:16, - from /data/rene/git/LibreOffice/master/vcl/inc/opengl/LineRende -rUtils.hxx:14, - from /data/rene/git/LibreOffice/master/vcl/opengl/LineRenderUti -ls.cxx:11: -/usr/include/glm/gtx/quaternion.hpp:23:3: error: #error "GLM: GLM_GTX_quaternion - is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - # error "GLM: GLM_GTX_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - ^~~~~ - -so just define it. - -Change-Id: I981bfb5fd944f32a3774b3f9b183989773bf235f -Reviewed-on: https://gerrit.libreoffice.org/48799 -Tested-by: Jenkins <ci@libreoffice.org> -Tested-by: Rene Engelhard <rene@debian.org> -Reviewed-by: Rene Engelhard <rene@debian.org> ---- - chart2/Library_chartcore.mk | 6 ++++++ - chart2/Library_chartopengl.mk | 6 ++++++ - vcl/Library_vcl.mk | 6 ++++++ - 3 files changed, 18 insertions(+) - -diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk -index f785d09..08455f9 100644 ---- a/chart2/Library_chartcore.mk -+++ b/chart2/Library_chartcore.mk -@@ -23,6 +23,12 @@ $(eval $(call gb_Library_add_defs,chartcore,\ - -DOOO_DLLIMPLEMENTATION_CHARTVIEW \ - )) - -+ifeq ($(SYSTEM_GLM),TRUE) -+$(eval $(call gb_Library_add_defs,chartcore,\ -+ -DGLM_ENABLE_EXPERIMENTAL \ -+)) -+endif -+ - $(eval $(call gb_Library_set_precompiled_header,chartcore,$(SRCDIR)/chart2/inc/pch/precompiled_chartcore)) - - $(eval $(call gb_Library_use_externals,chartcore,\ -diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk -index f999f94..8b5a22c 100644 ---- a/chart2/Library_chartopengl.mk -+++ b/chart2/Library_chartopengl.mk -@@ -54,5 +54,11 @@ $(eval $(call gb_Library_add_exception_objects,chartopengl,\ - chart2/source/view/main/DummyXShape \ - chart2/source/view/main/OpenGLRender \ - )) -+ -+ifeq ($(SYSTEM_GLM),TRUE) -+$(eval $(call gb_Library_add_defs,chartopengl,\ -+ -DGLM_ENABLE_EXPERIMENTAL \ -+)) -+endif - - # vim: set noet sw=4 ts=4: -diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk -index 699d6ab..a2caa8e 100644 ---- a/vcl/Library_vcl.mk -+++ b/vcl/Library_vcl.mk -@@ -49,6 +49,12 @@ $(eval $(call gb_Library_add_defs,vcl,\ - -DENABLE_MERGELIBS=$(if $(MERGELIBS),1,0) \ - )) - -+ifeq ($(SYSTEM_GLM),TRUE) -+$(eval $(call gb_Library_add_defs,vcl,\ -+ -DGLM_ENABLE_EXPERIMENTAL \ -+)) -+endif -+ - $(eval $(call gb_Library_use_sdk_api,vcl)) - - $(eval $(call gb_Library_use_custom_headers,vcl,\ --- -cgit v1.1 diff --git a/app-office/libreoffice/files/libreoffice-6.0.5.2-enable-gio-w-gtk3.patch b/app-office/libreoffice/files/libreoffice-6.0.5.2-enable-gio-w-gtk3.patch new file mode 100644 index 000000000000..4a018711ca2c --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-6.0.5.2-enable-gio-w-gtk3.patch @@ -0,0 +1,46 @@ +From a560bcbea943cb317e96c15c608c5e2f66e5698f Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann <sbergman@redhat.com> +Date: Thu, 31 May 2018 14:14:48 +0200 +Subject: --enable-gio also for --disable-gtk --enable-gtk3 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +...as is used by the Flatpak build. Other settings only checked in that block +controlled by ENABLE_GTK, and thus potentially erronously left empty for +--disable-gtk --enable-gtk3 builds, are GTHREAD- and GTK_PRINT-related settings. +GTHREAD_LIBS is explicitly used in vcl/Library_vclplug_gtk3.mk even, but it +being empty apparently has no negative effects, so leave it at that for now. +On the GTK_PRINT-related settings, Caolan commented on IRC: "ENABLE_GTK_PRINT +is probably best removed entirely I guess, it didn't work out and they're +redoing the dialog in upstream gtk again I'm told." + +Change-Id: I7e026c0ac9b23e7ace2c2e92390bdcc3be7d39a3 +Reviewed-on: https://gerrit.libreoffice.org/55127 +Tested-by: Jenkins <ci@libreoffice.org> +Reviewed-by: Stephan Bergmann <sbergman@redhat.com> +(cherry picked from commit b5dd045bf533a2ba4d1c98debe5a2acba4c8b486) +Reviewed-on: https://gerrit.libreoffice.org/55164 +Reviewed-by: Caolán McNamara <caolanm@redhat.com> +Tested-by: Caolán McNamara <caolanm@redhat.com> +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.ac b/configure.ac +index e35db48..9da61d9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -9875,7 +9875,9 @@ if test "$test_gtk" = "yes"; then + GTK_PRINT_CFLAGS=$(printf '%s' "$GTK_PRINT_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") + FilterLibs "${GTK_PRINT_LIBS}" + GTK_PRINT_LIBS="${filteredlibs}" ++ fi + ++ if test "$ENABLE_GTK" = "TRUE" || test "$ENABLE_GTK3" = "TRUE"; then + AC_MSG_CHECKING([whether to enable GIO support]) + if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gio" = "yes"; then + dnl Need at least 2.26 for the dbus support. +-- +cgit v1.1 + diff --git a/app-office/libreoffice/libreoffice-5.4.7.2.ebuild b/app-office/libreoffice/libreoffice-5.4.7.2.ebuild deleted file mode 100644 index a2e8ed475fac..000000000000 --- a/app-office/libreoffice/libreoffice-5.4.7.2.ebuild +++ /dev/null @@ -1,550 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -PYTHON_REQ_USE="threads,xml" - -# experimental ; release ; old -# Usually the tarballs are moved a lot so this should make -# everyone happy. -DEV_URI=" - https://dev-builds.libreoffice.org/pre-releases/src - https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/ - https://downloadarchive.documentfoundation.org/libreoffice/old/${PV}/src -" -ADDONS_URI="https://dev-www.libreoffice.org/src/" - -BRANDING="${PN}-branding-gentoo-0.8.tar.xz" -# PATCHSET="${P}-patchset-01.tar.xz" - -[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3" -inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS} -unset SCM_ECLASS - -DESCRIPTION="A full office productivity suite" -HOMEPAGE="https://www.libreoffice.org" -SRC_URI="branding? ( https://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 -# Only release has the tarballs -if [[ ${PV} != *9999* ]]; then - for i in ${DEV_URI}; do - SRC_URI+=" ${i}/${P}.tar.xz" - SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz" - 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=( - "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" - # no release for 8 years, should we package it? - "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" - # Does not build with 1.6 rhino at all - "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" - # requirement of rhino - "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" - # not packageable - "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" -) -SRC_URI+=" ${ADDONS_SRC[*]}" - -unset ADDONS_URI -unset ADDONS_SRC - -# Extensions that need extra work: -LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" - -IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive -gstreamer +gtk gtk3 jemalloc libressl mysql odk pdfimport postgres test vlc -$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" - -LICENSE="|| ( LGPL-3 MPL-1.1 )" -SLOT="0" -[[ ${PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" - -COMMON_DEPEND="${PYTHON_DEPS} - app-arch/unzip - app-arch/zip - app-crypt/gpgme[cxx] - app-text/hunspell:= - >=app-text/libabw-0.1.0 - >=app-text/libebook-0.1 - >=app-text/libetonyek-0.1 - app-text/libexttextcat - app-text/liblangtag - >=app-text/libmspub-0.1.0 - >=app-text/libmwaw-0.3.1 - >=app-text/libodfgen-0.1.0 - app-text/libstaroffice - app-text/libwpd:0.10[tools] - app-text/libwpg:0.3 - >=app-text/libwps-0.4 - app-text/mythes - >=dev-cpp/clucene-2.3.3.4-r2 - =dev-cpp/libcmis-0.5* - dev-db/unixODBC - dev-lang/perl - dev-libs/boost:=[nls] - dev-libs/expat - dev-libs/hyphen - dev-libs/icu:= - dev-libs/libassuan - dev-libs/libgpg-error - =dev-libs/liborcus-0.12* - dev-libs/librevenge - dev-libs/nspr - dev-libs/nss - !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) - libressl? ( dev-libs/libressl ) - >=dev-libs/redland-1.0.16 - >=dev-libs/xmlsec-1.2.24[nss] - media-gfx/graphite2 - media-libs/fontconfig - media-libs/freetype:2 - >=media-libs/harfbuzz-0.9.42:=[graphite,icu] - media-libs/lcms:2 - >=media-libs/libcdr-0.1.0 - >=media-libs/libepoxy-1.3.1[X] - >=media-libs/libfreehand-0.1.0 - media-libs/libpagemaker - >=media-libs/libpng-1.4:0= - >=media-libs/libvisio-0.1.0 - media-libs/libzmf - net-libs/neon - net-misc/curl - net-nds/openldap - sci-mathematics/lpsolve - virtual/glu - virtual/jpeg:0 - virtual/opengl - x11-libs/cairo[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 ) - eds? ( - dev-libs/glib:2 - gnome-base/dconf - gnome-extra/evolution-data-server - ) - firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - gtk? ( - x11-libs/gdk-pixbuf - >=x11-libs/gtk+-2.24:2 - ) - gtk3? ( - dev-libs/glib:2 - dev-libs/gobject-introspection - gnome-base/dconf - x11-libs/gtk+:3 - ) - jemalloc? ( dev-libs/jemalloc ) - libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) - libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) - mysql? ( dev-db/mysql-connector-c++ ) - pdfimport? ( app-text/poppler:=[cxx] ) - postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) -" - -RDEPEND="${COMMON_DEPEND} - !app-office/libreoffice-bin - !app-office/libreoffice-bin-debug - !app-office/openoffice - media-fonts/dejavu - media-fonts/liberation-fonts - media-fonts/libertine - || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) - java? ( >=virtual/jre-1.6 ) - vlc? ( media-video/vlc ) -" - -if [[ ${PV} != *9999* ]]; then - PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*" -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} - !<sys-devel/make-3.82 - >=dev-libs/libatomic_ops-7.2d - >=dev-libs/libxml2-2.7.8 - dev-libs/libxslt - dev-perl/Archive-Zip - >=dev-util/cppunit-1.14.0 - >=dev-util/gperf-3 - dev-util/intltool - >=dev-util/mdds-1.2.2:1= - media-libs/glm - sys-devel/bison - sys-devel/flex - sys-devel/gettext - sys-devel/ucpp - sys-libs/zlib - virtual/pkgconfig - x11-base/xorg-proto - x11-libs/libXt - x11-libs/libXtst - java? ( - dev-java/ant-core - >=virtual/jdk-1.6 - ) - odk? ( >=app-doc/doxygen-1.8.4 ) - test? ( - dev-util/cppunit - media-fonts/dejavu - ) -" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - bluetooth? ( dbus ) - libreoffice_extensions_nlpsolver? ( java ) - libreoffice_extensions_scripting-beanshell? ( java ) - libreoffice_extensions_scripting-javascript? ( java ) - libreoffice_extensions_wiki-publisher? ( java ) -" - -PATCHES=( - # not upstreamable stuff - "${FILESDIR}/${PN}-5.4-system-pyuno.patch" - "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" - # 6.0 branch - "${FILESDIR}/${PN}-5.4.4.2-poppler-0.62.patch" # bug 642602 - "${FILESDIR}/${PN}-6.0.3.2-poppler-0.64.patch" # bug 653478 - "${FILESDIR}/${P}-glm-0.9.9.patch" # bug 657178 - # 6.1 branch - "${FILESDIR}/${PN}-6.0.4.2-glm-0.9.9.patch" # bug 657178 - - # TODO: upstream - "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" - "${FILESDIR}/${PN}-5.4.4.2-gtk3-no-gtk-build.patch" # bug 641812 -) - -pkg_pretend() { - use java || \ - ewarn "If you plan to use Base application you should enable java or you will get various crashes." - - if has_version "<app-office/libreoffice-5.3.0[firebird]"; then - ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so" - ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version." - ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base" - fi - - if [[ ${MERGE_TYPE} != binary ]]; then - CHECKREQS_MEMORY="512M" - if is-flagq "-g*" && ! is-flagq "-g*0" ; then - CHECKREQS_DISK_BUILD="22G" - else - CHECKREQS_DISK_BUILD="6G" - fi - check-reqs_pkg_pretend - fi -} - -pkg_setup() { - java-pkg-opt-2_pkg_setup - python-single-r1_pkg_setup - xdg_environment_reset - - if [[ ${MERGE_TYPE} != binary ]]; then - CHECKREQS_MEMORY="512M" - if is-flagq "-g*" && ! is-flagq "-g*0" ; then - CHECKREQS_DISK_BUILD="22G" - else - CHECKREQS_DISK_BUILD="6G" - fi - check-reqs_pkg_setup - fi -} - -src_unpack() { - default - - if [[ ${PV} = *9999* ]]; then - local base_uri branch mypv - base_uri="https://anongit.freedesktop.org/git" - branch="master" - mypv=${PV/.9999} - [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}" - git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}" - git-r3_checkout "${base_uri}/${PN}/core" - - git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master" - git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help - fi -} - -src_prepare() { - default - - AT_M4DIR="m4" eautoreconf - # hack in the autogen.sh - touch autogen.lastrun - - # system pyuno mess - sed -i \ - -e "s:%eprefix%:${EPREFIX}:g" \ - -e "s:%libdir%:$(get_libdir):g" \ - pyuno/source/module/uno.py \ - pyuno/source/officehelper.py || die - # sed in the tests - sed -i \ - -e "s#all : build unitcheck#all : build#g" \ - solenv/gbuild/Module.mk || die - sed -i \ - -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \ - -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \ - Makefile.in || die - - sed -i \ - -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \ - -e "s,\$INSTALLDIRNAME.sh,${PN}," \ - bin/distro-install-desktop-integration || die - - if use branding; then - # hack... - mv -v "${WORKDIR}/branding-intro.png" "icon-themes/galaxy/brand/intro.png" || die - fi - - # Don't list pdfimport support in desktop when built with none, bug # 605464 - if ! use pdfimport; then - sed -i \ - -e ":MimeType: s:application/pdf;::" \ - -e ":Keywords: s:pdf;::" \ - sysui/desktop/menus/draw.desktop || die - fi -} - -src_configure() { - # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys - # Note: these are for Gentoo use ONLY. For your own distribution, please get - # your own set of keys. Feel free to contact chromium@gentoo.org for more info. - local google_default_client_id="329227923882.apps.googleusercontent.com" - local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" - - # optimization flags - export GMAKE_OPTIONS="${MAKEOPTS}" - # System python enablement: - export PYTHON_CFLAGS=$(python_get_CFLAGS) - export PYTHON_LIBS=$(python_get_LIBS) - - # system headers/libs/...: enforce using system packages - # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad - # --enable-cairo: ensure that cairo is always required - # --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 - # --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 - # --without-system-sane: just sane.h header that is used for scan in writer, - # not linked or anything else, worthless to depend on - # --disable-pdfium: not yet packaged - local myeconfargs=( - --with-system-dicts - --with-system-epoxy - --with-system-headers - --with-system-jars - --with-system-libs - --enable-cairo-canvas - --enable-largefile - --enable-mergelibs - --enable-neon - --enable-python=system - --enable-randr - --enable-release-build - --disable-breakpad - --disable-ccache - --disable-collada - --disable-dependency-tracking - --disable-epm - --disable-fetch-external - --disable-gltf - --disable-gstreamer-0-10 - --disable-kde4 - --disable-online-update - --disable-pdfium - --disable-report-builder - --disable-systray - --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") - --with-build-version="Gentoo official package" - --enable-extension-integration - --with-external-dict-dir="${EPREFIX}/usr/share/myspell" - --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" - --with-external-thes-dir="${EPREFIX}/usr/share/myspell" - --with-external-tar="${DISTDIR}" - --with-lang="" - --with-parallelism=$(makeopts_jobs) - --with-system-ucpp - --with-vendor="Gentoo Foundation" - --with-x - --without-fonts - --without-myspell-dicts - --without-help - --with-helppack-integration - --with-system-gpgmepp - --without-system-sane - $(use_enable bluetooth sdremote-bluetooth) - $(use_enable coinmp) - $(use_enable cups) - $(use_enable dbus) - $(use_enable debug) - $(use_enable eds evolution2) - $(use_enable firebird firebird-sdbc) - $(use_enable gstreamer gstreamer-1-0) - $(use_enable gtk) - $(use_enable gtk3) - $(use_enable mysql ext-mariadb-connector) - $(use_enable odk) - $(use_enable pdfimport) - $(use_enable postgres postgresql-sdbc) - $(use_enable vlc) - $(use_with coinmp system-coinmp) - $(use_with googledrive gdrive-client-id ${google_default_client_id}) - $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) - $(use_with java) - $(use_with mysql system-mysql-cppconn) - $(use_with odk doxygen) - ) - - if use eds || use gtk3; then - myeconfargs+=( --enable-dconf --enable-gio ) - else - myeconfargs+=( --disable-dconf --disable-gio ) - fi - - # libreoffice extensions handling - for lo_xt in ${LO_EXTS}; do - if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then - myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) ) - else - myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) ) - fi - done - - if use java; then - # hsqldb: system one is too new - myeconfargs+=( - --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 && \ - myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) ) - - use libreoffice_extensions_scripting-javascript && \ - myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) ) - fi - - is-flagq "-flto*" && myeconfargs+=( --enable-lto ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - # more and more LO stuff tries to use OpenGL, including tests during build - # bug 501508, bug 540624, bug 545974 and probably more - addpredict /dev/dri - addpredict /dev/ati - addpredict /dev/nvidiactl - - # 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" || die - 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=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\"" - perl "${S}/helpcontent2/helpers/create_ilst.pl" \ - -dir=helpcontent2/source/media/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 - - # bug 593514 - if use gtk3; then - dosym libreoffice/program/liblibreofficekitgtk.so \ - /usr/$(get_libdir)/liblibreofficekitgtk.so - fi - - # bash completion aliases - bashcomp_alias \ - libreoffice \ - unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice - - if use branding; then - insinto /usr/$(get_libdir)/${PN}/program - newins "${WORKDIR}/branding-sofficerc" sofficerc - dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die - fi - - # Hack for offlinehelp, this needs fixing upstream at some point. - # It is broken because we send --without-help - # https://bugs.freedesktop.org/show_bug.cgi?id=46506 - insinto /usr/$(get_libdir)/libreoffice/help - doins xmlhelp/util/*.xsl - - # Remove desktop files to support old installs that can't parse mime - rm -r "${ED}"usr/share/mimelnk/ || die - - pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin - pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/app-office/libreoffice/libreoffice-6.0.5.2.ebuild b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild index f8ee3a7fc14e..df31a0f84f82 100644 --- a/app-office/libreoffice/libreoffice-6.0.5.2.ebuild +++ b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild @@ -18,7 +18,7 @@ DEV_URI=" ADDONS_URI="https://dev-www.libreoffice.org/src/" BRANDING="${PN}-branding-gentoo-0.8.tar.xz" -PATCHSET="${P}-patchset-01.tar.xz" +PATCHSET="${P}-patchset-02.tar.xz" [[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3" inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS} @@ -64,7 +64,7 @@ unset ADDONS_SRC LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive -gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc +gstreamer +gtk gtk2 jemalloc kde mysql odk pdfimport postgres test vlc $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" REQUIRED_USE="${PYTHON_REQUIRED_USE} @@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" [[ ${MY_PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" COMMON_DEPEND="${PYTHON_DEPS} app-arch/unzip @@ -113,10 +113,10 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-libs/libgpg-error >=dev-libs/liborcus-0.13.3 dev-libs/librevenge + dev-libs/libxml2 + dev-libs/libxslt dev-libs/nspr dev-libs/nss - !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) - libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 @@ -135,6 +135,7 @@ COMMON_DEPEND="${PYTHON_DEPS} net-misc/curl net-nds/openldap sci-mathematics/lpsolve + sys-libs/zlib:= virtual/glu virtual/jpeg:0 virtual/opengl @@ -162,10 +163,12 @@ COMMON_DEPEND="${PYTHON_DEPS} gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 + x11-libs/pango ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 + x11-libs/pango ) jemalloc? ( dev-libs/jemalloc ) kde? ( @@ -211,10 +214,7 @@ fi # after everything upstream is under gbuild # as dmake execute tests right away DEPEND="${COMMON_DEPEND} - !<sys-devel/make-3.82 >=dev-libs/libatomic_ops-7.2d - >=dev-libs/libxml2-2.7.8 - dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 @@ -225,7 +225,6 @@ DEPEND="${COMMON_DEPEND} sys-devel/flex sys-devel/gettext sys-devel/ucpp - sys-libs/zlib virtual/pkgconfig x11-base/xorg-proto x11-libs/libXt @@ -252,6 +251,9 @@ PATCHES=( "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" "${FILESDIR}/${PN}-6.0.3.2-testTdf108947.patch" #bug 656600 + # 6.0 branch + "${FILESDIR}/${P}-enable-gio-w-gtk3.patch" #bug 661062 + # gtk3-kde5 vcl plugin backported from master "${WORKDIR}"/${PATCHSET/.tar.xz/} ) @@ -265,6 +267,7 @@ _check_reqs() { else CHECKREQS_DISK_BUILD="6G" fi + check-reqs_$1 } pkg_pretend() { @@ -277,10 +280,7 @@ pkg_pretend() { ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base" fi - if [[ ${MERGE_TYPE} != binary ]]; then - _check_reqs - check-reqs_pkg_pretend - fi + [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend } pkg_setup() { @@ -288,10 +288,7 @@ pkg_setup() { python-single-r1_pkg_setup xdg_environment_reset - if [[ ${MERGE_TYPE} != binary ]]; then - _check_reqs - check-reqs_pkg_setup - fi + [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup } src_unpack() { @@ -408,6 +405,7 @@ src_configure() { --disable-fetch-external --disable-gstreamer-0-10 --disable-online-update + --disable-openssl --disable-pdfium --disable-report-builder --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") @@ -420,6 +418,7 @@ src_configure() { --with-lang="" --with-parallelism=$(makeopts_jobs) --with-system-ucpp + --with-tls=nss --with-vendor="Gentoo Foundation" --with-x --without-fonts diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild index 3df147edf4c0..7fa72b5977b8 100644 --- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild @@ -64,7 +64,7 @@ unset ADDONS_SRC LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive -gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc +gstreamer +gtk gtk2 jemalloc kde mysql odk pdfimport postgres test vlc $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" REQUIRED_USE="${PYTHON_REQUIRED_USE} @@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" [[ ${MY_PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" COMMON_DEPEND="${PYTHON_DEPS} app-arch/unzip @@ -113,10 +113,10 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-libs/libgpg-error >=dev-libs/liborcus-0.13.3 dev-libs/librevenge + dev-libs/libxml2 + dev-libs/libxslt dev-libs/nspr dev-libs/nss - !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) - libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 @@ -135,6 +135,7 @@ COMMON_DEPEND="${PYTHON_DEPS} net-misc/curl net-nds/openldap sci-mathematics/lpsolve + sys-libs/zlib:= virtual/glu virtual/jpeg:0 virtual/opengl @@ -162,10 +163,12 @@ COMMON_DEPEND="${PYTHON_DEPS} gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 + x11-libs/pango ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 + x11-libs/pango ) jemalloc? ( dev-libs/jemalloc ) kde? ( @@ -211,10 +214,7 @@ fi # after everything upstream is under gbuild # as dmake execute tests right away DEPEND="${COMMON_DEPEND} - !<sys-devel/make-3.82 >=dev-libs/libatomic_ops-7.2d - >=dev-libs/libxml2-2.7.8 - dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 @@ -225,7 +225,6 @@ DEPEND="${COMMON_DEPEND} sys-devel/flex sys-devel/gettext sys-devel/ucpp - sys-libs/zlib virtual/pkgconfig x11-base/xorg-proto x11-libs/libXt @@ -265,6 +264,7 @@ _check_reqs() { else CHECKREQS_DISK_BUILD="6G" fi + check-reqs_$1 } pkg_pretend() { @@ -277,10 +277,7 @@ pkg_pretend() { ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base" fi - if [[ ${MERGE_TYPE} != binary ]]; then - _check_reqs - check-reqs_pkg_pretend - fi + [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend } pkg_setup() { @@ -288,10 +285,7 @@ pkg_setup() { python-single-r1_pkg_setup xdg_environment_reset - if [[ ${MERGE_TYPE} != binary ]]; then - _check_reqs - check-reqs_pkg_setup - fi + [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup } src_unpack() { @@ -408,6 +402,7 @@ src_configure() { --disable-fetch-external --disable-gstreamer-0-10 --disable-online-update + --disable-openssl --disable-pdfium --disable-report-builder --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") @@ -420,6 +415,7 @@ src_configure() { --with-lang="" --with-parallelism=$(makeopts_jobs) --with-system-ucpp + --with-tls=nss --with-vendor="Gentoo Foundation" --with-x --without-fonts diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild index ae37700e0e39..46abef27e981 100644 --- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild @@ -64,7 +64,7 @@ unset ADDONS_SRC LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive -gstreamer +gtk gtk2 kde libressl mysql odk pdfimport postgres test vlc +gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" REQUIRED_USE="${PYTHON_REQUIRED_USE} @@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" [[ ${MY_PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" COMMON_DEPEND="${PYTHON_DEPS} app-arch/unzip @@ -114,10 +114,10 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-libs/libgpg-error >=dev-libs/liborcus-0.13.3 dev-libs/librevenge + dev-libs/libxml2 + dev-libs/libxslt dev-libs/nspr dev-libs/nss - !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) - libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 @@ -136,6 +136,7 @@ COMMON_DEPEND="${PYTHON_DEPS} net-misc/curl net-nds/openldap sci-mathematics/lpsolve + sys-libs/zlib:= virtual/glu virtual/jpeg:0 virtual/opengl @@ -163,10 +164,12 @@ COMMON_DEPEND="${PYTHON_DEPS} gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 + x11-libs/pango ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 + x11-libs/pango ) kde? ( dev-qt/qtcore:5 @@ -211,10 +214,7 @@ fi # after everything upstream is under gbuild # as dmake execute tests right away DEPEND="${COMMON_DEPEND} - !<sys-devel/make-3.82 >=dev-libs/libatomic_ops-7.2d - >=dev-libs/libxml2-2.7.8 - dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 @@ -225,7 +225,6 @@ DEPEND="${COMMON_DEPEND} sys-devel/flex sys-devel/gettext sys-devel/ucpp - sys-libs/zlib virtual/pkgconfig x11-base/xorg-proto x11-libs/libXt @@ -262,6 +261,7 @@ _check_reqs() { else CHECKREQS_DISK_BUILD="6G" fi + check-reqs_$1 } pkg_pretend() { @@ -274,10 +274,7 @@ pkg_pretend() { ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base" fi - if [[ ${MERGE_TYPE} != binary ]]; then - _check_reqs - check-reqs_pkg_pretend - fi + [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend } pkg_setup() { @@ -285,10 +282,7 @@ pkg_setup() { python-single-r1_pkg_setup xdg_environment_reset - if [[ ${MERGE_TYPE} != binary ]]; then - _check_reqs - check-reqs_pkg_setup - fi + [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup } src_unpack() { @@ -405,6 +399,7 @@ src_configure() { --disable-fetch-external --disable-gstreamer-0-10 --disable-online-update + --disable-openssl --disable-pdfium --disable-report-builder --with-alloc=system @@ -417,6 +412,7 @@ src_configure() { --with-lang="" --with-parallelism=$(makeopts_jobs) --with-system-ucpp + --with-tls=nss --with-vendor="Gentoo Foundation" --with-x --without-fonts diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index cc4c2bc8ce11..46abef27e981 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -64,7 +64,7 @@ unset ADDONS_SRC LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive -gstreamer +gtk gtk2 kde libressl mysql odk pdfimport postgres test vlc +gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" REQUIRED_USE="${PYTHON_REQUIRED_USE} @@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" [[ ${MY_PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" COMMON_DEPEND="${PYTHON_DEPS} app-arch/unzip @@ -114,10 +114,10 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-libs/libgpg-error >=dev-libs/liborcus-0.13.3 dev-libs/librevenge + dev-libs/libxml2 + dev-libs/libxslt dev-libs/nspr dev-libs/nss - !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) - libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 @@ -136,6 +136,7 @@ COMMON_DEPEND="${PYTHON_DEPS} net-misc/curl net-nds/openldap sci-mathematics/lpsolve + sys-libs/zlib:= virtual/glu virtual/jpeg:0 virtual/opengl @@ -163,10 +164,12 @@ COMMON_DEPEND="${PYTHON_DEPS} gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 + x11-libs/pango ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 + x11-libs/pango ) kde? ( dev-qt/qtcore:5 @@ -211,10 +214,7 @@ fi # after everything upstream is under gbuild # as dmake execute tests right away DEPEND="${COMMON_DEPEND} - !<sys-devel/make-3.82 >=dev-libs/libatomic_ops-7.2d - >=dev-libs/libxml2-2.7.8 - dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 @@ -225,7 +225,6 @@ DEPEND="${COMMON_DEPEND} sys-devel/flex sys-devel/gettext sys-devel/ucpp - sys-libs/zlib virtual/pkgconfig x11-base/xorg-proto x11-libs/libXt @@ -262,6 +261,7 @@ _check_reqs() { else CHECKREQS_DISK_BUILD="6G" fi + check-reqs_$1 } pkg_pretend() { @@ -274,10 +274,7 @@ pkg_pretend() { ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base" fi - if [[ ${MERGE_TYPE} != binary ]]; then - _check_reqs - check-reqs_pkg_pretend - fi + [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend } pkg_setup() { @@ -285,10 +282,7 @@ pkg_setup() { python-single-r1_pkg_setup xdg_environment_reset - if [[ ${MERGE_TYPE} != binary ]]; then - _check_reqs - check-reqs_pkg_setup - fi + [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup } src_unpack() { @@ -405,6 +399,7 @@ src_configure() { --disable-fetch-external --disable-gstreamer-0-10 --disable-online-update + --disable-openssl --disable-pdfium --disable-report-builder --with-alloc=system @@ -417,6 +412,7 @@ src_configure() { --with-lang="" --with-parallelism=$(makeopts_jobs) --with-system-ucpp + --with-tls=nss --with-vendor="Gentoo Foundation" --with-x --without-fonts diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml index 174cf72da38f..b63d524dac8d 100644 --- a/app-office/libreoffice/metadata.xml +++ b/app-office/libreoffice/metadata.xml @@ -14,7 +14,6 @@ version</longdescription> <flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag> <flag name="googledrive">Enable support for remote files on Google Drive</flag> <flag name="gtk2">Enable legacy gtk2 frontend</flag> - <flag name="gtk3">Enable 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="pdfimport">Enable PDF import via the Poppler library</flag> |