From 7b9f15840068dfaeea5684f8a1af1fe460dfa14c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 2 Jun 2018 17:18:14 +0100 Subject: gentoo resync : 02.06.2018 --- app-office/libreoffice/Manifest | 16 +- .../files/libreoffice-5.4.5.1-pyuno-crash.patch | 87 ---- ...libreoffice-6.0.3.2-disable-flaky-tests-1.patch | 216 ++++++++ ...libreoffice-6.0.3.2-disable-flaky-tests-2.patch | 37 ++ .../libreoffice-6.0.3.2-disable-flaky-tests.patch | 253 --------- app-office/libreoffice/libreoffice-5.4.5.1.ebuild | 578 --------------------- app-office/libreoffice/libreoffice-6.0.3.2.ebuild | 4 +- app-office/libreoffice/libreoffice-6.0.4.2.ebuild | 2 +- app-office/libreoffice/libreoffice-6.0.9999.ebuild | 2 +- app-office/libreoffice/metadata.xml | 3 - 10 files changed, 263 insertions(+), 935 deletions(-) delete mode 100644 app-office/libreoffice/files/libreoffice-5.4.5.1-pyuno-crash.patch create mode 100644 app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch create mode 100644 app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-2.patch delete mode 100644 app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests.patch delete mode 100644 app-office/libreoffice/libreoffice-5.4.5.1.ebuild (limited to 'app-office/libreoffice') diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index d04c865b0bff..9a9adf8da700 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -3,31 +3,27 @@ AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0a 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.5.1-pyuno-crash.patch 3214 BLAKE2B 0df77d6f8d5fdfdc18665e881f5dcfd0d7323c2782ce91e74d972a743a36751cc270e3d50b8b2eeddb6d2c4470352a4ad1727a5c6fa708b47bc4d8b5f62636ba SHA512 203d75b8d246cb921926c287cb318d394e01331326cf027344680315c3afb155a3ad5df286e00f8ec71a4d99c6bf77f4b1d7ac9e35d16c4bf5ba8a7fdad37ea3 -AUX libreoffice-6.0.3.2-disable-flaky-tests.patch 10258 BLAKE2B 50dbe3b0a406f7808adb02882d08dfb918aa6f3905ee82bc03a8b1fd6dde7dc0d29f48dce11a627b2c8240eb7634cb14eff5a19e8539e576eae004c6ea5e3c02 SHA512 89c7028518863f5bf2c5c007e8d7b587d2a30cc59efc35880bd289253a86462abbe02dcebc0ed21cdff6076b5c1d8c140962115f8c803b95b4c9043a9661d97f +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 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 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555291 BLAKE2B dd66515fb2835c40905f91338a89921608f6aa96f0df2a0f2396d8ce397c2fd76173e1f72eff437d0167d5f831b3dd6b3050d5590ed88131921d269d0c63a8d2 SHA512 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8 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.5.1.tar.xz 193846832 BLAKE2B 50e9afb84d6e1901c3a6c99d1a4d3e274894d001afce71a0ced6a3ba0682995adf75e21eed40cfbc6d159581bf152273fad85615030fee33ba63dbf1ca15148d SHA512 70ef595aab3ddc81a000c18f2f783e5a87d98326fd3b69923c43e94e832a7f4d89f0d7444073d9ec48590e9a90b9fcd049ba0c85d17ac7921cd022cb2d0bebd5 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.4.2.tar.xz 204556512 BLAKE2B 2131fb0f810c81803f9905bc1f3f9bfa04615deceb8eb443644a35d6b4226f6876ffdbb8ef00c9ffe8e5a677877513b3c2adb40b3f87ddcdb46946c5bf3d6183 SHA512 004cef88c1a6d908a519b8813562d4dd623c899608026aa603dd86012a3d0b9a5d776c05e0e2d7541c691f4a9fc6c4d62c278fe88627872a1c6f841bddc2736e DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f -DIST libreoffice-help-5.4.5.1.tar.xz 2343180 BLAKE2B bd36ecae88313b60e9ad220f8ce47185e070e275d873741e96a98fd6d2dbf546b579fc304c1931775de86734710d2b91542ee9c9749b6036fe8e443cfecb60ed SHA512 b3860dd592207f83b8c6613fdb42962a9e175f6e850282cef6380869add7fe81c7292fdd145f2e2616f8113e2c18f6ed60210d4a182c1be021d7a1db61c9d89d 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.4.2.tar.xz 2972636 BLAKE2B 0528ad30fc754269a94a4b2a0c9eab26ecb707b1e9a230686a982a24215fbc91016813fecef687499ee4cfb49228febbfbaaaff7371053d130adefd705a1bb49 SHA512 ebdfc93e8dd5e44b6fc5baa087c86777b91bb18008809dc493dd0ddaf143b26c50349f99cc884678cb6db3f8d60b615c9a816872e73ceddeec8be126d65d2651 -EBUILD libreoffice-5.4.5.1.ebuild 17387 BLAKE2B 49447d04e804bb922dc23a0480c23b042feb8047ff8c3fd18ae1301e1eabf6776a9cd25718c8df8219ee2572cb6436900b7900edc59f5c945fab72e00f891102 SHA512 c5acb6351eb47e3c34dccc98c86f3eb146787a03aaf23aa195ad818719b102a26747b0de1e406845e134b27012830e8eed8abcf275e77d825225f828c67be248 EBUILD libreoffice-5.4.7.2.ebuild 16222 BLAKE2B a118f9d518c571927f24dcfd5db2373984a0e2be9caacf50af6005677706e3bc8ae57f8771a89a57e748b2221f8b8eaa19b0901218e6ce181bb28d25d7e6af24 SHA512 21e37083c7facb66bfaf3403bf2935430f1a581b61ab4d56b7d689a1762f5d14b8178f50c3e33a0d81f33f9e0ea062241f2d3e3296dd327d53ef33f431b92047 -EBUILD libreoffice-6.0.3.2.ebuild 16876 BLAKE2B 1dc12afccfcaf2fb7217a4ecadd89c838fc54adf08c1a717e04a9a18665509b363301196fa1bca73b1c534abdbb84a3a26d629621b0d7b164524d0cc62e9fc7f SHA512 61852aa12304d608bcf2f032653635729e8917278761d345e6532766ead809ef7c325f5e509b4de39952c3f9285010e04eeedaa54eae6900095851889eed9dbd -EBUILD libreoffice-6.0.4.2.ebuild 16817 BLAKE2B e1c95ffe3489ee72eb918b2c40bcb868706c019e2e6bcd72e2402e0befaabd6afc82446135e834f4010cbc36000ab0548bfd6fff2cd1e56a5a99cc20e4c49e7c SHA512 df6a331f94c511d5e2e3793a61e1103c81e85e575a8257c7fcfed5ad5f2e2ec604c4a6d8ea905cf18c7e712bd9be7dd12d137908238cf0e1699bb6a581a843c0 -EBUILD libreoffice-6.0.9999.ebuild 16817 BLAKE2B e1c95ffe3489ee72eb918b2c40bcb868706c019e2e6bcd72e2402e0befaabd6afc82446135e834f4010cbc36000ab0548bfd6fff2cd1e56a5a99cc20e4c49e7c SHA512 df6a331f94c511d5e2e3793a61e1103c81e85e575a8257c7fcfed5ad5f2e2ec604c4a6d8ea905cf18c7e712bd9be7dd12d137908238cf0e1699bb6a581a843c0 +EBUILD libreoffice-6.0.3.2.ebuild 16881 BLAKE2B e4ccafaa0c47aaceae3be045b9f7c64406c59fbcd7b2052025222352c89540270b5ffa349ce74f9bc9dcf0475f176e1b08d8b72e393e592f4f0bbca459e4e17c SHA512 1b179f51a8e3c3b26d465550407262847f754a498431e5fa6b468d7d162067c62670f72289a242b41fc89b4369d0a9f4427043c4513241111d3a1d3a2f6bb7fa +EBUILD libreoffice-6.0.4.2.ebuild 16819 BLAKE2B 2804ea8fc6b4cb60811ba18798a4d315259627ae5b64ff624e1210fc14403b7d61618e54503e5c2a9b235ed3f7fa6d50f7ab99632aa2abfcccbd77324ad5a238 SHA512 af1001dd66825e3ea600452f9e97feccf5e64305a4bdf8ef535c7f3b0d7f313097b8eb2d57809365fcd6a9d7f214f7c10fb19ebbe9b2044aad61b715dbadffb9 +EBUILD libreoffice-6.0.9999.ebuild 16819 BLAKE2B 2804ea8fc6b4cb60811ba18798a4d315259627ae5b64ff624e1210fc14403b7d61618e54503e5c2a9b235ed3f7fa6d50f7ab99632aa2abfcccbd77324ad5a238 SHA512 af1001dd66825e3ea600452f9e97feccf5e64305a4bdf8ef535c7f3b0d7f313097b8eb2d57809365fcd6a9d7f214f7c10fb19ebbe9b2044aad61b715dbadffb9 EBUILD libreoffice-6.1.9999.ebuild 16600 BLAKE2B e497c832f22797d839d084195dc70d37dc3091b3d9d88f4688a7e1ab53e624e073f7f72baa7800fa0dc09da913242ce8f4c565df694911cd2fc0d2df363195c5 SHA512 c062f2a1b2b35285266b56039579d37b347edcd7b274ee825a28b008bf2cd3ac1be2bf7a73ed4d499803ac7901d1284f776de12b666c20630791e6f1e9711e88 EBUILD libreoffice-9999.ebuild 16600 BLAKE2B e497c832f22797d839d084195dc70d37dc3091b3d9d88f4688a7e1ab53e624e073f7f72baa7800fa0dc09da913242ce8f4c565df694911cd2fc0d2df363195c5 SHA512 c062f2a1b2b35285266b56039579d37b347edcd7b274ee825a28b008bf2cd3ac1be2bf7a73ed4d499803ac7901d1284f776de12b666c20630791e6f1e9711e88 -MISC metadata.xml 1443 BLAKE2B cbf2c4306fdcde291bcb0692af7dc9f43f1eaf05fe93d6faffbc85833dc4d5ae653cc299a9bdb55dfb335c8aff316893a72ac48488fb372f667f81212648fe75 SHA512 df37d47b0f2f9f9c229b0d558d69fcda897a54b8ef1584d9940a7817885d52aa6b17b1879cf3103a9129fcac0611b4fe49213876bd2e446c70e57735a144b323 +MISC metadata.xml 1153 BLAKE2B 831243a115825974190637c2c9615e41e44d50227ba6b8e4c7f9683d8d510e422b573ee18f886673df2a3bf30feb5fcdfc7f1e90ec215d39bcccd9a11098d57a SHA512 50b686f39b0113d96b8a2b14f36581be68c2384d13a963ea3c20973b3af874bb9d50c4b7d5d2f11b2e0ffaf9deb351b5314fe30f954f17351ba0c8c850680c1d diff --git a/app-office/libreoffice/files/libreoffice-5.4.5.1-pyuno-crash.patch b/app-office/libreoffice/files/libreoffice-5.4.5.1-pyuno-crash.patch deleted file mode 100644 index 850f56465c77..000000000000 --- a/app-office/libreoffice/files/libreoffice-5.4.5.1-pyuno-crash.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 42e2c4af310deb7660b07c6307459c9d2a42bb8b Mon Sep 17 00:00:00 2001 -From: Michael Stahl -Date: Thu, 1 Feb 2018 13:52:00 +0100 -Subject: tdf#114815 pyuno: avoid 2 threads initing python in parallel - -According to the crash reports, it's possible for the grammar checking -thread to call GetGrammarChecker, instantiating lightproof, at the same -time as the main thread instantiates LngSvcMgr, which also instantiates -(some?) (all?) grammar checkers. - -Ensure that pyuno_loader::CreateInstance() initialises Python only -once with a C++11 thread safe static. - -For the backport, use rtl::Static instead, because on the 5.4 branch -MSVC does not have HAVE_THREADSAFE_STATICS enabled. - -Change-Id: I5b1faba9107355c508831a078366e4a29fdbfadf -(cherry picked from commit 5357ca82846ea7147ad61e9340f25647a5934eb0) -Reviewed-on: https://gerrit.libreoffice.org/49116 -Tested-by: Jenkins -Reviewed-by: Stephan Bergmann -(cherry picked from commit 362b0c521c1c58dc8ea5e87ecbb482d5bdc073f4) -Reviewed-on: https://gerrit.libreoffice.org/49298 -Reviewed-by: Michael Meeks -Tested-by: Markus Mohrhard -Reviewed-by: Markus Mohrhard ---- - pyuno/source/loader/pyuno_loader.cxx | 25 +++++++++++++++++++++---- - 1 file changed, 21 insertions(+), 4 deletions(-) - -diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx -index adbf6c8..0408af0 100644 ---- a/pyuno/source/loader/pyuno_loader.cxx -+++ b/pyuno/source/loader/pyuno_loader.cxx -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -176,11 +177,10 @@ static void prependPythonPath( const OUString & pythonPathBootstrap ) - osl_setEnvironment(envVar.pData, envValue.pData); - } - --Reference< XInterface > CreateInstance( const Reference< XComponentContext > & ctx ) -+struct PythonInit - { -- Reference< XInterface > ret; -- -- if( ! Py_IsInitialized() ) -+PythonInit() { -+ if (! Py_IsInitialized()) // may be inited by getComponentContext() already - { - OUString pythonPath; - OUString pythonHome; -@@ -236,9 +236,26 @@ Reference< XInterface > CreateInstance( const Reference< XComponentContext > & c - // PyThreadAttach below. - PyThreadState_Delete(tstate); - } -+} -+}; -+ -+namespace { -+ struct thePythonInit : public rtl::Static {}; -+} -+ -+Reference CreateInstance(const Reference & ctx) -+{ -+ // tdf#114815 thread-safe static to init python only once -+ thePythonInit::get(); -+ -+ Reference< XInterface > ret; - - PyThreadAttach attach( PyInterpreterState_Head() ); - { -+ // note: this can't race against getComponentContext() because -+ // either (in soffice.bin) CreateInstance() must be called before -+ // getComponentContext() can be called, or (in python.bin) the other -+ // way around - if( ! Runtime::isInitialized() ) - { - Runtime::initialize( ctx ); --- -cgit v1.1 - diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch new file mode 100644 index 000000000000..03421c5e12be --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch @@ -0,0 +1,216 @@ +Kindly borrowed from Debian. + +14:13 < mst__> _rene_, the toolkit unoapi tests are known to be flaky (in some + system dependent way) e.g. on the Win@6 tinderbox it always + crashes +14:14 < mst__> _rene_, sc.ScAccessible* tests also fail on some systems some of + the time + +diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk +index 25db0b6..14e507c 100644 +--- a/toolkit/Module_toolkit.mk ++++ b/toolkit/Module_toolkit.mk +@@ -26,11 +26,11 @@ $(eval $(call gb_Module_add_targets,toolkit,\ + ifneq ($(OOO_JUNIT_JAR),) + $(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\ + JunitTest_toolkit_complex \ +- JunitTest_toolkit_unoapi_1 \ +- JunitTest_toolkit_unoapi_2 \ +- JunitTest_toolkit_unoapi_3 \ +- JunitTest_toolkit_unoapi_4 \ + )) + endif ++# JunitTest_toolkit_unoapi_1 \ ++# JunitTest_toolkit_unoapi_2 \ ++# JunitTest_toolkit_unoapi_3 \ ++# JunitTest_toolkit_unoapi_4 \ + + # vim: set noet sw=4 ts=4: +diff --git a/sc/qa/unoapi/sc_1.sce b/sc/qa/unoapi/sc_1.sce +index fa1684c..cc8e1a5 100644 +--- a/sc/qa/unoapi/sc_1.sce ++++ b/sc/qa/unoapi/sc_1.sce +@@ -24,10 +24,3 @@ + # i84554 -o sc.AccessibleEditableTextPara_PreviewNote + # i88241 -o sc.AccessibleEditableTextPara_HeaderFooter + -o sc.AccessibleEditableTextPara_PreviewCell +--o sc.ScAccessibleCell +-# i91044 -o sc.ScAccessibleCsvCell +-# i91044 -o sc.ScAccessibleCsvGrid +-# i84641 -o sc.ScAccessibleCsvRuler +-# i88330 -o sc.ScAccessibleDocument +-# i91045 -o sc.ScAccessibleDocumentPagePreview +--o sc.ScAccessiblePageHeader +diff --git a/sc/qa/unoapi/sc_2.sce b/sc/qa/unoapi/sc_2.sce +index dbfc3e1..d235c5d 100644 +--- a/sc/qa/unoapi/sc_2.sce ++++ b/sc/qa/unoapi/sc_2.sce +@@ -15,11 +15,6 @@ + # except in compliance with the License. You may obtain a copy of + # the License at http://www.apache.org/licenses/LICENSE-2.0 . + # +-# fdo#FOO -o sc.ScAccessiblePageHeaderArea +--o sc.ScAccessiblePreviewCell +--o sc.ScAccessiblePreviewHeaderCell +--o sc.ScAccessiblePreviewTable +-# fdo#45337 -o sc.ScAccessibleSpreadsheet + # FIXME_REMOVE_WHEN_RE_BASE_COMPLETE + # -o sc.ScAnnotationObj + # -o sc.ScAnnotationShapeObj + +12:18 < _rene_> chris_wot: ping? +12:18 < chris_wot> heya +12:18 < chris_wot> you pinged? +12:19 < _rene_> chris_wot: any news on + https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815292? +12:20 < _rene_> (of course the this-night-uploaded rc3 also failed) +12:21 < chris_wot> ah, sorry - I've looked at an EMF regression, but I've not + gotten any further on that one +12:22 < chris_wot> I honestly think that for this one just disable the test for + now +12:22 < chris_wot> I'll ping the ML + +This seems fixed when opening the original doc. + +diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +index 54eed4d..78019bd 100644 +--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx ++++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +@@ -1128,30 +1128,30 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, "no-numlevel-but-indented.odt") + + + +-DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt") +-{ +- xmlDocPtr pXmlDoc = parseExport("word/document.xml"); +- if (!pXmlDoc) +- return; +- // there should be no flipH and flipV attributes in this case +- assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH"); +- assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV"); +- // check rotation angle +- assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000"); +- // check the first few coordinates of the polygon +-#ifndef MACOSX /* Retina-related rounding roundtrip error +- * hard to smooth out due to the use of string compare +- * instead of number */ +-#if !defined(_WIN32) +- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351"); +- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171"); +- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695"); +- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171"); +- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695"); +- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701"); +-#endif +-#endif +-} ++//DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt") ++//{ ++// xmlDocPtr pXmlDoc = parseExport("word/document.xml"); ++// if (!pXmlDoc) ++// return; ++// // there should be no flipH and flipV attributes in this case ++// assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH"); ++// assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV"); ++// // check rotation angle ++// assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000"); ++// // check the first few coordinates of the polygon ++//#ifndef MACOSX /* Retina-related rounding roundtrip error ++// * hard to smooth out due to the use of string compare ++// * instead of number */ ++//#if !defined(_WIN32) ++// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351"); ++// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171"); ++// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695"); ++// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171"); ++// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695"); ++// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701"); ++//#endif ++//#endif ++//} + + + CPPUNIT_PLUGIN_IMPLEMENT(); +diff --git a/svx/qa/unoapi/svx.sce b/svx/qa/unoapi/svx.sce +index 1c3925f..a16f001 100644 +--- a/svx/qa/unoapi/svx.sce ++++ b/svx/qa/unoapi/svx.sce +@@ -25,7 +25,7 @@ + #i111216 -o svx.AccessiblePresentationGraphicShape + #i111216 -o svx.AccessiblePresentationOLEShape + #i85539 -o svx.AccessiblePresentationShape +--o svx.AccessibleShape ++#-o svx.AccessibleShape + #i90294 -o svx.GraphicExporter + -o svx.SvxDrawPage + #i85501 -o svx.SvxGraphCtrlAccessibleContext + +19:26 <@x1sc0> _rene_, since that test is using exact dimensions, it seems it + fails on your side probably because the paragraph style is + different. 1. I will change the test to avoid the exact + dimensions. 2. meantime you can skip that test: +https://cgit.freedesktop.org/libreoffice/core/commit/?id=e05f16e6bf36efbaab16dd2ed1427a750ce7cafd +19:26 < IZBot> core - disable UI test that does exact comparison +19:27 < _rene_> mmh, ok, saw that but that was for a different test, so.. :) +19:27 -!- jacobo [~jaragunde@fanzine.igalia.com] has quit [Quit: Leaving.] +19:27 < _rene_> thanks, will do + +diff --git a/uitest/writer_tests/tdf79236.py b/uitest/writer_tests/tdf79236.py +index 8585e48d8c64..704f42c009a1 100644 +--- a/uitest/writer_tests/tdf79236.py ++++ b/uitest/writer_tests/tdf79236.py +@@ -8,8 +8,11 @@ from uitest.framework import UITestCase + import time + from uitest.uihelper.common import get_state_as_dict, type_text + ++import unittest ++ + class tdf79236(UITestCase): + ++ @unittest.skip("Currently broken") + def test_paragraph(self): + + self.ui_test.create_doc_in_start_center("writer") + +14:39 < ztamas> _rene_: chart2dump is used to fail because of font size differences, just use a bigger delta or disable it if it + fails for you. +14:40 <@sberg_> noelgrandin, no +14:40 < noelgrandin> sberg_, sure seems that way both in the debugger and in the resulting SAL_WARN output +14:42 < ztamas> _rene_: there were some work on making font rendering consistent on different platforms, but it's not finished + yet, I guess +diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk +index 3273055d5373..cb452139170c 100644 +--- a/chart2/Module_chart2.mk ++++ b/chart2/Module_chart2.mk +@@ -33,9 +33,9 @@ $(eval $(call gb_Module_add_slowcheck_targets,chart2,\ + CppunitTest_chart2_export \ + CppunitTest_chart2_import \ + CppunitTest_chart2_trendcalculators \ +- CppunitTest_chart2_dump \ + CppunitTest_chart2_pivot_chart_test \ + )) ++# CppunitTest_chart2_dump \ + + ifeq ($(ENABLE_CHART_TESTS),TRUE) + ifeq ($(WITH_FONTS), TRUE) +diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +index 4d65beeb90c4..f3d71501c41a 100644 +--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx ++++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +@@ -1559,14 +1559,14 @@ DECLARE_OOXMLIMPORT_TEST(testTdf43017, "tdf43017.docx") + } + + +-DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx") ++/*DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx") + { + // the position of the flying text frame should be off page + // 30624 below its anchor + OUString aTop = parseDump("//fly[1]/infos/bounds", "top"); + CPPUNIT_ASSERT_EQUAL( OUString("30624"), aTop ); + +-} ++}*/ + + DECLARE_OOXMLIMPORT_TEST(testTdf113946, "tdf113946.docx") + { diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-2.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-2.patch new file mode 100644 index 000000000000..55f2d8a55fc7 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-2.patch @@ -0,0 +1,37 @@ +--- a/xmlsecurity/qa/unit/signing/signing.cxx 2018-01-27 18:21:08.228434985 +0100 ++++ b/xmlsecurity/qa/unit/signing/signing.cxx 2018-01-27 18:21:37.428824309 +0100 +@@ -114,7 +114,7 @@ + /// Test a typical broken ODF signature where the XML dsig hash is corrupted. + void testODFBrokenDsigGPG(); + /// Test loading an encrypted ODF document +- void testODFEncryptedGPG(); ++// void testODFEncryptedGPG(); + #endif + CPPUNIT_TEST_SUITE(SigningTest); + CPPUNIT_TEST(testDescription); +@@ -143,7 +143,7 @@ + CPPUNIT_TEST(testODFUntrustedGoodGPG); + CPPUNIT_TEST(testODFBrokenStreamGPG); + CPPUNIT_TEST(testODFBrokenDsigGPG); +- CPPUNIT_TEST(testODFEncryptedGPG); ++// CPPUNIT_TEST(testODFEncryptedGPG); + #endif + CPPUNIT_TEST_SUITE_END(); + +@@ -743,14 +743,14 @@ + CPPUNIT_ASSERT_EQUAL(static_cast(SignatureState::BROKEN), static_cast(pObjectShell->GetDocumentSignatureState())); + } + +-void SigningTest::testODFEncryptedGPG() ++/*void SigningTest::testODFEncryptedGPG() + { + createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY) + "encryptedGPG.odt"); + SfxBaseModel* pBaseModel = dynamic_cast(mxComponent.get()); + CPPUNIT_ASSERT(pBaseModel); + SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell(); + CPPUNIT_ASSERT(pObjectShell); +-} ++}*/ + + #endif + diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests.patch deleted file mode 100644 index b25e4fc3ae5a..000000000000 --- a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests.patch +++ /dev/null @@ -1,253 +0,0 @@ -Kindly borrowed from Debian. - -14:13 < mst__> _rene_, the toolkit unoapi tests are known to be flaky (in some - system dependent way) e.g. on the Win@6 tinderbox it always - crashes -14:14 < mst__> _rene_, sc.ScAccessible* tests also fail on some systems some of - the time - -diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk -index 25db0b6..14e507c 100644 ---- a/toolkit/Module_toolkit.mk -+++ b/toolkit/Module_toolkit.mk -@@ -26,11 +26,11 @@ $(eval $(call gb_Module_add_targets,toolkit,\ - ifneq ($(OOO_JUNIT_JAR),) - $(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\ - JunitTest_toolkit_complex \ -- JunitTest_toolkit_unoapi_1 \ -- JunitTest_toolkit_unoapi_2 \ -- JunitTest_toolkit_unoapi_3 \ -- JunitTest_toolkit_unoapi_4 \ - )) - endif -+# JunitTest_toolkit_unoapi_1 \ -+# JunitTest_toolkit_unoapi_2 \ -+# JunitTest_toolkit_unoapi_3 \ -+# JunitTest_toolkit_unoapi_4 \ - - # vim: set noet sw=4 ts=4: -diff --git a/sc/qa/unoapi/sc_1.sce b/sc/qa/unoapi/sc_1.sce -index fa1684c..cc8e1a5 100644 ---- a/sc/qa/unoapi/sc_1.sce -+++ b/sc/qa/unoapi/sc_1.sce -@@ -24,10 +24,3 @@ - # i84554 -o sc.AccessibleEditableTextPara_PreviewNote - # i88241 -o sc.AccessibleEditableTextPara_HeaderFooter - -o sc.AccessibleEditableTextPara_PreviewCell ---o sc.ScAccessibleCell --# i91044 -o sc.ScAccessibleCsvCell --# i91044 -o sc.ScAccessibleCsvGrid --# i84641 -o sc.ScAccessibleCsvRuler --# i88330 -o sc.ScAccessibleDocument --# i91045 -o sc.ScAccessibleDocumentPagePreview ---o sc.ScAccessiblePageHeader -diff --git a/sc/qa/unoapi/sc_2.sce b/sc/qa/unoapi/sc_2.sce -index dbfc3e1..d235c5d 100644 ---- a/sc/qa/unoapi/sc_2.sce -+++ b/sc/qa/unoapi/sc_2.sce -@@ -15,11 +15,6 @@ - # except in compliance with the License. You may obtain a copy of - # the License at http://www.apache.org/licenses/LICENSE-2.0 . - # --# fdo#FOO -o sc.ScAccessiblePageHeaderArea ---o sc.ScAccessiblePreviewCell ---o sc.ScAccessiblePreviewHeaderCell ---o sc.ScAccessiblePreviewTable --# fdo#45337 -o sc.ScAccessibleSpreadsheet - # FIXME_REMOVE_WHEN_RE_BASE_COMPLETE - # -o sc.ScAnnotationObj - # -o sc.ScAnnotationShapeObj - -12:18 < _rene_> chris_wot: ping? -12:18 < chris_wot> heya -12:18 < chris_wot> you pinged? -12:19 < _rene_> chris_wot: any news on - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815292? -12:20 < _rene_> (of course the this-night-uploaded rc3 also failed) -12:21 < chris_wot> ah, sorry - I've looked at an EMF regression, but I've not - gotten any further on that one -12:22 < chris_wot> I honestly think that for this one just disable the test for - now -12:22 < chris_wot> I'll ping the ML - -This seems fixed when opening the original doc. - -diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx -index 54eed4d..78019bd 100644 ---- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx -+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx -@@ -1128,30 +1128,30 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, "no-numlevel-but-indented.odt") - - - --DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt") --{ -- xmlDocPtr pXmlDoc = parseExport("word/document.xml"); -- if (!pXmlDoc) -- return; -- // there should be no flipH and flipV attributes in this case -- assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH"); -- assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV"); -- // check rotation angle -- assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000"); -- // check the first few coordinates of the polygon --#ifndef MACOSX /* Retina-related rounding roundtrip error -- * hard to smooth out due to the use of string compare -- * instead of number */ --#if !defined(_WIN32) -- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351"); -- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171"); -- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695"); -- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171"); -- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695"); -- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701"); --#endif --#endif --} -+//DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt") -+//{ -+// xmlDocPtr pXmlDoc = parseExport("word/document.xml"); -+// if (!pXmlDoc) -+// return; -+// // there should be no flipH and flipV attributes in this case -+// assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH"); -+// assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV"); -+// // check rotation angle -+// assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000"); -+// // check the first few coordinates of the polygon -+//#ifndef MACOSX /* Retina-related rounding roundtrip error -+// * hard to smooth out due to the use of string compare -+// * instead of number */ -+//#if !defined(_WIN32) -+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351"); -+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171"); -+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695"); -+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171"); -+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695"); -+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701"); -+//#endif -+//#endif -+//} - - - CPPUNIT_PLUGIN_IMPLEMENT(); -diff --git a/svx/qa/unoapi/svx.sce b/svx/qa/unoapi/svx.sce -index 1c3925f..a16f001 100644 ---- a/svx/qa/unoapi/svx.sce -+++ b/svx/qa/unoapi/svx.sce -@@ -25,7 +25,7 @@ - #i111216 -o svx.AccessiblePresentationGraphicShape - #i111216 -o svx.AccessiblePresentationOLEShape - #i85539 -o svx.AccessiblePresentationShape ---o svx.AccessibleShape -+#-o svx.AccessibleShape - #i90294 -o svx.GraphicExporter - -o svx.SvxDrawPage - #i85501 -o svx.SvxGraphCtrlAccessibleContext - -19:26 <@x1sc0> _rene_, since that test is using exact dimensions, it seems it - fails on your side probably because the paragraph style is - different. 1. I will change the test to avoid the exact - dimensions. 2. meantime you can skip that test: -https://cgit.freedesktop.org/libreoffice/core/commit/?id=e05f16e6bf36efbaab16dd2ed1427a750ce7cafd -19:26 < IZBot> core - disable UI test that does exact comparison -19:27 < _rene_> mmh, ok, saw that but that was for a different test, so.. :) -19:27 -!- jacobo [~jaragunde@fanzine.igalia.com] has quit [Quit: Leaving.] -19:27 < _rene_> thanks, will do - -diff --git a/uitest/writer_tests/tdf79236.py b/uitest/writer_tests/tdf79236.py -index 8585e48d8c64..704f42c009a1 100644 ---- a/uitest/writer_tests/tdf79236.py -+++ b/uitest/writer_tests/tdf79236.py -@@ -8,8 +8,11 @@ from uitest.framework import UITestCase - import time - from uitest.uihelper.common import get_state_as_dict, type_text - -+import unittest -+ - class tdf79236(UITestCase): - -+ @unittest.skip("Currently broken") - def test_paragraph(self): - - self.ui_test.create_doc_in_start_center("writer") - -14:39 < ztamas> _rene_: chart2dump is used to fail because of font size differences, just use a bigger delta or disable it if it - fails for you. -14:40 <@sberg_> noelgrandin, no -14:40 < noelgrandin> sberg_, sure seems that way both in the debugger and in the resulting SAL_WARN output -14:42 < ztamas> _rene_: there were some work on making font rendering consistent on different platforms, but it's not finished - yet, I guess -diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk -index 3273055d5373..cb452139170c 100644 ---- a/chart2/Module_chart2.mk -+++ b/chart2/Module_chart2.mk -@@ -33,9 +33,9 @@ $(eval $(call gb_Module_add_slowcheck_targets,chart2,\ - CppunitTest_chart2_export \ - CppunitTest_chart2_import \ - CppunitTest_chart2_trendcalculators \ -- CppunitTest_chart2_dump \ - CppunitTest_chart2_pivot_chart_test \ - )) -+# CppunitTest_chart2_dump \ - - ifeq ($(ENABLE_CHART_TESTS),TRUE) - ifeq ($(WITH_FONTS), TRUE) -diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx -index 4d65beeb90c4..f3d71501c41a 100644 ---- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx -+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx -@@ -1559,14 +1559,14 @@ DECLARE_OOXMLIMPORT_TEST(testTdf43017, "tdf43017.docx") - } - - --DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx") -+/*DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx") - { - // the position of the flying text frame should be off page - // 30624 below its anchor - OUString aTop = parseDump("//fly[1]/infos/bounds", "top"); - CPPUNIT_ASSERT_EQUAL( OUString("30624"), aTop ); - --} -+}*/ - - DECLARE_OOXMLIMPORT_TEST(testTdf113946, "tdf113946.docx") - { ---- a/xmlsecurity/qa/unit/signing/signing.cxx 2018-01-27 18:21:08.228434985 +0100 -+++ b/xmlsecurity/qa/unit/signing/signing.cxx 2018-01-27 18:21:37.428824309 +0100 -@@ -114,7 +114,7 @@ - /// Test a typical broken ODF signature where the XML dsig hash is corrupted. - void testODFBrokenDsigGPG(); - /// Test loading an encrypted ODF document -- void testODFEncryptedGPG(); -+// void testODFEncryptedGPG(); - #endif - CPPUNIT_TEST_SUITE(SigningTest); - CPPUNIT_TEST(testDescription); -@@ -143,7 +143,7 @@ - CPPUNIT_TEST(testODFUntrustedGoodGPG); - CPPUNIT_TEST(testODFBrokenStreamGPG); - CPPUNIT_TEST(testODFBrokenDsigGPG); -- CPPUNIT_TEST(testODFEncryptedGPG); -+// CPPUNIT_TEST(testODFEncryptedGPG); - #endif - CPPUNIT_TEST_SUITE_END(); - -@@ -743,14 +743,14 @@ - CPPUNIT_ASSERT_EQUAL(static_cast(SignatureState::BROKEN), static_cast(pObjectShell->GetDocumentSignatureState())); - } - --void SigningTest::testODFEncryptedGPG() -+/*void SigningTest::testODFEncryptedGPG() - { - createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY) + "encryptedGPG.odt"); - SfxBaseModel* pBaseModel = dynamic_cast(mxComponent.get()); - CPPUNIT_ASSERT(pBaseModel); - SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell(); - CPPUNIT_ASSERT(pObjectShell); --} -+}*/ - - #endif - diff --git a/app-office/libreoffice/libreoffice-5.4.5.1.ebuild b/app-office/libreoffice/libreoffice-5.4.5.1.ebuild deleted file mode 100644 index a8b1cae3566d..000000000000 --- a/app-office/libreoffice/libreoffice-5.4.5.1.ebuild +++ /dev/null @@ -1,578 +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://download.documentfoundation.org/libreoffice/old/${PV}/ -" -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=( - "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )" - "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 collada +cups dbus debug eds firebird gltf googledrive -gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter 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:= - 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 ) - collada? ( media-libs/opencollada ) - 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 ) - gltf? ( >=media-libs/libgltf-0.1.0 ) - 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 ) - kde? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - kde-frameworks/kdelibs - ) - 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 ) - kde? ( kde-frameworks/oxygen-icons:* ) - 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} - !=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 ) - collada? ( gltf ) - 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" - - # 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 - "${FILESDIR}/${PN}-5.4.4.2-poppler-0.62.patch" # bug 642602 - - "${FILESDIR}/${P}-pyuno-crash.patch" # 5.4.5 branch commit after release -) - -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 "/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 - - 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_preinst() { - gnome2_icon_savelist -} - -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.3.2.ebuild b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild index 3c8a7c4dac39..837b49a029d8 100644 --- a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild +++ b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild @@ -70,7 +70,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" [[ ${PV} == *9999* ]] || \ -KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" COMMON_DEPEND="${PYTHON_DEPS} app-arch/unzip @@ -245,7 +245,7 @@ PATCHES=( # not upstreamable stuff "${FILESDIR}/${PN}-5.4-system-pyuno.patch" "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" - "${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests.patch" #bug 656676 + "${FILESDIR}"/${PN}-6.0.3.2-disable-flaky-tests-{1,2}.patch #bug 656676 # 6.0 branch "${FILESDIR}/${P}-poppler-0.64.patch" diff --git a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild index 433d077bc2c2..a7f087f49e26 100644 --- a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild +++ b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild @@ -246,7 +246,7 @@ PATCHES=( # not upstreamable stuff "${FILESDIR}/${PN}-5.4-system-pyuno.patch" "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" - "${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests.patch" #bug 656676 + "${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests-1.patch" #bug 656676 # TODO: upstream "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild index 433d077bc2c2..a7f087f49e26 100644 --- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild @@ -246,7 +246,7 @@ PATCHES=( # not upstreamable stuff "${FILESDIR}/${PN}-5.4-system-pyuno.patch" "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" - "${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests.patch" #bug 656676 + "${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests-1.patch" #bug 656676 # TODO: upstream "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml index f72d5cc7d181..174cf72da38f 100644 --- a/app-office/libreoffice/metadata.xml +++ b/app-office/libreoffice/metadata.xml @@ -12,15 +12,12 @@ computer. It will however make a snappier LibreOffice than the binary version Use sci-libs/coinor-mp as alternative solver - Enable Collada for rendering 3D models stored in *.dae and *.kmz format - Use media-libs/libgltf for inserting 3D models in the glTF format into presentations Enable support for remote files on Google Drive Enable legacy gtk2 frontend Enable experimental gtk3 frontend Use dev-libs/jemalloc for allocations Build the Office Development Kit Enable PDF import via the Poppler library - Build the system tray quickstarter Use media-video/vlc for video embedding -- cgit v1.2.3