diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-04-05 21:17:31 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-04-05 21:17:31 +0100 |
commit | dc7cbdfa65fd814b3b9aa3c56257da201109e807 (patch) | |
tree | c85d72f6f31f21f178069c9d41d41a7c1ff4b362 /app-office/libreoffice | |
parent | 0706fc6986773f4e4d391deff4ad5143c464ea4e (diff) |
gentoo resync : 05.04.2019
Diffstat (limited to 'app-office/libreoffice')
-rw-r--r-- | app-office/libreoffice/Manifest | 18 | ||||
-rw-r--r-- | app-office/libreoffice/files/libreoffice-6.2.2.2-boost-1.69.patch | 36 | ||||
-rw-r--r-- | app-office/libreoffice/files/libreoffice-6.2.3.1-kf5-update-delayed-frame-destruct.patch | 113 | ||||
-rw-r--r-- | app-office/libreoffice/files/libreoffice-6.2.3.1-qt5-kf5-disable-qt-hidpi-scaling.patch | 82 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-6.2.2.2.ebuild (renamed from app-office/libreoffice/libreoffice-6.2.1.2.ebuild) | 32 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-6.2.3.1.ebuild | 549 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-6.2.9999.ebuild | 39 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-9999.ebuild | 33 |
8 files changed, 805 insertions, 97 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index ca2a360f3e51..53cbbea8ec33 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -4,19 +4,25 @@ AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba343 AUX libreoffice-6.1.5.2-gtk3_kde5-non-native-fpicker-for-non-plasma.patch 4093 BLAKE2B c6f74ef29c055e22f7f58e4962c3036a39ca4cd731abf382576c6ad1954b8d8dd8c5fa90147931ef0bc4bd094c70143726e4a046c57e9a5062875c1ff248caa6 SHA512 df571472de299a3c184348ce48caef937604b9981101b986d8473b7bdfa0ca0244395ab8079cc97dcef23aea9864aff93523582a459c55457fdd4dbba4e4e985 AUX libreoffice-6.1.5.2-gtk3_kde5-set-kfilewidgets-custom-widget-only-once.patch 1693 BLAKE2B fee5ce93d89458b90465ab6febadb9fd86c8c039d42af8a4beb15aa5167f4cab87737219b11037949c180f4f8e4672f5319e90e1afbf5836c5bc7977814b168c SHA512 ffb7d60d30e84bdccc590e5d6575727f63ffa237b68813ca34106b9dc8112c0033af6eadfde44887da69f35341a3dccd92281c8a40b55889c50cbdad87e0a207 AUX libreoffice-6.2-ldap-optional.patch 6188 BLAKE2B 53ad75d5340f40b4229329e79b777464107553459ae56a2cce2e953ebc15b7f3decc4496fa11bed931d83feceb983d3a1613ea452671931244337125e8bd109d SHA512 9098e1208e1a35627f88ccd94f509ed48d28a02eafd45d9a20a4dcc2ea537a29b0f89c4cdec25be3e9af1773e93b7cf6d20dd0d8db9451117e4c61eb261f1548 +AUX libreoffice-6.2.2.2-boost-1.69.patch 1165 BLAKE2B 2d532bc33ab29f275243d63d0cf8a2bfabdd39898f4347eea255b660199a17a33ffa43a8493ad8559a7e1761ffc5d9b9b33bac98a35bb34fb037914ed8f7d09f SHA512 ee032c777ca3d038992562a31d3c42b8be478d9a2d26cc14432fb494a0a24730f96352013f9693397a6c5b91cd72aacf8030769f79ccdbc9f1d5a95945fb275f +AUX libreoffice-6.2.3.1-kf5-update-delayed-frame-destruct.patch 3922 BLAKE2B 989555039328ffd97a8c5ec0edf108dda5742b2e0d5c5a8da8a7ffde91a6e1bd9be9a0acde59b32509cda9908c52ebc527769d1179a567fc97593b8f7b522c3e SHA512 98a97188800f9e5e7f7c8870ecaa35caab2d1ad110bf63f6f7824e7c398bb3c9e26151076b13753582b8cef2b30d27f934b3dfbf301a9605bd1053f4eb3f8461 +AUX libreoffice-6.2.3.1-qt5-kf5-disable-qt-hidpi-scaling.patch 3408 BLAKE2B 0eac3e69c3066e337ff67be71371cef81c2a6c51f4b5fcfeb457abdb23a76bc90643bcd05f801f4cdb6b2b5a58db58a7498c92d914c2856c78efbd4978161d13 SHA512 0715803bfe5764de59a7f12cb325e4def3a6d1927ea6e8077d2ade7fdcdcd107deeb0066b7a5185bba4129bf0b90e817516cd43b849e42731cdddc3382823e6e DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140 -DIST libreoffice-6.2.1.1-patchset-01.tar.xz 8404 BLAKE2B 6fd1a3e931a1d3ef040e0e79ff53299fb47a55bf36f98998ebb896738a639aca8844bf6a5bb5fcbf3a5afeae935cb3e637436dcba456df005d00d5ed5a80e0d0 SHA512 eff36e8b5af2a592572ed60d9f22f59d8611dd5f62977ad93aa957181173d479a19f5907673b0f7532bfcca728a12a20101f2282914a34e0f0a53fd53e682ef3 -DIST libreoffice-6.2.1.2.tar.xz 213885668 BLAKE2B b1b15dacfded68e9ce2c183e211928d732564ef0a51a967216545d8ff39bf52e72ecbcb53672cc9d967cb4474fc10efbd97e3d9107d3f7169138c62e8221f212 SHA512 0d18e5f470b3e8a70d1679c7acdc91887cbbbb2032e1eb452308d257a6bc02d42e93fec66709c84838f7565e42217ac1d2b121e3356f7c754fc7ee33b7c6f0ef +DIST libreoffice-6.2.2.2-patchset-01.tar.xz 6952 BLAKE2B 6b6b5280c9c65b7995d49bd0a5c0667226366f498f04d747e883d21490c88fcdd5abe4348ffe37d3060d0b685d4c3c3cd5e826351b22f24b68779bc5ca9d92b3 SHA512 63cce0839f65962df425f212306ed65e3899c6da857f74d7ea335bd48712fab2faa1de7dbc28a5022021a408f02cb972c3bb7b511f6e1209f103b8d214e163ac +DIST libreoffice-6.2.2.2.tar.xz 214029032 BLAKE2B fc95d9dcb594bd18317285ecf593fb69825ecf061f7a339b48c01c858ee0340390d635a75f9be2d522f0b8883365d013b72b52f81cded509a2748ad354b9006c SHA512 f58f73fc76c57cbcbc24f63680ebc06f72cbbff9c1339c8186e70bf5f0f9ad0203ed2898ee7dd82cfb2bd0239d96a1534cec635847fe8fb50a0abe70848d2125 +DIST libreoffice-6.2.3.1.tar.xz 214212540 BLAKE2B 62898ab40a19e8517d32c427d68364289b73a8f13ea9c7b33f380f784908f5dbad2cbefe5e6e878c337b42306e29e2d7c574da36397b1bcd48651a519a8c04e0 SHA512 d835725f769af98c91ffe2e9cd6edb0361bbd7d8122ec6660fabebeec5830d14bc485ffa2b50a6bebcc72271440763e4aee427228c37ea81773bc83ef0650035 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f -DIST libreoffice-help-6.2.1.2.tar.xz 16187168 BLAKE2B 3b24bfa2b7f859329597305e98694d164b82f3bc6767b82df9d6b35951455d98ffaa19cb42417e1b3ece73fe35b3abebbd11fb8a0cd38f370fc7ed203b26bc55 SHA512 c8bd2765b46162203d0b0acc06dc76108bd0093020981e1030d26d5a8771fb9494337c16cc99c10b7de7a906e713dd27555b0af8754d142387c3a968fa663a2f +DIST libreoffice-help-6.2.2.2.tar.xz 15267780 BLAKE2B 6e5300f8cbd202ccf411d7f5d5268075e53d004b986917a382b0bcae6e3eb2a6b69ff36bbb38b23e9661f2f0df0388032dfc2156c7e2665414137e125cc83247 SHA512 c9aebd77aa44ea54e08c9e305aa073e29a02b11fbe118f346f2bb17a6aa8c3ff13fa3ba212a29eaa4c2b3861365bf4a8683979c5e77c57fa538ef18f4aea7ae4 +DIST libreoffice-help-6.2.3.1.tar.xz 13023992 BLAKE2B 5cb0f6081f60cf2ac6fe9e1e8715c5e48a4e8769a44dda1dd8a66aed18992710c6075a18ff19d3c5dba136d41396da42fd66d9ce1f1cc4d5fbc77a5c04f72e6d SHA512 1bc10999401bd7fe2a7454eb036675fd43cca9c4d0ef817f28c82cb6d3818afd44428b75fd31b2dac84a77a79f0a026679fd582ffa572b79bba38de1470f8857 EBUILD libreoffice-6.1.5.2.ebuild 16965 BLAKE2B b4c7e322edfeed776794f313ed3e7382f35e8ba072ce058749b4bcd6627749f592862365fa8a499bd981ad2220bc60dcdd7dc574eff7612773b4351209a4838d SHA512 e59d2fcaa749c73f52faf339c78ff92b5ceae9f952509227b6f346cb4467b0737ea27349d64d9ab6dac5966ed356ccd2cd352156ea8a2b866fadf830d57bf996 -EBUILD libreoffice-6.2.1.2.ebuild 16870 BLAKE2B 504f41bf2ba2f2c96bf2c34c427e7a4c1dca1aa37a7ab1240a95203a7dc57bf9e27d28108e322c9c9b81a9145235fc6f79138ea9dd47c5ba3ad584dab40c3ca9 SHA512 4705d5089179769b2dc44b0c9300f351dd7825c57b8d5ab2b494777903fbc46b5cff2c11c8f3e47326d8c518a96d82bdb7e750a75992cfaae04e054c29980ab0 -EBUILD libreoffice-6.2.9999.ebuild 17096 BLAKE2B bbcc6a14713f40ded9ef056c53e40572d0116626f66937984cf53bfe20faae484796889cde299364a725b8eaf3b3c04dc7a3ac4a281c4c02d9ec55c881c091dc SHA512 44bd3df5227cc048f2a88364faa84cbab6028933f46c689a68407af8f0e735543285064c5a424f54225878861206047a3e62a58b1e1c7f8e1eded0b7beca1099 -EBUILD libreoffice-9999.ebuild 16803 BLAKE2B 59ee769ff2fe9c81bbfc280114d835eee84657d1d5ad678624dadc5270549af9c3d55a8cefe57a2df830998c4cb154b6263dc9b8b99eac8e6d8d208074adc6ea SHA512 a167030961143a01865af85176ac8615fec7fc2859427afa2c17b1440e33f218d5f18c761162d7b6db01766b0b6acdc64beaa64198f11a6fd6e098358d3a7c44 +EBUILD libreoffice-6.2.2.2.ebuild 15946 BLAKE2B 5ee388f559cb2f2a51a3871603fd44faaea1fd1eb7198c17da208f93e6727daad54674be61257be9dac74e0babee0a4cb655f28bda7fc14e728f269cbaa511a4 SHA512 acb406eaceab2336f227847228f601b10ced5fb5b0a8793326d8d8f8a314727053ed8d26e838b203f1a045da804c612d99bfb87c706387914156791d9169e642 +EBUILD libreoffice-6.2.3.1.ebuild 15894 BLAKE2B 83ad85dfac22d739b782369cf0e876b2c8ab9dd6242443a625a248ecdea559bedc6b59869679cd51e9236b408763a66c4cd8e69dae7b43ee6b45b4ff48dd42e3 SHA512 1247524373fd25488c1752aa489b6693138097d67ec2bca3dd86c746c80a1d563386e0fbf8f139e82a044cf0c2762d7f5ca3626a87c0009d19f2861750f881b1 +EBUILD libreoffice-6.2.9999.ebuild 15740 BLAKE2B 4d1061d3fb675fcbcf424d68d7697cd6e793a595c723a8d8425ced8d436e4447165d85e19ab852ee82b63be82bc926fda8761fa8d4d13bfc99353999e92e4b55 SHA512 10ffedfe6da3f65e3ebd1daa5871400a88846e3b6393b454f802fd655837592713d91c936037cf62e686fcaf9ed49b6cf3ec58828a11d7e52db8d48b575ca10e +EBUILD libreoffice-9999.ebuild 15678 BLAKE2B 6282d6df8cd81553e0db03edebd6150aac7df2a270dac3be8f22ce528524a43d4e6bb64e92ade05ecfddcd87252a815359a8c9283137d0129d416e85461787b9 SHA512 ebe8efc2dbe687012085584b91e0713f257827fb81d1610631cd34497c8d5473e527ded434b4594dda98b0b3af88b7d88ad4309d44bb95b9e805a8ebfcd7d568 MISC metadata.xml 1086 BLAKE2B 486defe600d5a74151756ff486e6eca7d529491dfc8db061c6589dc122d9c47e97f8301f28cb86b566ba69e578b9ae6d1e5dae2ca44972e322ccdb1e829aea94 SHA512 c29b3763e187455edc966fb2fdd85cd22faaa5c58b0dbdafc80c9c0ae8ea8400c189723778a86d108869d8891d9d0db5e1e7de931303737178c1e1f084d6f8c7 diff --git a/app-office/libreoffice/files/libreoffice-6.2.2.2-boost-1.69.patch b/app-office/libreoffice/files/libreoffice-6.2.2.2-boost-1.69.patch new file mode 100644 index 000000000000..0c4c38cf58c8 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-6.2.2.2-boost-1.69.patch @@ -0,0 +1,36 @@ +From 358637547c5bb7ae6ca637640c4279455414dbfa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com> +Date: Fri, 15 Mar 2019 16:16:31 +0100 +Subject: Fix build with boost 1.69 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is also fixed with master with boost bump which we do not need +here. + +Change-Id: I61caec10c0c6d442cef3d51c31eaff01f18b89e3 +Reviewed-on: https://gerrit.libreoffice.org/69310 +Reviewed-by: Tomáš Chvátal <tchvatal@suse.cz> +Tested-by: Tomáš Chvátal <tchvatal@suse.cz> +Reviewed-by: Caolán McNamara <caolanm@redhat.com> +Tested-by: Caolán McNamara <caolanm@redhat.com> +--- + sfx2/source/appl/shutdownicon.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx +index e917c3a..8a51e5c 100644 +--- a/sfx2/source/appl/shutdownicon.cxx ++++ b/sfx2/source/appl/shutdownicon.cxx +@@ -143,7 +143,7 @@ bool LoadModule() + #endif // ENABLE_QUICKSTART_APPLET + } + assert(!boost::logic::indeterminate(loaded)); +- return loaded; ++ return bool(loaded); + } + + } +-- +cgit v1.1 diff --git a/app-office/libreoffice/files/libreoffice-6.2.3.1-kf5-update-delayed-frame-destruct.patch b/app-office/libreoffice/files/libreoffice-6.2.3.1-kf5-update-delayed-frame-destruct.patch new file mode 100644 index 000000000000..17843e007e08 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-6.2.3.1-kf5-update-delayed-frame-destruct.patch @@ -0,0 +1,113 @@ +From d622be2d6bcfcc2c7260421e0eaa09c76ce15da2 Mon Sep 17 00:00:00 2001 +From: Aleksei Nikiforov <darktemplar@basealt.ru> +Date: Wed, 6 Mar 2019 16:10:17 +0300 +Subject: tdf#123406 KDE5: Update delayed frame destruction + +Move deleteLater() call to the different event loop. +This fixes issue with frames not being disposed of +deterministically, and previously opened window +not reactivating. + +Also hide modal dialog window before unsetting modal mode. +Unsetting modal mode may require to toggle window visibility. +Window will be hidden soon anyway, +and additional generated events might make finding correct +focused window harder. + +Change-Id: Id7839f817075785287b09f6ac79eb3fb211726aa +Reviewed-on: https://gerrit.libreoffice.org/68852 +Tested-by: Jenkins +Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> +Reviewed-on: https://gerrit.libreoffice.org/70078 +Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> +--- + vcl/inc/qt5/Qt5Instance.hxx | 2 ++ + vcl/qt5/Qt5Instance.cxx | 12 ++++++++++-- + vcl/source/window/dialog.cxx | 4 ++-- + 3 files changed, 14 insertions(+), 4 deletions(-) + +diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx +index 91682bd..cece484 100644 +--- a/vcl/inc/qt5/Qt5Instance.hxx ++++ b/vcl/inc/qt5/Qt5Instance.hxx +@@ -50,10 +50,12 @@ public: + + private Q_SLOTS: + bool ImplYield(bool bWait, bool bHandleAllCurrentEvents); ++ static void deleteObjectLater(QObject* pObject); + + Q_SIGNALS: + bool ImplYieldSignal(bool bWait, bool bHandleAllCurrentEvents); + std::unique_ptr<SalMenu> createMenuSignal(bool, Menu*); ++ void deleteObjectLaterSignal(QObject* pObject); + + public: + explicit Qt5Instance(bool bUseCairo = false); +diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx +index 8de9fc7..58f93fe 100644 +--- a/vcl/qt5/Qt5Instance.cxx ++++ b/vcl/qt5/Qt5Instance.cxx +@@ -67,6 +67,12 @@ Qt5Instance::Qt5Instance(bool bUseCairo) + Qt::BlockingQueuedConnection); + connect(this, &Qt5Instance::createMenuSignal, this, &Qt5Instance::CreateMenu, + Qt::BlockingQueuedConnection); ++ ++ // this one needs to be queued non-blocking ++ // in order to have this event arriving to correct event processing loop ++ connect(this, &Qt5Instance::deleteObjectLaterSignal, this, ++ [](QObject* pObject) { Qt5Instance::deleteObjectLater(pObject); }, ++ Qt::QueuedConnection); + } + + Qt5Instance::~Qt5Instance() +@@ -78,6 +84,8 @@ Qt5Instance::~Qt5Instance() + free(m_pFakeArgvFreeable[i]); + } + ++void Qt5Instance::deleteObjectLater(QObject* pObject) { pObject->deleteLater(); } ++ + SalFrame* Qt5Instance::CreateChildFrame(SystemParentData* /*pParent*/, SalFrameStyleFlags nStyle) + { + return new Qt5Frame(nullptr, nStyle, m_bUseCairo); +@@ -94,7 +102,7 @@ void Qt5Instance::DestroyFrame(SalFrame* pFrame) + if (pFrame) + { + assert(dynamic_cast<Qt5Frame*>(pFrame)); +- static_cast<Qt5Frame*>(pFrame)->deleteLater(); ++ Q_EMIT deleteObjectLaterSignal(static_cast<Qt5Frame*>(pFrame)); + } + } + +@@ -109,7 +117,7 @@ void Qt5Instance::DestroyObject(SalObject* pObject) + if (pObject) + { + assert(dynamic_cast<Qt5Object*>(pObject)); +- static_cast<Qt5Object*>(pObject)->deleteLater(); ++ Q_EMIT deleteObjectLaterSignal(static_cast<Qt5Object*>(pObject)); + } + } + +diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx +index 0c75f85..1688163 100644 +--- a/vcl/source/window/dialog.cxx ++++ b/vcl/source/window/dialog.cxx +@@ -1097,6 +1097,8 @@ void Dialog::EndDialog( long nResult ) + + const bool bModal = GetType() != WindowType::MODELESSDIALOG; + ++ Hide(); ++ + if (bModal) + { + SetModalInputMode(false); +@@ -1121,8 +1123,6 @@ void Dialog::EndDialog( long nResult ) + } + } + +- Hide(); +- + if (bModal && GetParent()) + { + NotifyEvent aNEvt( MouseNotifyEvent::ENDEXECUTEDIALOG, this ); +-- +cgit v1.1 diff --git a/app-office/libreoffice/files/libreoffice-6.2.3.1-qt5-kf5-disable-qt-hidpi-scaling.patch b/app-office/libreoffice/files/libreoffice-6.2.3.1-qt5-kf5-disable-qt-hidpi-scaling.patch new file mode 100644 index 000000000000..12f3ddc29587 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-6.2.3.1-qt5-kf5-disable-qt-hidpi-scaling.patch @@ -0,0 +1,82 @@ +From c3eeb421526f284419e90d2c4c4da5b0d7bbcc0e Mon Sep 17 00:00:00 2001 +From: Jan-Marek Glogowski <glogow@fbihome.de> +Date: Fri, 29 Mar 2019 02:58:59 +0100 +Subject: tdf#124292 Qt5 / KDE5 disable Qt's HiDPI scaling + +LO does its own layouting and also all the scaling, so disable +the automatic HiDPI scaling explicitly. Otherwise fonts will be +rendered in LoDPI and just scaled as an image, if UI scaling is +enabled in KDE, resulting in really blocky / ugly fonts. + +Change-Id: I38503ce27c1671e80d0749d21c6c6dcff1a808a6 +Reviewed-on: https://gerrit.libreoffice.org/69941 +Tested-by: Jenkins +Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> +(cherry picked from commit b4698a2241ec26d796c66da3a814f7cc693785b6) +Reviewed-on: https://gerrit.libreoffice.org/69984 +Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> +--- + vcl/qt5/Qt5Graphics_GDI.cxx | 4 ++-- + vcl/qt5/Qt5Instance.cxx | 2 ++ + vcl/unx/kde5/KDE5SalGraphics.cxx | 4 ++-- + vcl/unx/kde5/KDE5SalInstance.cxx | 2 ++ + 4 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/vcl/qt5/Qt5Graphics_GDI.cxx b/vcl/qt5/Qt5Graphics_GDI.cxx +index 90baba3..851d222 100644 +--- a/vcl/qt5/Qt5Graphics_GDI.cxx ++++ b/vcl/qt5/Qt5Graphics_GDI.cxx +@@ -643,8 +643,8 @@ void Qt5Graphics::GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY) + return; + + QScreen* pScreen = m_pFrame->GetQWidget()->window()->windowHandle()->screen(); +- rDPIX = pScreen->logicalDotsPerInchX(); +- rDPIY = pScreen->logicalDotsPerInchY(); ++ rDPIX = pScreen->logicalDotsPerInchX() * pScreen->devicePixelRatio() + 0.5; ++ rDPIY = pScreen->logicalDotsPerInchY() * pScreen->devicePixelRatio() + 0.5; + } + + sal_uInt16 Qt5Graphics::GetBitCount() const { return getFormatBits(m_pQImage->format()); } +diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx +index adbe70b..8de9fc7 100644 +--- a/vcl/qt5/Qt5Instance.cxx ++++ b/vcl/qt5/Qt5Instance.cxx +@@ -336,6 +336,8 @@ VCLPLUG_QT5_PUBLIC SalInstance* create_SalInstance() + unsetenv("SESSION_MANAGER"); + } + ++ QApplication::setAttribute(Qt::AA_DisableHighDpiScaling); ++ + int* pFakeArgc = new int; + *pFakeArgc = nFakeArgc; + pQApplication = new QApplication(*pFakeArgc, pFakeArgv); +diff --git a/vcl/unx/kde5/KDE5SalGraphics.cxx b/vcl/unx/kde5/KDE5SalGraphics.cxx +index 290127d..0b4b428 100644 +--- a/vcl/unx/kde5/KDE5SalGraphics.cxx ++++ b/vcl/unx/kde5/KDE5SalGraphics.cxx +@@ -78,8 +78,8 @@ void KDE5SalGraphics::GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY) + return; + + QScreen* pScreen = m_pFrame->GetQWidget()->window()->windowHandle()->screen(); +- rDPIX = pScreen->logicalDotsPerInchX(); +- rDPIY = pScreen->logicalDotsPerInchY(); ++ rDPIX = pScreen->logicalDotsPerInchX() * pScreen->devicePixelRatio() + 0.5; ++ rDPIY = pScreen->logicalDotsPerInchY() * pScreen->devicePixelRatio() + 0.5; + } + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +diff --git a/vcl/unx/kde5/KDE5SalInstance.cxx b/vcl/unx/kde5/KDE5SalInstance.cxx +index 401afbc..32998cd 100644 +--- a/vcl/unx/kde5/KDE5SalInstance.cxx ++++ b/vcl/unx/kde5/KDE5SalInstance.cxx +@@ -144,6 +144,8 @@ VCLPLUG_KDE5_PUBLIC SalInstance* create_SalInstance() + unsetenv("SESSION_MANAGER"); + } + ++ QApplication::setAttribute(Qt::AA_DisableHighDpiScaling); ++ + int* pFakeArgc = new int; + *pFakeArgc = nFakeArgc; + pQApplication = new QApplication(*pFakeArgc, pFakeArgv); +-- +cgit v1.1 diff --git a/app-office/libreoffice/libreoffice-6.2.1.2.ebuild b/app-office/libreoffice/libreoffice-6.2.2.2.ebuild index 33dcacf28ec1..abd92a269e11 100644 --- a/app-office/libreoffice/libreoffice-6.2.1.2.ebuild +++ b/app-office/libreoffice/libreoffice-6.2.2.2.ebuild @@ -18,7 +18,7 @@ DEV_URI=" ADDONS_URI="https://dev-www.libreoffice.org/src/" BRANDING="${PN}-branding-gentoo-0.8.tar.xz" -PATCHSET="${PN}-6.2.1.1-patchset-01.tar.xz" +PATCHSET="${P}-patchset-01.tar.xz" [[ ${MY_PV} == *9999* ]] && inherit git-r3 inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg @@ -247,6 +247,8 @@ fi PATCHES=( # master branch "${FILESDIR}/${PN}-6.2-ldap-optional.patch" + # 6.2 stable branch + "${FILESDIR}/${P}-boost-1.69.patch" "${WORKDIR}"/${PATCHSET/.tar.xz/} # not upstreamable stuff @@ -426,8 +428,8 @@ src_configure() { --with-x --without-fonts --without-myspell-dicts - --without-help - --with-helppack-integration + --with-help="html" + --without-helppack-integration --with-system-gpgmepp --without-system-sane $(use_enable bluetooth sdremote-bluetooth) @@ -504,24 +506,6 @@ src_compile() { addpredict /dev/ati addpredict /dev/nvidiactl - # hack for offlinehelp, this needs fixing upstream at some point - # it is broken because we send --without-help - # https://bugs.freedesktop.org/show_bug.cgi?id=46506 - ( - grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die - source "${T}/config_host.mk" 2&> /dev/null - - local path="${WORKDIR}/helpcontent2/source/auxiliary/" - mkdir -p "${path}" || die - - echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\"" - perl "${S}/helpcontent2/helpers/create_ilst.pl" \ - -dir=helpcontent2/source/media/helpimg \ - > "${path}/helpimg.ilst" - [[ -s "${path}/helpimg.ilst" ]] || \ - ewarn "The help images list is empty, something is fishy, report a bug." - ) - local target use test && target="build" || target="build-nocheck" @@ -556,12 +540,6 @@ src_install() { echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die fi - # Hack for offlinehelp, this needs fixing upstream at some point. - # It is broken because we send --without-help - # https://bugs.freedesktop.org/show_bug.cgi?id=46506 - insinto /usr/$(get_libdir)/libreoffice/help - doins xmlhelp/util/*.xsl - pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin } diff --git a/app-office/libreoffice/libreoffice-6.2.3.1.ebuild b/app-office/libreoffice/libreoffice-6.2.3.1.ebuild new file mode 100644 index 000000000000..ff477aefb764 --- /dev/null +++ b/app-office/libreoffice/libreoffice-6.2.3.1.ebuild @@ -0,0 +1,549 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) +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 flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg + +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=( + "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 bluetooth +branding coinmp +cups dbus debug eds firebird +googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc +$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + bluetooth? ( dbus ) + libreoffice_extensions_nlpsolver? ( java ) + libreoffice_extensions_scripting-beanshell? ( java ) + libreoffice_extensions_scripting-javascript? ( java ) + libreoffice_extensions_wiki-publisher? ( java ) +" + +LICENSE="|| ( LGPL-3 MPL-1.1 )" +SLOT="0" +[[ ${MY_PV} == *9999* ]] || \ +KEYWORDS="" +# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-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 + >=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* + dev-db/unixODBC + dev-lang/perl + dev-libs/boost:=[nls] + dev-libs/expat + dev-libs/hyphen + dev-libs/icu:= + dev-libs/libassuan + dev-libs/libgpg-error + >=dev-libs/liborcus-0.14.0 + 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.24[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 + 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? ( dev-python/lxml[${PYTHON_USEDEP}] ) + bluetooth? ( + dev-libs/glib:2 + net-wireless/bluez + ) + coinmp? ( sci-libs/coinor-mp ) + cups? ( net-print/cups ) + dbus? ( sys-apps/dbus ) + 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 + x11-libs/pango + ) + gtk2? ( + x11-libs/gdk-pixbuf + >=x11-libs/gtk+-2.24:2 + x11-libs/pango + ) + kde? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtx11extras:5 + dev-qt/qtwidgets: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 + >=dev-util/mdds-1.4.1:1= + media-libs/glm + sys-devel/ucpp + x11-base/xorg-proto + x11-libs/libXt + x11-libs/libXtst + java? ( + dev-java/ant-core + >=virtual/jdk-1.6 + ) + 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 + !app-office/openoffice + media-fonts/liberation-fonts + || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) + java? ( >=virtual/jre-1.6 ) + kde? ( kde-frameworks/breeze-icons:* ) + vlc? ( media-video/vlc ) +" +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=( + # master branch + "${FILESDIR}/${PN}-6.2-ldap-optional.patch" + # 6.2 stable branch + "${FILESDIR}/${P}-qt5-kf5-disable-qt-hidpi-scaling.patch" + "${FILESDIR}/${P}-kf5-update-delayed-frame-destruct.patch" + # "${WORKDIR}"/${PATCHSET/.tar.xz/} + + # not upstreamable stuff + "${FILESDIR}/${PN}-5.4-system-pyuno.patch" + "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" + "${FILESDIR}/${PN}-6.1-nomancompress.patch" +) + +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() { + use java || \ + ewarn "If you plan to use Base application you should enable java or you will get various crashes." + + if has_version "<app-office/libreoffice-5.3.0[firebird]"; then + ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so" + ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version." + ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base" + fi + + [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend +} + +pkg_setup() { + java-pkg-opt-2_pkg_setup + python-single-r1_pkg_setup + + [[ ${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() { + xdg_src_prepare + + # 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 + + # system pyuno mess + sed -i \ + -e "s:%eprefix%:${EPREFIX}:g" \ + -e "s:%libdir%:$(get_libdir):g" \ + pyuno/source/module/uno.py \ + pyuno/source/officehelper.py || die + # sed in the tests + sed -i \ + -e "s#all : build unitcheck#all : build#g" \ + solenv/gbuild/Module.mk || die + sed -i \ + -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \ + -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \ + Makefile.in || die + + sed -i \ + -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \ + -e "s,\$INSTALLDIRNAME.sh,${PN}," \ + bin/distro-install-desktop-integration || die + + if use branding; then + # hack... + mv -v "${WORKDIR}/branding-intro.png" "icon-themes/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" + + # optimization flags + export GMAKE_OPTIONS="${MAKEOPTS}" + # System python enablement: + export PYTHON_CFLAGS=$(python_get_CFLAGS) + export PYTHON_LIBS=$(python_get_LIBS) + + if use kde; then + export QT_SELECT=5 # bug 639620 needs proper fix though + export QT5DIR="$(qt5_get_bindir)/../" + export MOC5="$(qt5_get_bindir)/moc" + fi + + 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 + 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-dependency-tracking + --disable-epm + --disable-fetch-external + --disable-gstreamer-0-10 + --disable-online-update + --disable-openssl + --disable-pdfium + --disable-report-builder + --with-build-version="${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-sane + $(use_enable bluetooth sdremote-bluetooth) + $(use_enable coinmp) + $(use_enable cups) + $(use_enable dbus) + $(use_enable debug) + $(use_enable eds evolution2) + $(use_enable firebird firebird-sdbc) + $(use_enable gstreamer gstreamer-1-0) + $(use_enable gtk gtk3) + $(use_enable gtk2 gtk) + $(use_enable kde kde5) + $(use_enable kde qt5) + $(use_enable ldap) + $(use_enable odk) + $(use_enable pdfimport) + $(use_enable postgres postgresql-sdbc) + $(use_enable vlc) + $(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 gtk && use kde; then + myeconfargs+=( --enable-gtk3-kde5 ) + fi + + 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}" + --with-jdk-home=$(java-config --jdk-home 2>/dev/null) + --with-jvm-path="${EPREFIX}/usr/lib/" + ) + + use libreoffice_extensions_scripting-beanshell && \ + myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) ) + + use libreoffice_extensions_scripting-javascript && \ + myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) ) + fi + + is-flagq "-flto*" && myeconfargs+=( --enable-lto ) + + 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 + make DESTDIR="${D}" distro-pack-install -o build -o check || die + + # 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 +} + +pkg_preinst() { + java-utils-2_pkg_preinst + xdg_pkg_preinst +} diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild index caf354cdab3b..0fa4dccc4d59 100644 --- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild @@ -18,10 +18,10 @@ DEV_URI=" ADDONS_URI="https://dev-www.libreoffice.org/src/" BRANDING="${PN}-branding-gentoo-0.8.tar.xz" -PATCHSET="${PN}-6.2.1.1-patchset-01.tar.xz" +# PATCHSET="${P}-patchset-01.tar.xz" [[ ${MY_PV} == *9999* ]] && inherit git-r3 -inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg +inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg DESCRIPTION="A full office productivity suite" HOMEPAGE="https://www.libreoffice.org" @@ -247,9 +247,7 @@ fi PATCHES=( # master branch "${FILESDIR}/${PN}-6.2-ldap-optional.patch" - "${WORKDIR}"/${PATCHSET/.tar.xz/}/001-qt5-change-salgraphics-gettextlayout-def.patch - "${WORKDIR}"/${PATCHSET/.tar.xz/}/002-qt5-assert-missing-salgraphics-font-on-gettextlayout.patch - "${WORKDIR}"/${PATCHSET/.tar.xz/}/003-qt5-fpicker-honor-autoextension.patch + # "${WORKDIR}"/${PATCHSET/.tar.xz/} # not upstreamable stuff "${FILESDIR}/${PN}-5.4-system-pyuno.patch" @@ -428,8 +426,8 @@ src_configure() { --with-x --without-fonts --without-myspell-dicts - --without-help - --with-helppack-integration + --with-help="html" + --without-helppack-integration --with-system-gpgmepp --without-system-sane $(use_enable bluetooth sdremote-bluetooth) @@ -506,24 +504,6 @@ src_compile() { addpredict /dev/ati addpredict /dev/nvidiactl - # hack for offlinehelp, this needs fixing upstream at some point - # it is broken because we send --without-help - # https://bugs.freedesktop.org/show_bug.cgi?id=46506 - ( - grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die - source "${T}/config_host.mk" 2&> /dev/null - - local path="${WORKDIR}/helpcontent2/source/auxiliary/" - mkdir -p "${path}" || die - - echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\"" - perl "${S}/helpcontent2/helpers/create_ilst.pl" \ - -dir=helpcontent2/source/media/helpimg \ - > "${path}/helpimg.ilst" - [[ -s "${path}/helpimg.ilst" ]] || \ - ewarn "The help images list is empty, something is fishy, report a bug." - ) - local target use test && target="build" || target="build-nocheck" @@ -557,15 +537,6 @@ src_install() { dodir /etc/env.d echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die fi - - # Hack for offlinehelp, this needs fixing upstream at some point. - # It is broken because we send --without-help - # https://bugs.freedesktop.org/show_bug.cgi?id=46506 - insinto /usr/$(get_libdir)/libreoffice/help - doins xmlhelp/util/*.xsl - - pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin - pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin } pkg_preinst() { diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 33af7c8cd646..25021012eee0 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -21,7 +21,7 @@ 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 flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg +inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg DESCRIPTION="A full office productivity suite" HOMEPAGE="https://www.libreoffice.org" @@ -424,8 +424,8 @@ src_configure() { --with-x --without-fonts --without-myspell-dicts - --without-help - --with-helppack-integration + --with-help="html" + --without-helppack-integration --with-system-gpgmepp --without-system-sane $(use_enable bluetooth sdremote-bluetooth) @@ -502,24 +502,6 @@ src_compile() { addpredict /dev/ati addpredict /dev/nvidiactl - # hack for offlinehelp, this needs fixing upstream at some point - # it is broken because we send --without-help - # https://bugs.freedesktop.org/show_bug.cgi?id=46506 - ( - grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die - source "${T}/config_host.mk" 2&> /dev/null - - local path="${WORKDIR}/helpcontent2/source/auxiliary/" - mkdir -p "${path}" || die - - echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\"" - perl "${S}/helpcontent2/helpers/create_ilst.pl" \ - -dir=helpcontent2/source/media/helpimg \ - > "${path}/helpimg.ilst" - [[ -s "${path}/helpimg.ilst" ]] || \ - ewarn "The help images list is empty, something is fishy, report a bug." - ) - local target use test && target="build" || target="build-nocheck" @@ -553,15 +535,6 @@ src_install() { dodir /etc/env.d echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die fi - - # Hack for offlinehelp, this needs fixing upstream at some point. - # It is broken because we send --without-help - # https://bugs.freedesktop.org/show_bug.cgi?id=46506 - insinto /usr/$(get_libdir)/libreoffice/help - doins xmlhelp/util/*.xsl - - pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin - pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin } pkg_preinst() { |