* [gentoo-commits] proj/musl:master commit in: app-office/libreoffice/, app-office/libreoffice/files/
@ 2016-03-14 23:29 Anthony G. Basile
0 siblings, 0 replies; 6+ messages in thread
From: Anthony G. Basile @ 2016-03-14 23:29 UTC (permalink / raw
To: gentoo-commits
commit: 0cd61d3baaed53c6f864dbe016fe4952f460362c
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 23:18:31 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 23:39:36 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=0cd61d3b
app-office/libreoffice: update to 5.0.5.2
Package-Manager: portage-2.2.26
RepoMan-Options: --force
app-office/libreoffice/Manifest | 14 +-
.../libreoffice-4.3.5.2-remove-bashisms.patch | 38 ----
.../libreoffice-4.4.0.3-telepathy-build-fix.patch | 40 ----
...reoffice-4.4.1.2-add-kde4-open-url-script.patch | 56 ------
...-4.4.4.3-cleanup-IsNativeControlSupported.patch | 212 ---------------------
.../libreoffice-4.4.4.3-fix-KDE4-FileDialog.patch | 76 --------
...ibreoffice-4.4.4.3-improve-KDE4FilePicker.patch | 193 -------------------
...ffice-4.4.5.2-fix-KDE4-listbox-regression.patch | 80 --------
.../files/libreoffice-5.0.5.2-linux-musl.patch | 61 ++++++
...2-r99.ebuild => libreoffice-5.0.5.2-r99.ebuild} | 8 +-
10 files changed, 69 insertions(+), 709 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index cfa86d9..2972578 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,14 +1,8 @@
-AUX libreoffice-4.3.5.2-remove-bashisms.patch 1330 SHA256 b477a07738fae7dadd324f1b792707cdda35b1f477cee43386b8a71ddbd090ea SHA512 850c1a252b141c6b32737f12766d7d6d9f0028eddcbc0b63bcfcaa70555a3a23f9e798c339176188c56e3769c1583a0b8c78feeade4f1120b0ddb2d02e2de6ed WHIRLPOOL ae5b0febeee433b82a55e130625ec52f8dbd859dfa39e4130ec16d7ca2deef061bd9c8a34e9ce96fdf3c6b18bf4c5fa48a382dfb7c22c069678ebaffd4252cba
AUX libreoffice-4.4-system-pyuno.patch 1598 SHA256 444ba9a06a548952cd82f7ea2ff17e5bd7b04788dc894ef5376bf3440749de9e SHA512 043c78f923b941a1e8985ee16d8e6b23859207eac0f4fdc52fedbce0103d62309aa7aae14e19f8bb26bef9d4213dee9871fcc3770f99be84f3405573e32ced78 WHIRLPOOL 51f85f39847a587551b6887362557771a81b6abc59b926eace36f8e2eb61cd4895486c28d44fe38e77fc1b77b0ed4e142d65f4793bf2161c9d0c5c0abeca07f7
-AUX libreoffice-4.4.0.3-telepathy-build-fix.patch 1503 SHA256 d23431960aa3898331b0e80f827c2eb224c3586bdaf9d2bb9dc10e2aa58ae6f3 SHA512 cf76698e851e31646ad7e6f9547d8c0917a047fa93b5132d00f0ea246945344f3e1df2376a9e3ffcd7ee7a4a200e24e213330482fddf50fc47558b5a9b949426 WHIRLPOOL 92e870da0ea77954d2b04e39887909a0cf20fe4277388be0074c01fac5c7adfa1cfed84333b3e7ae26f7866082bb1711ba453f877b8bc2b390d74a17d41830c0
-AUX libreoffice-4.4.1.2-add-kde4-open-url-script.patch 2144 SHA256 d35630cffc304652ad4e7df6d88dbd2ea499ae7a904a6b4c6a7eec9570ebee23 SHA512 2999f66d65e50cd06f8df1a48727407a6f4d0259d5d7dffedb3b750ed4876f93374b1a1a0aaa7d8e223e3a25ccbf05ca05d1a919fe36fc0eee0f7cd956a5949d WHIRLPOOL dbdd05bd29dcc37c94ee67ba4b1856b970a735af2ee3a468440f1edcb760a008fef2f62fb43ce2fef3626953786456652c8b606dea2b24650c72c1be66a976ef
AUX libreoffice-4.4.1.2-fix-includes.patch 1149 SHA256 2044d4c997472a46e95c68fa8bec19c1424e9074fad05df9f1c0d220dec00281 SHA512 15defc8362fb0e53db32b75d9c4ece73e1ee8bd1cc05b4dd8f072f808e6943b385a5415513b237d3daa130dedce3c6ac6370e05ec0b4a25065ce27aadd269e92 WHIRLPOOL a643af5504f09003409cdbb4e9445481b448fc67c35ef5dc2e35a71301b138c3007e1d78f4bac6128137e37c41d4c6363447eeee44b6aeba8ac68729e4661ea7
AUX libreoffice-4.4.1.2-linux-musl.patch 1962 SHA256 5cf5a446e5769f6a2df01c5c10702514fe9178334d1e53d3c7df843ca72c6fa2 SHA512 5fb4d5bf5cab21a0c95a9e51a4a138b427a08677c34bc14287c3eb74926b606345d5185c76bbe8957043d79dc33d46cf4aaa5182642c7fb9136dc48ed9e7fabb WHIRLPOOL 3e089da32a5425f1e892c80635489fde99198a5b15e1be94b996c49f2cf77e45144f624d68d9c11aef921bce0ce0ac632d52af348335ba5d61ae6049e9c4282b
AUX libreoffice-4.4.1.2-musl-fix-execinfo.patch 736 SHA256 7171dfa651a7ee81b4e13a9fd9131428d9a65af138cac4cb428ae6c3e4bcb1f3 SHA512 567123f990c4a47c2e4cebf99f3486150740015e647ca2b2521e606f3350fc55ceda6c7ac031302da34e8fc90747d66619334fcfda4e7b8998456fe3619ab860 WHIRLPOOL d25df4d89e5739f3586296569345c38d44aeb59c1f6ed83ddd9c76139e6e5b639506c5d761838c2faa70e8a30bb6b68b15c4bdf3255f7658542f70c91bffeb32
-AUX libreoffice-4.4.4.3-cleanup-IsNativeControlSupported.patch 7615 SHA256 a1c0a663966e306270d17fc63f0f2b5c62585eaa46b6c5c0e9becf7c30acd60b SHA512 ff607595107edc33d903b0bb010c36b4d17ca7d3a907fc151c32757255993f5cade5581376d89855727173ccc2c1e619f0af15e7773e0dcd98937325a82c6211 WHIRLPOOL 4e6dfa1704e6d48a681a3346801ab099085d141248be999e186ee55d15fca3f7554bb76ef5a118766a929ee74d4a802dc2ab9f3d1b46b7106a394e8dfbd73d10
-AUX libreoffice-4.4.4.3-fix-KDE4-FileDialog.patch 2725 SHA256 c6f71a016d92405de995d731e1dbb7b40f6af9989096744a69a52de176645fb0 SHA512 5800219accbd9bbfcd66841ff1b1a338faddec33bfc73d1c958126ff53b7d3dbf410622d74597d98ad925af07a66eee23e076b436f73d5076c0f9b439f99cefd WHIRLPOOL 6cdbf5266d96fb37dc542f6c07c034badbe38f1a9cb2b39aa402d0b70d407f074f278209aecb3e4dfb6246b1cf97389d7ed7a59ccbbc9a2de0dc74d18519fae6
-AUX libreoffice-4.4.4.3-improve-KDE4FilePicker.patch 5764 SHA256 3cb715491fbd91abdeb99477d19417bfc299376ec4532d5ef8826d4b9e001eee SHA512 11a860f9fb227e04e8f1d66ad54072d0117d6506a1e4d66a11876999a17bbac67b550f90cc8cf128d8cc81600eafa8bbcc49907657ccced2cbbf133c5acbe31c WHIRLPOOL 3f8bf68815132b0c436e8656d83208c4d5c30f45c069a33f6de28c54ccc3d7f2fe90413e3be34594cd0383ec9a448dd4ce2b0cca719f834d8671ddec22c47b5b
-AUX libreoffice-4.4.5.2-fix-KDE4-listbox-regression.patch 3719 SHA256 d20df249f1773391aba12763fa9f7a247b9ba030fd358535fef2b5d7b45ce2ca SHA512 36600bebc040a4d50aa4abb628bb1a6d974332ec58e02f5034c4f3419d730a0db2b38a0c84374901cc5fde19ef8d2c716d88356bf4b372649536e3e665063c00 WHIRLPOOL e85716e1cf531df4cd86cfbd9e7f759aeba5cc79a825cac801d90c54a1a8c817a3ce5be1c41db39d2340f99e206d7bb271e11d4c4e84c7226d3ef7945171caba
+AUX libreoffice-5.0.5.2-linux-musl.patch 1908 SHA256 b4fe6b57d1351c4d6a28dc67971c8e43448215c6ab6ffabfde5106da560a5c5d SHA512 cbb465e641616537a8f7c2438bf87661fb409b8337486b5a8ab7f1ecf099c9c4d96f531fef18f8f17ddca4813d3df4162629b93434ac35b7d01c7683de928524 WHIRLPOOL e305c2855c9141e6a1fd296cd8e05e50c388a9a30e4bb8dd4ba60773929abd660ac8940e42f2aad418f58a696f6232570d9000114113aaaf016d74462775c766
DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec
DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5
DIST 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1652670 SHA256 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a SHA512 5664203e6426880041cdb227e91f79f00d2ca7ae28c6997f61b72cc599aac55838d082d2b2b551bd7a228424c350ddea5d41599b8ca58d444a2cd46c9206ea91 WHIRLPOOL 6486c48b73a4f79760b443cfd397b704eca0fd32b72304ae7e7cfa0f43583b0af15c7384548b5215ae57513ed8366c8f3a74630ab466ba19a63b346af8c5eaca
@@ -17,8 +11,8 @@ DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f WHIRLPOOL 8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
-DIST libreoffice-5.0.3.2.tar.xz 167009360 SHA256 77f9c9569c1199d914f38afa01547c1874535c56ad74b19614a0afc3ad66d4bd SHA512 fe49577d26c2241a2e7d6f2e8faa25cacf77dc94dbe76f7dbbf1b208295695298d24842c73444b284e9af2a323b7536cce6727ffab0431ac22d80691a9902e62 WHIRLPOOL 2a907729d9f2b436a0206f558022d9ace69d494106e3c76f9c141d1202438ca7c662eca102595e8143cb4c70cece44447f99b1093e813249433684725f3287d0
+DIST libreoffice-5.0.5.2.tar.xz 167135308 SHA256 1ee729db840cf98bb00fed8c65550ccd6ced03123e3befcc511fe8df6f671b88 SHA512 f469d2faccd3e445324b0e8219a8a31b4dc8314a9b0559bfff06dd422eb6e6a9194dd4777391e71daa9bddf362cccca958defe165805f91e8334f95f36a011d2 WHIRLPOOL df4d74171c95f57a1a0fc7d25b7668abde5bb4eb8b326fd2179b4f311f5e63408919ca69bf2efe7effb2700488e11a0b4dc2059a5ce9c6a2de81d8f80314f598
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
-DIST libreoffice-help-5.0.3.2.tar.xz 1882292 SHA256 7e5535b8bd9be88170abdef187d3cf16d2cccdb1fdbd4404a22f1cff55bd953e SHA512 73de5507b0e7994a189d5580ad7bfdf842e9a3a10cc0a9bbe39eb11f20e47fa7016f6cf6748ad7c35260587cfc7078eaac6055b439292068a9d9783509bd715d WHIRLPOOL 1e7c79250a407c0eac5f1538290dfe1f04b22799bc04a295cd6dfbf0405dc4478283dea09ede52adf25077729852c11f9f74e98f257c47a8a30b350d83d532ac
-EBUILD libreoffice-5.0.3.2-r99.ebuild 18462 SHA256 64bff2afbcd3e70790a871f16e55d34404ac251c7b898ed0309b3abd6dff28f8 SHA512 8b6e2f243c0b43bbb54ca03cdcb5eb475350e34e470a4d69a27f210fadfb55241f8a912b7c30099545d0e2af000793c14d6bf125184293fb7a286476d090192d WHIRLPOOL 4a45450277a927513eeebe543a214ff7a4e8860e009e4ebc334ca6493bc05da8245da32f49593f3a9dd6cbf583b2fbcd0c5ab905266e2162da6f5f83f95c08de
+DIST libreoffice-help-5.0.5.2.tar.xz 1882884 SHA256 6664496d23d3e7e56dbca22b7cd9a2cf66e0e91609a20976870e0e235540c02a SHA512 63a27a160a98360d04f062c4a9b123ed0e89a4e081aaa03e50b0df7ef04c4396977401f909541a5f3510a3c2d7dbfc4c52839a1a4adc1a29bae8dd6a8056a170 WHIRLPOOL b9aae3d2f622ebb27bd9943d8111ec9c3fcfc77b35b1b93f294ed8fe7106ab001a10260c7f9ed45b5f9ca65229d15f25a3a92f6000682b6ae651c0cf16e81fed
+EBUILD libreoffice-5.0.5.2-r99.ebuild 18444 SHA256 1759cd26f67c99ec8e0d061938b884229b38caa919fdf9f0c2eff420e35a3f2c SHA512 08b19ddfaee0c4a4bf405ba461b59561cdab715f5cdc394ec48347e547aa7b65a5c813badf4f9cdb618d5a83e8bcec8f78781989c2801737e168d1371fda6b52 WHIRLPOOL b4009561d7482423a60ec73dcf4e5256eaa2f90ef3eaa3e545cb946fe92321490b3de332149c0cba9b985963098ad84a669b9799b55b23cf7e7262192ba51c89
MISC metadata.xml 1274 SHA256 bd4493db2b60fa26fdc8101687d92cea7760d19676f08a8c36b820755a1f8c6a SHA512 c25b674ddedf86ab66c6cea0e40822b658fab3e281f31d7e0ece4311c2edd7a1f1bee0ea20fc1e35224c8000443b38320be104fa26ce3cfa95df26ee5927aab1 WHIRLPOOL f5d25cc64f3dc9cbb92a84bcabb828c582e97617a34fd655c6ede9d0422a1e3e5d00bc87e37f2128d7ba394d51af2c42b6e0ee9ec255ad563b53e71f4675393d
diff --git a/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch b/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch
deleted file mode 100644
index 370b4aa..0000000
--- a/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f53e79acd0d42f5c41e1104056af9cf23e9e2e2a Mon Sep 17 00:00:00 2001
-From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
-Date: Sun, 4 Jan 2015 15:33:35 +0100
-Subject: [PATCH] Replace bash-specific code from configure.ac, fixes build for
- sh=dash users
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Original patch by Rémi Cardona <remi@gentoo.org>
-
-Change-Id: I815567df8a868c3997e8ac357b8529fded28c950
-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=525454
-Reviewed-on: https://gerrit.libreoffice.org/13731
-Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-Tested-by: Caolán McNamara <caolanm@redhat.com>
----
- configure.ac | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8aa33d0..5dbe640 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -11483,9 +11483,8 @@ test_font_map()
- FONTFILE_LOWER="$(echo $FONTFILE | $AWK '{print tolower($0)}')"
-
- TESTEXPR="'${FONTFILE_LOWER}' = '$(echo $FONT | $AWK '{print tolower($0)}').ttf'"
-- while true ; do
-+ while test "$#" -ge 1 ; do
- MAPPING="$(echo $1 | $AWK '{print tolower($0)}')"; shift
-- test -n "$MAPPING" || break
- TESTEXPR="${TESTEXPR} -o '${FONTFILE_LOWER}' = '$MAPPING-regular.ttf'"
- done
- if test $TESTEXPR
---
-2.3.0
-
diff --git a/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch b/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch
deleted file mode 100644
index 2833385..0000000
--- a/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 623b38fa5769f8cdec10b54b2a600bc4c4e077e6 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Sun, 11 Jan 2015 13:08:37 +0100
-Subject: OSL_ENSURE was not declared in this scope
-
-Change-Id: I426c0feee7b76fe02473e07fa209a61967af3e99
-
-diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx
-index 86986fc..df4a63f 100644
---- a/tubes/source/conference.cxx
-+++ b/tubes/source/conference.cxx
-@@ -248,7 +248,7 @@ static void channel_closed_cb( TpChannel *channel, gpointer user_data, GObject *
-
- void TeleConference::setChannel( TpAccount *pAccount, TpDBusTubeChannel* pChannel )
- {
-- OSL_ENSURE( !mpChannel, "TeleConference::setChannel: already have channel");
-+ SAL_WARN_IF( mpChannel, "tubes", "TeleConference::setChannel: already have channel");
- if (mpChannel)
- g_object_unref( mpChannel);
- if (mpAccount)
-@@ -297,7 +297,7 @@ bool TeleConference::offerTube()
- {
- INFO_LOGGER( "TeleConference::offerTube");
-
-- OSL_ENSURE( mpChannel, "TeleConference::offerTube: no channel");
-+ SAL_WARN_IF( !mpChannel, "tubes", "TeleConference::offerTube: no channel");
- if (!mpChannel)
- return false;
-
-@@ -319,7 +319,7 @@ bool TeleConference::setTube( GDBusConnection* pTube)
- {
- INFO_LOGGER( "TeleConference::setTube");
-
-- OSL_ENSURE( !pImpl->mpTube, "TeleConference::setTube: already tubed");
-+ SAL_WARN_IF( pImpl->mpTube, "tubes", "TeleConference::setTube: already tubed");
-
- pImpl->mpTube = pTube;
-
---
-cgit v0.10.2
diff --git a/app-office/libreoffice/files/libreoffice-4.4.1.2-add-kde4-open-url-script.patch b/app-office/libreoffice/files/libreoffice-4.4.1.2-add-kde4-open-url-script.patch
deleted file mode 100644
index d4c4d28..0000000
--- a/app-office/libreoffice/files/libreoffice-4.4.1.2-add-kde4-open-url-script.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From f7db2461292be3e23f5b3af47e488eaa8105d8db Mon Sep 17 00:00:00 2001
-From: Jan-Marek Glogowski <glogow@fbihome.de>
-Date: Wed, 26 Nov 2014 13:35:42 +0100
-Subject: Add kde4-open-url script
-
-Adds a KDE4 specific URL processing script.
-
-Change-Id: I0116fa95f076a5772e88c616e93de542fe4fe4e4
-
-diff --git a/shell/Package_scripts_kde.mk b/shell/Package_scripts_kde.mk
-index c5e4978..162bcc5 100644
---- a/shell/Package_scripts_kde.mk
-+++ b/shell/Package_scripts_kde.mk
-@@ -9,6 +9,12 @@
-
- $(eval $(call gb_Package_Package,shell_scripts_kde,$(SRCDIR)/shell/source/unix/misc))
-
-+ifeq ($(ENABLE_KDE),TRUE)
- $(eval $(call gb_Package_add_file,shell_scripts_kde,$(LIBO_BIN_FOLDER)/kde-open-url,kde-open-url.sh))
-+endif
-+
-+ifeq ($(ENABLE_KDE4),TRUE)
-+$(eval $(call gb_Package_add_file,shell_scripts_kde,$(LIBO_BIN_FOLDER)/kde4-open-url,kde4-open-url.sh))
-+endif
-
- # vim: set shiftwidth=4 tabstop=4 noexpandtab:
-diff --git a/shell/source/unix/misc/kde4-open-url.sh b/shell/source/unix/misc/kde4-open-url.sh
-new file mode 100755
-index 0000000..e5b8125
---- /dev/null
-+++ b/shell/source/unix/misc/kde4-open-url.sh
-@@ -0,0 +1,22 @@
-+#!/bin/sh
-+#
-+# This file is part of the LibreOffice project.
-+#
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+#
-+# This file incorporates work covered by the following license notice:
-+#
-+# Licensed to the Apache Software Foundation (ASF) under one or more
-+# contributor license agreements. See the NOTICE file distributed
-+# with this work for additional information regarding copyright
-+# ownership. The ASF licenses this file to you under the Apache
-+# License, Version 2.0 (the "License"); you may not use this file
-+# except in compliance with the License. You may obtain a copy of
-+# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-+#
-+
-+# use kde-open or xdg-open if available, falling back to our own open-url
-+kde-open "$1" 2>/dev/null || xdg-open "$1" 2>/dev/null || `dirname "$0"`/open-url "$1" 2>/dev/null
-+exit 0
---
-cgit v0.10.2
diff --git a/app-office/libreoffice/files/libreoffice-4.4.4.3-cleanup-IsNativeControlSupported.patch b/app-office/libreoffice/files/libreoffice-4.4.4.3-cleanup-IsNativeControlSupported.patch
deleted file mode 100644
index 7cb33b9..0000000
--- a/app-office/libreoffice/files/libreoffice-4.4.4.3-cleanup-IsNativeControlSupported.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-Merged upstream commits:
-
-88e16529fc7b0e312b68e38295348c93b437aad8 "tdf#92110 KDE4: cleanup IsNativeControlSupported"
-57792314c7b05f71c66834ee47bfaa09003df765 "tdf#92115 KDE4: better listbox theming"
-
-
-diff -u b/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
---- b/vcl/unx/kde4/KDESalGraphics.cxx
-+++ b/vcl/unx/kde4/KDESalGraphics.cxx
-@@ -85,47 +85,43 @@
-
- bool KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart part )
- {
-- if (type == CTRL_PUSHBUTTON) return true;
--
-- if (type == CTRL_MENUBAR) return true;
--
-- if (type == CTRL_MENU_POPUP) return true;
--
-- if (type == CTRL_EDITBOX) return true;
--
-- if (type == CTRL_COMBOBOX) return true;
--
-- if (type == CTRL_TOOLBAR) return true;
--
-- if (type == CTRL_CHECKBOX) return true;
--
-- if (type == CTRL_LISTBOX) return true;
--
-- if (type == CTRL_LISTNODE) return true;
--
-- if (type == CTRL_FRAME) return true;
--
-- if (type == CTRL_SCROLLBAR) return true;
--
-- if (type == CTRL_WINDOW_BACKGROUND) return true;
--
-- if (type == CTRL_SPINBOX && (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE) ) return true;
--
-- // no spinbuttons for KDE, paint spinbox complete
-- //if (type == CTRL_SPINBUTTONS) return true;
--
-- if (type == CTRL_GROUPBOX) return true;
--
-- if (type == CTRL_FIXEDLINE) return true;
--
-- if (type == CTRL_TOOLTIP) return true;
-+ switch (type)
-+ {
-+ case CTRL_PUSHBUTTON:
-+ case CTRL_RADIOBUTTON:
-+ case CTRL_CHECKBOX:
-+ case CTRL_TOOLTIP:
-+ case CTRL_PROGRESS:
-+ case CTRL_LISTNODE:
-+ return (part == PART_ENTIRE_CONTROL);
-+
-+ case CTRL_MENUBAR:
-+ case CTRL_MENU_POPUP:
-+ case CTRL_EDITBOX:
-+ case CTRL_COMBOBOX:
-+ case CTRL_TOOLBAR:
-+ case CTRL_FRAME:
-+ case CTRL_SCROLLBAR:
-+ case CTRL_WINDOW_BACKGROUND:
-+ case CTRL_GROUPBOX:
-+ case CTRL_FIXEDLINE:
-+ return true;
-+
-+ case CTRL_LISTBOX:
-+ return (part == PART_ENTIRE_CONTROL
-+ || part == PART_SUB_EDIT
-+ || part == PART_WINDOW
-+ || part == PART_BUTTON_DOWN);
-
-- if (type == CTRL_RADIOBUTTON) return true;
-+ case CTRL_SPINBOX:
-+ return (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE);
-
-- if (type == CTRL_SLIDER && (part == PART_TRACK_HORZ_AREA || part == PART_TRACK_VERT_AREA) )
-- return true;
-+ case CTRL_SLIDER:
-+ return (part == PART_TRACK_HORZ_AREA || part == PART_TRACK_VERT_AREA);
-
-- if ( (type == CTRL_PROGRESS) && (part == PART_ENTIRE_CONTROL) ) return true;
-+ default:
-+ break;
-+ }
-
- return false;
- }
-@@ -221,15 +217,15 @@
- const ImplControlValue& value,
- const OUString& )
- {
-- if( lastPopupRect.isValid() && ( type != CTRL_MENU_POPUP || part != PART_MENU_ITEM ))
-- lastPopupRect = QRect();
--
-- // put not implemented types here
-- if (type == CTRL_SPINBUTTONS)
-- {
-+ bool nativeSupport = IsNativeControlSupported( type, part );
-+ if( ! nativeSupport ) {
-+ assert( ! nativeSupport && "drawNativeControl called without native support!" );
- return false;
- }
-
-+ if( lastPopupRect.isValid() && ( type != CTRL_MENU_POPUP || part != PART_MENU_ITEM ))
-+ lastPopupRect = QRect();
-+
- bool returnVal = true;
-
- QRect widgetRect = region2QRect(rControlRegion);
-@@ -414,24 +410,26 @@
- }
- else if (type == CTRL_LISTBOX)
- {
-- if( part == PART_WINDOW )
-- {
-- lcl_drawFrame( QStyle::PE_Frame, m_image,
-- vclStateValue2StateFlag(nControlState, value) );
-- }
-- else
-- {
-- QStyleOptionComboBox option;
-- if (part == PART_SUB_EDIT)
-- {
-+ QStyleOptionComboBox option;
-+ switch (part) {
-+ case PART_WINDOW:
-+ lcl_drawFrame( QStyle::PE_Frame, m_image,
-+ vclStateValue2StateFlag(nControlState, value) );
-+ break;
-+ case PART_SUB_EDIT:
- draw( QStyle::CE_ComboBoxLabel, &option, m_image,
- vclStateValue2StateFlag(nControlState, value) );
-- }
-- else
-- {
-+ break;
-+ case PART_ENTIRE_CONTROL:
-+ draw( QStyle::CC_ComboBox, &option, m_image,
-+ vclStateValue2StateFlag(nControlState, value) );
-+ break;
-+ case PART_BUTTON_DOWN:
-+ m_image->fill( Qt::transparent );
-+ option.subControls = QStyle::SC_ComboBoxArrow;
- draw( QStyle::CC_ComboBox, &option, m_image,
- vclStateValue2StateFlag(nControlState, value) );
-- }
-+ break;
- }
- }
- else if (type == CTRL_LISTNODE)
-@@ -652,6 +650,12 @@
- const OUString&,
- Rectangle &nativeBoundingRegion, Rectangle &nativeContentRegion )
- {
-+ bool nativeSupport = IsNativeControlSupported( type, part );
-+ if( ! nativeSupport ) {
-+ assert( ! nativeSupport && "drawNativeControl called without native support!" );
-+ return false;
-+ }
-+
- bool retVal = false;
-
- QRect boundingRect = region2QRect( controlRegion );
-@@ -733,8 +737,6 @@
- {
- case PART_ENTIRE_CONTROL:
- {
-- int size = QApplication::style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2;
--
- // find out the minimum size that should be used
- // assume contents is a text ling
- int nHeight = QApplication::fontMetrics().height();
-@@ -747,8 +749,10 @@
- // FIXME: why this difference between comboboxes and listboxes ?
- // because a combobox has a sub edit and that is positioned
- // inside the outer bordered control ?
-- if( type == CTRL_COMBOBOX )
-+ if( type == CTRL_COMBOBOX ) {
-+ int size = QApplication::style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2;
- contentRect.adjust(-size,-size,size,size);
-+ }
- retVal = true;
- break;
- }
-@@ -761,13 +765,22 @@
- retVal = true;
- break;
- case PART_SUB_EDIT:
-+ {
- contentRect = QApplication::style()->subControlRect(
- QStyle::CC_ComboBox, &cbo, QStyle::SC_ComboBoxEditField );
-
-- contentRect.translate( boundingRect.left(), boundingRect.top() );
-+ int hmargin = QApplication::style()->pixelMetric(
-+ QStyle::PM_FocusFrameHMargin, &styleOption);
-+ int vmargin = QApplication::style()->pixelMetric(
-+ QStyle::PM_FocusFrameVMargin, &styleOption);
-+
-+ contentRect.translate( boundingRect.left() + hmargin, boundingRect.top() + vmargin );
-+ contentRect.adjust( 0, 0, -2 * hmargin, -2 * vmargin );
-+ boundingRect = contentRect;
-
- retVal = true;
- break;
-+ }
- case PART_WINDOW:
- retVal = true;
- break;
diff --git a/app-office/libreoffice/files/libreoffice-4.4.4.3-fix-KDE4-FileDialog.patch b/app-office/libreoffice/files/libreoffice-4.4.4.3-fix-KDE4-FileDialog.patch
deleted file mode 100644
index 2247781..0000000
--- a/app-office/libreoffice/files/libreoffice-4.4.4.3-fix-KDE4-FileDialog.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From e7352d5ada69f212dc813c4cbd257d036e7a27c8 Mon Sep 17 00:00:00 2001
-From: Juergen Funk <juergen.funk_ml@cib.de>
-Date: Fri, 3 Jul 2015 08:33:03 +0200
-Subject: tdf#92517 KDE4-FileDialog: "Save as" has wrong Filter
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixing follow
- - The order of calling: first should be set the filter, after
- that can be set the current filter
- - change the function from "setCurrentFilter" to "setCurrentItem"
- When you set the filter over "setCurrentFilter" you need the full
- search string "extention|description" e.g. "*.docx|Microsoft Word.."
- - Not need the escape of slash (with that can not find
- "Microsoft Word 2007/2010 XML (.docx))"
-
-Change-Id: Ie4f7d6fd619b391487ee944c3e745c855600ee54
-Reviewed-on: https://gerrit.libreoffice.org/16721
-Tested-by: Jenkins <ci@libreoffice.org>
-Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
-(cherry picked from commit a93cfd5afb9072de00fc4b2a070f23ebdad6e4fe)
-Reviewed-on: https://gerrit.libreoffice.org/16890
-Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-Tested-by: Caolán McNamara <caolanm@redhat.com>
-
-diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
-index 4615bd4..a638955 100644
---- a/vcl/unx/kde4/KDE4FilePicker.cxx
-+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
-@@ -250,6 +250,10 @@ sal_Int16 SAL_CALL KDE4FilePicker::execute()
-
- _dialog->clearFilter();
- _dialog->setFilter(_filter);
-+
-+ if(!_currentFilter.isNull())
-+ _dialog->filterWidget()->setCurrentItem(_currentFilter);
-+
- _dialog->filterWidget()->setEditable(false);
-
- VCLKDEApplication::preDialogSetup();
-@@ -384,9 +388,7 @@ void SAL_CALL KDE4FilePicker::setCurrentFilter( const OUString &title )
- return Q_EMIT setCurrentFilterSignal( title );
- }
-
-- QString t = toQString(title);
-- t.replace("/", "\\/");
-- _dialog->filterWidget()->setCurrentFilter(t);
-+ _currentFilter = toQString(title);
- }
-
- OUString SAL_CALL KDE4FilePicker::getCurrentFilter()
-@@ -633,6 +635,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args )
- }
-
- _filter.clear();
-+ _currentFilter.clear();
-
- // parameter checking
- uno::Any arg;
-diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx
-index 98e9af6..ff3a8602 100644
---- a/vcl/unx/kde4/KDE4FilePicker.hxx
-+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
-@@ -66,6 +66,8 @@ protected:
-
- //running filter string to add to dialog
- QString _filter;
-+ // string to set the current filter
-+ QString _currentFilter;
-
- //mapping of SAL control ID's to created custom controls
- QHash<sal_Int16, QWidget*> _customWidgets;
---
-cgit v0.10.2
-
diff --git a/app-office/libreoffice/files/libreoffice-4.4.4.3-improve-KDE4FilePicker.patch b/app-office/libreoffice/files/libreoffice-4.4.4.3-improve-KDE4FilePicker.patch
deleted file mode 100644
index d0350e4..0000000
--- a/app-office/libreoffice/files/libreoffice-4.4.4.3-improve-KDE4FilePicker.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-Merged upstream commits:
-
-6fc55b9abd783b624241d56e34751ea495adbd7d "KDE4: actually apply file dialog operation mode"
-b613270a730ace29dd1b16b29be2222b34f34a5d "KDE4: improve default load and save dialog titles"
-2b999dd6da5a90db66afe852a007fab8c62ffaec "vcl: kde4: loplugin:staticmethods"
-3e8c14df67a43d3088ed7df0a2b0d96a4bc42d57 "tdf#92353 FileSave: Not confirmed for overwrite a file (unix)"
-
-
-diff -u b/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
---- b/vcl/unx/kde4/KDE4FilePicker.cxx
-+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
-@@ -58,6 +58,8 @@
-
- #include "generic/geninst.h"
-
-+#include "svids.hrc"
-+
- using namespace ::com::sun::star;
- using namespace ::com::sun::star::ui::dialogs;
- using namespace ::com::sun::star::ui::dialogs::TemplateDescription;
-@@ -109,7 +111,6 @@
-
- KDE4FilePicker::KDE4FilePicker( const uno::Reference<uno::XComponentContext>& )
- : KDE4FilePicker_Base(_helperMutex)
-- , _resMgr( ResMgr::CreateResMgr("fps_office") )
- , allowRemoteUrls( false )
- {
- _extraControls = new QWidget();
-@@ -128,8 +129,6 @@
- #endif
-
- setMultiSelectionMode( false );
-- //default mode
-- _dialog->setOperationMode(KFileDialog::Opening);
-
- // XExecutableDialog functions
- connect( this, SIGNAL( setTitleSignal( const OUString & ) ),
-@@ -202,7 +201,6 @@
- SalYieldMutexReleaser aReleaser;
- return Q_EMIT cleanupProxySignal();
- }
-- delete _resMgr;
- delete _dialog;
- }
-
-@@ -524,6 +522,24 @@
- return toOUString(label);
- }
-
-+QString KDE4FilePicker::getResString( sal_Int16 aRedId )
-+{
-+ QString aResString;
-+
-+ if( aRedId < 0 )
-+ return aResString;
-+
-+ try
-+ {
-+ aResString = toQString(ResId(aRedId, *ImplGetResMgr()).toString());
-+ }
-+ catch(...)
-+ {
-+ }
-+
-+ return aResString.replace('~', '&');
-+}
-+
- void KDE4FilePicker::addCustomControl(sal_Int16 controlId)
- {
- QWidget* widget = 0;
-@@ -532,37 +548,37 @@
- switch (controlId)
- {
- case CHECKBOX_AUTOEXTENSION:
-- resId = STR_SVT_FILEPICKER_AUTO_EXTENSION;
-+ resId = STR_FPICKER_AUTO_EXTENSION;
- break;
- case CHECKBOX_PASSWORD:
-- resId = STR_SVT_FILEPICKER_PASSWORD;
-+ resId = STR_FPICKER_PASSWORD;
- break;
- case CHECKBOX_FILTEROPTIONS:
-- resId = STR_SVT_FILEPICKER_FILTER_OPTIONS;
-+ resId = STR_FPICKER_FILTER_OPTIONS;
- break;
- case CHECKBOX_READONLY:
-- resId = STR_SVT_FILEPICKER_READONLY;
-+ resId = STR_FPICKER_READONLY;
- break;
- case CHECKBOX_LINK:
-- resId = STR_SVT_FILEPICKER_INSERT_AS_LINK;
-+ resId = STR_FPICKER_INSERT_AS_LINK;
- break;
- case CHECKBOX_PREVIEW:
-- resId = STR_SVT_FILEPICKER_SHOW_PREVIEW;
-+ resId = STR_FPICKER_SHOW_PREVIEW;
- break;
- case CHECKBOX_SELECTION:
-- resId = STR_SVT_FILEPICKER_SELECTION;
-+ resId = STR_FPICKER_SELECTION;
- break;
- case PUSHBUTTON_PLAY:
-- resId = STR_SVT_FILEPICKER_PLAY;
-+ resId = STR_FPICKER_PLAY;
- break;
- case LISTBOX_VERSION:
-- resId = STR_SVT_FILEPICKER_VERSION;
-+ resId = STR_FPICKER_VERSION;
- break;
- case LISTBOX_TEMPLATE:
-- resId = STR_SVT_FILEPICKER_TEMPLATES;
-+ resId = STR_FPICKER_TEMPLATES;
- break;
- case LISTBOX_IMAGE_TEMPLATE:
-- resId = STR_SVT_FILEPICKER_IMAGE_TEMPLATE;
-+ resId = STR_FPICKER_IMAGE_TEMPLATE;
- break;
- case LISTBOX_VERSION_LABEL:
- case LISTBOX_TEMPLATE_LABEL:
-@@ -581,16 +597,7 @@
- case CHECKBOX_PREVIEW:
- case CHECKBOX_SELECTION:
- {
-- QString label;
--
-- if (_resMgr && resId != -1)
-- {
-- OUString s(ResId(resId, *_resMgr).toString());
-- label = toQString(s);
-- label.replace("~", "&");
-- }
--
-- widget = new QCheckBox(label, _extraControls);
-+ widget = new QCheckBox(getResString(resId), _extraControls);
-
- // the checkbox is created even for CHECKBOX_AUTOEXTENSION to simplify
- // code, but the checkbox is hidden and ignored
-@@ -719,8 +726,23 @@
- 1 );
- }
-
-- _dialog->setOperationMode(operationMode);
-- _dialog->setConfirmOverwrite(true);
-+ _dialog->setOperationMode( operationMode );
-+
-+ sal_Int16 resId = -1;
-+ switch (_dialog->operationMode())
-+ {
-+ case KFileDialog::Opening:
-+ resId = STR_FPICKER_OPEN;
-+ break;
-+ case KFileDialog::Saving:
-+ resId = STR_FPICKER_SAVE;
-+ _dialog->setConfirmOverwrite( true );
-+ break;
-+ default:
-+ break;
-+ }
-+
-+ _dialog->setCaption(getResString(resId));
- }
-
- void SAL_CALL KDE4FilePicker::cancel()
-diff -u b/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx
---- b/vcl/unx/kde4/KDE4FilePicker.hxx
-+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
-@@ -41,8 +41,6 @@
- class QWidget;
- class QLayout;
-
--class ResMgr;
--
- typedef ::cppu::WeakComponentImplHelper5
- < ::com::sun::star::ui::dialogs::XFilePicker2
- , ::com::sun::star::ui::dialogs::XFilePicker3
-@@ -61,8 +59,6 @@
-
- ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener > m_xListener;
-
-- ResMgr *_resMgr;
--
- //the dialog to display
- KFileDialog* _dialog;
-
-@@ -225,6 +221,8 @@
- //add a custom control widget to the file dialog
- void addCustomControl(sal_Int16 controlId);
-
-+ static QString getResString( sal_Int16 aRedId );
-+
- private Q_SLOTS:
- void cleanupProxy();
- void checkProtocol();
diff --git a/app-office/libreoffice/files/libreoffice-4.4.5.2-fix-KDE4-listbox-regression.patch b/app-office/libreoffice/files/libreoffice-4.4.5.2-fix-KDE4-listbox-regression.patch
deleted file mode 100644
index f4ee985..0000000
--- a/app-office/libreoffice/files/libreoffice-4.4.5.2-fix-KDE4-listbox-regression.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From ef126328c3ad35d51395abc461c3d64429f91c26 Mon Sep 17 00:00:00 2001
-From: Jan-Marek Glogowski <glogow@fbihome.de>
-Date: Thu, 30 Jul 2015 18:10:03 +0200
-Subject: tdf#92903 KDE4: fix listbox regression from 92115
-
-So at least in case of the CTRL_LISTBOX, getNativeControlRegion is
-called for a type and part unsupported by IsNativeControlSupported.
-
-For whatever reason, this results in broken listboxes drawn in
-Base's "Table Design" dialog, when selecting "field type", which
-draws the listbox on top of the cell.
-
-To make it worse, it seems the listbox is actually drawn to a
-smaller space then the actual requirement. Appearently it seems to
-use the content rect, instead of the bounding rect.
-
-So in addition to fixing the drawing, this patch increases the
-listbox bounding rect, which looks too large in normal dialogs, but
-makes the Base's listbox better readable.
-
-Change-Id: I112ec038fd20ad33facd260d16b5d68b508d2bd0
-Reviewed-on: https://gerrit.libreoffice.org/17438
-Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
-Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
-
-diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
-index 3e79e1e..eeb741f 100644
---- a/vcl/unx/kde4/KDESalGraphics.cxx
-+++ b/vcl/unx/kde4/KDESalGraphics.cxx
-@@ -108,10 +108,7 @@ bool KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart par
- return true;
-
- case CTRL_LISTBOX:
-- return (part == PART_ENTIRE_CONTROL
-- || part == PART_SUB_EDIT
-- || part == PART_WINDOW
-- || part == PART_BUTTON_DOWN);
-+ return (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE);
-
- case CTRL_SPINBOX:
- return (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE);
-@@ -650,12 +647,6 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
- const OUString&,
- Rectangle &nativeBoundingRegion, Rectangle &nativeContentRegion )
- {
-- bool nativeSupport = IsNativeControlSupported( type, part );
-- if( ! nativeSupport ) {
-- assert( ! nativeSupport && "drawNativeControl called without native support!" );
-- return false;
-- }
--
- bool retVal = false;
-
- QRect boundingRect = region2QRect( controlRegion );
-@@ -753,6 +744,14 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
- int size = QApplication::style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2;
- contentRect.adjust(-size,-size,size,size);
- }
-+ else {
-+ int hmargin = QApplication::style()->pixelMetric(
-+ QStyle::PM_FocusFrameHMargin, &styleOption);
-+ int vmargin = QApplication::style()->pixelMetric(
-+ QStyle::PM_FocusFrameVMargin, &styleOption);
-+ boundingRect.translate( -hmargin, -vmargin );
-+ boundingRect.adjust( -hmargin, -vmargin, 2 * hmargin, 2 * vmargin );
-+ }
- retVal = true;
- break;
- }
-@@ -776,7 +775,6 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
-
- contentRect.translate( boundingRect.left() + hmargin, boundingRect.top() + vmargin );
- contentRect.adjust( 0, 0, -2 * hmargin, -2 * vmargin );
-- boundingRect = contentRect;
-
- retVal = true;
- break;
---
-cgit v0.10.2
-
diff --git a/app-office/libreoffice/files/libreoffice-5.0.5.2-linux-musl.patch b/app-office/libreoffice/files/libreoffice-5.0.5.2-linux-musl.patch
new file mode 100644
index 0000000..29c26b4
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.0.5.2-linux-musl.patch
@@ -0,0 +1,61 @@
+diff -Naur libreoffice-5.0.5.2.orig/configure.ac libreoffice-5.0.5.2/configure.ac
+--- libreoffice-5.0.5.2.orig/configure.ac 2016-02-04 16:41:28.000000000 +0000
++++ libreoffice-5.0.5.2/configure.ac 2016-03-14 10:12:03.004000000 +0000
+@@ -587,7 +587,7 @@
+ fi
+ ;;
+
+-linux-gnu*|k*bsd*-gnu*)
++linux-gnu*|linux-musl*|k*bsd*-gnu*)
+ test_gtk=yes
+ build_gstreamer_1_0=yes
+ build_gstreamer_0_10=yes
+@@ -4124,7 +4124,7 @@
+ esac
+ ;;
+
+-linux-gnu*)
++linux-gnu*|linux-musl*)
+ COM=GCC
+ GUIBASE=unx
+ OS=LINUX
+@@ -7074,7 +7074,7 @@
+ test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
+ ;;
+
+- linux-gnu*)
++ linux-gnu*|linux-musl*)
+ JAVAINC="-I$JAVA_HOME/include"
+ JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
+ test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
+@@ -9550,21 +9550,6 @@
+ fi
+ AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA)
+
+-dnl ***************************************
+-dnl testing libc version for Linux...
+-dnl ***************************************
+-if test "$_os" = "Linux"; then
+- AC_MSG_CHECKING([whether libc is >= 2.1.1])
+- exec 6>/dev/null # no output
+- AC_CHECK_LIB(c, gnu_get_libc_version, HAVE_LIBC=yes; export HAVE_LIBC)
+- exec 6>&1 # output on again
+- if test "$HAVE_LIBC"; then
+- AC_MSG_RESULT([yes])
+- else
+- AC_MSG_ERROR([no, upgrade libc])
+- fi
+-fi
+-
+ dnl =========================================
+ dnl Check for the Windows SDK.
+ dnl =========================================
+@@ -12942,7 +12927,7 @@
+
+ case "$host_os" in
+
+- aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*)
++ aix*|dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*)
+ if test "$ENABLE_JAVA" != "" -a "$JDK"!="gcj"; then
+ pathmunge "$JAVA_HOME/bin" "after"
+ fi
diff --git a/app-office/libreoffice/libreoffice-5.0.3.2-r99.ebuild b/app-office/libreoffice/libreoffice-5.0.5.2-r99.ebuild
similarity index 99%
rename from app-office/libreoffice/libreoffice-5.0.3.2-r99.ebuild
rename to app-office/libreoffice/libreoffice-5.0.5.2-r99.ebuild
index 04e7437..46b3362 100644
--- a/app-office/libreoffice/libreoffice-5.0.3.2-r99.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.5.2-r99.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -96,7 +96,7 @@ unset lo_xt
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
COMMON_DEPEND="
${PYTHON_DEPS}
@@ -115,7 +115,7 @@ COMMON_DEPEND="
app-text/libwpd:0.10[tools]
app-text/libwpg:0.3
=app-text/libwps-0.4*
- >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
+ >=app-text/poppler-0.16:=[cxx]
>=dev-cpp/clucene-2.3.3.4-r2
=dev-cpp/libcmis-0.5*
dev-db/unixODBC
@@ -266,7 +266,7 @@ PATCHES=(
# musl fixes
"${FILESDIR}/${PN}-4.4.1.2-fix-includes.patch"
- "${FILESDIR}/${PN}-4.4.1.2-linux-musl.patch"
+ "${FILESDIR}/${PN}-5.0.5.2-linux-musl.patch"
"${FILESDIR}/${PN}-4.4.1.2-musl-fix-execinfo.patch"
)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/musl:master commit in: app-office/libreoffice/, app-office/libreoffice/files/
@ 2016-08-10 8:07 Anthony G. Basile
0 siblings, 0 replies; 6+ messages in thread
From: Anthony G. Basile @ 2016-08-10 8:07 UTC (permalink / raw
To: gentoo-commits
commit: a07541f85f8e0b5b973fbe6f2e92aebaa1560115
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 10 08:07:06 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Aug 10 08:07:06 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=a07541f8
app-office/libreoffice: version bump to 5.1.4.2
Package-Manager: portage-2.2.28
RepoMan-Options: --force
app-office/libreoffice/Manifest | 10 +-
.../files/libreoffice-5.1.4.2-gcc6.patch | 40 +++++
.../files/libreoffice-curl-7.50.0.patch | 23 +++
...2-r99.ebuild => libreoffice-5.1.4.2-r99.ebuild} | 195 +++++++++------------
app-office/libreoffice/metadata.xml | 2 +
5 files changed, 154 insertions(+), 116 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 2972578..b8389b1 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -3,6 +3,8 @@ AUX libreoffice-4.4.1.2-fix-includes.patch 1149 SHA256 2044d4c997472a46e95c68fa8
AUX libreoffice-4.4.1.2-linux-musl.patch 1962 SHA256 5cf5a446e5769f6a2df01c5c10702514fe9178334d1e53d3c7df843ca72c6fa2 SHA512 5fb4d5bf5cab21a0c95a9e51a4a138b427a08677c34bc14287c3eb74926b606345d5185c76bbe8957043d79dc33d46cf4aaa5182642c7fb9136dc48ed9e7fabb WHIRLPOOL 3e089da32a5425f1e892c80635489fde99198a5b15e1be94b996c49f2cf77e45144f624d68d9c11aef921bce0ce0ac632d52af348335ba5d61ae6049e9c4282b
AUX libreoffice-4.4.1.2-musl-fix-execinfo.patch 736 SHA256 7171dfa651a7ee81b4e13a9fd9131428d9a65af138cac4cb428ae6c3e4bcb1f3 SHA512 567123f990c4a47c2e4cebf99f3486150740015e647ca2b2521e606f3350fc55ceda6c7ac031302da34e8fc90747d66619334fcfda4e7b8998456fe3619ab860 WHIRLPOOL d25df4d89e5739f3586296569345c38d44aeb59c1f6ed83ddd9c76139e6e5b639506c5d761838c2faa70e8a30bb6b68b15c4bdf3255f7658542f70c91bffeb32
AUX libreoffice-5.0.5.2-linux-musl.patch 1908 SHA256 b4fe6b57d1351c4d6a28dc67971c8e43448215c6ab6ffabfde5106da560a5c5d SHA512 cbb465e641616537a8f7c2438bf87661fb409b8337486b5a8ab7f1ecf099c9c4d96f531fef18f8f17ddca4813d3df4162629b93434ac35b7d01c7683de928524 WHIRLPOOL e305c2855c9141e6a1fd296cd8e05e50c388a9a30e4bb8dd4ba60773929abd660ac8940e42f2aad418f58a696f6232570d9000114113aaaf016d74462775c766
+AUX libreoffice-5.1.4.2-gcc6.patch 1595 SHA256 a1f3978a91afee987b46abda4c0f9ecc2ec6d11c467b98153d94006439adcc21 SHA512 d0bd586e093bcc043c13c5d90ea1834a2333511df012a74fbf1a89f2e6c9f44a2e7b78af5654443d89ddcc9a89930b28a4d31e1b3b9c324898c0cef4c2c985af WHIRLPOOL c0ccfac9807b470295e23687a9427619c9ebc5300d12a4908a6289008578b8175633f753e0256a378996e31292bf8cda4c28e932d686257b1736e620776a4205
+AUX libreoffice-curl-7.50.0.patch 814 SHA256 ad365a9569d46509bf621568277cf15ee9fc29f63233e8256f86e1f0640032f2 SHA512 3e861c0f456fecd74116176dffe38e9bfb83959e3bf45e1b11bdeeda6226a7ba17b45cd514642f8f54d2406e98cb15da253b5adb248c4c74b95eb727fe16f9d8 WHIRLPOOL 22ac7f78268681a2e961b20be586db16d70d8f654246bfe8101effdd9315c80949cf604f34965bc6de265c884b42d4794ac28da78a70a9b58b408d6d829960e1
DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec
DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5
DIST 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1652670 SHA256 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a SHA512 5664203e6426880041cdb227e91f79f00d2ca7ae28c6997f61b72cc599aac55838d082d2b2b551bd7a228424c350ddea5d41599b8ca58d444a2cd46c9206ea91 WHIRLPOOL 6486c48b73a4f79760b443cfd397b704eca0fd32b72304ae7e7cfa0f43583b0af15c7384548b5215ae57513ed8366c8f3a74630ab466ba19a63b346af8c5eaca
@@ -11,8 +13,8 @@ DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f WHIRLPOOL 8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
-DIST libreoffice-5.0.5.2.tar.xz 167135308 SHA256 1ee729db840cf98bb00fed8c65550ccd6ced03123e3befcc511fe8df6f671b88 SHA512 f469d2faccd3e445324b0e8219a8a31b4dc8314a9b0559bfff06dd422eb6e6a9194dd4777391e71daa9bddf362cccca958defe165805f91e8334f95f36a011d2 WHIRLPOOL df4d74171c95f57a1a0fc7d25b7668abde5bb4eb8b326fd2179b4f311f5e63408919ca69bf2efe7effb2700488e11a0b4dc2059a5ce9c6a2de81d8f80314f598
+DIST libreoffice-5.1.4.2.tar.xz 176233960 SHA256 cae54a79ed858ad92044179b5c33bd29c5770a8eccde04ed80c5ebfd92078385 SHA512 80e79b6a20f85e295fead9fc5f9578d846a889fe6bc7a0f51b76117408ee6c8e7fbddf99c22e2caaac3253f10907121ed3508cefab2fb1b2ccaa90c4cf52c33a WHIRLPOOL 2005e5321b6e25196db535a786c50b66c635b07d1482e562f1595f3f84fbf0c702717d934d50e319822f194f1bdc9d15da1885658042d277ae8535f75f9856ba
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
-DIST libreoffice-help-5.0.5.2.tar.xz 1882884 SHA256 6664496d23d3e7e56dbca22b7cd9a2cf66e0e91609a20976870e0e235540c02a SHA512 63a27a160a98360d04f062c4a9b123ed0e89a4e081aaa03e50b0df7ef04c4396977401f909541a5f3510a3c2d7dbfc4c52839a1a4adc1a29bae8dd6a8056a170 WHIRLPOOL b9aae3d2f622ebb27bd9943d8111ec9c3fcfc77b35b1b93f294ed8fe7106ab001a10260c7f9ed45b5f9ca65229d15f25a3a92f6000682b6ae651c0cf16e81fed
-EBUILD libreoffice-5.0.5.2-r99.ebuild 18444 SHA256 1759cd26f67c99ec8e0d061938b884229b38caa919fdf9f0c2eff420e35a3f2c SHA512 08b19ddfaee0c4a4bf405ba461b59561cdab715f5cdc394ec48347e547aa7b65a5c813badf4f9cdb618d5a83e8bcec8f78781989c2801737e168d1371fda6b52 WHIRLPOOL b4009561d7482423a60ec73dcf4e5256eaa2f90ef3eaa3e545cb946fe92321490b3de332149c0cba9b985963098ad84a669b9799b55b23cf7e7262192ba51c89
-MISC metadata.xml 1274 SHA256 bd4493db2b60fa26fdc8101687d92cea7760d19676f08a8c36b820755a1f8c6a SHA512 c25b674ddedf86ab66c6cea0e40822b658fab3e281f31d7e0ece4311c2edd7a1f1bee0ea20fc1e35224c8000443b38320be104fa26ce3cfa95df26ee5927aab1 WHIRLPOOL f5d25cc64f3dc9cbb92a84bcabb828c582e97617a34fd655c6ede9d0422a1e3e5d00bc87e37f2128d7ba394d51af2c42b6e0ee9ec255ad563b53e71f4675393d
+DIST libreoffice-help-5.1.4.2.tar.xz 1905160 SHA256 60356c3e3a8e5ba8216c18e127cfa2b7d0eb55c69e50f056e8f78a7d9dc735cc SHA512 a8af619dff4b873574afd4b6cfc930543ab58a449a5cfa4b76a0edf242e18a885b6cba1f1a660e9a07e902c367f1a305c2c525f2b0a70e99f56ae5303abef5fe WHIRLPOOL 2e195dac9e6d2280ec3ac36243c4c62010e04763c5510a1f5e06f39e2f6e44aad555b460f72b2f09aba43a9571b3d20b50d6caf4a028e3e6acfe4e37d7598b70
+EBUILD libreoffice-5.1.4.2-r99.ebuild 17705 SHA256 e8b976164fe79af19dadad66cfcabcfb57635db6cad949d86846b9145979d581 SHA512 3e15d068ce14d1aae808195d3de85c28d6b126a91f44eefd77c957a89ec2724c953d10f97e25b274c7942833c3930b968a1947d0bea7821d0f1d7ed8a4f71230 WHIRLPOOL 9cf54ebac945be2b92857b94f003a58bfeaa621b297ec4be51032b9548332537540494a3c32983a84e53d4b0ee648abf63ca65334648e8be8ab9fa43a2d82717
+MISC metadata.xml 1425 SHA256 2ca5293a7d9b6a9a58235149d00aefd8a33f3d93df32a5d4c88b94d96bb0f181 SHA512 42787dbbddbfee01aa4b4c0ee2b6fe8e612e901736d18ab3fff8fd19917b4ab65e04eaee7dd13790ae2aebc52f74ce203fcedab8bdfdcbceabf9fa043d287c1f WHIRLPOOL 65925c5dee093ad51c04be88d33b34cfe677b6a27bc659602f0aa9a550f6ab716d0244ad4a76cf3a5b6ad6d6c9401a4cf8729251c30a141413f382d7b9653157
diff --git a/app-office/libreoffice/files/libreoffice-5.1.4.2-gcc6.patch b/app-office/libreoffice/files/libreoffice-5.1.4.2-gcc6.patch
new file mode 100644
index 0000000..9e7ee73
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.1.4.2-gcc6.patch
@@ -0,0 +1,40 @@
+From 91fcc0032c2d0d343b914dfe3bea0b0bf1589e91 Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene@debian.org>
+Date: Tue, 24 May 2016 16:35:57 +0200
+Subject: [PATCH] KDE4 cflags no /usr/include usage to fix build failure with
+ gcc6
+
+Change-Id: I53106b9ebfa7cc5c7b6c6d6f3bb3a4e5f2261f4f
+---
+ configure.ac | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 091abb4..86cc7b6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -11117,6 +11117,7 @@ the root of your Qt installation by exporting QT4DIR before running "configure".
+ if test "x$kde_incdir" = "xno"; then
+ AC_MSG_ERROR([KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
+ fi
++ if test "$kde_incdir" = "/usr/include"; then kde_incdir=; fi
+
+ dnl Check for KDE4 libraries
+ AC_MSG_CHECKING([for KDE4 libraries])
+@@ -11134,7 +11135,12 @@ the root of your Qt installation by exporting QT4DIR before running "configure".
+ fi
+
+ PKG_CHECK_MODULES([QT4],[QtNetwork QtGui])
+- KDE4_CFLAGS="-I$kde_incdir $QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
++ if ! test -z "$kde_incdir"; then
++ KDE4_CFLAGS="-I$kde_incdir $QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
++ else
++ KDE4_CFLAGS="$QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
++ fi
++
+ KDE4_LIBS="-L$kde_libdir -lkio -lkfile -lkdeui -lkdecore -L$qt_lib_dir $QT4_LIBS"
+ KDE4_CFLAGS=$(printf '%s' "$KDE4_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
+ FilterLibs "$KDE4_LIBS"
+--
+2.9.0
+
diff --git a/app-office/libreoffice/files/libreoffice-curl-7.50.0.patch b/app-office/libreoffice/files/libreoffice-curl-7.50.0.patch
new file mode 100644
index 0000000..4a947d0
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-curl-7.50.0.patch
@@ -0,0 +1,23 @@
+From 0b8e589875ffd84150470832de18ebd79989efc0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Mon, 25 Jul 2016 12:08:35 +0100
+Subject: curl 7.50.0 has CURL as typedef struct Curl_easy
+
+Change-Id: I22e5e2cdf78c38087579071c1b1570a8adc7d3c4
+
+diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx
+index be68d9a..315ccb7 100644
+--- a/ucb/source/ucp/ftp/ftploaderthread.cxx
++++ b/ucb/source/ucp/ftp/ftploaderthread.cxx
+@@ -71,7 +71,7 @@ FTPLoaderThread::~FTPLoaderThread() {
+
+
+ CURL* FTPLoaderThread::handle() {
+- CURL* ret = osl_getThreadKeyData(m_threadKey);
++ CURL* ret = static_cast<CURL*>(osl_getThreadKeyData(m_threadKey));
+ if(!ret) {
+ ret = curl_easy_init();
+ if (ret != nullptr) {
+--
+cgit v0.10.2
+
diff --git a/app-office/libreoffice/libreoffice-5.0.5.2-r99.ebuild b/app-office/libreoffice/libreoffice-5.1.4.2-r99.ebuild
similarity index 82%
rename from app-office/libreoffice/libreoffice-5.0.5.2-r99.ebuild
rename to app-office/libreoffice/libreoffice-5.1.4.2-r99.ebuild
index 46b3362..4b508d0 100644
--- a/app-office/libreoffice/libreoffice-5.0.5.2-r99.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.4.2-r99.ebuild
@@ -2,10 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
KDE_SCM="git"
CMAKE_REQUIRED="never"
@@ -20,7 +19,6 @@ DEV_URI="
http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
http://download.documentfoundation.org/libreoffice/old/${PV}/
"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
ADDONS_URI="http://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
@@ -75,79 +73,69 @@ ADDONS_SRC=(
SRC_URI+=" ${ADDONS_SRC[*]}"
unset ADDONS_URI
-unset EXT_URI
unset ADDONS_SRC
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
-
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-# Unpackaged separate extensions:
-# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
-# hunart: only on ooo extensions -> fubared download path somewhere on sf
-# numbertext, typo, validator, watch-window: ^^
-# oooblogger: no homepage or anything
# Extensions that need extra work:
-for lo_xt in ${LO_EXTS}; do
- IUSE+=" libreoffice_extensions_${lo_xt}"
-done
-unset lo_xt
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome google
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres quickstarter telepathy test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- app-arch/zip
+COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
- >=app-text/hunspell-1.3.2-r3
- app-text/mythes
+ app-arch/zip
+ app-text/hunspell
>=app-text/libabw-0.1.0
- >=app-text/libexttextcat-3.2
- >=app-text/libebook-0.1.1
- >=app-text/libetonyek-0.1.2
+ >=app-text/libebook-0.1
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
app-text/liblangtag
>=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.5
+ >=app-text/libmwaw-0.3.1
>=app-text/libodfgen-0.1.0
app-text/libwpd:0.10[tools]
app-text/libwpg:0.3
- =app-text/libwps-0.4*
- >=app-text/poppler-0.16:=[cxx]
+ >=app-text/libwps-0.4
+ app-text/mythes
+ app-text/poppler:=[cxx]
>=dev-cpp/clucene-2.3.3.4-r2
=dev-cpp/libcmis-0.5*
dev-db/unixODBC
+ dev-lang/perl
>=dev-libs/boost-1.55:=
dev-libs/expat
- >=dev-libs/hyphen-2.7.1
- >=dev-libs/icu-4.8.1.1:=
- =dev-libs/liborcus-0.7*
- >=dev-libs/librevenge-0.0.1
- >=dev-libs/nspr-4.8.8
- >=dev-libs/nss-3.12.9
- >=dev-lang/perl-5.0
+ dev-libs/hyphen
+ dev-libs/icu:=
+ =dev-libs/liborcus-0.9*
+ dev-libs/librevenge
+ dev-libs/nspr
+ dev-libs/nss
!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
libressl? ( dev-libs/libressl )
>=dev-libs/redland-1.0.16
media-gfx/graphite2
- >=media-libs/fontconfig-2.8.0
+ media-libs/fontconfig
media-libs/freetype:2
- >=media-libs/glew-1.10
+ >=media-libs/glew-1.10:=
>=media-libs/harfbuzz-0.9.18:=[icu(+)]
media-libs/lcms:2
- >=media-libs/libpng-1.4:0=
>=media-libs/libcdr-0.1.0
>=media-libs/libfreehand-0.1.0
media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
>=media-libs/libvisio-0.1.0
- >=net-misc/curl-7.21.4
net-libs/neon
+ net-misc/curl
net-nds/openldap
sci-mathematics/lpsolve
virtual/jpeg:0
- >=x11-libs/cairo-1.10.0[X]
+ x11-libs/cairo[X,-xlib-xcb]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
@@ -157,45 +145,41 @@ COMMON_DEPEND="
coinmp? ( sci-libs/coinor-mp )
collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
cups? ( net-print/cups )
- dbus? ( >=dev-libs/dbus-glib-0.92 )
- eds? ( gnome-extra/evolution-data-server )
+ dbus? ( dev-libs/dbus-glib )
+ eds? (
+ dev-libs/glib:2
+ gnome-extra/evolution-data-server
+ )
firebird? ( >=dev-db/firebird-2.5 )
gltf? ( media-libs/libgltf )
- gnome? ( gnome-base/gconf:2 )
- gtk? (
- x11-libs/gdk-pixbuf[X]
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? ( >=x11-libs/gtk+-3.8:3 )
+ gnome? ( gnome-base/dconf )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
)
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- libreoffice_extensions_wiki-publisher? (
- dev-java/commons-codec:0
- dev-java/commons-httpclient:3
- dev-java/commons-lang:2.1
- dev-java/commons-logging:0
+ gtk? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
)
- mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? (
+ gtk3? (
dev-libs/glib:2
- >=net-libs/telepathy-glib-0.18.0
- >=x11-libs/gtk+-2.24:2
+ dev-libs/gobject-introspection
+ >=x11-libs/gtk+-3.8:3
)
+ jemalloc? ( dev-libs/jemalloc )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mysql? ( dev-db/mysql-connector-c++ )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+ telepathy? ( net-libs/telepathy-glib )
"
RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice-bin
!app-office/libreoffice-bin-debug
- !<app-office/openoffice-bin-3.4.0-r1
!app-office/openoffice
- media-fonts/libertine
media-fonts/liberation-fonts
+ media-fonts/libertine
media-fonts/urw-fonts
java? ( >=virtual/jre-1.6 )
kde? ( $(add_kdeapps_dep kioclient) )
@@ -214,6 +198,7 @@ fi
# after everything upstream is under gbuild
# as dmake execute tests right away
DEPEND="${COMMON_DEPEND}
+ !<sys-devel/make-3.82
>=dev-libs/libatomic_ops-7.2d
>=dev-libs/libxml2-2.7.8
dev-libs/libxslt
@@ -224,12 +209,9 @@ DEPEND="${COMMON_DEPEND}
>=dev-util/mdds-0.12.0:0=
media-libs/glm
net-misc/npapi-sdk
- >=sys-apps/findutils-4.4.2
sys-devel/bison
- sys-apps/coreutils
sys-devel/flex
sys-devel/gettext
- >=sys-devel/make-3.82
sys-devel/ucpp
sys-libs/zlib
virtual/pkgconfig
@@ -240,19 +222,18 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xineramaproto
x11-proto/xproto
java? (
+ dev-java/ant-core
>=virtual/jdk-1.6
- >=dev-java/ant-core-1.7
)
odk? ( >=app-doc/doxygen-1.8.4 )
test? ( dev-util/cppunit )
"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
collada? ( gltf )
- gnome? ( gtk )
eds? ( gnome )
+ gnome? ( gtk )
telepathy? ( gtk )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
@@ -261,6 +242,10 @@ REQUIRED_USE="
"
PATCHES=(
+ # from 5.2 branch
+ "${FILESDIR}/${PN}-5.1.4.2-gcc6.patch"
+ "${FILESDIR}/${PN}-curl-7.50.0.patch"
+
# not upstreamable stuff
"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
@@ -271,21 +256,25 @@ PATCHES=(
)
CHECKREQS_MEMORY="512M"
-if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
-pkg_pretend() {
- local pgslot
+if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+elif [[ ${MERGE_TYPE} != binary ]] ; then
+ CHECKREQS_DISK_BUILD="6G"
+fi
+pkg_pretend() {
use java || \
ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
if [[ ${MERGE_TYPE} != binary ]]; then
check-reqs_pkg_pretend
- if [[ $(gcc-major-version) -lt 4 ]] || {
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; }
- then
- eerror "Compilation with gcc older than 4.6 is not supported"
+ if [[ $(tc-getCC) == clang ]] ; then
+ : # ignore clang, which works
+ elif [[ $(gcc-major-version) -lt 4 ]] || {
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
+ eerror "Compilation with gcc older than 4.7 is not supported"
die "Too old gcc found."
fi
fi
@@ -293,7 +282,7 @@ pkg_pretend() {
# Ensure pg version but we have to be sure the pg is installed (first
# install on clean system)
if use postgres && has_version dev-db/postgresql; then
- pgslot=$(postgresql-config show)
+ local pgslot=$(postgresql-config show)
if [[ ${pgslot//.} -lt 90 ]] ; then
eerror "PostgreSQL slot must be set to 9.0 or higher."
eerror " postgresql-config set 9.0"
@@ -338,16 +327,9 @@ src_unpack() {
}
src_prepare() {
- # patchset
- if [[ -n ${PATCHSET} ]]; then
- EPATCH_FORCE="yes" \
- EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
- EPATCH_SUFFIX="patch" \
- epatch
- fi
-
- epatch "${PATCHES[@]}"
- epatch_user
+ [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
+ eapply "${PATCHES[@]}"
+ eapply_user
AT_M4DIR="m4" eautoreconf
# hack in the autogen.sh
@@ -377,12 +359,17 @@ src_prepare() {
src_configure() {
local java_opts
local internal_libs
- local lo_ext
local ext_opts
+ # Set up Google API keys, see http://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 2.7 enablement:
+ # System python enablement:
export PYTHON_CFLAGS=$(python_get_CFLAGS)
export PYTHON_LIBS=$(python_get_LIBS)
@@ -425,15 +412,6 @@ src_configure() {
use libreoffice_extensions_scripting-javascript && \
java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
-
- if use libreoffice_extensions_wiki-publisher; then
- java_opts+="
- --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
- --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
- --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
- --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
- "
- fi
fi
# system headers/libs/...: enforce using system packages
@@ -442,11 +420,6 @@ src_configure() {
# --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
- # --disable-gnome-vfs: old gnome virtual fs support
- # --disable-kdeab: kde3 adressbook
- # --disable-kde: kde3 support
- # --disable-systray: quickstarter does not actually work at all so do not
- # promote it
# --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
@@ -471,13 +444,9 @@ src_configure() {
--disable-dependency-tracking \
--disable-epm \
--disable-fetch-external \
- --disable-gnome-vfs \
--disable-gstreamer-0-10 \
--disable-report-builder \
- --disable-kdeab \
- --disable-kde \
--disable-online-update \
- --disable-systray \
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
--with-build-version="Gentoo official package" \
--enable-extension-integration \
@@ -504,9 +473,8 @@ src_configure() {
$(use_enable eds evolution2) \
$(use_enable firebird firebird-sdbc) \
$(use_enable gltf) \
- $(use_enable gnome gconf) \
$(use_enable gnome gio) \
- $(use_enable gnome lockdown) \
+ $(use_enable gnome dconf) \
$(use_enable gstreamer gstreamer-1-0) \
$(use_enable gtk) \
$(use_enable gtk3) \
@@ -514,11 +482,14 @@ src_configure() {
$(use_enable mysql ext-mariadb-connector) \
$(use_enable odk) \
$(use_enable postgres postgresql-sdbc) \
+ $(use_enable quickstarter systray) \
$(use_enable telepathy) \
$(use_enable vlc) \
$(use_with coinmp system-coinmp) \
$(use_with collada system-opencollada) \
$(use_with gltf system-libgltf) \
+ $(use_with google gdrive-client-id ${google_default_client_id}) \
+ $(use_with google gdrive-client-secret ${google_default_client_secret}) \
$(use_with java) \
$(use_with mysql system-mysql-cppconn) \
$(use_with odk doxygen) \
@@ -588,7 +559,7 @@ src_install() {
insinto /usr/$(get_libdir)/libreoffice/help
doins xmlhelp/util/*.xsl
- # Remove desktop files for support to old installs that can't parse mime
+ # Remove desktop files to support old installs that can't parse mime
rm -r "${ED}"usr/share/mimelnk/ || die
# FIXME: Hack add missing file
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index 2c92bb7..e1f2f47 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -14,9 +14,11 @@ version</longdescription>
<flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag>
<flag name="collada">Enable Collada for rendering 3D models stored in *.dae and *.kmz format</flag>
<flag name="gltf">Use media-libs/libgltf for inserting 3D models in the glTF format into presentations</flag>
+ <flag name="google">Enable support for remote files on Google Drive</flag>
<flag name="gtk3">Enable highly experimental gtk3 frontend</flag>
<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
<flag name="odk">Build the Office Development Kit</flag>
+ <flag name="quickstarter">Build the system tray quickstarter</flag>
<flag name="telepathy">Enable document colaboration features using telepathy communication framework.</flag>
<flag name="vlc">Use <pkg>media-video/vlc</pkg> for video embedding</flag>
</use>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/musl:master commit in: app-office/libreoffice/, app-office/libreoffice/files/
@ 2017-03-30 4:20 Aric Belsito
0 siblings, 0 replies; 6+ messages in thread
From: Aric Belsito @ 2017-03-30 4:20 UTC (permalink / raw
To: gentoo-commits
commit: d9465d15086244b950b2a5e6c056c215cdc52cb3
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Thu Mar 30 04:20:08 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Thu Mar 30 04:20:08 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=d9465d15
app-office/libreoffice: add 5.2.6.2
app-office/libreoffice/Manifest | 5 +
.../files/libreoffice-5.2.5.1-glibc-2.24.patch | 10 +
.../files/libreoffice-5.2.5.1-musl-vlc.patch | 10 +
app-office/libreoffice/libreoffice-5.2.6.2.ebuild | 600 +++++++++++++++++++++
4 files changed, 625 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 01165ee..afe8417 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -3,6 +3,8 @@ AUX libreoffice-5.0.5.2-linux-musl.patch 1908 SHA256 b4fe6b57d1351c4d6a28dc67971
AUX libreoffice-5.2-icu58.patch 12602 SHA256 42555c654d29d99a9130d6c164af107b9e94c4012cb51a0411e56dae0a3a913c SHA512 364614ee5aa1606f1d4308e4ba8fa942bcf3f3f0483027e74dc2ea3e7cfa3837b45b49d503fee8d5a591790f2489b864e677615e6715c61d9093ce1dbb99bab4 WHIRLPOOL dcae21697344cc5c605138c5f80dcbfedbb005269a8ad0e4ef34ab9a73876db8b82977f8531fccbc3041fc30baf3727192f7451c9073ecee0f723f74ba6f42b8
AUX libreoffice-5.2-system-pyuno.patch 1590 SHA256 9f42c69cd286561c8ed294d9dff3316cebad2491b5a20880186fd2b30d9aa096 SHA512 34228d6022ba50480940f99d55d8c4bda14becfa51b26af17dadd21e641ac387c04a4f6d4992323248f30f2ca9a37b53741ee8a465a3fccf4be707539a06005b WHIRLPOOL f652a0e7fe681567f9f03c99fe1709e6b9a2346dcd9fd4ed3016b53471a3f20e05eb865a6ff19d3b7dccb0b11c8408fd86d754af1f36024ef137cf33a55d10f2
AUX libreoffice-5.2.3.3-fix-includes.patch 807 SHA256 51052d983eeea85d8d71385e4eeda61b6a8746854fe046b9a91e12c013d9ed89 SHA512 c9e0b05640d7d0e6053b8dd4735664d761a7d381c5b5cbda059fb7b38ab28531c014b6d38f58a0e1f7171a43d62f04d8ecbb7b6b008d0ad30017228ec7e6601a WHIRLPOOL 105a2f0345a23846af3b50c3571f4602831e96e7691fdce12984ead21f42d9dffb6d0e188133dda3a282f1f73f862f2b424f7406587a26b77a247b3b2e0a4e67
+AUX libreoffice-5.2.5.1-glibc-2.24.patch 361 SHA256 3f87a11b6d1218a4510835e12c446821cfd47fe61feb6f59aeb4a8c774f9dffe SHA512 b5ff4c6d3771bcdde21613ad15459120ac1d759b1b3b422b5cba3ee23f7ddf88fde274956f2c91f0a6a37cb36a8d90d8f90bd865e6c2d3ff7c2100e2b469dbd8 WHIRLPOOL 8a0150685640a2adefa7d7cc3b50e37801cbd1de5570d037df8ba2b34f5b54fecb9732f7a793be4f20961b11ba06805113172321df43952dade4ca662835394e
+AUX libreoffice-5.2.5.1-musl-vlc.patch 357 SHA256 adda6aa44231b030a205fbaced361c7d8e7e4763300a6a54693e3a1e148b6f6b SHA512 260baabc2dc3dffe3d575e4a18322a4ea9669eff7a464a0c9e85b16ffb4fa67a62ea039e69074ef94093dcca9479e51699d3e55f34a4380d43b27145f345a999 WHIRLPOOL f204f62f405604b80ff1cf204c0a2eed53f504add6692c53b7d3dc761a72d894edb473181fd154e98459bd0b45e6f865d0c5e384ebb631710353d009b243b5aa
DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec
DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5
DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 SHA256 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a WHIRLPOOL a5156d06323699d2cbf539f14f5f44f54ebf33e86c7f14e98acd4c6e29c3e496f91dd6792401148ffa32e3dcb1cd4f087ed804e306b241cef86de0aa347d25d4
@@ -11,7 +13,10 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab0
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
DIST ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 1769329 SHA256 3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 SHA512 2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5 WHIRLPOOL 29ddaef03d46fe08aa2dba200be755817f8e77de3bbbb3ed86dae65e891239f3051f79fdfadec6ae56023197e32e1c44a94385a1ce306081f3bf94be6226f8c7
DIST libreoffice-5.2.3.3.tar.xz 183870036 SHA256 a8f1365d166bf24ac4b97ed8466f46cca29cf72e7e992bb84d24c3dc8e1c32c1 SHA512 8628a820ad620ca946457adf0b0ed9741f13c67aa061761d04b743340d13ef498f23e75e6183206b34ce7154b1ec3096f8afcb69b2ab02e17c6ef00155e1b084 WHIRLPOOL 17edc4dd47938db71a5b5ec3ba318d02fbcab7c389bdb51432d36f1f018667c58b1ec3b38b09610542653c9442b65950e0daa062149cfeb7e35e699c6c9f89eb
+DIST libreoffice-5.2.6.2.tar.xz 164804780 SHA256 3d49e339631114652820b890859eef85601d1aeda2acb1309f0de24009f53570 SHA512 b84420a773739162555b28700a5588771a1fa7131d82a5861799f402df65f84a17715f80b8ba9aa793c1fed78c7e38b8bfbff2c3b9e0e8f119c9b453a8e6edc9 WHIRLPOOL fe6e739c78172add6fb1235c5ddcffc7d62767008ca5acafd2d95ba143367b26bae94c7f295527d55312ecec4bee47d53daab8b2f2ac159f8d581c7532e3ee48
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
DIST libreoffice-help-5.2.3.3.tar.xz 1936920 SHA256 443be26b35c6b454d5d1ca17c58cc33ae90946f8e1003a98118467b49989cd3a SHA512 927421887d2d41538ba79d6d584bf84ad3fd7a58d3b9d95801cf67a0dcce61421934cd273a38803b5519c434232d1aaeb88d52cab391ae7292809ebbb3b501f9 WHIRLPOOL 36da9c200c0174f745827afb099530d06f6489f8be4a521b7dd37441fc2a1f9691a7d4a07e2914dec0f57845f96e4e143133105e5a730eebeb2e1c5c3283d3bb
+DIST libreoffice-help-5.2.6.2.tar.xz 1446048 SHA256 c0cd648d9994814925083d1a891b63b5e5233718eb8f8782810bb602c0fdb88b SHA512 10568ffb0d7fbd1a01681e52e594b39f120802e8fd70d12824a2be0185bdf491c28818fc8a9fe16fed8533fa61119b90d6f0a1a8f9488a83b33f6a6be2d75e37 WHIRLPOOL e3921ba0b64819b19cd278f7a87dec4313e6cd9df58108170e2d438b0c08644395ac568f7cc601e88ff466e78fa6bbd426fdc9b4a704d3d8693b8c0cb1537ab8
EBUILD libreoffice-5.2.3.3-r1.ebuild 17720 SHA256 39222465e69a399e878ed3037d71d153aa844277c16e055c3e41aabd4b2c3199 SHA512 1979e33ff786e0166c58cb58f5c2a8e0da47aa40df8c0ad038ed4a460d255f10d87745d961c4174c811e4670eb688bacd32c4b6164f173214f8e2f74aaa49bb2 WHIRLPOOL 0bf9eff2851c1cecccaf6ef06e5139ac93902cef9a5559f39edbf9b5605ca03296bdb28b8f11ae07765fb9df44f3f29ac4d55ae0805c3b35b3385de617b28d7b
+EBUILD libreoffice-5.2.6.2.ebuild 18066 SHA256 9f85ce738a3df5ac6a2d1e72c70faecb9a3c8d1014ed6f3ad5c5c94166ca41f6 SHA512 91633113614f2fd51ba24fc867c70345a18872c1eb16b4b52716270451e01fd7725820889b628de1f078ad6c3898819df9b5e777f30e57d741296e6ab04baab4 WHIRLPOOL 1d8db1c20a9a258c02bc10d3598d8c7374859373b1078b77f19e5418ae93a3c5c1f36e6f0edaf7233f44b08c3259667e197349387a5e08ff67552f4e36fb701c
MISC metadata.xml 1506 SHA256 e9682eb8fcf1609f39f15680caa33f2b87151ecca4189964ea750a5e8a09485a SHA512 20e6d0f46aa551074f0f0b794d6c4c92e011bf6ab854c7111fad081f9f9d9fe51e370decbbbe9b2cc74a7d1369e38fe0cb3c2768c2d287fc30346c8e4d6783aa WHIRLPOOL ae9571006a3f933ee16ea4e34e3a3cb1b017ce1734e4e09f4ff9f421031c10ebe7c1b5ee87ff84532c13805ec7b4284e14b4aab3d06767d28268b58a768ce9c1
diff --git a/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch b/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch
new file mode 100644
index 0000000..d714ff2
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch
@@ -0,0 +1,10 @@
+--- libreoffice-5.2.5.1.orig/desktop/unx/source/pagein.c 2017-01-11 16:54:33.000000000 -0800
++++ libreoffice-5.2.5.1/desktop/unx/source/pagein.c 2017-02-03 10:22:51.697673613 -0800
+@@ -26,6 +26,7 @@
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+
+ /* do_pagein */
+ static void do_pagein (const char * filename)
diff --git a/app-office/libreoffice/files/libreoffice-5.2.5.1-musl-vlc.patch b/app-office/libreoffice/files/libreoffice-5.2.5.1-musl-vlc.patch
new file mode 100644
index 0000000..2188309
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.2.5.1-musl-vlc.patch
@@ -0,0 +1,10 @@
+--- libreoffice-5.2.5.1.orig/avmedia/source/vlc/wrapper/Types.hxx 2017-01-12 01:54:33.000000000 +0100
++++ libreoffice-5.2.5.1/avmedia/source/vlc/wrapper/Types.hxx 2017-01-27 20:03:39.243895504 +0100
+@@ -15,6 +15,7 @@
+ #if defined(_WIN32)
+ typedef __int64 libvlc_time_t;
+ #else
++# include <stdint.h>
+ typedef int64_t libvlc_time_t;
+ #endif
+
diff --git a/app-office/libreoffice/libreoffice-5.2.6.2.ebuild b/app-office/libreoffice/libreoffice-5.2.6.2.ebuild
new file mode 100644
index 0000000..6a5ece5
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-5.2.6.2.ebuild
@@ -0,0 +1,600 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_REQUIRED="optional"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+ http://dev-builds.libreoffice.org/pre-releases/src
+ http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+ http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ for mod in ${MODULES}; do
+ if [[ ${mod} == core ]]; then
+ SRC_URI+=" ${i}/${P}.tar.xz"
+ else
+ SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+ fi
+ done
+ unset mod
+ 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=(
+ "${ADDONS_URI}/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz" # modifies source code
+ "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-text/hunspell
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libodfgen-0.1.0
+ app-text/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-1.55:=
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ =dev-libs/liborcus-0.11*
+ dev-libs/librevenge
+ dev-libs/nspr
+ dev-libs/nss
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+ libressl? ( dev-libs/libressl )
+ >=dev-libs/redland-1.0.16
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/glew-1.10:=
+ >=media-libs/harfbuzz-0.9.18:=[icu(+)]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ net-libs/neon
+ net-misc/curl
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ virtual/jpeg:0
+ x11-libs/cairo[X,-xlib-xcb(-)]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ virtual/glu
+ virtual/opengl
+ bluetooth? ( net-wireless/bluez )
+ coinmp? ( sci-libs/coinor-mp )
+ collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
+ cups? ( net-print/cups )
+ dbus? ( dev-libs/dbus-glib )
+ eds? (
+ dev-libs/glib:2
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-2.5 )
+ gltf? ( media-libs/libgltf )
+ gnome? ( gnome-base/dconf )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ )
+ gtk3? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ >=x11-libs/gtk+-3.8:3
+ )
+ jemalloc? ( dev-libs/jemalloc )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mysql? ( dev-db/mysql-connector-c++ )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+ telepathy? ( net-libs/telepathy-glib )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ media-fonts/libertine
+ media-fonts/urw-fonts
+ java? ( >=virtual/jre-1.6 )
+ kde? ( $(add_kdeapps_dep kioclient) )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+ !<sys-devel/make-3.82
+ >=dev-libs/libatomic_ops-7.2d
+ >=dev-libs/libxml2-2.7.8
+ dev-libs/libxslt
+ dev-perl/Archive-Zip
+ dev-util/cppunit
+ >=dev-util/gperf-3
+ dev-util/intltool
+ >=dev-util/mdds-1.2.0:1=
+ media-libs/glm
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/ucpp
+ sys-libs/zlib
+ virtual/pkgconfig
+ x11-libs/libXt
+ x11-libs/libXtst
+ x11-proto/randrproto
+ x11-proto/xextproto
+ x11-proto/xineramaproto
+ x11-proto/xproto
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? ( dev-util/cppunit )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ collada? ( gltf )
+ eds? ( gnome )
+ gnome? ( gtk )
+ telepathy? ( gtk )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+PATCHES=(
+ # from master branch
+ "${FILESDIR}/${PN}-5.2-icu58.patch"
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.2-system-pyuno.patch"
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+
+ # musl patches
+ "${FILESDIR}/${PN}-4.4.1.2-musl-fix-execinfo.patch"
+ "${FILESDIR}/${PN}-5.0.5.2-linux-musl.patch"
+ "${FILESDIR}/${PN}-5.2.3.3-fix-includes.patch"
+ "${FILESDIR}/${PN}-5.2.5.1-musl-vlc.patch"
+)
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_pkg_pretend
+
+ if ! $(tc-is-clang) && { [[ $(gcc-major-version) -lt 4 ]] ||
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
+ eerror "Compilation with gcc older than 4.7 is not supported"
+ die "Too old gcc found."
+ fi
+ fi
+
+ # Ensure pg version but we have to be sure the pg is installed (first
+ # install on clean system)
+ if use postgres && has_version dev-db/postgresql; then
+ local pgslot=$(postgresql-config show)
+ if [[ ${pgslot//.} -lt 90 ]] ; then
+ eerror "PostgreSQL slot must be set to 9.0 or higher."
+ eerror " postgresql-config set 9.0"
+ die "PostgreSQL slot is not set to 9.0 or higher."
+ fi
+ fi
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ kde4-base_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_pkg_setup
+ fi
+}
+
+src_unpack() {
+ local mod
+
+ [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+ use branding && unpack "${BRANDING}"
+
+ if [[ ${PV} != *9999* ]]; then
+ unpack "${P}.tar.xz"
+ for mod in ${MODULES}; do
+ [[ ${mod} == core ]] && continue
+ unpack "${PN}-${mod}-${PV}.tar.xz"
+ done
+ else
+ local base_uri branch checkout mypv
+ base_uri="git://anongit.freedesktop.org"
+ for mod in ${MODULES}; do
+ branch="master"
+ mypv=${PV/.9999}
+ [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+ [[ ${mod} != core ]] && checkout="${S}/${mod}"
+ [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+ git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
+ done
+ fi
+}
+
+src_prepare() {
+ [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
+ eapply "${PATCHES[@]}"
+ eapply_user
+
+ 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" "${S}/icon-themes/galaxy/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ local java_opts
+ local ext_opts
+
+ # Set up Google API keys, see http://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 collada; then
+ export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+ export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+ else
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ java_opts="
+ --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 && \
+ java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+ use libreoffice_extensions_scripting-javascript && \
+ java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+ fi
+
+ if use kde; then
+ # bug 544108, bug 599076
+ export QMAKEQT4="$(qt4_get_bindir)/qmake"
+ export MOCQT4="$(qt4_get_bindir)/moc"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-graphite: disabling causes build breakages
+ # --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
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+ --with-system-dicts \
+ --with-system-headers \
+ --with-system-jars \
+ --with-system-libs \
+ --enable-cairo-canvas \
+ --enable-graphite \
+ --enable-largefile \
+ --enable-mergelibs \
+ --enable-neon \
+ --enable-python=system \
+ --enable-randr \
+ --enable-release-build \
+ --disable-ccache \
+ --disable-crashdump \
+ --disable-dependency-tracking \
+ --disable-epm \
+ --disable-fetch-external \
+ --disable-gstreamer-0-10 \
+ --disable-hardlink-deliver \
+ --disable-online-update \
+ --disable-report-builder \
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+ --with-build-version="Gentoo official package" \
+ --enable-extension-integration \
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-tar="${DISTDIR}" \
+ --with-lang="" \
+ --with-parallelism=$(makeopts_jobs) \
+ --with-system-ucpp \
+ --with-vendor="Gentoo Foundation" \
+ --with-x \
+ --without-fonts \
+ --without-myspell-dicts \
+ --without-help \
+ --with-helppack-integration \
+ --without-sun-templates \
+ --without-system-sane \
+ $(use_enable bluetooth sdremote-bluetooth) \
+ $(use_enable coinmp) \
+ $(use_enable collada) \
+ $(use_enable cups) \
+ $(use_enable debug) \
+ $(use_enable dbus) \
+ $(use_enable eds evolution2) \
+ $(use_enable firebird firebird-sdbc) \
+ $(use_enable gltf) \
+ $(use_enable gnome gio) \
+ $(use_enable gnome dconf) \
+ $(use_enable gstreamer gstreamer-1-0) \
+ $(use_enable gtk) \
+ $(use_enable gtk3) \
+ $(use_enable kde kde4) \
+ $(use_enable mysql ext-mariadb-connector) \
+ $(use_enable odk) \
+ $(use_enable pdfimport) \
+ $(use_enable postgres postgresql-sdbc) \
+ $(use_enable quickstarter systray) \
+ $(use_enable telepathy) \
+ $(use_enable vlc) \
+ $(use_with coinmp system-coinmp) \
+ $(use_with collada system-opencollada) \
+ $(use_with gltf system-libgltf) \
+ $(use_with googledrive gdrive-client-id ${google_default_client_id}) \
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
+ $(use_with java) \
+ $(use_with mysql system-mysql-cppconn) \
+ $(use_with odk doxygen) \
+ ${java_opts} \
+ ${ext_opts}
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=icon-themes/galaxy/res/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk3; then
+ dosym /usr/$(get_libdir)/libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ # Remove desktop files to support old installs that can't parse mime
+ rm -r "${ED}"usr/share/mimelnk/ || die
+
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+ # Cache updates - all handled by kde eclass for all environments
+ kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+}
+
+pkg_postrm() {
+ kde4-base_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/musl:master commit in: app-office/libreoffice/, app-office/libreoffice/files/
@ 2017-06-30 11:07 Anthony G. Basile
0 siblings, 0 replies; 6+ messages in thread
From: Anthony G. Basile @ 2017-06-30 11:07 UTC (permalink / raw
To: gentoo-commits
commit: 9cdc5e686800974a71ff3029a37ae25faae0ee2c
Author: callmetango <callmetango <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Thu Jun 29 08:05:23 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jun 30 11:06:58 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=9cdc5e68
app-office/libreoffice: fixed compilation of version 5.3.3.2
* forward ported libreoffice-5.2-system-pyuno patch
* created libreoffice-5.3.0.3-linux-musl patch based on Alpine Linux one
app-office/libreoffice/Manifest | 4 +-
.../files/libreoffice-5.3-system-pyuno.patch | 47 ++++++++++++++++
.../files/libreoffice-5.3.0.3-linux-musl.patch | 62 ++++++++++++++++++++++
app-office/libreoffice/libreoffice-5.3.3.2.ebuild | 2 +-
4 files changed, 113 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 2f89158..6c82d14 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,6 +5,8 @@ AUX libreoffice-5.2-system-pyuno.patch 1590 SHA256 9f42c69cd286561c8ed294d9dff33
AUX libreoffice-5.2.3.3-fix-includes.patch 807 SHA256 51052d983eeea85d8d71385e4eeda61b6a8746854fe046b9a91e12c013d9ed89 SHA512 c9e0b05640d7d0e6053b8dd4735664d761a7d381c5b5cbda059fb7b38ab28531c014b6d38f58a0e1f7171a43d62f04d8ecbb7b6b008d0ad30017228ec7e6601a WHIRLPOOL 105a2f0345a23846af3b50c3571f4602831e96e7691fdce12984ead21f42d9dffb6d0e188133dda3a282f1f73f862f2b424f7406587a26b77a247b3b2e0a4e67
AUX libreoffice-5.2.5.1-glibc-2.24.patch 361 SHA256 3f87a11b6d1218a4510835e12c446821cfd47fe61feb6f59aeb4a8c774f9dffe SHA512 b5ff4c6d3771bcdde21613ad15459120ac1d759b1b3b422b5cba3ee23f7ddf88fde274956f2c91f0a6a37cb36a8d90d8f90bd865e6c2d3ff7c2100e2b469dbd8 WHIRLPOOL 8a0150685640a2adefa7d7cc3b50e37801cbd1de5570d037df8ba2b34f5b54fecb9732f7a793be4f20961b11ba06805113172321df43952dade4ca662835394e
AUX libreoffice-5.2.5.1-musl-vlc.patch 357 SHA256 adda6aa44231b030a205fbaced361c7d8e7e4763300a6a54693e3a1e148b6f6b SHA512 260baabc2dc3dffe3d575e4a18322a4ea9669eff7a464a0c9e85b16ffb4fa67a62ea039e69074ef94093dcca9479e51699d3e55f34a4380d43b27145f345a999 WHIRLPOOL f204f62f405604b80ff1cf204c0a2eed53f504add6692c53b7d3dc761a72d894edb473181fd154e98459bd0b45e6f865d0c5e384ebb631710353d009b243b5aa
+AUX libreoffice-5.3-system-pyuno.patch 1665 SHA256 87a43eef9b77328b9c66a48d39ca81a89a7f25f9476e1a830b570a48d72fff4d SHA512 3883b2b4c7a0513b1e33d50f4e2e6fc7f72e679cb1d7357c1e6ab4993bfae630cd6abd2112e5cdeb8baf181f0beabe9206a4fe8694b31cd3f855ce55cbe4b73c WHIRLPOOL 490d369b3789f18647e8c702335fe16ca9211e4fd6d3aa4ee62ce6ddb0a964cae21792d48e673fe6d7859fb35da9f430c05caa2796225874b80b040cf056d19f
+AUX libreoffice-5.3.0.3-linux-musl.patch 1952 SHA256 8aebc0eb195dcd75d0245136edaaae34417d394ccbd30e0d5bd563556f7851b1 SHA512 14be93ca7273d05a25230a7d20b23207297199918aa352af6b96506b94667f05fc340bc92d1332723763ead20524df46f81de0d9c60c6f1808b2a1a164e6d1ff WHIRLPOOL 792569ce09db2a3933faddeb8d5092695f897056885c9a435609405a58ea5aad78947b16d7eaf3ddcf865080bea2dcf7655ca2261d2d7511874b101ef14955ed
DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec
DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5
DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 SHA256 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a WHIRLPOOL a5156d06323699d2cbf539f14f5f44f54ebf33e86c7f14e98acd4c6e29c3e496f91dd6792401148ffa32e3dcb1cd4f087ed804e306b241cef86de0aa347d25d4
@@ -19,5 +21,5 @@ DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e06
DIST libreoffice-help-5.2.7.2.tar.xz 1940516 SHA256 f7d35c460da96ed2d52cf97baef159382b38e5ce4579c34e65480ff2911cac4b SHA512 c86bc17448fcd1da01e13d3e9fee739610fde390abaf0635cc4593755d102da08a5eea0533076e1a0f8d89f0b32ba5086b155b9b388f317a5e4c669bf17769e1 WHIRLPOOL 4da96a14b70be718109eda5ced62cec85b96e9028fcf65d729a99604598de81edc097bc06577f3ce7958de1316b04d2d2f1f2782c6504a487ffc6ebaaf7feca6
DIST libreoffice-help-5.3.3.2.tar.xz 2127200 SHA256 f9b4fef5f449cdbbcb5796908d0536576585c511173bfccf2ca049b5dcbb0dc7 SHA512 5c73997cf95e4d5acb2693560ac49aef5f589cee22ce22de1ee8f0e0fa2189d8893afe70790895160feb832049943cfc5e1d322bbd9fd7c7d0bbf3b11a8d9a25 WHIRLPOOL fd3c3afc070cb4fe1145ac631e80bbea3333a36c1d10a43b5a16d1dbdee5e78a614617e6290b961ad951b639410205cc5bdadbefe8b55639046ec9633ff269c8
EBUILD libreoffice-5.2.7.2.ebuild 18066 SHA256 c5ddfc32e04d5b770b01c6f728d943e6ba9196c4ac93d419b5e3552fbc020161 SHA512 8c8bac08d79db6b78ea4d101ef7765974319898c30ffc4f933ee2fedfe51d1c72a1a381ec66acdd9aa68a5e33f4597daab33776915381626bd4ef5e160191084 WHIRLPOOL e4b6579fa88063cb3118fa5bdc88c41ddf19eada26953818d37eeac9d6535b33efda27cb5af36624d83cc6755e1b95dbca7b707e1fdc93e7d21d761b391c5c75
-EBUILD libreoffice-5.3.3.2.ebuild 18381 SHA256 49de133af81ea9cd37355810af8a6610ce4e80f69c2376403c2eb2ecd501886a SHA512 2b9ce99b6d87262cc36176370f56ccb96e36aabd0752383832bf7dbdff2123f14a5298a018d94f238fd1593e4ae372744bc2734a5faf2c6b8c0252dbdbf8dbab WHIRLPOOL dfcd8364d18befbd27d1cfe36a6e724a423600ea834f5618761adf76698e4e1e44815899aefa5b4e5b53a3e7388c51f1ddd62f5c7f0576d9d0d24bad5ea5d68f
+EBUILD libreoffice-5.3.3.2.ebuild 18381 SHA256 7719d8904b8b867932d0fac42482d0962c4870f2fb79097ca91121a151a8d8bc SHA512 483fcad9125611985e559df9e4c87a8c81754f632f2c0c53afa5c82008b8fe426503125cbc8fb4afb54a46d2a3898aa5934bb2b0cb1e7f530b9704eea52054e7 WHIRLPOOL 8241fd2ed8f78de61607f4530b68eba4e37831d6616f04427f8dd3c615982be3830e88ac5ca6857031f85cc58fb0ed2a7e211f6272783cb259aa922fa5946101
MISC metadata.xml 1506 SHA256 e9682eb8fcf1609f39f15680caa33f2b87151ecca4189964ea750a5e8a09485a SHA512 20e6d0f46aa551074f0f0b794d6c4c92e011bf6ab854c7111fad081f9f9d9fe51e370decbbbe9b2cc74a7d1369e38fe0cb3c2768c2d287fc30346c8e4d6783aa WHIRLPOOL ae9571006a3f933ee16ea4e34e3a3cb1b017ce1734e4e09f4ff9f421031c10ebe7c1b5ee87ff84532c13805ec7b4284e14b4aab3d06767d28268b58a768ce9c1
diff --git a/app-office/libreoffice/files/libreoffice-5.3-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-5.3-system-pyuno.patch
new file mode 100644
index 0000000..3ab3e82
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.3-system-pyuno.patch
@@ -0,0 +1,47 @@
+diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
+index a259bf6..672fa23 100755
+--- a/desktop/scripts/soffice.sh
++++ b/desktop/scripts/soffice.sh
+@@ -139,6 +139,9 @@ if echo "$checks" | grep -q "cc" ; then
+ exit 1;
+ fi
+
++PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
++export PYTHONPATH
++
+ case "`uname -s`" in
+ NetBSD|OpenBSD|DragonFly)
+ # this is a temporary hack until we can live with the default search paths
+
+--- a/pyuno/source/module/uno.py 2016-08-07 20:57:51.653712240 -0400
++++ b/pyuno/source/module/uno.py 2016-08-07 20:59:33.958896861 -0400
+@@ -16,11 +16,16 @@
+ # except in compliance with the License. You may obtain a copy of
+ # the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ #
++import os
+ import pyuno
+ import sys
+ import traceback
+ import warnings
+
++sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program')
++if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
++ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc"
++
+ # since on Windows sal3.dll no longer calls WSAStartup
+ import socket
+
+diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py
+index 99d3b03..704edab 100755
+--- a/pyuno/source/officehelper.py
++++ b/pyuno/source/officehelper.py
+@@ -44,7 +44,7 @@ def bootstrap():
+ if "UNO_PATH" in os.environ:
+ sOffice = os.environ["UNO_PATH"]
+ else:
+- sOffice = "" # lets hope for the best
++ sOffice = "%eprefix%/usr/%libdir%/libreoffice/program"
+ sOffice = os.path.join(sOffice, "soffice")
+ if platform.startswith("win"):
+ sOffice += ".exe"
diff --git a/app-office/libreoffice/files/libreoffice-5.3.0.3-linux-musl.patch b/app-office/libreoffice/files/libreoffice-5.3.0.3-linux-musl.patch
new file mode 100644
index 0000000..45cc32b
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.3.0.3-linux-musl.patch
@@ -0,0 +1,62 @@
+Taken from https://git.alpinelinux.org/cgit/aports/tree/community/libreoffice/linux-musl.patch?id=23119189c868089ed1cc1016c7bc528fcb90b5e8
+
+--- libreoffice-5.3.0.3/configure.ac.orig 2017-01-26 22:22:46.000000000 +0000
++++ libreoffice-5.3.0.3/configure.ac 2017-02-08 13:14:16.777547599 +0000
+@@ -652,7 +652,7 @@
+ fi
+ ;;
+
+-linux-gnu*|k*bsd*-gnu*)
++linux-gnu*|linux-musl*|k*bsd*-gnu*)
+ test_gtk=yes
+ build_gstreamer_1_0=yes
+ build_gstreamer_0_10=yes
+@@ -4170,7 +4170,7 @@
+ esac
+ ;;
+
+-linux-gnu*)
++linux-gnu*|linux-musl*)
+ COM=GCC
+ USING_X11=TRUE
+ OS=LINUX
+@@ -7197,7 +7197,7 @@
+ test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
+ ;;
+
+- linux-gnu*)
++ linux-gnu*|linux-musl*)
+ JAVAINC="-I$JAVA_HOME/include"
+ JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
+ test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
+@@ -9748,21 +9748,6 @@
+ fi
+ AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA)
+
+-dnl ***************************************
+-dnl testing libc version for Linux...
+-dnl ***************************************
+-if test "$_os" = "Linux"; then
+- AC_MSG_CHECKING([whether libc is >= 2.1.1])
+- exec 6>/dev/null # no output
+- AC_CHECK_LIB(c, gnu_get_libc_version, HAVE_LIBC=yes; export HAVE_LIBC)
+- exec 6>&1 # output on again
+- if test "$HAVE_LIBC"; then
+- AC_MSG_RESULT([yes])
+- else
+- AC_MSG_ERROR([no, upgrade libc])
+- fi
+-fi
+-
+ dnl =========================================
+ dnl Check for the Windows SDK.
+ dnl =========================================
+@@ -12775,7 +12760,7 @@
+
+ case "$host_os" in
+
+- aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*)
++ aix*|dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*)
+ if test "$ENABLE_JAVA" != ""; then
+ pathmunge "$JAVA_HOME/bin" "after"
+ fi
diff --git a/app-office/libreoffice/libreoffice-5.3.3.2.ebuild b/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
index 8b27176..5c85f98 100644
--- a/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
@@ -249,7 +249,7 @@ PATCHES=(
# musl patches
"${FILESDIR}/${PN}-4.4.1.2-musl-fix-execinfo.patch"
- "${FILESDIR}/${PN}-5.0.5.2-linux-musl.patch"
+ "${FILESDIR}/${PN}-5.3.0.3-linux-musl.patch"
"${FILESDIR}/${PN}-5.2.3.3-fix-includes.patch"
"${FILESDIR}/${PN}-5.2.5.1-musl-vlc.patch"
)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/musl:master commit in: app-office/libreoffice/, app-office/libreoffice/files/
@ 2019-01-15 10:30 Anthony G. Basile
0 siblings, 0 replies; 6+ messages in thread
From: Anthony G. Basile @ 2019-01-15 10:30 UTC (permalink / raw
To: gentoo-commits
commit: f59563efa6da68cb2767e5b6d44c65934d4836db
Author: callmetango <callmetango <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Tue Jan 8 06:49:45 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jan 15 10:29:59 2019 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=f59563ef
app-office/libreoffice: version bump to 6.1.4.2
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
app-office/libreoffice/Manifest | 13 +-
.../files/libreoffice-6.1-nomancompress.patch | 29 ++
...eoffice-6.1.4.2-disable-liborcus-unittest.patch | 13 +
.../files/libreoffice-6.1.4.2-linux-musl.patch | 60 +++
.../libreoffice-6.1.4.2-musl-fix-execinfo.patch | 39 ++
.../libreoffice-6.1.4.2-musl-fix-includes.patch | 13 +
.../files/libreoffice-6.1.4.2-musl-stacksize.patch | 39 ++
app-office/libreoffice/libreoffice-6.1.4.2.ebuild | 578 +++++++++++++++++++++
8 files changed, 773 insertions(+), 11 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 1bba52d..866b812 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,12 +1,3 @@
-AUX libreoffice-5.2.5.1-glibc-2.24.patch 361 BLAKE2B d95ded4f051c77aed22ce99f6273b73ec0893190622f55a3d6d3c3e3e53c59a2f3ce3f645b011c1afa02b727ee803898c65f8feff723955a2fe1a69de6d24480 SHA512 b5ff4c6d3771bcdde21613ad15459120ac1d759b1b3b422b5cba3ee23f7ddf88fde274956f2c91f0a6a37cb36a8d90d8f90bd865e6c2d3ff7c2100e2b469dbd8
-AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0ad4b57a3739d6d34a2941f2ea57d3a5c4ab65e3f3c2376243aa88c9c05b1038cf9bfb7605a370d11513bb4553de2d268010519 SHA512 2aa6d1fc96749b79b3291f6e27630c6cf59d2c743f0dd8603867ba8aec2c17f87b70e1dd031365013f7e9ea53c160e9cb3f48af592a587dc05f3ae4cc1b35df6
-AUX libreoffice-5.4-system-pyuno.patch 1399 BLAKE2B d7516b0ac19509dae8eaaac94acad65e35c71b68ea0f2962c41d9422a89993dc90e76b1f7cd3d19f8f3860b443f063ee1c17024c7f56fd3b8470d2b690eb9c32 SHA512 41b57b857a294b8ac234aaf160dbd380008f716ffdf481b7c733f1dab8702876aad827ab9f1b8f2f26778f0b3a6dfdc9e3ae190188a484d9aeb4568df2e9b418
-AUX libreoffice-6.0.3.2-disable-flaky-tests-1.patch 8928 BLAKE2B e5399e0e520dfe4ac5d0a02c3bf3372ccdc7725f073aabb74c36600a7cd09eb45a9e5d5486bf700ae374723206e3a421069b298137d14a9b05e17e70f2d9d3b4 SHA512 ca100dc389ed93a5eeed35f001d9e0f6f886782bfaa3dead3105b9bce91ca9e721354b55cd67fdb40c7d2d64966c530ebc6ba6a4e3c62b0e006759c7b64f1b29
-AUX libreoffice-6.0.3.2-testTdf108947.patch 638 BLAKE2B 38da9bf34a921d22002d45e650c738687706c77a67ac2748ee14efb48f47a328b1339712687b525a4f66a1ad0b36fc69c0613ef441067a206ea4df81754f4727 SHA512 a712fb653d86a74a96d568805ca48d183a7ec71f32ef34cfb98a4999cb7fead3f5cd11f5d8f8944041583d5221b0dbaeb3cdfc625a1958118e867569d0c56479
-AUX libreoffice-6.0.6.2-disable-liborcus-unittest.patch 806 BLAKE2B 80fe7c24fad360092b9642aa2ab6bbe7eadfa561312908a7d2b5541551c6f03f17573b51fdd2d82ea435555dc0762df9d3f07d3d91a8255786ffb82a24d48c34 SHA512 056ec393ef36aa790919bdb976b100593481a3dffec0ec4095023df6706e0a2ccc3aec9383d8382b2fecbc77e13833599ead82fb712d7b7147bdf01175b4c5a9
-AUX libreoffice-6.0.6.2-linux-musl.patch 1812 BLAKE2B 7d18cdbd40d5b2a56f55500b57d6104cdd0bb6211aec5d4096752736cf5e71be1b8770bc6978c466ba16f139ccc3adc769015880c16bacbcbf94a54ee65c5193 SHA512 10a1ee056ebce41b2f6d3863b220f8529f70b7fd159ff2d36967ad96d9653166737db4ba865c10769c37afad553f59fb9629437c0d8a1afbbff963fc36dbbf1a
-AUX libreoffice-6.0.6.2-musl-fix-execinfo.patch 1014 BLAKE2B d252b43c98ebf9708430d0531d0ed9f5b99f249a98fbab48f13dc750a5e5091442ae8d0c56ba81eb4a2c634be81bec6d82bbc94bda8b7b23a2ab3d9509524e3d SHA512 4aa595588226ac2060ae78f4f857db1b148735429a47389f75313df61cabf0819ad2add15c09cae5c5ebbce64852589ca89932c72281ba662ab53dddec4e1336
-AUX libreoffice-6.0.6.2-musl-fix-includes.patch 1123 BLAKE2B fc1c1a871ba0f8d903d0f06a9bfa71890ee5def1f55345b47d12cabb762510149a9a49e761b2ced2452b44a505ad3685f8d5ecdf23fac90871c13058c418cdf9 SHA512 ae36500897db9d758e95da1791ef2577d59b0e0865baba316b4a1f1f48ce9fd5e52fc3f14fa45aeeab73c5b93f57e89f9a42c996bdb3c85eb3beb2634543d85e
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
@@ -14,7 +5,7 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-6.0.5.2-patchset-01.tar.xz 39820 BLAKE2B d8b436378b05a8a58156817b5d1e0323fd6fcfde9aa9fc4fc6a8056a06a16c84c5860ffe1ae715faddb707c5aa417b43e6c7f5c05821f86208edbb3778d830a1 SHA512 ec99a6358c0a20075abc0aa136ad6ccded4562fa0f25897efe2a8783fb33b97b92a2dd8041206b3344a79dfd10ebe98b79c8bf0b4e8539e45942978f0028dc59
DIST libreoffice-6.0.6.2.tar.xz 205022916 BLAKE2B 715d24c7bbfe4d570011f5090cf647421f68e73fb76047ec0fb973ec0bfb30be3ec1d521bdd92369e23abaa444e7afd3e070ff613486e8f85b9ca76d9496fd0e SHA512 8cf7bd4d8f81ee09f8a21c4ccb12f788c67cf1cba71e08b9b720f9e8b4ec2dfcc25452ef05b6b60529463241c2b23a70eb6a79a8f15b95e890a2ea9cbb458517
+DIST libreoffice-6.1.4.2.tar.xz 207710664 BLAKE2B 52bab412094c1ff7e184ea65c588360c18b061c3e14b7be07171f6b5831261766e2ac7d7373f5f789d125671da41e8b67d34360d4b7014dcb98df01828aeb094 SHA512 ba81b7744b908f9fe67a83e72c17c08b3b2e99599a5fd4f9cc1f2d81b3fd0ddb8065ae466205f85185ab9420350cea0b2d60108df3e583b74bd1fcd9e4eb0c3c
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.0.6.2.tar.xz 2972748 BLAKE2B 38534d5fd08751af587fd5b5be03b39b086e2bc26878c50e98bafd7a2b48f517ac29b8d434748449b0a3e8a451c31f40255094d64965800aadfd94c111295be5 SHA512 89caab57774f85f3e58523c0debb57247a0f10959634bf296aaacc4928bcce6ea8ed9f167b267e2e0eeb52b69714eeb094fedfa3e810cf409dfbc7c5e49b7c13
-EBUILD libreoffice-6.0.6.2.ebuild 17001 BLAKE2B bf32a9fb7399f9bdef68abf3985fb07ff726dcecd8631f43ae936d9b815ee8c31bf11e82b2c39dc3b473726b97d90931560a9a79a556a61edc3f37d4c4a0733a SHA512 c058c8823afd9318e19b230e7d26b30b40d7d6780672767d5a6c3fb0e90257cb7cfb78f86f36061a975afe2cb86637ed0e9cdfa7944f4a85cacd1172efad0fc9
-MISC metadata.xml 1090 BLAKE2B b30fc707317ea0601859f327540712eae38a9fc7365675501fca648e17e2ee3b35c2391e76dc7878b53e5216ca4eb2618595fbac2e07d8680f8daeaa67aaeeeb SHA512 4ffa1f2d605bc5666e25ce126d3264f9ed272ae1b12b9dd17ae366462d58de4a64767ee63928b233c21a15a77b549eb5c574064e73164cb20b0adb6ce12a9ec2
+DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 53c398efb3b839740a9146ea1b0f70f019936c914f7aedf38b7da69faf532ab139a8847d6eb251b2850511e0e7bd169c74fafedd0926dc987659aa27878cf740 SHA512 e24f2f6795856da62f77ebfdcfedc8190b8ecef74e395fc263f0cab4a27c0fe3d95f37665747a590fc7a6a93c6c3473a2a4501c50d415cc602f85838955fe9ab
diff --git a/app-office/libreoffice/files/libreoffice-6.1-nomancompress.patch b/app-office/libreoffice/files/libreoffice-6.1-nomancompress.patch
new file mode 100644
index 0000000..ea6eb8b
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.1-nomancompress.patch
@@ -0,0 +1,29 @@
+--- a/bin/distro-install-desktop-integration 2018-10-29 20:55:29.000000000 +0100
++++ b/bin/distro-install-desktop-integration 2018-11-22 02:03:36.464866894 +0100
+@@ -39,22 +39,20 @@
+
+ create_man_link()
+ {
+- echo "Install $MANDIR/man1/$1.1.gz"
++ echo "Install $MANDIR/man1/$1.1"
+
+ mkdir -p $DESTDIR$MANDIR/man1
+ echo ".so man1/$2.1" >| $DESTDIR$MANDIR/man1/$1.1
+- gzip -f $DESTDIR$MANDIR/man1/$1.1
+- test -f "$DESTDIR/$3" && echo "$MANDIR/man1/$1.1.gz" >>"$DESTDIR/$3"
++ test -f "$DESTDIR/$3" && echo "$MANDIR/man1/$1.1" >>"$DESTDIR/$3"
+ }
+
+ install_man()
+ {
+- echo "Install $MANDIR/man1/$1.1.gz"
++ echo "Install $MANDIR/man1/$1.1"
+
+ mkdir -p $DESTDIR$MANDIR/man1
+ cp "${SRCDIR?}"/sysui/desktop/man/$1.1 $DESTDIR$MANDIR/man1 || exit 1;
+- gzip -f $DESTDIR$MANDIR/man1/$1.1
+- test -f "$DESTDIR/$2" && echo "$MANDIR/man1/$1.1.gz" >>"$DESTDIR/$2"
++ test -f "$DESTDIR/$2" && echo "$MANDIR/man1/$1.1" >>"$DESTDIR/$2"
+ }
+
+
diff --git a/app-office/libreoffice/files/libreoffice-6.1.4.2-disable-liborcus-unittest.patch b/app-office/libreoffice/files/libreoffice-6.1.4.2-disable-liborcus-unittest.patch
new file mode 100644
index 0000000..afdca6b
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.1.4.2-disable-liborcus-unittest.patch
@@ -0,0 +1,13 @@
+--- a/sc/qa/unit/subsequent_filters-test.cxx 2018-02-22 18:45:41.000000000 +0100
++++ b/sc/qa/unit/subsequent_filters-test.cxx 2018-03-02 11:24:08.616015560 +0100
+@@ -2395,7 +2395,9 @@
+ CPPUNIT_ASSERT_MESSAGE("Style Name1 : Doesn't have Attribute background, but it should have.",
+ pStyleSheet->GetItemSet().HasItem(ATTR_BACKGROUND, &pItem));
+ const SvxBrushItem* pBackground = static_cast<const SvxBrushItem*>(pItem);
+- CPPUNIT_ASSERT_EQUAL(Color(254, 255, 204), pBackground->GetColor());
++ /* This test fails with liborcus >= 0.13.3
++ * CPPUNIT_ASSERT_EQUAL(Color(254, 255, 204), pBackground->GetColor());
++ */
+
+ CPPUNIT_ASSERT_MESSAGE("Style Name1 : Doesn't have Attribute border, but it should have.",
+ pStyleSheet->GetItemSet().HasItem(ATTR_BORDER, &pItem));
diff --git a/app-office/libreoffice/files/libreoffice-6.1.4.2-linux-musl.patch b/app-office/libreoffice/files/libreoffice-6.1.4.2-linux-musl.patch
new file mode 100644
index 0000000..5fbf6b3
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.1.4.2-linux-musl.patch
@@ -0,0 +1,60 @@
+--- libreoffice-5.3.0.3/configure.ac.orig 2017-01-26 22:22:46.000000000 +0000
++++ libreoffice-5.3.0.3/configure.ac 2017-02-08 13:14:16.777547599 +0000
+@@ -652,7 +652,7 @@
+ fi
+ ;;
+
+-linux-gnu*|k*bsd*-gnu*)
++linux-gnu*|linux-musl*|k*bsd*-gnu*)
+ test_gtk=yes
+ build_gstreamer_1_0=yes
+ build_gstreamer_0_10=yes
+@@ -4170,7 +4170,7 @@
+ esac
+ ;;
+
+-linux-gnu*)
++linux-gnu*|linux-musl*)
+ COM=GCC
+ USING_X11=TRUE
+ OS=LINUX
+@@ -7197,7 +7197,7 @@
+ test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
+ ;;
+
+- linux-gnu*)
++ linux-gnu*|linux-musl*)
+ JAVAINC="-I$JAVA_HOME/include"
+ JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
+ test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
+@@ -9748,21 +9748,6 @@
+ fi
+ AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA)
+
+-dnl ***************************************
+-dnl testing libc version for Linux...
+-dnl ***************************************
+-if test "$_os" = "Linux"; then
+- AC_MSG_CHECKING([whether libc is >= 2.1.1])
+- exec 6>/dev/null # no output
+- AC_CHECK_LIB(c, gnu_get_libc_version, HAVE_LIBC=yes; export HAVE_LIBC)
+- exec 6>&1 # output on again
+- if test "$HAVE_LIBC"; then
+- AC_MSG_RESULT([yes])
+- else
+- AC_MSG_ERROR([no, upgrade libc])
+- fi
+-fi
+-
+ dnl =========================================
+ dnl Check for the Windows SDK.
+ dnl =========================================
+@@ -12775,7 +12760,7 @@
+
+ case "$host_os" in
+
+- aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*)
++ aix*|dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*)
+ if test "$ENABLE_JAVA" != ""; then
+ pathmunge "$JAVA_HOME/bin" "after"
+ fi
diff --git a/app-office/libreoffice/files/libreoffice-6.1.4.2-musl-fix-execinfo.patch b/app-office/libreoffice/files/libreoffice-6.1.4.2-musl-fix-execinfo.patch
new file mode 100644
index 0000000..4c3b359
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.1.4.2-musl-fix-execinfo.patch
@@ -0,0 +1,39 @@
+diff --git a/sal/osl/unx/backtrace.h b/sal/osl/unx/backtrace.h
+index 5fafc1c..408c12c 100644
+--- a/sal/osl/unx/backtrace.h
++++ b/sal/osl/unx/backtrace.h
+@@ -20,7 +20,7 @@
+ #ifndef INCLUDED_SAL_OSL_UNX_BACKTRACE_H
+ #define INCLUDED_SAL_OSL_UNX_BACKTRACE_H
+
+-#if defined (LINUX)
++#if defined (LINUX) && defined (__GLIBC__)
+
+ #include <execinfo.h>
+
+diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx
+index f4c9a9c..da6d9cf 100644
+--- a/sal/osl/unx/signal.cxx
++++ b/sal/osl/unx/signal.cxx
+@@ -35,7 +35,7 @@
+
+ #endif /* MACOSX */
+
+-#ifdef LINUX
++#if defined(LINUX) && defined(__GLIBC__)
+ #include <execinfo.h>
+ #include <link.h>
+ #define INCLUDE_BACKTRACE
+diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c
+index 1d9a58b..fd648e4 100644
+--- a/sal/osl/unx/backtrace.c
++++ b/sal/osl/unx/backtrace.c
+@@ -282,7 +282,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
+ }
+ }
+
+-#elif !defined LINUX
++#elif !defined(__GLIBC__)
+
+ int backtrace( void **buffer, int max_frames )
+ {
diff --git a/app-office/libreoffice/files/libreoffice-6.1.4.2-musl-fix-includes.patch b/app-office/libreoffice/files/libreoffice-6.1.4.2-musl-fix-includes.patch
new file mode 100644
index 0000000..d2048e2
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.1.4.2-musl-fix-includes.patch
@@ -0,0 +1,13 @@
+diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
+index f177d86..99bb408 100644
+--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
++++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
+@@ -21,7 +21,7 @@
+ #include <dbus/dbus.h>
+ #include <errno.h>
+ #include <fcntl.h>
+- #include <sys/unistd.h>
++ #include <unistd.h>
+ #include <sys/socket.h>
+ #include <bluetooth/bluetooth.h>
+ #include <bluetooth/rfcomm.h>
diff --git a/app-office/libreoffice/files/libreoffice-6.1.4.2-musl-stacksize.patch b/app-office/libreoffice/files/libreoffice-6.1.4.2-musl-stacksize.patch
new file mode 100644
index 0000000..9968ccb
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.1.4.2-musl-stacksize.patch
@@ -0,0 +1,39 @@
+diff -Naur libreoffice-6.1.0.3/sal/osl/unx/thread.cxx libreoffice-6.1.0.3-patched/sal/osl/unx/thread.cxx
+--- libreoffice-6.1.0.3/sal/osl/unx/thread.cxx 2018-08-02 22:54:54.000000000 +0300
++++ libreoffice-6.1.0.3-patched/sal/osl/unx/thread.cxx 2018-09-05 18:21:38.552838233 +0300
+@@ -249,7 +249,7 @@
+ short nFlags)
+ {
+ Thread_Impl* pImpl;
+-#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS)
++#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS) || (defined LINUX && !defined __GLIBC__)
+ pthread_attr_t attr;
+ size_t stacksize;
+ #endif
+@@ -265,7 +265,7 @@
+
+ pthread_mutex_lock (&(pImpl->m_Lock));
+
+-#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS)
++#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS) || (defined LINUX && !defined __GLIBC__)
+ if (pthread_attr_init(&attr) != 0)
+ return nullptr;
+
+@@ -282,7 +282,7 @@
+
+ if ((nRet = pthread_create (
+ &(pImpl->m_hThread),
+-#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS)
++#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS) || (defined LINUX && !defined __GLIBC__)
+ &attr,
+ #else
+ PTHREAD_ATTR_DEFAULT,
+@@ -301,7 +301,7 @@
+ return nullptr;
+ }
+
+-#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS)
++#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS) || (defined LINUX && !defined __GLIBC__)
+ pthread_attr_destroy(&attr);
+ #endif
+
diff --git a/app-office/libreoffice/libreoffice-6.1.4.2.ebuild b/app-office/libreoffice/libreoffice-6.1.4.2.ebuild
new file mode 100644
index 0000000..ba47781
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.1.4.2.ebuild
@@ -0,0 +1,578 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,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 eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils 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=(
+ "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 mysql odk pdfimport postgres test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ kde? ( gtk )
+ 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="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/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.13*
+ 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/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ 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? ( net-wireless/bluez )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( dev-libs/dbus-glib )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ 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
+ )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mysql? ( dev-db/mysql-connector-c++ )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/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
+
+# 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/intltool
+ =dev-util/mdds-1.3*:1=
+ media-libs/glm
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/ucpp
+ virtual/pkgconfig
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+
+PATCHES=(
+ # "${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"
+
+ # musl compatibility by AlpineLinux
+ "${FILESDIR}/${PN}-6.1.4.2-linux-musl.patch"
+ "${FILESDIR}/${PN}-6.1.4.2-musl-fix-execinfo.patch"
+ "${FILESDIR}/${PN}-6.1.4.2-musl-fix-includes.patch"
+ "${FILESDIR}/${PN}-6.1.4.2-disable-liborcus-unittest.patch"
+ "${FILESDIR}/${PN}-6.1.4.2-musl-stacksize.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
+ 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
+
+ # 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-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-qt5
+ --disable-report-builder
+ --with-alloc=system
+ --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
+ --without-help
+ --with-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable gtk2 gtk)
+ $(use_enable kde gtk3-kde5)
+ $(use_enable mysql ext-mariadb-connector)
+ $(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 mysql system-mysql-cppconn)
+ $(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}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=helpcontent2/source/media/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use 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
+
+ # 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_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/musl:master commit in: app-office/libreoffice/, app-office/libreoffice/files/
@ 2021-06-30 14:18 Jory Pratt
0 siblings, 0 replies; 6+ messages in thread
From: Jory Pratt @ 2021-06-30 14:18 UTC (permalink / raw
To: gentoo-commits
commit: 75df34a20dd831f2d5f7fd5dbb02a1f4c50eab7b
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 30 14:15:26 2021 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Wed Jun 30 14:15:26 2021 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=75df34a2
app-office/libreoffice: Cleanup unsupported version
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
.../files/libreoffice-6.4.3.2-boost-1.73.patch | 118 ----
.../files/libreoffice-6.4.6.2-llvm-10.patch | 102 ----
....7.2-fix-wrong-setting-for-doc-properties.patch | 75 ---
.../files/libreoffice-6.4.7.2-icu-68-1.patch | 46 --
.../files/libreoffice-6.4.7.2-icu-68-2.patch | 28 -
app-office/libreoffice/libreoffice-6.4.7.2.ebuild | 597 ---------------------
7 files changed, 968 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index bec1203..14a9b2c 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -17,9 +17,7 @@ DIST db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip 1396007 BLAKE2B 8012d
DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48dff6df5c857a6bd0510a92aa6d9b9660ad63b2344d5195fef072e526f8d7900791b15442923b63196dda3f SHA512 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a39ee9798182b70ba650fa954234b964e33278ac4fe3f84f8c3218ad49f12d139079328036b4f9d80cde967888c0a66393c34dedf27af69dac02c5aff SHA512 9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743
DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
-DIST libreoffice-6.4.7.2.tar.xz 232364676 BLAKE2B 1df8f2a3aa00bd057dd1d6d9665a541330ceeabb2bb5d46351449cf9b916a5649f38dc0e0175cf3733123f9247157f5fd0f2c34c8dad1d676da6c31d8346927b SHA512 ba6ff5948624d7a76025406c38728d643be656091d79320a1c5ddba10000411662951a0b02de7a9e796e76d8185b6e9113882406bb0c1452b4c988ac3095afa8
DIST libreoffice-7.1.3.2.tar.xz 244104432 BLAKE2B f73bd448f94bc88a1dc775d032ce849ee1dd610c4077c709ffbe40d8c99527c7775cfe2309a636093182ac988ecf44a4b61df0e0a83b332fcc77a05edb602791 SHA512 d7329475cad5bece9358b29bc590da1841c3c0b4aef511508d9398519c514fa176c90675857f1830925818f2dcc8b9c0986e5d34d3a33cce617e4ada23c60a72
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 9ee12ec6aa6d5539408e0206e313901540533e28686585fa0bb4edbeaa482bb0ad1cd4ae37ac18dab66bb3e2ea32d52d9960236cbf3e0f8fb5ca07c007f38794 SHA512 a5381a8cca9988998dc01d3815869e47193c1da814b714cbedb51a2099f7dc5444315c657e32defab2eb0b9a9e2a922bc4c5fbc36b7a2b60e7c551887a9cdbb3
DIST libreoffice-help-7.1.3.2.tar.xz 111785416 BLAKE2B 12d97764976ae0e4736638e9b758c5920d38d608e66fc3343d74178a935632396e1e07fbb98b6f380fd103c3f5e2edf917726a760420f6dfd3d2e42aaa215096 SHA512 576dbea391777a907275b630ed704dd3d9ad0627f8a18da1cbd23fe28df04c3a509583c2404f810df3aaac15ef0881e2c1e0a55c9f31618715586628873367eb
DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d
diff --git a/app-office/libreoffice/files/libreoffice-6.4.3.2-boost-1.73.patch b/app-office/libreoffice/files/libreoffice-6.4.3.2-boost-1.73.patch
deleted file mode 100644
index 0eb4069..0000000
--- a/app-office/libreoffice/files/libreoffice-6.4.3.2-boost-1.73.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 55c724b93dfd4c9a1afb10d60fbc2d7a9a66cf61 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Wed, 29 Jan 2020 12:44:52 +0000
-Subject: replace boost::bimap in sdext pdfimport
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-the error message with boost 1.69 and gcc 10 is so ungodly its easier to throw
-bimap out and use something simpler
-
-Change-Id: Ie324a0b81931bbd427483878a87beeca455ada18
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87683
-Tested-by: Jenkins
-Reviewed-by: Caolán McNamara <caolanm@redhat.com>
----
- sdext/source/pdfimport/inc/pdfiprocessor.hxx | 12 ++++--------
- sdext/source/pdfimport/tree/pdfiprocessor.cxx | 21 ++++++++++++---------
- 2 files changed, 16 insertions(+), 17 deletions(-)
-
-diff --git a/sdext/source/pdfimport/inc/pdfiprocessor.hxx b/sdext/source/pdfimport/inc/pdfiprocessor.hxx
-index 89f9d601b7b0..9e08d6a6a765 100644
---- a/sdext/source/pdfimport/inc/pdfiprocessor.hxx
-+++ b/sdext/source/pdfimport/inc/pdfiprocessor.hxx
-@@ -37,9 +37,6 @@
- #include "treevisitorfactory.hxx"
- #include "genericelements.hxx"
-
--#include <boost/bimap/bimap.hpp>
--#include <boost/bimap/unordered_set_of.hpp>
--
- namespace pdfi
- {
-
-@@ -160,10 +157,8 @@ namespace pdfi
- typedef std::unordered_map<sal_Int32,FontAttributes> IdToFontMap;
- typedef std::unordered_map<FontAttributes,sal_Int32,FontAttrHash> FontToIdMap;
-
-- typedef boost::bimaps::bimap<
-- boost::bimaps::unordered_set_of<GraphicsContext, GraphicsContextHash>,
-- boost::bimaps::unordered_set_of<sal_Int32>
-- > GCToIdBiMap;
-+ typedef std::unordered_map<sal_Int32,GraphicsContext> IdToGCMap;
-+ typedef std::unordered_map<GraphicsContext, sal_Int32, GraphicsContextHash> GCToIdMap;
-
- typedef std::vector<GraphicsContext> GraphicsContextStack;
-
-@@ -178,7 +173,8 @@ namespace pdfi
-
- GraphicsContextStack m_aGCStack;
- sal_Int32 m_nNextGCId;
-- GCToIdBiMap m_aGCToId;
-+ IdToGCMap m_aIdToGC;
-+ GCToIdMap m_aGCToId;
-
- ImageContainer m_aImages;
-
-diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
-index c6baa7fee8b2..ed2eaf6510b9 100644
---- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
-+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
-@@ -54,6 +54,7 @@ namespace pdfi
- m_aFontToId(),
- m_aGCStack(),
- m_nNextGCId( 1 ),
-+ m_aIdToGC(),
- m_aGCToId(),
- m_aImages(),
- m_nPages(0),
-@@ -65,12 +66,13 @@ namespace pdfi
- aDefFont.isBold = false;
- aDefFont.isItalic = false;
- aDefFont.size = 10*PDFI_OUTDEV_RESOLUTION/72;
-- m_aIdToFont[ 0 ] = aDefFont;
-- m_aFontToId[ aDefFont ] = 0;
-+ m_aIdToFont.insert({0, aDefFont});
-+ m_aFontToId.insert({aDefFont, 0});
-
- GraphicsContext aDefGC;
- m_aGCStack.push_back( aDefGC );
-- m_aGCToId.insert(GCToIdBiMap::relation(aDefGC, 0));
-+ m_aGCToId.insert({aDefGC, 0});
-+ m_aIdToGC.insert({0, aDefGC});
- }
-
- void PDFIProcessor::setPageNum( sal_Int32 nPages )
-@@ -468,12 +470,13 @@ const FontAttributes& PDFIProcessor::getFont( sal_Int32 nFontId ) const
- sal_Int32 PDFIProcessor::getGCId( const GraphicsContext& rGC )
- {
- sal_Int32 nGCId = 0;
-- auto it = m_aGCToId.left.find( rGC );
-- if( it != m_aGCToId.left.end() )
-+ auto it = m_aGCToId.find( rGC );
-+ if( it != m_aGCToId.end() )
- nGCId = it->second;
- else
- {
-- m_aGCToId.insert(GCToIdBiMap::relation(rGC, m_nNextGCId));
-+ m_aGCToId.insert({rGC, m_nNextGCId});
-+ m_aIdToGC.insert({m_nNextGCId, rGC});
- nGCId = m_nNextGCId;
- m_nNextGCId++;
- }
-@@ -483,9 +486,9 @@ sal_Int32 PDFIProcessor::getGCId( const GraphicsContext& rGC )
-
- const GraphicsContext& PDFIProcessor::getGraphicsContext( sal_Int32 nGCId ) const
- {
-- auto it = m_aGCToId.right.find( nGCId );
-- if( it == m_aGCToId.right.end() )
-- it = m_aGCToId.right.find( 0 );
-+ auto it = m_aIdToGC.find( nGCId );
-+ if( it == m_aIdToGC.end() )
-+ it = m_aIdToGC.find( 0 );
- return it->second;
- }
-
---
-cgit v1.2.1
diff --git a/app-office/libreoffice/files/libreoffice-6.4.6.2-llvm-10.patch b/app-office/libreoffice/files/libreoffice-6.4.6.2-llvm-10.patch
deleted file mode 100644
index 4a1ff51..0000000
--- a/app-office/libreoffice/files/libreoffice-6.4.6.2-llvm-10.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 986bd28388df745dd969e7be7c3bda36b2b2cb0e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Thu, 6 Aug 2020 10:50:47 +0100
-Subject: [PATCH] ofz#24641 libc++abi __cxa_exception has grown another member
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https: //github.com/llvm/llvm-project/commit/f2a436058fcbc11291e73badb44e243f61046183
-
-this is the same problem as
-
-commit f4b6f6a8ae60bdec53512728d00853b73fa18500
-Author: Stephan Bergmann <sbergman@redhat.com>
-Date: Thu Feb 13 08:40:11 2020 +0100
-
- Hack to dynamically adapt to __cxa_exceptiom in LLVM 11 libcxxabi
-
- (where the new change to __cxa_exception effectively reverts the change that
- prompted 7a9dd3d482deeeb3ed1d50074e56adbd3f928296 "Hack to dynamically adapt to
- __cxa_exceptiom in LLVM 5.0 libcxxabi")
-
- Change-Id: Iec4ef1dc188bea2223d99b1b7eb8adec636c98e7
- Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88583
- Tested-by: Jenkins
- Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-
-so c-n-p that solution here
-
-Change-Id: I4475757a766e3ade7b9fcaf6149e535c9f9a4fa4
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100209
-Tested-by: Caolán McNamara <caolanm@redhat.com>
-Reviewed-by: Caolán McNamara <caolanm@redhat.com>
----
- .../cpp_uno/gcc3_linux_x86-64/except.cxx | 28 +++++++++++++++++++
- .../cpp_uno/gcc3_linux_x86-64/share.hxx | 14 ++++++++++
- 2 files changed, 42 insertions(+)
-
-diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
-index e9e861f1c210..25931671f7dc 100644
---- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
-+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
-@@ -150,6 +150,34 @@ void fillUnoException(uno_Any * pUnoExc, uno_Mapping * pCpp2Uno)
- return;
- }
-
-+#if defined _LIBCPPABI_VERSION // detect libc++abi
-+ // Very bad HACK to find out whether we run against a libcxxabi that has a new
-+ // __cxa_exception::reserved member at the start, introduced with LLVM 11
-+ // <https://github.com/llvm/llvm-project/commit/f2a436058fcbc11291e73badb44e243f61046183>
-+ // "[libcxxabi] Insert padding in __cxa_exception struct for compatibility". The layout of the
-+ // start of __cxa_exception is
-+ //
-+ // [8 byte void *reserve]
-+ // 8 byte size_t referenceCount
-+ //
-+ // where the (bad, hacky) assumption is that reserve (if present) is null
-+ // (__cxa_allocate_exception in at least LLVM 11 zero-fills the object, and nothing actively
-+ // sets reserve) while referenceCount is non-null (__cxa_throw sets it to 1, and
-+ // __cxa_decrement_exception_refcount destroys the exception as soon as it drops to 0; for a
-+ // __cxa_dependent_exception, the referenceCount member is rather
-+ //
-+ // 8 byte void* primaryException
-+ //
-+ // but which also will always be set to a non-null value in __cxa_rethrow_primary_exception).
-+ // As described in the definition of __cxa_exception
-+ // (bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx), this hack (together with the "#if 0"
-+ // there) can be dropped once we can be sure that we only run against new libcxxabi that has the
-+ // reserve member:
-+ if (*reinterpret_cast<void **>(header) == nullptr) {
-+ header = reinterpret_cast<__cxxabiv1::__cxa_exception*>(reinterpret_cast<void **>(header) + 1);
-+ }
-+#endif
-+
- std::type_info *exceptionType = __cxxabiv1::__cxa_current_exception_type();
-
- typelib_TypeDescription * pExcTypeDescr = nullptr;
-diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
-index e8afe35c4f59..53c8841fbbcb 100644
---- a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
-+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
-@@ -108,6 +108,20 @@ namespace __cxxabiv1 {
- struct __cxa_exception {
- #if defined _LIBCPPABI_VERSION // detect libc++abi
- #if defined __LP64__ || LIBCXXABI_ARM_EHABI
-+#if 0
-+ // This is a new field added with LLVM 11
-+ // <https://github.com/llvm/llvm-project/commit/f2a436058fcbc11291e73badb44e243f61046183>
-+ // "[libcxxabi] Insert padding in __cxa_exception struct for compatibility". The HACK in
-+ // fillUnoException (bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx) tries to find out at
-+ // runtime whether a __cxa_exception has this member. Once we can be sure that we only run
-+ // against new libcxxabi that has this member, we can drop the "#if 0" here and drop the hack
-+ // in fillUnoException.
-+
-+ // Now _Unwind_Exception is marked with __attribute__((aligned)),
-+ // which implies __cxa_exception is also aligned. Insert padding
-+ // in the beginning of the struct, rather than before unwindHeader.
-+ void *reserve;
-+#endif
- std::size_t referenceCount;
- #endif
- #endif
diff --git a/app-office/libreoffice/files/libreoffice-6.4.7.2-fix-wrong-setting-for-doc-properties.patch b/app-office/libreoffice/files/libreoffice-6.4.7.2-fix-wrong-setting-for-doc-properties.patch
deleted file mode 100644
index 9c9d417..0000000
--- a/app-office/libreoffice/files/libreoffice-6.4.7.2-fix-wrong-setting-for-doc-properties.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 188ddcd482150b5fdeb44d97e57831e3e27b3f5b Mon Sep 17 00:00:00 2001
-From: Justin Luth <justin_luth@sil.org>
-Date: Mon, 28 Sep 2020 20:21:52 +0300
-Subject: tdf#136983 partial revert NFC ww8 cleanup: remove unused variables
-
-This is a partial revert of LO 6.2
-commit 2ec0cf500222aef55d02df80154b47fbb92970c9
-
-I can't think of any excuse for how I possibly missed that
-xDocProps was being defined/used outside of this clause.
-Just plain stupid and blind.
-
-The good news is that the create and modified date still
-seem to be getting saved somehow/somewhere. So it isn't
-the disaster that it looks like it could have been.
-
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103565
-Tested-by: Jenkins
-Reviewed-by: Justin Luth <justin_luth@sil.org>
-(cherry picked from commit 1086654d6e8cc22f1f99195668db3f305437e570)
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104495
-Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
-(cherry picked from commit 19b8ded3ae18dd4070a3e21d7b980782a27e5547)
-
-Change-Id: I72ef56fa50b9e92e4ce687b132b1919cfae6c1f6
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104497
-Tested-by: Jenkins
-Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
----
- sw/qa/extras/ww8export/ww8export3.cxx | 5 +++++
- sw/source/filter/ww8/wrtww8.cxx | 6 +++++-
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/sw/qa/extras/ww8export/ww8export3.cxx b/sw/qa/extras/ww8export/ww8export3.cxx
-index 764ae66a20fa..9c83b6f62fa9 100644
---- a/sw/qa/extras/ww8export/ww8export3.cxx
-+++ b/sw/qa/extras/ww8export/ww8export3.cxx
-@@ -14,6 +14,7 @@
- #include <com/sun/star/container/XIndexAccess.hpp>
- #include <com/sun/star/drawing/FillStyle.hpp>
- #include <com/sun/star/drawing/LineDash.hpp>
-+#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
- #include <com/sun/star/graphic/XGraphic.hpp>
- #include <com/sun/star/text/XFormField.hpp>
- #include <com/sun/star/text/XTextTable.hpp>
-@@ -49,6 +50,10 @@ DECLARE_WW8EXPORT_TEST(testTdf37778_readonlySection, "tdf37778_readonlySection.d
- // tdf#127862: page fill color (in this case white) was lost
- uno::Reference<beans::XPropertySet> xStyle(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY);
- CPPUNIT_ASSERT(drawing::FillStyle_NONE != getProperty<drawing::FillStyle>(xStyle, "FillStyle"));
-+
-+ // tdf#136983
-+ uno::Reference<document::XDocumentPropertiesSupplier> xDPS(mxComponent, uno::UNO_QUERY);
-+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Last printed date", sal_Int16(2009), xDPS->getDocumentProperties()->getPrintDate().Year);
- }
-
- DECLARE_WW8EXPORT_TEST(testTdf122429_header, "tdf122429_header.doc")
-diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
-index e908cab35162..8d4add7b34bf 100644
---- a/sw/source/filter/ww8/wrtww8.cxx
-+++ b/sw/source/filter/ww8/wrtww8.cxx
-@@ -501,7 +501,11 @@ static void WriteDop( WW8Export& rWrt )
- uno::Reference<beans::XPropertySet> xProps;
- if ( pDocShell )
- {
-- xProps.set(pDocShell->GetModel(), uno::UNO_QUERY);
-+ uno::Reference<lang::XComponent> xModelComp(pDocShell->GetModel(), uno::UNO_QUERY);
-+ xProps.set(xModelComp, uno::UNO_QUERY);
-+ uno::Reference<document::XDocumentPropertiesSupplier> xDPS(xModelComp, uno::UNO_QUERY_THROW);
-+ xDocProps = xDPS->getDocumentProperties();
-+ OSL_ENSURE(xDocProps.is(), "DocumentProperties is null");
-
- rDop.lKeyProtDoc = pDocShell->GetModifyPasswordHash();
- }
---
-cgit v1.2.1
diff --git a/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-1.patch b/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-1.patch
deleted file mode 100644
index fe20e34..0000000
--- a/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-1.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 0b14b9ec55fb2a8dd0ec24e1c03702bc4bbf1878 Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene@debian.org>
-Date: Sun, 1 Nov 2020 18:30:49 +0100
-Subject: fix build with ICU 68
-
-use standard true.
-
-/home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx: In member function 'virtual void i18npool::Calendar_gregorian::setLocalDateTime(double)':
-/home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx:363:40: error: 'TRUE' was not declared in this scope
- 363 | body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status );
- | ^~~~
-
-/usr/include/unicode/umachine.h says:
-
-@deprecated ICU 68 Use standard "true" instead.
-
-Change-Id: I45d2b0afa6a9043767af5c2cf41ba24377f2cdc4
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105057
-Tested-by: Jenkins
-Reviewed-by: Eike Rathke <erack@redhat.com>
----
- i18npool/source/calendar/calendar_gregorian.cxx | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
-index b7ae49fbd96e..59ee46fa0e0f 100644
---- a/i18npool/source/calendar/calendar_gregorian.cxx
-+++ b/i18npool/source/calendar/calendar_gregorian.cxx
-@@ -347,7 +347,14 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDays )
- "Calendar_gregorian::setLocalDateTime: " << std::fixed << fM << " rounded to " << fR);
- int32_t nZoneOffset, nDSTOffset;
- UErrorCode status = U_ZERO_ERROR;
-- body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status );
-+ body->getTimeZone().getOffset( fR,
-+#if U_ICU_VERSION_MAJOR_NUM >= 68
-+ true,
-+#else
-+ TRUE,
-+#endif
-+ nZoneOffset, nDSTOffset, status );
-+
- if ( !U_SUCCESS(status) ) throw ERROR;
- status = U_ZERO_ERROR;
- body->setTime( fR - (nZoneOffset + nDSTOffset), status );
---
-cgit v1.2.1
diff --git a/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-2.patch b/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-2.patch
deleted file mode 100644
index bd7dc04..0000000
--- a/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 523f8613c124b722b721c8055db2085a005e09dd Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 6 Nov 2020 02:43:07 +0100
-Subject: [PATCH] Fix build with ICU 68, use standard true. (part 2/2 missing
- from 0b14b9ec)
-
-Change-Id: I776dd4e1fc92ef1ef09b88e239bf0d6942c28ca3
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- svx/source/dialog/fntctrl.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
-index d312d7ad5f49..10c84ca95222 100644
---- a/svx/source/dialog/fntctrl.cxx
-+++ b/svx/source/dialog/fntctrl.cxx
-@@ -1014,7 +1014,7 @@ void SvxFontPrevWindow::SetFromItemSet(const SfxItemSet &rSet, bool bPreviewBack
- rCTLFont.SetFillColor( rColor );
- }
- else
-- bTransparent = TRUE;
-+ bTransparent = true;
-
- rFont.SetTransparent( bTransparent );
- rCJKFont.SetTransparent( bTransparent );
---
-2.29.2
-
diff --git a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild b/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
deleted file mode 100644
index 4f72d25..0000000
--- a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
+++ /dev/null
@@ -1,597 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-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-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=(
- # QR code generating library for >=libreoffice-6.4
- "${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 coinmp +cups +dbus debug eds firebird
-googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
-$(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"
-
-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.2
- dev-db/unixODBC
- 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.15
- 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
- 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_MULTI_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- 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
- 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
- >=virtual/jdk-1.8
- )
- 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.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"
-
- # 6.4 branch (fixed in 6.4.8)
- "${FILESDIR}/${P}-fix-wrong-setting-for-doc-properties.patch"
-
- # git master
- "${FILESDIR}/${PN}-6.4.3.2-boost-1.73.patch" # bug 721806
- "${FILESDIR}/${PN}-6.4.6.2-llvm-10.patch" # bug 713574
- "${FILESDIR}"/${P}-icu-68-{1,2}.patch # bug 752021, +downstream backport
-
- # musl compatibility by AlpineLinux
- "${FILESDIR}/${PN}-6.4.4.2-linux-musl.patch"
- "${FILESDIR}/${PN}-6.1.4.2-musl-fix-execinfo.patch"
- "${FILESDIR}/${PN}-6.1.4.2-disable-liborcus-unittest.patch"
- "${FILESDIR}/${PN}-6.1.4.2-musl-stacksize.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 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."
-
- [[ ${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"
-
- # 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-qrencode: 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-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-jfreereport
- --without-system_apache_commons
- --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_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}"
- --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
- 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=$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym ../../../${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym ../../../../${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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-06-30 14:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-14 23:29 [gentoo-commits] proj/musl:master commit in: app-office/libreoffice/, app-office/libreoffice/files/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2016-08-10 8:07 Anthony G. Basile
2017-03-30 4:20 Aric Belsito
2017-06-30 11:07 Anthony G. Basile
2019-01-15 10:30 Anthony G. Basile
2021-06-30 14:18 Jory Pratt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox