| 1 |
commit: acb139bce39f9da39917c25ad33bf58d63f69f24 |
| 2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri May 5 22:36:10 2017 +0000 |
| 4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 5 |
CommitDate: Fri May 5 22:36:10 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=acb139bc |
| 7 |
|
| 8 |
app-office/libreoffice: version bump to 5.2.7.2 |
| 9 |
|
| 10 |
app-office/libreoffice/Manifest | 14 ++------------ |
| 11 |
app-office/libreoffice/libreoffice-5.2.6.2.ebuild | 4 ++-- |
| 12 |
...ce-5.2.3.3-r1.ebuild => libreoffice-5.2.7.2.ebuild} | 18 +++++++++++++++--- |
| 13 |
3 files changed, 19 insertions(+), 17 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest |
| 16 |
index afe8417..bc5395b 100644 |
| 17 |
--- a/app-office/libreoffice/Manifest |
| 18 |
+++ b/app-office/libreoffice/Manifest |
| 19 |
@@ -1,10 +1,3 @@ |
| 20 |
-AUX libreoffice-4.4.1.2-musl-fix-execinfo.patch 736 SHA256 7171dfa651a7ee81b4e13a9fd9131428d9a65af138cac4cb428ae6c3e4bcb1f3 SHA512 567123f990c4a47c2e4cebf99f3486150740015e647ca2b2521e606f3350fc55ceda6c7ac031302da34e8fc90747d66619334fcfda4e7b8998456fe3619ab860 WHIRLPOOL d25df4d89e5739f3586296569345c38d44aeb59c1f6ed83ddd9c76139e6e5b639506c5d761838c2faa70e8a30bb6b68b15c4bdf3255f7658542f70c91bffeb32 |
| 21 |
-AUX libreoffice-5.0.5.2-linux-musl.patch 1908 SHA256 b4fe6b57d1351c4d6a28dc67971c8e43448215c6ab6ffabfde5106da560a5c5d SHA512 cbb465e641616537a8f7c2438bf87661fb409b8337486b5a8ab7f1ecf099c9c4d96f531fef18f8f17ddca4813d3df4162629b93434ac35b7d01c7683de928524 WHIRLPOOL e305c2855c9141e6a1fd296cd8e05e50c388a9a30e4bb8dd4ba60773929abd660ac8940e42f2aad418f58a696f6232570d9000114113aaaf016d74462775c766 |
| 22 |
-AUX libreoffice-5.2-icu58.patch 12602 SHA256 42555c654d29d99a9130d6c164af107b9e94c4012cb51a0411e56dae0a3a913c SHA512 364614ee5aa1606f1d4308e4ba8fa942bcf3f3f0483027e74dc2ea3e7cfa3837b45b49d503fee8d5a591790f2489b864e677615e6715c61d9093ce1dbb99bab4 WHIRLPOOL dcae21697344cc5c605138c5f80dcbfedbb005269a8ad0e4ef34ab9a73876db8b82977f8531fccbc3041fc30baf3727192f7451c9073ecee0f723f74ba6f42b8 |
| 23 |
-AUX libreoffice-5.2-system-pyuno.patch 1590 SHA256 9f42c69cd286561c8ed294d9dff3316cebad2491b5a20880186fd2b30d9aa096 SHA512 34228d6022ba50480940f99d55d8c4bda14becfa51b26af17dadd21e641ac387c04a4f6d4992323248f30f2ca9a37b53741ee8a465a3fccf4be707539a06005b WHIRLPOOL f652a0e7fe681567f9f03c99fe1709e6b9a2346dcd9fd4ed3016b53471a3f20e05eb865a6ff19d3b7dccb0b11c8408fd86d754af1f36024ef137cf33a55d10f2 |
| 24 |
-AUX libreoffice-5.2.3.3-fix-includes.patch 807 SHA256 51052d983eeea85d8d71385e4eeda61b6a8746854fe046b9a91e12c013d9ed89 SHA512 c9e0b05640d7d0e6053b8dd4735664d761a7d381c5b5cbda059fb7b38ab28531c014b6d38f58a0e1f7171a43d62f04d8ecbb7b6b008d0ad30017228ec7e6601a WHIRLPOOL 105a2f0345a23846af3b50c3571f4602831e96e7691fdce12984ead21f42d9dffb6d0e188133dda3a282f1f73f862f2b424f7406587a26b77a247b3b2e0a4e67 |
| 25 |
-AUX libreoffice-5.2.5.1-glibc-2.24.patch 361 SHA256 3f87a11b6d1218a4510835e12c446821cfd47fe61feb6f59aeb4a8c774f9dffe SHA512 b5ff4c6d3771bcdde21613ad15459120ac1d759b1b3b422b5cba3ee23f7ddf88fde274956f2c91f0a6a37cb36a8d90d8f90bd865e6c2d3ff7c2100e2b469dbd8 WHIRLPOOL 8a0150685640a2adefa7d7cc3b50e37801cbd1de5570d037df8ba2b34f5b54fecb9732f7a793be4f20961b11ba06805113172321df43952dade4ca662835394e |
| 26 |
-AUX libreoffice-5.2.5.1-musl-vlc.patch 357 SHA256 adda6aa44231b030a205fbaced361c7d8e7e4763300a6a54693e3a1e148b6f6b SHA512 260baabc2dc3dffe3d575e4a18322a4ea9669eff7a464a0c9e85b16ffb4fa67a62ea039e69074ef94093dcca9479e51699d3e55f34a4380d43b27145f345a999 WHIRLPOOL f204f62f405604b80ff1cf204c0a2eed53f504add6692c53b7d3dc761a72d894edb473181fd154e98459bd0b45e6f865d0c5e384ebb631710353d009b243b5aa |
| 27 |
DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec |
| 28 |
DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5 |
| 29 |
DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 SHA256 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a WHIRLPOOL a5156d06323699d2cbf539f14f5f44f54ebf33e86c7f14e98acd4c6e29c3e496f91dd6792401148ffa32e3dcb1cd4f087ed804e306b241cef86de0aa347d25d4 |
| 30 |
@@ -12,11 +5,8 @@ DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555 |
| 31 |
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f WHIRLPOOL 8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4 |
| 32 |
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c |
| 33 |
DIST ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 1769329 SHA256 3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 SHA512 2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5 WHIRLPOOL 29ddaef03d46fe08aa2dba200be755817f8e77de3bbbb3ed86dae65e891239f3051f79fdfadec6ae56023197e32e1c44a94385a1ce306081f3bf94be6226f8c7 |
| 34 |
-DIST libreoffice-5.2.3.3.tar.xz 183870036 SHA256 a8f1365d166bf24ac4b97ed8466f46cca29cf72e7e992bb84d24c3dc8e1c32c1 SHA512 8628a820ad620ca946457adf0b0ed9741f13c67aa061761d04b743340d13ef498f23e75e6183206b34ce7154b1ec3096f8afcb69b2ab02e17c6ef00155e1b084 WHIRLPOOL 17edc4dd47938db71a5b5ec3ba318d02fbcab7c389bdb51432d36f1f018667c58b1ec3b38b09610542653c9442b65950e0daa062149cfeb7e35e699c6c9f89eb |
| 35 |
DIST libreoffice-5.2.6.2.tar.xz 164804780 SHA256 3d49e339631114652820b890859eef85601d1aeda2acb1309f0de24009f53570 SHA512 b84420a773739162555b28700a5588771a1fa7131d82a5861799f402df65f84a17715f80b8ba9aa793c1fed78c7e38b8bfbff2c3b9e0e8f119c9b453a8e6edc9 WHIRLPOOL fe6e739c78172add6fb1235c5ddcffc7d62767008ca5acafd2d95ba143367b26bae94c7f295527d55312ecec4bee47d53daab8b2f2ac159f8d581c7532e3ee48 |
| 36 |
+DIST libreoffice-5.2.7.2.tar.xz 184589464 SHA256 106154a72a329605166a49bfa31c6d1cc03133d600ad0ef340b45e4e2a92891d SHA512 f7414a0d0d654d1d9bd6c5524ff2acf2f21c544dd6ed79f4f2d22f79db46264f95f7ca8dd482027f7a573d2d491ea6c8d9875b262d5e2b917dfddb749a3ea95f WHIRLPOOL 28d7f9531190a16bdea14c5dcc710ef593085fddca1b4d7d0cd6107d5f93e4b94a1ae035a626376ab7abfcd926a263b1437de1e52011bb96aa6d87b046a38da8 |
| 37 |
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538 |
| 38 |
-DIST libreoffice-help-5.2.3.3.tar.xz 1936920 SHA256 443be26b35c6b454d5d1ca17c58cc33ae90946f8e1003a98118467b49989cd3a SHA512 927421887d2d41538ba79d6d584bf84ad3fd7a58d3b9d95801cf67a0dcce61421934cd273a38803b5519c434232d1aaeb88d52cab391ae7292809ebbb3b501f9 WHIRLPOOL 36da9c200c0174f745827afb099530d06f6489f8be4a521b7dd37441fc2a1f9691a7d4a07e2914dec0f57845f96e4e143133105e5a730eebeb2e1c5c3283d3bb |
| 39 |
DIST libreoffice-help-5.2.6.2.tar.xz 1446048 SHA256 c0cd648d9994814925083d1a891b63b5e5233718eb8f8782810bb602c0fdb88b SHA512 10568ffb0d7fbd1a01681e52e594b39f120802e8fd70d12824a2be0185bdf491c28818fc8a9fe16fed8533fa61119b90d6f0a1a8f9488a83b33f6a6be2d75e37 WHIRLPOOL e3921ba0b64819b19cd278f7a87dec4313e6cd9df58108170e2d438b0c08644395ac568f7cc601e88ff466e78fa6bbd426fdc9b4a704d3d8693b8c0cb1537ab8 |
| 40 |
-EBUILD libreoffice-5.2.3.3-r1.ebuild 17720 SHA256 39222465e69a399e878ed3037d71d153aa844277c16e055c3e41aabd4b2c3199 SHA512 1979e33ff786e0166c58cb58f5c2a8e0da47aa40df8c0ad038ed4a460d255f10d87745d961c4174c811e4670eb688bacd32c4b6164f173214f8e2f74aaa49bb2 WHIRLPOOL 0bf9eff2851c1cecccaf6ef06e5139ac93902cef9a5559f39edbf9b5605ca03296bdb28b8f11ae07765fb9df44f3f29ac4d55ae0805c3b35b3385de617b28d7b |
| 41 |
-EBUILD libreoffice-5.2.6.2.ebuild 18066 SHA256 9f85ce738a3df5ac6a2d1e72c70faecb9a3c8d1014ed6f3ad5c5c94166ca41f6 SHA512 91633113614f2fd51ba24fc867c70345a18872c1eb16b4b52716270451e01fd7725820889b628de1f078ad6c3898819df9b5e777f30e57d741296e6ab04baab4 WHIRLPOOL 1d8db1c20a9a258c02bc10d3598d8c7374859373b1078b77f19e5418ae93a3c5c1f36e6f0edaf7233f44b08c3259667e197349387a5e08ff67552f4e36fb701c |
| 42 |
-MISC metadata.xml 1506 SHA256 e9682eb8fcf1609f39f15680caa33f2b87151ecca4189964ea750a5e8a09485a SHA512 20e6d0f46aa551074f0f0b794d6c4c92e011bf6ab854c7111fad081f9f9d9fe51e370decbbbe9b2cc74a7d1369e38fe0cb3c2768c2d287fc30346c8e4d6783aa WHIRLPOOL ae9571006a3f933ee16ea4e34e3a3cb1b017ce1734e4e09f4ff9f421031c10ebe7c1b5ee87ff84532c13805ec7b4284e14b4aab3d06767d28268b58a768ce9c1 |
| 43 |
+DIST libreoffice-help-5.2.7.2.tar.xz 1940516 SHA256 f7d35c460da96ed2d52cf97baef159382b38e5ce4579c34e65480ff2911cac4b SHA512 c86bc17448fcd1da01e13d3e9fee739610fde390abaf0635cc4593755d102da08a5eea0533076e1a0f8d89f0b32ba5086b155b9b388f317a5e4c669bf17769e1 WHIRLPOOL 4da96a14b70be718109eda5ced62cec85b96e9028fcf65d729a99604598de81edc097bc06577f3ce7958de1316b04d2d2f1f2782c6504a487ffc6ebaaf7feca6 |
| 44 |
|
| 45 |
diff --git a/app-office/libreoffice/libreoffice-5.2.6.2.ebuild b/app-office/libreoffice/libreoffice-5.2.6.2.ebuild |
| 46 |
index 6a5ece5..2e0e5b8 100644 |
| 47 |
--- a/app-office/libreoffice/libreoffice-5.2.6.2.ebuild |
| 48 |
+++ b/app-office/libreoffice/libreoffice-5.2.6.2.ebuild |
| 49 |
@@ -83,12 +83,12 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" |
| 50 |
LICENSE="|| ( LGPL-3 MPL-1.1 )" |
| 51 |
SLOT="0" |
| 52 |
[[ ${PV} == *9999* ]] || \ |
| 53 |
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" |
| 54 |
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" |
| 55 |
|
| 56 |
COMMON_DEPEND="${PYTHON_DEPS} |
| 57 |
app-arch/unzip |
| 58 |
app-arch/zip |
| 59 |
- app-text/hunspell |
| 60 |
+ app-text/hunspell:= |
| 61 |
>=app-text/libabw-0.1.0 |
| 62 |
>=app-text/libebook-0.1 |
| 63 |
>=app-text/libetonyek-0.1 |
| 64 |
|
| 65 |
diff --git a/app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild b/app-office/libreoffice/libreoffice-5.2.7.2.ebuild |
| 66 |
similarity index 97% |
| 67 |
rename from app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild |
| 68 |
rename to app-office/libreoffice/libreoffice-5.2.7.2.ebuild |
| 69 |
index 6fc5e58..3fad018 100644 |
| 70 |
--- a/app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild |
| 71 |
+++ b/app-office/libreoffice/libreoffice-5.2.7.2.ebuild |
| 72 |
@@ -83,12 +83,12 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" |
| 73 |
LICENSE="|| ( LGPL-3 MPL-1.1 )" |
| 74 |
SLOT="0" |
| 75 |
[[ ${PV} == *9999* ]] || \ |
| 76 |
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" |
| 77 |
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" |
| 78 |
|
| 79 |
COMMON_DEPEND="${PYTHON_DEPS} |
| 80 |
app-arch/unzip |
| 81 |
app-arch/zip |
| 82 |
- app-text/hunspell |
| 83 |
+ app-text/hunspell:= |
| 84 |
>=app-text/libabw-0.1.0 |
| 85 |
>=app-text/libebook-0.1 |
| 86 |
>=app-text/libetonyek-0.1 |
| 87 |
@@ -245,10 +245,14 @@ PATCHES=( |
| 88 |
# not upstreamable stuff |
| 89 |
"${FILESDIR}/${PN}-5.2-system-pyuno.patch" |
| 90 |
|
| 91 |
+ # TODO: upstream |
| 92 |
+ "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" |
| 93 |
+ |
| 94 |
# musl patches |
| 95 |
"${FILESDIR}/${PN}-4.4.1.2-musl-fix-execinfo.patch" |
| 96 |
"${FILESDIR}/${PN}-5.0.5.2-linux-musl.patch" |
| 97 |
"${FILESDIR}/${PN}-5.2.3.3-fix-includes.patch" |
| 98 |
+ "${FILESDIR}/${PN}-5.2.5.1-musl-vlc.patch" |
| 99 |
) |
| 100 |
|
| 101 |
pkg_pretend() { |
| 102 |
@@ -265,7 +269,7 @@ pkg_pretend() { |
| 103 |
fi |
| 104 |
check-reqs_pkg_pretend |
| 105 |
|
| 106 |
- if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || { |
| 107 |
+ if ! $(tc-is-clang) && { [[ $(gcc-major-version) -lt 4 ]] || |
| 108 |
[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then |
| 109 |
eerror "Compilation with gcc older than 4.7 is not supported" |
| 110 |
die "Too old gcc found." |
| 111 |
@@ -361,6 +365,14 @@ src_prepare() { |
| 112 |
# hack... |
| 113 |
mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die |
| 114 |
fi |
| 115 |
+ |
| 116 |
+ # Don't list pdfimport support in desktop when built with none, bug # 605464 |
| 117 |
+ if ! use pdfimport; then |
| 118 |
+ sed -i \ |
| 119 |
+ -e ":MimeType: s:application/pdf;::" \ |
| 120 |
+ -e ":Keywords: s:pdf;::" \ |
| 121 |
+ sysui/desktop/menus/draw.desktop || die |
| 122 |
+ fi |
| 123 |
} |
| 124 |
|
| 125 |
src_configure() { |
Archives