commit: 00f94354819c7cc2e1e35585db30de6411a7f5c3
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Fri Jun 30 20:39:16 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Fri Jun 30 20:41:13 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=00f94354
app-office/libreoffice: version bump to 5.3.4.2
app-office/libreoffice/Manifest | 8 ++++++--
.../libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch | 11 +++++++++++
app-office/libreoffice/libreoffice-5.2.7.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.3.3.2.ebuild | 2 +-
...{libreoffice-5.3.3.2.ebuild => libreoffice-5.3.4.2.ebuild} | 6 +++---
5 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 6c82d14..4192cbe 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,6 +7,7 @@ AUX libreoffice-5.2.5.1-glibc-2.24.patch 361 SHA256
3f87a11b6d1218a4510835e12c44
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
+AUX libreoffice-5.3.4.2-kioclient5.patch 605 SHA256
fe58b04bdadad25bdfc02d613cf9bef686c31e59f38a933ef1b359ee8fe9aaf2 SHA512
2aa6d1fc96749b79b3291f6e27630c6cf59d2c743f0dd8603867ba8aec2c17f87b70e1dd031365013f7e9ea53c160e9cb3f48af592a587dc05f3ae4cc1b35df6
WHIRLPOOL
50917a062e9dd83b21ff349b758e01dbdc7e47014184ecaf5051ff0cc7fd480d8c0c1f7de492a03ed3864ae9cc9d2ab6df44c7fe3e88f067048391d32489fbfc
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
@@ -17,9 +18,12 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150
SHA256 75823776fb51
DIST ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 1769329 SHA256
3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 SHA512
2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5
WHIRLPOOL
29ddaef03d46fe08aa2dba200be755817f8e77de3bbbb3ed86dae65e891239f3051f79fdfadec6ae56023197e32e1c44a94385a1ce306081f3bf94be6226f8c7
DIST libreoffice-5.2.7.2.tar.xz 184589464 SHA256
106154a72a329605166a49bfa31c6d1cc03133d600ad0ef340b45e4e2a92891d SHA512
f7414a0d0d654d1d9bd6c5524ff2acf2f21c544dd6ed79f4f2d22f79db46264f95f7ca8dd482027f7a573d2d491ea6c8d9875b262d5e2b917dfddb749a3ea95f
WHIRLPOOL
28d7f9531190a16bdea14c5dcc710ef593085fddca1b4d7d0cd6107d5f93e4b94a1ae035a626376ab7abfcd926a263b1437de1e52011bb96aa6d87b046a38da8
DIST libreoffice-5.3.3.2.tar.xz 190216268 SHA256
9632956926d9d5c9049ce5b81c2673f298ae73b873d53cce8cfaea8ee243619a SHA512
ff7ffb5a74d51305d098bf34196ff97ae9b4087119bb06929245facc345499896fbc15e9b99b1c7ac22e85b5d461192b3a4e8cdee7238fd1efae74197cbd8338
WHIRLPOOL
e93a6f8b181f4578d2447a50c402b4177add6861db8e7cadb76c412611b5bc49118064eb4cce57506cd4e934ce5d729d458972781f3bf8212a886c4fcb0a46d4
+DIST libreoffice-5.3.4.2.tar.xz 188762904 SHA256
1d75393fd8b02b1e2e2e001bc0262359c7452e29a0fff35cb152717246f02379 SHA512
ac3b0a0615577faf6c2529b7ec888fd7969d32f38d8b83a3747535bc408e8d2ef2e724f5b1840ae79a219bb855584be87f10ab26ef101afe04dd15d224e6ebc0
WHIRLPOOL
4b314f2df7ee8bd80049cc6ad04e65df11a46a20853f0a285389cf2c72006dd122f1826ae0080c7efc41faa251b77a48f839f345451d993b48bc673d6e450aed
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256
22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
WHIRLPOOL
1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
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
7719d8904b8b867932d0fac42482d0962c4870f2fb79097ca91121a151a8d8bc SHA512
483fcad9125611985e559df9e4c87a8c81754f632f2c0c53afa5c82008b8fe426503125cbc8fb4afb54a46d2a3898aa5934bb2b0cb1e7f530b9704eea52054e7
WHIRLPOOL
8241fd2ed8f78de61607f4530b68eba4e37831d6616f04427f8dd3c615982be3830e88ac5ca6857031f85cc58fb0ed2a7e211f6272783cb259aa922fa5946101
+DIST libreoffice-help-5.3.4.2.tar.xz 2108116 SHA256
ab8600dc99e09d90fec83bcc505c42556156730f78973cecd74fa377fe8de91a SHA512
c4785e7e1b99806adc6b354f8ebf5d81a76b1f802628f0453fc365989ed07c5ba039145ea1ebbfbd0340815157c6638040953afad1c1c9f80bc3271257137d7c
WHIRLPOOL
fe229a3bd9b99067d33ab4d53ae6502578fff4ee3e184b0096e9da3c458534a35751cc6809b77351c011730a91d94c2bf9be94abaa026852ab67b3b6c50cdc7c
+EBUILD libreoffice-5.2.7.2.ebuild 18072 SHA256
d27c0dfcb258e8c8472c5e365c2c66ba62984ae00ff12835cb094340d8c1427e SHA512
6862d9d832347475813920ae294a1aef7394a8213869844b1789c42a089c419054d1879579248a20ec791a1e695f9dbd707c2661159b09fb2d88bc7c10956202
WHIRLPOOL
2fbbe4ff48f0ac3b4fd25ed077aabc5b0863faeaa60fa03f177be6d2b5bfd34b10aac99c29c6f9fddbab8c36173cb735e9aa88756251f39b474c172120059511
+EBUILD libreoffice-5.3.3.2.ebuild 18387 SHA256
59827e4dc9c24b8bbae95b71b73c7c3ec7090078d2bf2a33289499d3ec18d294 SHA512
7d3900ee026c29834690de6f5270be0456d9f336f1eb94fcfa1ae88f7ad4971daeb4c7411e86d50c09480c579a6550da1f7907a7d2a7923b85d2c515ecf929d5
WHIRLPOOL
92a7316e7c3599579ef7e948f48c942422e8b1bba54654fd039fc85bdabe6e5ea53e6ce59bf59db9bcaf2731053d901ada5bbfffab18fc9472c25c66d834740e
+EBUILD libreoffice-5.3.4.2.ebuild 18452 SHA256
b24245f0a04c8d8e81e23c9999c896997b0af15c01ff31c5c15023194233145a SHA512
1adb9f0c4c01dbbd47b87529991e90e58f04f211bac290fadf33a7e4262fe17aa031359af108d1cc67ce1a365014ce326a2cfd123a95a4f62b0fc37ab99e6122
WHIRLPOOL
d191b03fdd376d4b8a19cd7722fe04521a22d28c17b6dba1ca68791fdda8ddc52eb121142471543b0c739fba04b09d08797e0da46a90491a66010edc8af3f081
MISC metadata.xml 1506 SHA256
e9682eb8fcf1609f39f15680caa33f2b87151ecca4189964ea750a5e8a09485a SHA512
20e6d0f46aa551074f0f0b794d6c4c92e011bf6ab854c7111fad081f9f9d9fe51e370decbbbe9b2cc74a7d1369e38fe0cb3c2768c2d287fc30346c8e4d6783aa
WHIRLPOOL
ae9571006a3f933ee16ea4e34e3a3cb1b017ce1734e4e09f4ff9f421031c10ebe7c1b5ee87ff84532c13805ec7b4284e14b4aab3d06767d28268b58a768ce9c1
diff --git a/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch
b/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch
new file mode 100644
index 0000000..a6e732f
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch
@@ -0,0 +1,11 @@
+--- a/shell/source/unix/misc/senddoc.sh 2017-06-15 15:44:22.000000000
+0200
++++ b/shell/source/unix/misc/senddoc.sh 2017-06-25 01:00:08.525435930
+0200
+@@ -389,6 +389,8 @@
+ elif [ -n "$DESKTOP_LAUNCH" ]; then
+ #
http://lists.freedesktop.org/pipermail/xdg/2004-August/002873.html
+ MAILER=${DESKTOP_LAUNCH}
++ elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open5 ] ; then
++ MAILER=/usr/bin/kde-open5
+ elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open ] ; then
+ MAILER=/usr/bin/kde-open
+ elif [ -x /usr/bin/xdg-open ] ; then
diff --git a/app-office/libreoffice/libreoffice-5.2.7.2.ebuild
b/app-office/libreoffice/libreoffice-5.2.7.2.ebuild
index 2e0e5b8..a8b94c9 100644
--- a/app-office/libreoffice/libreoffice-5.2.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.7.2.ebuild
@@ -148,7 +148,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
gnome-extra/evolution-data-server
)
firebird? ( >=dev-db/firebird-2.5 )
- gltf? ( media-libs/libgltf )
+ gltf? ( =media-libs/libgltf-0.0* )
gnome? ( gnome-base/dconf )
gstreamer? (
media-libs/gstreamer:1.0
diff --git a/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
b/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
index 5c85f98..903dd4e 100644
--- a/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
@@ -150,7 +150,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
gnome-extra/evolution-data-server
)
firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
- gltf? ( media-libs/libgltf )
+ gltf? ( =media-libs/libgltf-0.0* )
gnome? ( gnome-base/dconf )
gstreamer? (
media-libs/gstreamer:1.0
diff --git a/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
b/app-office/libreoffice/libreoffice-5.3.4.2.ebuild
similarity index 99%
copy from app-office/libreoffice/libreoffice-5.3.3.2.ebuild
copy to app-office/libreoffice/libreoffice-5.3.4.2.ebuild
index 5c85f98..8f16918 100644
--- a/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.4.2.ebuild
@@ -150,7 +150,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
gnome-extra/evolution-data-server
)
firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
- gltf? ( media-libs/libgltf )
+ gltf? ( =media-libs/libgltf-0.0* )
gnome? ( gnome-base/dconf )
gstreamer? (
media-libs/gstreamer:1.0
@@ -180,9 +180,8 @@ RDEPEND="${COMMON_DEPEND}
!app-office/openoffice
media-fonts/liberation-fonts
media-fonts/libertine
- media-fonts/urw-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools $(add_kdeapps_dep
kioclient) )
java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
vlc? ( media-video/vlc )
"
@@ -243,6 +242,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.3-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
