From cc4618c9ba3d974948ebf340b542d8cb01db2f55 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 16 Sep 2021 22:05:01 +0100 Subject: gentoo resync : 16.09.2021 --- app-office/libreoffice/Manifest | 13 +- .../files/libreoffice-7.1.5.2-bison-3.8.patch | 53 ++ ...ce-7.1.6.2-KF5-fix-double-buffer-graphics.patch | 310 ++++++++++ app-office/libreoffice/libreoffice-7.1.5.2.ebuild | 1 + app-office/libreoffice/libreoffice-7.1.6.2.ebuild | 672 +++++++++++++++++++++ app-office/libreoffice/libreoffice-7.1.9999.ebuild | 5 +- app-office/libreoffice/libreoffice-9999.ebuild | 2 +- app-office/libreoffice/metadata.xml | 2 +- 8 files changed, 1051 insertions(+), 7 deletions(-) create mode 100644 app-office/libreoffice/files/libreoffice-7.1.5.2-bison-3.8.patch create mode 100644 app-office/libreoffice/files/libreoffice-7.1.6.2-KF5-fix-double-buffer-graphics.patch create mode 100644 app-office/libreoffice/libreoffice-7.1.6.2.ebuild (limited to 'app-office/libreoffice') diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 0c584e4c6705..5d1bb7a7b2e9 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -2,6 +2,8 @@ AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0a AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba34369137336327f4d1ee27789c5f6229b9a82f4aeab0eaeaf494e60b992c66fcdb276b6423b87713febb14e9eeaffa388369ca8 SHA512 f82e23f15cefd947af20a50e1e4168c9023d5f8b9e19da7f76b141a60be4fa3516ad16400ce26e4d0ff293c570031ac87bbbf6766444e1b31e7bc3ee8ef58083 AUX libreoffice-7.0.3.1-qt5detect.patch 1065 BLAKE2B bce0bb8d36f903516f437520e0b1a99080984933173ac30686136632a795f16b8e82f7bfb9dfe77b048154cf3616b3c6c96fd7c563284212ce4b3f9a4490f368 SHA512 e4273fcb2140c50c9030ef3ffeb451169c2e04fcf7e43650ad1d0928fa18ebe77dd482e2686fbaf9660aebfc17b9ce22b3dfa76f2248ae4af9bc51826e2785c2 AUX libreoffice-7.1.3.2-bashism.patch 1092 BLAKE2B 0c14e7a282cafe030a39b15551695e61bd9fd70090589e4b94b0839a31b28e634f927b7a21e73de74ea890fc575ab23923a14ad9e226a626dec331db9014391f SHA512 abafcf90b93078c1ec8cc8bf807ec089fc0f79a3eb0823a1da4026a40281369998b72a2c894dc268c56af586476d39991099b99a2f9a74d03fac98b856d4e84d +AUX libreoffice-7.1.5.2-bison-3.8.patch 2309 BLAKE2B be06f308b00733d18f3cd6a641dc17e98b7b8de1829cf7a3b0c4de237513c3604fcc9bb456522ceb044cdef6292cbb64db7c5fb0f76b8259bb92b48cfccde51c SHA512 87f20b9e143d29377b790fe7472aa3d956142f0444a85075f34ad68cf81313afe79bb6baa03c2535cb629720979187c1068e43d7bfb09992c59c9ad562b8c089 +AUX libreoffice-7.1.6.2-KF5-fix-double-buffer-graphics.patch 11871 BLAKE2B 31a07dbae4fe1c0dbc9c7e2f709dcb088dee92b52f63deded2fabf8c8bc94f657b0baa393059bb7667356d2ee940955acde461eaf53402bd08c0174e5cb069f0 SHA512 61924d14e4a524037122f2b684ef70fcd1ba5351d7d121b4d8a39f11b650bbaa4679b5df1e706c561041896651ac60b0299fe290e832d435b358626c00e56bbc AUX libreoffice-7.2.0.4-qt5detect.patch 536 BLAKE2B fd77876d1ca3973ad30c9ebb60bf28e163dd29dcaebaa2b94d84f4c2ab060617d96f4df3d5114f17f882b0cb8b9e2ecdb284fdd1e4aaf8a34cc0c1f06a295c04 SHA512 e1ac7dfc4743cbdea3050b18c1714d06c8bcca4abc51d56e13362c8379fbdd3d37a1916c962fcb1389783c9b1fd72783c9ee45fbb649538ca0fc0cb7b05bcacf DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c @@ -25,13 +27,16 @@ DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c7 DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa8b9e470e10044dbfd3812391f29e1421df8d7ac3869955698ddbc9575feebcfbac27bb074a60ccc0527dca1c3 SHA512 295ab15115e75b1f6074f17d3538afe0de9b2b77ab454f5c63cb05e8df11886d82942fbf21ba01486052e3f6c75b0636b99d8e660cd3472dc4b87c31d3cd557b DIST libreoffice-7.1.3.2.tar.xz 244104432 BLAKE2B f73bd448f94bc88a1dc775d032ce849ee1dd610c4077c709ffbe40d8c99527c7775cfe2309a636093182ac988ecf44a4b61df0e0a83b332fcc77a05edb602791 SHA512 d7329475cad5bece9358b29bc590da1841c3c0b4aef511508d9398519c514fa176c90675857f1830925818f2dcc8b9c0986e5d34d3a33cce617e4ada23c60a72 DIST libreoffice-7.1.5.2.tar.xz 244350068 BLAKE2B ac3c7f5cabcb27ce3ed31febb04ce54b93bc8b4fa716259d1b93d5364e75b85af3352ad70a023b56271e769f5537b3f3151e837ee13498e08f1871e5b47d778c SHA512 dad5ffd344a7bad88ed8e77df4fb17b42237715e7b1feb7a7de164f2fbf6698feefedeb57974d8275067a06c0da60e9b07a333ccc1bb2f6d55a6b52408bd9b5f +DIST libreoffice-7.1.6.2.tar.xz 244535588 BLAKE2B 79d4980b5842b37e7fdc328e832e3b672225e1903676d5c63ab68d7a993caf000bdb763837f98b4dd8156a95224ce22f501ec66dc315ca801a9c748e203e9170 SHA512 13f8e0a45614c75861b6262bcf845c1dc63baef044dc434319f739b6180f61a740f945e99663d76b1c51ce5226b9765431aa34b49d8a7f017c966bf5d4694257 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f DIST libreoffice-help-7.1.3.2.tar.xz 111785416 BLAKE2B 12d97764976ae0e4736638e9b758c5920d38d608e66fc3343d74178a935632396e1e07fbb98b6f380fd103c3f5e2edf917726a760420f6dfd3d2e42aaa215096 SHA512 576dbea391777a907275b630ed704dd3d9ad0627f8a18da1cbd23fe28df04c3a509583c2404f810df3aaac15ef0881e2c1e0a55c9f31618715586628873367eb DIST libreoffice-help-7.1.5.2.tar.xz 111785852 BLAKE2B 18962fe9260f6cf8ec7b1676f077b9f43e0277769b31b8e2c22cf83ac2963f3e92448901bc12f56dfb579da8a8a1ce20d6bd34c4bc3449f7e0972c03d22f63be SHA512 c669b6c4bfc3c6f46e4ee0bf86b158054f7178b9785273d9aba8183236b2ff6dbaf5584d5e4fb09bba3a8d010373599e7473a4ba15c229087c689198ceeee1c7 +DIST libreoffice-help-7.1.6.2.tar.xz 111785436 BLAKE2B 810de348ca8fc297a75608bf4def1b4fe68dae976c727ceb157937de8029e9d30b52929c4a4fa6521b3391be27943bfe30b76466b9c415b4f78f0b68a28377ca SHA512 1b0f7fe4bc9bf2e16e3b3ddf49d4a70ef1d7369d9fd4d4835618007a230fb6e36e81fa1bde42d38dba1068147b285148dbff6c336aff52872e8794b594d309ad DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d DIST skia-m94-975fcdd755dfc5d57cddbb25857e0c4ac29abe98.tar.xz 11672176 BLAKE2B 64d7821656002d23be839079dedffe1132497992aaef97ec734d6e430f2eda69f5344ca7fe75dd68fee847fa4c6638b4fc28194a951b91498ece5c6d4bcf3e44 SHA512 ae66fa7caeb5a328d96cd1c35eb8700080be5d3e3764e35b8056b03948e44b8bb8266284c87b44f9200accb95dbb8a2771a6e5ba067d34a7fbd33b1ababf19f8 EBUILD libreoffice-7.1.3.2.ebuild 19593 BLAKE2B 0ad7019e0cef8ab019f5993897ba2641c95258cf21251b0b86266a1c9af92e01153895be1198b234ad4381546366642412739ba79d9aee1cb258ae2bcd48f717 SHA512 909cf68a3d06c287feac0b104a9f3e262e5216b11722029f486e2e982f99d07d259db4e04125c9016d19c350d7599f5e6b72ffbae59c9bb070d4569136bda740 -EBUILD libreoffice-7.1.5.2.ebuild 19609 BLAKE2B 83226e67fcd0f3fb54690687dcf0c8ee7426c1d97a9be7b4fcb3702752aa06ac3eb9d815b34d9614e758d920fee56ed5858a387261818d270bd04517a59d686b SHA512 cfd2da54051e21a35ff93999c14dd0fda841bc081d1398990a1674f820d3cd66a55bf50769f39e5bc97f76d21fd70e8ab9e9ed34af93baef4e539c2a90eeabaa -EBUILD libreoffice-7.1.9999.ebuild 19705 BLAKE2B 6feb38a509865791e552e526178fb11f76252f5627dad71b60b3a4608a20a6baedc268957fd188a42dee3ddae1e036dd42466678ee40b5be83fb5705cd4b6542 SHA512 7e7abcf0c149cb86b5d6e2145888c357688f568920d7cd33c96cdda5863e99e1a3a8f2755080f91c3340de98628b536aaf02a5c604245119ee60e9f5d7d50006 -EBUILD libreoffice-9999.ebuild 19489 BLAKE2B a44938998e31862c66ac3922816a667acd7661a1091a43c2a37d7fabb808cf23b8872be9c9283d39c502be93574b53c61bf50dfe22c7369c08467165ff75a599 SHA512 723d773d7fe361874057689082196f8fad38e68338125c106f4dc5762e17677213722d927d1b8921ee3bcb0cbb2240c38f3a8d1047953fba3ef75a879c6be1f2 -MISC metadata.xml 1221 BLAKE2B 2cc713dbc6d112ac21f8846f9dad48c09972c0d6846a253773280564cf9370934ec798a1579d894d7679c591045542cf2c8cb8a308bf097ce5eac64f40fda3f0 SHA512 c1ab6a23d6fa4ed6b2d77b08c895f653890998a8ed7fb2fa69251adacc9a96e32c0d1298a2b7c287efe85d37a2707e740b6b036174b7b6e39d37a25e3866e957 +EBUILD libreoffice-7.1.5.2.ebuild 19658 BLAKE2B 66486620c15f16b1ab53857b3586f497ce09e364a76ee72226d2826b8e875b618545fcff407ea67ff0ec8b5c1b31b14e1e36109a1093709f5dd069205a7acb6c SHA512 004ce83b8c2096a0d9b1444e221229e1ca334bfd701a295398552b70d2695a9a8ae1a1132c2d73be025f08639d43984fcafaa946c9bb0f914eab22743f47cc82 +EBUILD libreoffice-7.1.6.2.ebuild 19914 BLAKE2B 21ded0f5bb8a845b8de9c370071d2f140da876fe0726dd0a67ed8612bd4d53de2916b8e26f698b70fdfe40b38235bee94d3bb9cf916b1bee60c0f04c8106ea1e SHA512 35e0990698f0f141dfadb1ccb7e1d1661dfd1150cf319d9707a87d0a5add98a2a9674adef9ce5101ffbaa3e10ed6e19e04dc9507a4cc18d8241870ab68ed4333 +EBUILD libreoffice-7.1.9999.ebuild 19784 BLAKE2B a7f5ce994b0ca7e1ffed9f16015bcf0e8b57a38bf618d9950c7bffb15e01710925156f9ac6cdb832aa1abdaf75bacee7757c53699341049587ee9e10f6cfccec SHA512 0b489d98096fa0f97a4a8b8ace8a48608e5ac999c04c1a7bd195d562e4909584a376a0e146743bf18c78ee83fad1321f84a08f9b021f1f5b3f71078132281366 +EBUILD libreoffice-9999.ebuild 19494 BLAKE2B 8558c8d53ba3cd5c801df1fac03821dbfaee26db294b94363a92c0d54207bf9011e416fed9ec83c02333048397faf92ddd6265cf1f167a3382970f53428ecbc5 SHA512 7e7805889dc2e16fc7910af0089b51e1365b930c1b330043485332615f01c6098c5b348186bcf1f8e56b7d1b38db0656f205b4f7f777ba1f9836223f7fb62927 +MISC metadata.xml 1222 BLAKE2B 02bb2d5bae26c3a97d77a36d90a2ffa0cac1eb2a0aabfac7d7f11d6b685264b7daad1a860598940af0fe9411068830d7eaf8553cbe4f69afedb092669b719cf1 SHA512 4ad197bb97eab3e860ba163b4c63839949fc9280a2ab53abc81ebb6c351d633e65ef3335a2d3af718d0e4a64e3312dfaff58f6cbab55507c57a6663c2850c3fd diff --git a/app-office/libreoffice/files/libreoffice-7.1.5.2-bison-3.8.patch b/app-office/libreoffice/files/libreoffice-7.1.5.2-bison-3.8.patch new file mode 100644 index 000000000000..b60b99a6c6c8 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-7.1.5.2-bison-3.8.patch @@ -0,0 +1,53 @@ +From 45227d9b79dc4f2a2aa6874cd4e3c02b7934b197 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Tue, 14 Sep 2021 12:20:48 +0200 +Subject: Adapt to Bison 3.8 internal yyn -> yyrule rename + +see + +"glr2.cc: log the execution of deferred actions" including "Rename argument yyn +as yyrule for clarity." + +YYBISON was defined as 1 rather than as a representation of the Bison version +prior to + +"yacc.c: provide the Bison version as an integral macro", which shouldn't be a +problem here. And YYBISON is apparently completely undefined with +/usr/bin/bison on macOS. + +(The preceding comment always mentioned "yyi" and "yyrmap" in apparent mismatch +with the actually used "yyn" and "yyr1" ever since +c25ec0608a167bcf1d891043f02273761c351701 "initial import", so just leave it +untouched.) + +Change-Id: I4f901407aa21ed4abec84e661d813ee7599f02f0 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122082 +Tested-by: Jenkins +Reviewed-by: Stephan Bergmann +--- + connectivity/source/parse/sqlbison.y | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y +index d14f36e7794f..c4be0bc00bd0 100644 +--- a/connectivity/source/parse/sqlbison.y ++++ b/connectivity/source/parse/sqlbison.y +@@ -74,9 +74,15 @@ inline connectivity::OSQLInternalNode* newNode(const OUString& _newValue, + + // yyi is the internal number of the rule that is currently being reduced + // This can be mapped to external rule number via the yyrmap. ++#if defined YYBISON && YYBISON >= 30800 ++#define SQL_NEW_RULE newNode("", SQLNodeType::Rule, yyr1[yyrule]) ++#define SQL_NEW_LISTRULE newNode("", SQLNodeType::ListRule, yyr1[yyrule]) ++#define SQL_NEW_COMMALISTRULE newNode("", SQLNodeType::CommaListRule, yyr1[yyrule]) ++#else + #define SQL_NEW_RULE newNode("", SQLNodeType::Rule, yyr1[yyn]) + #define SQL_NEW_LISTRULE newNode("", SQLNodeType::ListRule, yyr1[yyn]) + #define SQL_NEW_COMMALISTRULE newNode("", SQLNodeType::CommaListRule, yyr1[yyn]) ++#endif + + + extern connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER; +-- +cgit v1.2.1 + diff --git a/app-office/libreoffice/files/libreoffice-7.1.6.2-KF5-fix-double-buffer-graphics.patch b/app-office/libreoffice/files/libreoffice-7.1.6.2-KF5-fix-double-buffer-graphics.patch new file mode 100644 index 000000000000..36ed138f2a31 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-7.1.6.2-KF5-fix-double-buffer-graphics.patch @@ -0,0 +1,310 @@ +From ec23228a3a2fc4e8868f7f04b838313be59ad719 Mon Sep 17 00:00:00 2001 +From: Jan-Marek Glogowski +Date: Sun, 11 Apr 2021 17:40:26 +0200 +Subject: tdf#143796 Qt5/KF5 fix double-buffer graphics + +This is a squashed commit for: + +"Qt5/KF5 get rid of unneeded own grahics handling" +"tdf#143334 Qt5 don't reset buffer on style change" +"tdf#144008 Qt5/Kf5 create frames in the GUI thread" + +commit 963f252cd1ea9c268a6ced68a3454b10cbee1a89 +commit ec77a2ed0283cb3446f6e352fc329afd3dfb785c +commit 923b30aa27ceb377d6a540c012000e89ce5db31e + +The first commit exposed the same problem to kf5, the 2nd patch is +the real fix and the 3rd partly a regression for kf5 from the 1st +commit but also an additional bugfix for qt5. + +Change-Id: I84b8dd106a35a5c2fda08a525f657b0b733a5cb7 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121795 +Tested-by: Jenkins +Reviewed-by: Michael Weghorn +Reviewed-by: Jan-Marek Glogowski +Reviewed-by: Adolfo Jayme Barrientos +--- + vcl/inc/qt5/Qt5Frame.hxx | 8 +------- + vcl/inc/qt5/Qt5Instance.hxx | 1 + + vcl/qt5/Qt5Frame.cxx | 34 ++++++++++++---------------------- + vcl/qt5/Qt5Instance.cxx | 18 +++++++++++++++--- + vcl/unx/kf5/KF5SalFrame.cxx | 24 ------------------------ + vcl/unx/kf5/KF5SalFrame.hxx | 6 ------ + vcl/unx/kf5/KF5SalInstance.cxx | 16 +++++++++++++--- + vcl/unx/kf5/KF5SalInstance.hxx | 1 + + 8 files changed, 43 insertions(+), 65 deletions(-) + +diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx +index 54a721e03730..9b6e3811c3bb 100644 +--- a/vcl/inc/qt5/Qt5Frame.hxx ++++ b/vcl/inc/qt5/Qt5Frame.hxx +@@ -77,17 +77,12 @@ class VCLPLUG_QT5_PUBLIC Qt5Frame : public QObject, public SalFrame + std::unique_ptr m_pQImage; + std::unique_ptr m_pQt5Graphics; + UniqueCairoSurface m_pSurface; +- std::unique_ptr m_pOurSvpGraphics; +- // in base class, this ptr is the same as m_pOurSvpGraphic +- // in derived class, it can point to a derivative +- // of Qt5SvpGraphics (which the derived class then owns) +- Qt5SvpGraphics* m_pSvpGraphics; ++ std::unique_ptr m_pSvpGraphics; + DamageHandler m_aDamageHandler; + QRegion m_aRegion; + bool m_bNullRegion; + + bool m_bGraphicsInUse; +- bool m_bGraphicsInvalid; + SalFrameStyleFlags m_nStyle; + Qt5Frame* m_pParent; + PointerStyle m_ePointerStyle; +@@ -144,7 +139,6 @@ public: + void Damage(sal_Int32 nExtentsX, sal_Int32 nExtentsY, sal_Int32 nExtentsWidth, + sal_Int32 nExtentsHeight) const; + +- void InitQt5SvpGraphics(Qt5SvpGraphics* pQt5SvpGraphics); + virtual SalGraphics* AcquireGraphics() override; + virtual void ReleaseGraphics(SalGraphics* pGraphics) override; + +diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx +index d73a59de51c1..a2372e58f8c9 100644 +--- a/vcl/inc/qt5/Qt5Instance.hxx ++++ b/vcl/inc/qt5/Qt5Instance.hxx +@@ -82,6 +82,7 @@ protected: + virtual Qt5FilePicker* + createPicker(css::uno::Reference const& context, + QFileDialog::FileMode); ++ bool useCairo() const { return m_bUseCairo; } + + public: + explicit Qt5Instance(std::unique_ptr& pQApp, bool bUseCairo = false); +diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx +index b398e9a5cf3b..d39d1729c812 100644 +--- a/vcl/qt5/Qt5Frame.cxx ++++ b/vcl/qt5/Qt5Frame.cxx +@@ -104,10 +104,8 @@ sal_Int32 screenNumber(const QScreen* pScreen) + Qt5Frame::Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo) + : m_pTopLevel(nullptr) + , m_bUseCairo(bUseCairo) +- , m_pSvpGraphics(nullptr) + , m_bNullRegion(true) + , m_bGraphicsInUse(false) +- , m_bGraphicsInvalid(false) + , m_ePointerStyle(PointerStyle::Arrow) + , m_pDragSource(nullptr) + , m_pDropTarget(nullptr) +@@ -288,17 +286,6 @@ void Qt5Frame::Damage(sal_Int32 nExtentsX, sal_Int32 nExtentsY, sal_Int32 nExten + 1 / devicePixelRatioF())); + } + +-void Qt5Frame::InitQt5SvpGraphics(Qt5SvpGraphics* pQt5SvpGraphics) +-{ +- QSize aSize = m_pQWidget->size() * devicePixelRatioF(); +- m_pSvpGraphics = pQt5SvpGraphics; +- m_pSurface.reset( +- cairo_image_surface_create(CAIRO_FORMAT_ARGB32, aSize.width(), aSize.height())); +- m_pSvpGraphics->setSurface(m_pSurface.get(), basegfx::B2IVector(aSize.width(), aSize.height())); +- cairo_surface_set_user_data(m_pSurface.get(), Qt5SvpGraphics::getDamageKey(), &m_aDamageHandler, +- nullptr); +-} +- + SalGraphics* Qt5Frame::AcquireGraphics() + { + if (m_bGraphicsInUse) +@@ -308,24 +295,28 @@ SalGraphics* Qt5Frame::AcquireGraphics() + + if (m_bUseCairo) + { +- if (!m_pOurSvpGraphics || m_bGraphicsInvalid) ++ if (!m_pSvpGraphics) + { +- m_pOurSvpGraphics.reset(new Qt5SvpGraphics(this)); +- InitQt5SvpGraphics(m_pOurSvpGraphics.get()); +- m_bGraphicsInvalid = false; ++ QSize aSize = m_pQWidget->size() * devicePixelRatioF(); ++ m_pSvpGraphics.reset(new Qt5SvpGraphics(this)); ++ m_pSurface.reset( ++ cairo_image_surface_create(CAIRO_FORMAT_ARGB32, aSize.width(), aSize.height())); ++ m_pSvpGraphics->setSurface(m_pSurface.get(), ++ basegfx::B2IVector(aSize.width(), aSize.height())); ++ cairo_surface_set_user_data(m_pSurface.get(), Qt5SvpGraphics::getDamageKey(), ++ &m_aDamageHandler, nullptr); + } +- return m_pOurSvpGraphics.get(); ++ return m_pSvpGraphics.get(); + } + else + { +- if (!m_pQt5Graphics || m_bGraphicsInvalid) ++ if (!m_pQt5Graphics) + { + m_pQt5Graphics.reset(new Qt5Graphics(this)); + m_pQImage.reset( + new QImage(m_pQWidget->size() * devicePixelRatioF(), Qt5_DefaultFormat32)); + m_pQImage->fill(Qt::transparent); + m_pQt5Graphics->ChangeQImage(m_pQImage.get()); +- m_bGraphicsInvalid = false; + } + return m_pQt5Graphics.get(); + } +@@ -335,7 +326,7 @@ void Qt5Frame::ReleaseGraphics(SalGraphics* pSalGraph) + { + (void)pSalGraph; + if (m_bUseCairo) +- assert(pSalGraph == m_pOurSvpGraphics.get()); ++ assert(pSalGraph == m_pSvpGraphics.get()); + else + assert(pSalGraph == m_pQt5Graphics.get()); + m_bGraphicsInUse = false; +@@ -1145,7 +1136,6 @@ void Qt5Frame::UpdateSettings(AllSettings& rSettings) + style.SetShadowColor(toColor(pal.color(QPalette::Disabled, QPalette::WindowText))); + style.SetDarkShadowColor(toColor(pal.color(QPalette::Inactive, QPalette::WindowText))); + +- m_bGraphicsInvalid = true; + rSettings.SetStyleSettings(style); + } + +diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx +index ca1f914dd707..bceae35e9016 100644 +--- a/vcl/qt5/Qt5Instance.cxx ++++ b/vcl/qt5/Qt5Instance.cxx +@@ -252,13 +252,21 @@ void Qt5Instance::deleteObjectLater(QObject* pObject) { pObject->deleteLater(); + + SalFrame* Qt5Instance::CreateChildFrame(SystemParentData* /*pParent*/, SalFrameStyleFlags nStyle) + { +- return new Qt5Frame(nullptr, nStyle, m_bUseCairo); ++ SalFrame* pRet(nullptr); ++ RunInMainThread([&, this]() { pRet = new Qt5Frame(nullptr, nStyle, useCairo()); }); ++ assert(pRet); ++ return pRet; + } + + SalFrame* Qt5Instance::CreateFrame(SalFrame* pParent, SalFrameStyleFlags nStyle) + { + assert(!pParent || dynamic_cast(pParent)); +- return new Qt5Frame(static_cast(pParent), nStyle, m_bUseCairo); ++ ++ SalFrame* pRet(nullptr); ++ RunInMainThread( ++ [&, this]() { pRet = new Qt5Frame(static_cast(pParent), nStyle, useCairo()); }); ++ assert(pRet); ++ return pRet; + } + + void Qt5Instance::DestroyFrame(SalFrame* pFrame) +@@ -273,7 +281,11 @@ void Qt5Instance::DestroyFrame(SalFrame* pFrame) + SalObject* Qt5Instance::CreateObject(SalFrame* pParent, SystemWindowData*, bool bShow) + { + assert(!pParent || dynamic_cast(pParent)); +- return new Qt5Object(static_cast(pParent), bShow); ++ ++ SalObject* pRet(nullptr); ++ RunInMainThread([&]() { pRet = new Qt5Object(static_cast(pParent), bShow); }); ++ assert(pRet); ++ return pRet; + } + + void Qt5Instance::DestroyObject(SalObject* pObject) +diff --git a/vcl/unx/kf5/KF5SalFrame.cxx b/vcl/unx/kf5/KF5SalFrame.cxx +index 1aa0b9008de7..8f14594586d2 100644 +--- a/vcl/unx/kf5/KF5SalFrame.cxx ++++ b/vcl/unx/kf5/KF5SalFrame.cxx +@@ -45,7 +45,6 @@ + + KF5SalFrame::KF5SalFrame(KF5SalFrame* pParent, SalFrameStyleFlags nState, bool bUseCairo) + : Qt5Frame(pParent, nState, bUseCairo) +- , m_bGraphicsInUse(false) + { + } + +@@ -162,27 +161,4 @@ void KF5SalFrame::UpdateSettings(AllSettings& rSettings) + rSettings.SetStyleSettings(style); + } + +-SalGraphics* KF5SalFrame::AcquireGraphics() +-{ +- if (m_bGraphicsInUse) +- return nullptr; +- +- m_bGraphicsInUse = true; +- +- if (!m_pKF5Graphics) +- { +- m_pKF5Graphics.reset(new Qt5SvpGraphics(this)); +- Qt5Frame::InitQt5SvpGraphics(m_pKF5Graphics.get()); +- } +- +- return m_pKF5Graphics.get(); +-} +- +-void KF5SalFrame::ReleaseGraphics(SalGraphics* pSalGraph) +-{ +- (void)pSalGraph; +- assert(pSalGraph == m_pKF5Graphics.get()); +- m_bGraphicsInUse = false; +-} +- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +diff --git a/vcl/unx/kf5/KF5SalFrame.hxx b/vcl/unx/kf5/KF5SalFrame.hxx +index f757535c2f35..d0fdd91978e6 100644 +--- a/vcl/unx/kf5/KF5SalFrame.hxx ++++ b/vcl/unx/kf5/KF5SalFrame.hxx +@@ -28,15 +28,9 @@ class QWidget; + + class KF5SalFrame : public Qt5Frame + { +-private: +- std::unique_ptr m_pKF5Graphics; +- bool m_bGraphicsInUse; +- + public: + KF5SalFrame(KF5SalFrame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo); + +- virtual SalGraphics* AcquireGraphics() override; +- virtual void ReleaseGraphics(SalGraphics* pGraphics) override; + virtual void UpdateSettings(AllSettings& rSettings) override; + }; + +diff --git a/vcl/unx/kf5/KF5SalInstance.cxx b/vcl/unx/kf5/KF5SalInstance.cxx +index 5b95ff8df572..d9d7747fe647 100644 +--- a/vcl/unx/kf5/KF5SalInstance.cxx ++++ b/vcl/unx/kf5/KF5SalInstance.cxx +@@ -40,11 +40,21 @@ KF5SalInstance::KF5SalInstance(std::unique_ptr& pQApp) + pSVData->maAppData.mxToolkitName = OUString("kf5"); + } + +-SalFrame* KF5SalInstance::CreateFrame(SalFrame* pParent, SalFrameStyleFlags nState) ++SalFrame* KF5SalInstance::CreateChildFrame(SystemParentData* /*pParent*/, SalFrameStyleFlags nStyle) + { + SalFrame* pRet(nullptr); +- RunInMainThread([&pRet, pParent, nState]() { +- pRet = new KF5SalFrame(static_cast(pParent), nState, true); ++ RunInMainThread([&, this]() { pRet = new KF5SalFrame(nullptr, nStyle, useCairo()); }); ++ assert(pRet); ++ return pRet; ++} ++ ++SalFrame* KF5SalInstance::CreateFrame(SalFrame* pParent, SalFrameStyleFlags nStyle) ++{ ++ assert(!pParent || dynamic_cast(pParent)); ++ ++ SalFrame* pRet(nullptr); ++ RunInMainThread([&, this]() { ++ pRet = new KF5SalFrame(static_cast(pParent), nStyle, useCairo()); + }); + assert(pRet); + return pRet; +diff --git a/vcl/unx/kf5/KF5SalInstance.hxx b/vcl/unx/kf5/KF5SalInstance.hxx +index 5dd306da5231..b951df59ab33 100644 +--- a/vcl/unx/kf5/KF5SalInstance.hxx ++++ b/vcl/unx/kf5/KF5SalInstance.hxx +@@ -28,6 +28,7 @@ class KF5SalInstance final : public Qt5Instance + QFileDialog::FileMode) override; + + SalFrame* CreateFrame(SalFrame* pParent, SalFrameStyleFlags nStyle) override; ++ SalFrame* CreateChildFrame(SystemParentData* pParent, SalFrameStyleFlags nStyle) override; + + public: + explicit KF5SalInstance(std::unique_ptr& pQApp); +-- +cgit v1.2.1 + diff --git a/app-office/libreoffice/libreoffice-7.1.5.2.ebuild b/app-office/libreoffice/libreoffice-7.1.5.2.ebuild index c44dee00e18b..08d09ea8bd9d 100644 --- a/app-office/libreoffice/libreoffice-7.1.5.2.ebuild +++ b/app-office/libreoffice/libreoffice-7.1.5.2.ebuild @@ -295,6 +295,7 @@ PATCHES=( # master branch "${FILESDIR}/${PN}-7.1.3.2-bashism.patch" # bug 780432 + "${FILESDIR}/${P}-bison-3.8.patch" # bug 812923 ) S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/app-office/libreoffice/libreoffice-7.1.6.2.ebuild b/app-office/libreoffice/libreoffice-7.1.6.2.ebuild new file mode 100644 index 000000000000..f2d42758311a --- /dev/null +++ b/app-office/libreoffice/libreoffice-7.1.6.2.ebuild @@ -0,0 +1,672 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE="threads(+),xml" + +MY_PV="${PV/_alpha/.alpha}" +MY_PV="${MY_PV/_beta/.beta}" +# 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/${MY_PV:0:5}/ + https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src +" +ADDONS_URI="https://dev-www.libreoffice.org/src/" + +BRANDING="${PN}-branding-gentoo-0.8.tar.xz" +# PATCHSET="${P}-patchset-01.tar.xz" + +[[ ${MY_PV} == *9999* ]] && inherit git-r3 +inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils + +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+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}" + +# Split modules following git/tarballs; Core MUST be first! +# Help is used for the image generator +# Only release has the tarballs +if [[ ${MY_PV} != *9999* ]]; then + for i in ${DEV_URI}; do + SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz" + SRC_URI+=" ${i}/${PN}-help-${MY_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=( + # broken against latest upstream release, too many patches on top: + # https://github.com/tdf/libcmis/pull/43 + "${ADDONS_URI}/libcmis-0.5.2.tar.xz" + # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c + "${ADDONS_URI}/dtoa-20180411.tgz" + # not packaged in Gentoo, https://skia.org/ + "${ADDONS_URI}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz" + # QR code generating library for >=libreoffice-6.4, bug #691740 + "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz" + "base? ( + ${ADDONS_URI}/commons-logging-1.2-src.tar.gz + ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip + ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip + ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip + ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip + ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip + ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + )" + "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="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird +googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan +$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + base? ( firebird java ) + bluetooth? ( dbus ) + gtk? ( dbus ) + libreoffice_extensions_nlpsolver? ( java ) + libreoffice_extensions_scripting-beanshell? ( java ) + libreoffice_extensions_scripting-javascript? ( java ) + libreoffice_extensions_wiki-publisher? ( java ) +" + +RESTRICT="!test? ( test )" + +LICENSE="|| ( LGPL-3 MPL-1.1 )" +SLOT="0" + +[[ ${MY_PV} == *9999* ]] || \ +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux" + +BDEPEND=" + dev-util/intltool + sys-devel/bison + sys-devel/flex + sys-devel/gettext + virtual/pkgconfig + odk? ( >=app-doc/doxygen-1.8.4 ) +" +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/libepubgen + >=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/libnumbertext-1.0.6 + >=app-text/libodfgen-0.1.0 + app-text/libqxp + 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.2 + dev-db/unixODBC + >=games-engines/box2d-2.4.1:0 + dev-lang/perl + >=dev-libs/boost-1.72.0:=[nls] + dev-libs/expat + dev-libs/hyphen + dev-libs/icu:= + dev-libs/libassuan + dev-libs/libgpg-error + dev-libs/liborcus:0/0.16 + dev-libs/librevenge + dev-libs/libxml2 + dev-libs/libxslt + dev-libs/nspr + dev-libs/nss + >=dev-libs/redland-1.0.16 + >=dev-libs/xmlsec-1.2.28[nss] + media-gfx/fontforge + 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-0.31.1:= + net-misc/curl + sci-mathematics/lpsolve + sys-libs/zlib + virtual/glu + virtual/jpeg:0 + virtual/opengl + x11-libs/cairo[X] + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + accessibility? ( + $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]') + ) + bluetooth? ( + dev-libs/glib:2 + net-wireless/bluez + ) + clang? ( + || ( + ( sys-devel/clang:12 + sys-devel/llvm:12 + =sys-devel/lld-12* ) + ( sys-devel/clang:11 + sys-devel/llvm:11 + =sys-devel/lld-11* ) + ( sys-devel/clang:10 + sys-devel/llvm:10 + =sys-devel/lld-10* ) + ) + ) + coinmp? ( sci-libs/coinor-mp ) + cups? ( net-print/cups ) + dbus? ( sys-apps/dbus[X] ) + 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? ( + dev-libs/glib:2 + dev-libs/gobject-introspection + gnome-base/dconf + media-libs/mesa[egl(+)] + x11-libs/gtk+:3[X] + x11-libs/pango + ) + kde? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + kde-frameworks/kconfig:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/ki18n:5 + kde-frameworks/kio:5 + kde-frameworks/kwindowsystem:5 + ) + ldap? ( net-nds/openldap ) + libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) + libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) + mariadb? ( dev-db/mariadb-connector-c ) + !mariadb? ( dev-db/mysql-connector-c ) + pdfimport? ( app-text/poppler:=[cxx] ) + postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) +" +# FIXME: cppunit should be moved to test conditional +# after everything upstream is under gbuild +# as dmake execute tests right away +# tests apparently also need google-carlito-fonts (not packaged) +DEPEND="${COMMON_DEPEND} + >=dev-libs/libatomic_ops-7.2d + dev-perl/Archive-Zip + >=dev-util/cppunit-1.14.0 + >=dev-util/gperf-3.1 + dev-util/mdds:1/1.5 + media-libs/glm + sys-devel/ucpp + x11-base/xorg-proto + x11-libs/libXt + x11-libs/libXtst + java? ( + dev-java/ant-core + || ( + dev-java/openjdk:11 + dev-java/openjdk-bin:11 + ) + ) + test? ( + app-crypt/gnupg + dev-util/cppunit + media-fonts/dejavu + media-fonts/liberation-fonts + ) +" +RDEPEND="${COMMON_DEPEND} + !app-office/libreoffice-bin + !app-office/libreoffice-bin-debug + media-fonts/liberation-fonts + || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) + java? ( || ( + dev-java/openjdk:11 + dev-java/openjdk-jre-bin:11 + >=virtual/jre-1.8 + ) ) + kde? ( kde-frameworks/breeze-icons:* ) +" +if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then + PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*" +else + # Translations are not reliable on live ebuilds + # rather force people to use english only. + PDEPEND="!app-office/libreoffice-l10n" +fi + +PATCHES=( + # "${WORKDIR}"/${PATCHSET/.tar.xz/} + + # not upstreamable stuff + "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" + "${FILESDIR}/${PN}-6.1-nomancompress.patch" + "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch" + + # 7.1 branch + "${FILESDIR}/${P}-KF5-fix-double-buffer-graphics.patch" + + # master branch + "${FILESDIR}/${PN}-7.1.3.2-bashism.patch" # bug 780432 + "${FILESDIR}/${PN}-7.1.5.2-bison-3.8.patch" # bug 812923 +) + +S="${WORKDIR}/${PN}-${MY_PV}" + +_check_reqs() { + CHECKREQS_MEMORY="512M" + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + CHECKREQS_DISK_BUILD="22G" + else + CHECKREQS_DISK_BUILD="6G" + fi + check-reqs_$1 +} + +pkg_pretend() { + if use x86; then + elog "Unfortunately for packaging reasons on x86, various Java-based wizards," + elog "most notably Report Builder in LibreOffice Base, will not be available." + elog "See also: https://bugs.gentoo.org/785640" + else + use base || + ewarn "If you plan to use Base application you must enable USE base." + use java || + ewarn "Without USE java, several wizards are not going to be available." + fi + + [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend +} + +pkg_setup() { + java-pkg-opt-2_pkg_setup + python-single-r1_pkg_setup + xdg_environment_reset + + [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup +} + +src_unpack() { + default + + if [[ ${MY_PV} = *9999* ]]; then + local base_uri branch mypv + base_uri="https://anongit.freedesktop.org/git" + branch="master" + mypv=${MY_PV/.9999} + [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}" + git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}" + git-r3_checkout "${base_uri}/${PN}/core" + LOCOREGIT_VERSION=${EGIT_VERSION} + + 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 + + # sandbox violations on many systems, we don't need it. Bug #646406 + sed -i \ + -e "/KF5_CONFIG/s/kf5-config/no/" \ + configure.ac || die "Failed to disable kf5-config" + + AT_M4DIR="m4" eautoreconf + # hack in the autogen.sh + touch autogen.lastrun + + # 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/colibre/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" + + # Show flags set at the beginning + einfo "Preset CFLAGS: ${CFLAGS}" + einfo "Preset LDFLAGS: ${LDFLAGS}" + + if use clang ; then + # Force clang + einfo "Enforcing the use of clang due to USE=clang ..." + AR=llvm-ar + CC=${CHOST}-clang + CXX=${CHOST}-clang++ + NM=llvm-nm + RANLIB=llvm-ranlib + LDFLAGS+=" -fuse-ld=lld" + else + # Force gcc + einfo "Enforcing the use of gcc due to USE=-clang ..." + AR=gcc-ar + CC=${CHOST}-gcc + CXX=${CHOST}-g++ + NM=gcc-nm + RANLIB=gcc-ranlib + fi + + if use custom-cflags ; then + elog "USE=custom-cflags has been selected. You are on your own to make sure that" + elog "the build succeeds. Good luck!" + else + strip-flags + fi + + export LO_CLANG_CC=${CC} + export LO_CLANG_CXX=${CXX} + + # Show flags set at the end + einfo " Used CFLAGS: ${CFLAGS}" + einfo " Used LDFLAGS: ${LDFLAGS}" + + # Ensure we use correct toolchain + tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG + + if use vulkan && ! use clang ; then + ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang." + fi + + # optimization flags + export GMAKE_OPTIONS="${MAKEOPTS}" + # System python enablement: + export PYTHON_CFLAGS=$(python_get_CFLAGS) + export PYTHON_LIBS=$(python_get_LIBS) + + use kde && export QT5DIR="$(qt5_get_bindir)/.." + + local gentoo_buildid="Gentoo official package" + if [[ -n ${LOCOREGIT_VERSION} ]]; then + gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})" + fi + + # 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 + # --without-system-qrcodegen: has no real build system and LO is the only user + local myeconfargs=( + --with-system-dicts + --with-system-epoxy + --with-system-headers + --with-system-jars + --with-system-libs + --enable-build-opensymbol + --enable-cairo-canvas + --enable-largefile + --enable-mergelibs + --enable-neon + --enable-python=system + --enable-randr + --enable-release-build + --disable-breakpad + --disable-bundle-mariadb + --disable-ccache + --disable-epm + --disable-fetch-external + --disable-gtk3-kde5 + --disable-online-update + --disable-openssl + --disable-pdfium + --disable-vlc + --with-extra-buildid="${gentoo_buildid}" + --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-tls=nss + --with-vendor="Gentoo Foundation" + --with-x + --without-fonts + --without-myspell-dicts + --with-help="html" + --without-helppack-integration + --with-system-gpgmepp + --without-system-jfreereport + --without-system_apache_commons + --without-system-libcmis + --without-system-sane + --without-system-qrcodegen + $(use_enable base report-builder) + $(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 gtk3) + $(use_enable kde kf5) + $(use_enable kde qt5) + $(use_enable ldap) + $(use_enable odk) + $(use_enable pdfimport) + $(use_enable postgres postgresql-sdbc) + $(use_enable vulkan skia) + $(use_with accessibility lxml) + $(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 odk doxygen) + ) + + if use eds || use gtk; 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}" + ) + if has_version "dev-java/openjdk:11"; then + myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" ) + elif has_version "dev-java/openjdk-bin:11"; then + myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" ) + fi + + 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 ) + + MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ + 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 + + 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 + emake DESTDIR="${D}" distro-pack-install -o build -o check + + # bug 593514 + if use gtk; 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 + + # bug 703474 + insinto /usr/include + doins -r include/LibreOfficeKit + + local lodir=/usr/$(get_libdir)/libreoffice + # patching this would break tests + cat <<-EOF > "${T}"/uno.py +import sys, os +sys.path.append('${EPREFIX}${lodir}/program') +os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc') +EOF + sed -e "/^import sys/d" -e "/^import os/d" \ + -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed" + cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die + cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die + + # more system pyuno mess + sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \ + -i "${D}"${lodir}/program/officehelper.py || die + + python_optimize "${D}"${lodir}/program + # link python bridge in site-packages, bug 667802 + local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program + for py in uno.py unohelper.py officehelper.py; do + dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py} + while IFS="" read -d $'\0' -r pyc; do + pyc=${pyc//*\/} + dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc} + done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0) + done +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} diff --git a/app-office/libreoffice/libreoffice-7.1.9999.ebuild b/app-office/libreoffice/libreoffice-7.1.9999.ebuild index 229e39b60b6a..74914f80b472 100644 --- a/app-office/libreoffice/libreoffice-7.1.9999.ebuild +++ b/app-office/libreoffice/libreoffice-7.1.9999.ebuild @@ -105,7 +105,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" [[ ${MY_PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux" BDEPEND=" dev-util/intltool @@ -295,6 +295,9 @@ PATCHES=( "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" "${FILESDIR}/${PN}-6.1-nomancompress.patch" "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch" + + # master branch + "${FILESDIR}/${PN}-7.1.3.2-bashism.patch" # bug 780432 ) S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 48469b754b1d..188cea2395f9 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" [[ ${MY_PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux" BDEPEND=" dev-util/intltool diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml index 4ac974303a8d..40db3a615495 100644 --- a/app-office/libreoffice/metadata.xml +++ b/app-office/libreoffice/metadata.xml @@ -1,5 +1,5 @@ - + office@gentoo.org -- cgit v1.2.3