[gentoo-commits] proj/musl:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

["Anthony G. Basile" <blueness@gentoo.org>]

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"
 )