diff options
author | V3n3RiX <venerix@koprulu.sector> | 2021-11-13 13:10:00 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2021-11-13 13:10:00 +0000 |
commit | e9d044d4b9b71200a96adfa280848858c0f468c9 (patch) | |
tree | 1bd8ef816043a8cd340f1d774e79553a1a7d31d8 /app-office/libreoffice | |
parent | fc2f1018fc323ef2c6572734a9b130427cba76a6 (diff) |
gentoo resync : 13.11.2021
Diffstat (limited to 'app-office/libreoffice')
-rw-r--r-- | app-office/libreoffice/Manifest | 11 | ||||
-rw-r--r-- | app-office/libreoffice/files/libreoffice-7.1.6.2-KF5-fix-double-buffer-graphics.patch | 310 | ||||
-rw-r--r-- | app-office/libreoffice/files/libreoffice-7.2.2.2-makefile-gengal.patch | 90 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-7.1.6.2.ebuild | 672 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-7.1.7.2.ebuild (renamed from app-office/libreoffice/libreoffice-7.1.9999.ebuild) | 27 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-7.2.2.2.ebuild | 3 |
6 files changed, 112 insertions, 1001 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index b0539ff98a85..961d9f8195bd 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -3,8 +3,8 @@ AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba343 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 +AUX libreoffice-7.2.2.2-makefile-gengal.patch 11807 BLAKE2B 6d8547d64df433f7786a538d29e8462af031e3a7cfc78b22940e1df18d9d684611a4a0340d4e495a0ed8bae70d5bde44c8805821d7e579fb7476abd360dc6d64 SHA512 0844af3144a437288cc05e8dc8e69125e273ba869232f9b6800889db2a82aa7026b337e439231a9ea40cf6a9f8199f939bc3fc5828acb0f8575346d109eab242 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c DIST 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip 1180582 BLAKE2B b2b91f608cccdc823c11ce946ecf12b8cb7b1218fa8763ed7b64cf2567114f0703b4103a4eb2369874a4006112396470d1a0a72e6f186c9fac629cbca0fe18d6 SHA512 9fe106bbdb55365f589246e5a0d10bbe9b35224132b66a1823dc6361633a67f2acc0e8c393dc7ed70d086858d16d242b8806b8b2184c98e3d20d0be85bed9c44 @@ -27,19 +27,18 @@ DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c7 DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa8b9e470e10044dbfd3812391f29e1421df8d7ac3869955698ddbc9575feebcfbac27bb074a60ccc0527dca1c3 SHA512 295ab15115e75b1f6074f17d3538afe0de9b2b77ab454f5c63cb05e8df11886d82942fbf21ba01486052e3f6c75b0636b99d8e660cd3472dc4b87c31d3cd557b DIST libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz 5005888 BLAKE2B 836ec268c19c27ac079ea1084587c3e999f39ad2188be1a5cf8337ad0473ffda6c32d0695254d3797d1607707329befa88da6043f424544487238e550eda8590 SHA512 4159dfb4d08e359feb23127e12db590260913e70774161ac9513abb5183ad6ed6d2bdfbe56fc8aa68e2fc57ee29eae67aa0180e1a7d955016884ecba2ca60ff8 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-7.1.7.2.tar.xz 244585600 BLAKE2B 65cb8f5ddbae5aa8fb37a54cc0fab8d541a030f6f94141f4e4355f1dfb24a927ffb713e5213e382152fe444e115f27b41f297ca37e320193c5e0289a01ee5430 SHA512 fa55bea912b4efa73cd1ad8bcc611a71146ab42534a348a7c695916d74f1912ad13a2d9ccb4f3f4ee4d604a0747619b75bbcc5e2b14bc306d53b3a1f27525093 DIST libreoffice-7.2.2.2.tar.xz 252478892 BLAKE2B e2e4ce76fc91ef0725f105ee87e480ede51610de7cabbc2bee1e32a9822f457ff9c21b0b13636447751727f42917dbdc9e24e20457ee9e5f1e4054d742337b5f SHA512 9adc14aa2aa24e1e91b32f0663d3fed8421baf78c3d310e8cc52ae70ea338b9d58406344d22d2c2fa6f91f10ae91945ef2d5713036f9144705bdb4c19ad69ca7 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f 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 libreoffice-help-7.1.7.2.tar.xz 111785664 BLAKE2B 947860ebbcdf8bd0ee96ebad688057d776d049ccad066951bf0361bcc1f9a1f8187eed266061ad161f479a3691263dc4f179f4b81aa666fdc1a4a380d28425a4 SHA512 20c464ff9cea68b37f6988faea84e9d72ba174706e75d91bbcac514011c65ab55d4f3a9f21fbb8f04f02908237b16d7a6983624c5ab8f27ee4f83aa7eb621268 DIST libreoffice-help-7.2.2.2.tar.xz 111988404 BLAKE2B a0caafa4685c7356c8f1e592c104cd6e403283eb5b86580665637c3319eac4b651805ca6d7c45c5a0522e882ca1a28b6ae08f73c71b0417612c6fc084e194c1d SHA512 1e3a250b68f591c0dc0cd5d57843baa370ed009faabc9446826e8207043af5d193a263b85b9443a2baf1cb64366d90d08b763adf9ec9865d256f760f847ea638 DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d DIST skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz 10630696 BLAKE2B a3d42d08a0622de591d177184b6225cf62e3048d02d8f2012b6b02aae186b644c899c4e73b528b3528a4acec6cec07e3576dd6d97b130fedf3b2ec5b2ddf4ed7 SHA512 625ed461d85ce5c5c73ffd20bc3f2c9b5fe6ba557693b793b387ffb434d4f0d9056bd9befe6760c55e9e47f09c02373a49b8ac106162a40d940ea351e8c873c0 DIST skia-m94-975fcdd755dfc5d57cddbb25857e0c4ac29abe98.tar.xz 11672176 BLAKE2B 64d7821656002d23be839079dedffe1132497992aaef97ec734d6e430f2eda69f5344ca7fe75dd68fee847fa4c6638b4fc28194a951b91498ece5c6d4bcf3e44 SHA512 ae66fa7caeb5a328d96cd1c35eb8700080be5d3e3764e35b8056b03948e44b8bb8266284c87b44f9200accb95dbb8a2771a6e5ba067d34a7fbd33b1ababf19f8 EBUILD libreoffice-7.1.5.2.ebuild 19656 BLAKE2B c8506f343afa3b1c50de9637135f32cca01d37873b2255ddab85ae3b3f4c4b5491ef25c4ea6d3f32658b4f52e60d1fa19db461d109b2d7d7c5b3a94c02fb1354 SHA512 93f175a8a2c96fb506d09982c2cf102501a1e4da23a22e41bd7c95707a24a55f7e4eb86fe0206383b43a90d5891c860a95ab461b77342fb195150bb1b0da2a07 -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-7.2.2.2.ebuild 19530 BLAKE2B 822b13f8e89585f1b4c4949c37b1c939c31425218658fb73689b60b074fd181ab12e4839c7cb2cbb28612482a00a54eb18717b17aca4d8dd2e53979db3f9bcf4 SHA512 14c09e4f00ac200a22c331bea5912c19904253db40516d73c36f6313315e8c201b568ee8237ec2bd1ef1cf9e710dac719b20ec67cb1a38053d799c5626276bd4 +EBUILD libreoffice-7.1.7.2.ebuild 19839 BLAKE2B 01ec5f13acf2d2283de06520d2ff06c5c67cb4f65ebb6113d709d1adf3226675a11d2a263dd102f18f81870136aa57a7bf3bfb4a79306eb5e6db648e0e92e2af SHA512 9f6b5f95146862f98df6d57c5cdbc3a4172bce5d0db69b1146adc36c2dc0079c0d63a7227650ff4aa4265cdf113e7d91ff152b20d7b55540ae11d55a2a210b58 +EBUILD libreoffice-7.2.2.2.ebuild 19594 BLAKE2B cbf9ee16dd972d4609698c37392a9b08183ab4e7862592dde22cd61e483b62fcff346b79089adf6b0c8a41cbd391b2205e54c5dd67bbeaa499d972d40d1f629c SHA512 0f742b97f5abef693498104f2d5a5b7caa83038d564100caffa7e536ece475ef540cdd681a382a7d894f4e26dff67d999fca4e023950d330661ca552b54906ab EBUILD libreoffice-7.2.9999.ebuild 19530 BLAKE2B b0b997ca10ac01edd0e57feb8f377bfd25b1424f3fac984401038be730a47a661f18a5f7957e5aee525cc45a015ade1276fff09351a4ae2c856910f366f5f126 SHA512 a5c88709944108b03935df65a03c93adf2596317ae62ed8cd3c184ab31881d20f6f0c7d58eb46e4879963da691f0fb9e5a0aaf96d474fa9f57d8eaf494f2ff3b EBUILD libreoffice-9999.ebuild 19698 BLAKE2B 9074839d89c7f037f036bf269d96d98cd6683ed1aa06fbc5c7feedc95576252a348273636a5a9c526a5a64d39c9b32dfff3dbf76653efbc2aca35c20b79210a5 SHA512 7e832b33d85733da6ff95d258f295404e2128d52ccbc9cd1f73f3b04b5f37b4e28735e8d94918294dfb67eb41ca6f567726365fde2d9ca24798490539eef8c57 MISC metadata.xml 1222 BLAKE2B 02bb2d5bae26c3a97d77a36d90a2ffa0cac1eb2a0aabfac7d7f11d6b685264b7daad1a860598940af0fe9411068830d7eaf8553cbe4f69afedb092669b719cf1 SHA512 4ad197bb97eab3e860ba163b4c63839949fc9280a2ab53abc81ebb6c351d633e65ef3335a2d3af718d0e4a64e3312dfaff58f6cbab55507c57a6663c2850c3fd 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 deleted file mode 100644 index 36ed138f2a31..000000000000 --- a/app-office/libreoffice/files/libreoffice-7.1.6.2-KF5-fix-double-buffer-graphics.patch +++ /dev/null @@ -1,310 +0,0 @@ -From ec23228a3a2fc4e8868f7f04b838313be59ad719 Mon Sep 17 00:00:00 2001 -From: Jan-Marek Glogowski <glogow@fbihome.de> -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 <m.weghorn@posteo.de> -Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> -Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> ---- - 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<QImage> m_pQImage; - std::unique_ptr<Qt5Graphics> m_pQt5Graphics; - UniqueCairoSurface m_pSurface; -- std::unique_ptr<Qt5SvpGraphics> 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<Qt5SvpGraphics> 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<css::uno::XComponentContext> const& context, - QFileDialog::FileMode); -+ bool useCairo() const { return m_bUseCairo; } - - public: - explicit Qt5Instance(std::unique_ptr<QApplication>& 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<Qt5Frame*>(pParent)); -- return new Qt5Frame(static_cast<Qt5Frame*>(pParent), nStyle, m_bUseCairo); -+ -+ SalFrame* pRet(nullptr); -+ RunInMainThread( -+ [&, this]() { pRet = new Qt5Frame(static_cast<Qt5Frame*>(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<Qt5Frame*>(pParent)); -- return new Qt5Object(static_cast<Qt5Frame*>(pParent), bShow); -+ -+ SalObject* pRet(nullptr); -+ RunInMainThread([&]() { pRet = new Qt5Object(static_cast<Qt5Frame*>(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<Qt5SvpGraphics> 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<QApplication>& 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<KF5SalFrame*>(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<KF5SalFrame*>(pParent)); -+ -+ SalFrame* pRet(nullptr); -+ RunInMainThread([&, this]() { -+ pRet = new KF5SalFrame(static_cast<KF5SalFrame*>(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<QApplication>& pQApp); --- -cgit v1.2.1 - diff --git a/app-office/libreoffice/files/libreoffice-7.2.2.2-makefile-gengal.patch b/app-office/libreoffice/files/libreoffice-7.2.2.2-makefile-gengal.patch new file mode 100644 index 000000000000..5fd0179ccb05 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-7.2.2.2-makefile-gengal.patch @@ -0,0 +1,90 @@ +https://github.com/LibreOffice/core/commit/0e7d4d99beda181f4e22725e4b8295d25489696f +https://bugs.gentoo.org/821265 + +From 0e7d4d99beda181f4e22725e4b8295d25489696f Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann <sbergman@redhat.com> +Date: Sun, 22 Aug 2021 11:26:38 +0200 +Subject: [PATCH] gengal needs Library_localedata_en now + +Whatever caused that requirement, but a from-scratch build of e.g. +Gallery_backgrounds failed for me (with a follow-on SIGABRT after +"framework/source/services/desktop.cxx:176: Desktop::~Desktop(): Who forgot to +dispose this service?") because it failed to load +instdir/program/../program/liblocaledata_en.so at + +> #1 0x00007fffda0b9671 in i18npool::LocaleDataImpl::getFunctionSymbol(com::sun::star::lang::Locale const&, char const*) (this=0x159b630, rLocale=..., pFunction=0x7fffda136ed8 "getAllFormats0") at i18npool/source/localedata/localedata.cxx:1460 +> #2 0x00007fffda0b6a93 in i18npool::LocaleDataImpl::FormatSection::getFunc(i18npool::LocaleDataImpl&, com::sun::star::lang::Locale const&, char const*) (this=0x7fffffffc840, rLocaleData=..., rL=..., pName=0x7fffda136ed8 "getAllFormats0") at i18npool/source/localedata/localedata.cxx:857 +> #3 0x00007fffda0b6b5c in i18npool::LocaleDataImpl::getAllFormats(com::sun::star::lang::Locale const&) (this=0x159b630, rLocale=...) at i18npool/source/localedata/localedata.cxx:865 +> #4 0x00007fffda0d4815 in NumberFormatCodeMapper::getFormats(com::sun::star::lang::Locale const&) (this=0x1594fa0, rLocale=...) at i18npool/source/numberformatcode/numberformatcode.cxx:150 +> #5 0x00007fffda0d4155 in NumberFormatCodeMapper::getAllFormatCode(short, com::sun::star::lang::Locale const&) (this=0x1594fa0, formatUsage=8, rLocale=...) at i18npool/source/numberformatcode/numberformatcode.cxx:92 +> #6 0x00007ffff572a824 in LocaleDataWrapper::loadCurrencyFormats() (this=0x159b3f0) at unotools/source/i18n/localedatawrapper.cxx:544 +> #7 0x00007ffff572777e in LocaleDataWrapper::loadData() (this=0x159b3f0) at unotools/source/i18n/localedatawrapper.cxx:131 +> #8 0x00007ffff57271b4 in LocaleDataWrapper::LocaleDataWrapper(LanguageTag const&, std::__debug::vector<rtl::OUString, std::allocator<rtl::OUString> > const&) (this=0x159b3f0, rLanguageTag=..., rOverrideDateAcceptancePatterns=std::__debug::vector of length 0, capacity 0) at unotools/source/i18n/localedatawrapper.cxx:80 +> #9 0x00007ffff5766fd6 in SvtSysLocale_Impl::SvtSysLocale_Impl() (this=0x158a4e0) at unotools/source/misc/syslocale.cxx:67 +> #10 0x00007ffff5768ad7 in std::construct_at<SvtSysLocale_Impl>(SvtSysLocale_Impl*) (__location=0x158a4e0) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/stl_construct.h:97 +> #11 0x00007ffff5768b1c in std::allocator_traits<std::allocator<SvtSysLocale_Impl> >::construct<SvtSysLocale_Impl>(std::allocator<SvtSysLocale_Impl>&, SvtSysLocale_Impl*) (__a=..., __p=0x158a4e0) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/alloc_traits.h:514 +> #12 0x00007ffff57688c2 in std::_Sp_counted_ptr_inplace<SvtSysLocale_Impl, std::allocator<SvtSysLocale_Impl>, (__gnu_cxx::_Lock_policy)2>::_Sp_counted_ptr_inplace<>(std::allocator<SvtSysLocale_Impl>) (this=0x158a4d0, __a=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr_base.h:519 +> #13 0x00007ffff576860a in std::__shared_count<(__gnu_cxx::_Lock_policy)2>::__shared_count<SvtSysLocale_Impl, std::allocator<SvtSysLocale_Impl>>(SvtSysLocale_Impl*&, std::_Sp_alloc_shared_tag<std::allocator<SvtSysLocale_Impl> >) (this=0x7fffffffd0a8, __p=@0x7fffffffd0a0: 0x0, __a=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr_base.h:650 +> #14 0x00007ffff57684c6 in std::__shared_ptr<SvtSysLocale_Impl, (__gnu_cxx::_Lock_policy)2>::__shared_ptr<std::allocator<SvtSysLocale_Impl>>(std::_Sp_alloc_shared_tag<std::allocator<SvtSysLocale_Impl> >) (this=0x7fffffffd0a0, __tag=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr_base.h:1342 +> #15 0x00007ffff576838d in std::shared_ptr<SvtSysLocale_Impl>::shared_ptr<std::allocator<SvtSysLocale_Impl>>(std::_Sp_alloc_shared_tag<std::allocator<SvtSysLocale_Impl> >) (this=0x7fffffffd0a0, __tag=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr.h:409 +> #16 0x00007ffff5768164 in std::allocate_shared<SvtSysLocale_Impl, std::allocator<SvtSysLocale_Impl>>(std::allocator<SvtSysLocale_Impl> const&) (__a=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr.h:863 +> #17 0x00007ffff5767dfc in std::make_shared<SvtSysLocale_Impl>() () at ~/gcc/trunk/inst/include/c++/12.0.0/bits/shared_ptr.h:879 +> #18 0x00007ffff5767583 in SvtSysLocale::SvtSysLocale() (this=0x7fffffffd120) at unotools/source/misc/syslocale.cxx:122 +> #19 0x00007ffff015148f in FwkResId(TranslateId) (aId=...) at framework/source/fwe/classes/fwkresid.cxx:22 +> #20 0x00007ffff025f333 in framework::Desktop::constructorInit() (this=0x1588850) at framework/source/services/desktop.cxx:106 +> #21 0x00007ffff0265c1c in (anonymous namespace)::createDesktop(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) (context=...) at framework/source/services/desktop.cxx:1764 +> #22 0x00007ffff0265ce5 in framework::getDesktop(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) (context=...) at framework/source/services/desktop.cxx:1773 +> #23 0x00007ffff0265d9e in com_sun_star_comp_framework_Desktop_get_implementation(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) (context=0x522200) at framework/source/services/desktop.cxx:1782 +> #24 0x00007ffff5a5d864 in std::__invoke_impl<com::sun::star::uno::XInterface*, com::sun::star::uno::XInterface* (*&)(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&), com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&>(std::__invoke_other, com::sun::star::uno::XInterface* (*&)(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&), com::sun::star::uno::XComponentContext*&&, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) (__f=@0x54bb58: 0x7ffff0265d5f <com_sun_star_comp_framework_Desktop_get_implementation(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&)>) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/invoke.h:61 +> #25 0x00007ffff5a551f4 in std::__invoke_r<com::sun::star::uno::XInterface*, com::sun::star::uno::XInterface* (*&)(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&), com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&>(com::sun::star::uno::XInterface* (*&)(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&), com::sun::star::uno::XComponentContext*&&, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) (__fn=@0x54bb58: 0x7ffff0265d5f <com_sun_star_comp_framework_Desktop_get_implementation(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&)>) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/invoke.h:114 +> #26 0x00007ffff5a4d254 in std::_Function_handler<com::sun::star::uno::XInterface* (com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&), com::sun::star::uno::XInterface* (*)(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&)>::_M_invoke(std::_Any_data const&, com::sun::star::uno::XComponentContext*&&, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) (__functor=..., __args#0=@0x7fffffffd4f0: 0x522200, __args#1=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/std_function.h:291 +> #27 0x00007ffff5a3f913 in std::function<com::sun::star::uno::XInterface* (com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&)>::operator()(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) const (this=0x54bb58, __args#0=0x522200, __args#1=...) at ~/gcc/trunk/inst/include/c++/12.0.0/bits/std_function.h:568 +> #28 0x00007ffff5a2a396 in cppuhelper::ServiceManager::Data::Implementation::doCreateInstance(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) (this=0x54baa0, context=...) at cppuhelper/source/servicemanager.cxx:704 +> #29 0x00007ffff5a2a12a in cppuhelper::ServiceManager::Data::Implementation::createInstance(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, bool) (this=0x54baa0, context=..., singletonRequest=false) at cppuhelper/source/servicemanager.cxx:672 +> #30 0x00007ffff5a2d02d in cppuhelper::ServiceManager::createInstanceWithContext(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) (this=0x523450, aServiceSpecifier=..., Context=...) at cppuhelper/source/servicemanager.cxx:1003 +> #31 0x00007ffff6cd9922 in com::sun::star::frame::Desktop::create(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) (the_context=...) at workdir/UnoApiHeadersTarget/offapi/normal/com/sun/star/frame/Desktop.hpp:38 +> #32 0x00007ffff6cd8c07 in SfxApplication::Initialize_Impl() (this=0x1588150) at sfx2/source/appl/appinit.cxx:182 +> #33 0x00007ffff6cb776a in SfxApplication::GetOrCreate() () at sfx2/source/appl/app.cxx:122 +> #34 0x0000000000405ecf in (anonymous namespace)::GalApp::Main() (this=0x4204e0 <vclmain::createApplication()::aGalApp>) at svx/source/gengal/gengal.cxx:254 +> #35 0x00007ffff2dd6777 in ImplSVMain() () at vcl/source/app/svmain.cxx:199 +> #36 0x00007ffff2dd6898 in SVMain() () at vcl/source/app/svmain.cxx:231 +> #37 0x0000000000410f1f in sal_main() () at vcl/source/salmain/salmain.cxx:34 +> #38 0x0000000000410efa in main(int, char**) (argc=10, argv=0x7fffffffded8) at vcl/source/salmain/salmain.cxx:29 + +This fix should remove the need for the cross-build--only fix +0e142fa01972ad28182ca54b855d0ecae0d5c83b "cross-toolset: gengal now needs +localedata_en", which it reverts. + +Change-Id: If71b7249c19619a83911c7624e3d99077decba31 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120837 +Tested-by: Jenkins +Reviewed-by: Stephan Bergmann <sbergman@redhat.com> +--- + RepositoryExternal.mk | 1 + + solenv/gbuild/extensions/pre_BuildTools.mk | 1 - + 2 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk +index 6e732c94793b2..15cfbfde3d4ac 100644 +--- a/RepositoryExternal.mk ++++ b/RepositoryExternal.mk +@@ -3875,6 +3875,7 @@ endef + define gb_Executable__register_gengal + $(call gb_Executable_add_runtime_dependencies,gengal,\ + $(call gb_Library_get_target_for_build,$(CPPU_ENV_FOR_BUILD)_uno) \ ++ $(call gb_Library_get_target_for_build,localedata_en) \ + $(if $(filter MACOSX,$(OS_FOR_BUILD)),$(call gb_Library_get_target_for_build,vclplug_osx)) \ + $(if $(filter WNT,$(OS_FOR_BUILD)),$(call gb_Library_get_target_for_build,vclplug_win)) \ + $(if $(filter host,$(gb_Side)),$(call gb_Package_get_target,postprocess_images)) \ +diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk +index e08906068d246..84e2ea533673f 100644 +--- a/solenv/gbuild/extensions/pre_BuildTools.mk ++++ b/solenv/gbuild/extensions/pre_BuildTools.mk +@@ -47,7 +47,6 @@ gb_BUILD_TOOLS = \ + $(foreach executable,$(gb_BUILD_TOOLS_executables),$(call gb_Executable_get_runtime_dependencies,$(executable))) \ + $(foreach executable,$(gb_BUILD_TOOLS_executables_extern),$(call gb_ExternalExecutable_get_dependencies,$(executable))) \ + $(INSTROOT)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) \ +- $(if $(WITH_GALLERY_BUILD),$(call gb_Library_get_target,localedata_en)) \ + + endif + diff --git a/app-office/libreoffice/libreoffice-7.1.6.2.ebuild b/app-office/libreoffice/libreoffice-7.1.6.2.ebuild deleted file mode 100644 index f2d42758311a..000000000000 --- a/app-office/libreoffice/libreoffice-7.1.6.2.ebuild +++ /dev/null @@ -1,672 +0,0 @@ -# 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.7.2.ebuild index 74914f80b472..1aabf934a4ce 100644 --- a/app-office/libreoffice/libreoffice-7.1.9999.ebuild +++ b/app-office/libreoffice/libreoffice-7.1.7.2.ebuild @@ -113,6 +113,20 @@ BDEPEND=" sys-devel/flex sys-devel/gettext virtual/pkgconfig + clang? ( || ( + ( sys-devel/clang:13 + sys-devel/llvm:13 + =sys-devel/lld-13* ) + ( 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* ) + ) ) odk? ( >=app-doc/doxygen-1.8.4 ) " COMMON_DEPEND="${PYTHON_DEPS} @@ -186,19 +200,6 @@ COMMON_DEPEND="${PYTHON_DEPS} 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] ) diff --git a/app-office/libreoffice/libreoffice-7.2.2.2.ebuild b/app-office/libreoffice/libreoffice-7.2.2.2.ebuild index 808d0d4018b3..2c5b0382a057 100644 --- a/app-office/libreoffice/libreoffice-7.2.2.2.ebuild +++ b/app-office/libreoffice/libreoffice-7.2.2.2.ebuild @@ -295,6 +295,9 @@ PATCHES=( "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" "${FILESDIR}/${PN}-6.1-nomancompress.patch" "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch" + + # Upstream + "${FILESDIR}/${PN}-7.2.2.2-makefile-gengal.patch" ) S="${WORKDIR}/${PN}-${MY_PV}" |