commit: 280a544893371d4aadcae7d47beb3d09ab85906d
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Sat May 27 00:51:14 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sat May 27 00:51:14 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=280a5448
app-office/libreoffice: version bump to 5.3.3.2
app-office/libreoffice/Manifest | 9 +++--
app-office/libreoffice/libreoffice-5.2.7.2.ebuild | 2 +-
...e-5.2.6.2.ebuild => libreoffice-5.3.3.2.ebuild} | 44 ++++++++++++----------
3 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index a49f2d0..2f89158 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -10,13 +10,14 @@ DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288
SHA256 eafde646a7dbe46
DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 SHA256
64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 SHA512
4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
WHIRLPOOL
a5156d06323699d2cbf539f14f5f44f54ebf33e86c7f14e98acd4c6e29c3e496f91dd6792401148ffa32e3dcb1cd4f087ed804e306b241cef86de0aa347d25d4
DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
555291 SHA256 b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb
SHA512
1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8
WHIRLPOOL
d809712c3fcaca922d64f67a14d9dc3e750ecf359687c7ba0e8c6c7fc7750e43721a21ce29d5a3b0b87b83bfe7b71947e701ba4aed0a337ec35ecbb22d8dec34
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512
ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
WHIRLPOOL
8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4
+DIST 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz 1794694 SHA256
41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f SHA512
20b0c0ba517c764fcd32165254ae6dcdda8fb72ca3279dbfcf42d899e91d380b78d9be3b1c3d32910eaad5544a4fc51218e32579b10e6b6639338a7bd8b1ddc5
WHIRLPOOL
f4d783d01346860ed2cf1d15e692e70e65034bee120c853cf7692358799a6e3339a1bb022f4d72ee4364adddd43766aa01770070a0081d1adcc588e4f84786f9
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.6.2.tar.xz 164804780 SHA256
3d49e339631114652820b890859eef85601d1aeda2acb1309f0de24009f53570 SHA512
b84420a773739162555b28700a5588771a1fa7131d82a5861799f402df65f84a17715f80b8ba9aa793c1fed78c7e38b8bfbff2c3b9e0e8f119c9b453a8e6edc9
WHIRLPOOL
fe6e739c78172add6fb1235c5ddcffc7d62767008ca5acafd2d95ba143367b26bae94c7f295527d55312ecec4bee47d53daab8b2f2ac159f8d581c7532e3ee48
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-branding-gentoo-0.8.tar.xz 151568 SHA256
22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
WHIRLPOOL
1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
-DIST libreoffice-help-5.2.6.2.tar.xz 1446048 SHA256
c0cd648d9994814925083d1a891b63b5e5233718eb8f8782810bb602c0fdb88b SHA512
10568ffb0d7fbd1a01681e52e594b39f120802e8fd70d12824a2be0185bdf491c28818fc8a9fe16fed8533fa61119b90d6f0a1a8f9488a83b33f6a6be2d75e37
WHIRLPOOL
e3921ba0b64819b19cd278f7a87dec4313e6cd9df58108170e2d438b0c08644395ac568f7cc601e88ff466e78fa6bbd426fdc9b4a704d3d8693b8c0cb1537ab8
DIST libreoffice-help-5.2.7.2.tar.xz 1940516 SHA256
f7d35c460da96ed2d52cf97baef159382b38e5ce4579c34e65480ff2911cac4b SHA512
c86bc17448fcd1da01e13d3e9fee739610fde390abaf0635cc4593755d102da08a5eea0533076e1a0f8d89f0b32ba5086b155b9b388f317a5e4c669bf17769e1
WHIRLPOOL
4da96a14b70be718109eda5ced62cec85b96e9028fcf65d729a99604598de81edc097bc06577f3ce7958de1316b04d2d2f1f2782c6504a487ffc6ebaaf7feca6
-EBUILD libreoffice-5.2.6.2.ebuild 18066 SHA256
c5ddfc32e04d5b770b01c6f728d943e6ba9196c4ac93d419b5e3552fbc020161 SHA512
8c8bac08d79db6b78ea4d101ef7765974319898c30ffc4f933ee2fedfe51d1c72a1a381ec66acdd9aa68a5e33f4597daab33776915381626bd4ef5e160191084
WHIRLPOOL
e4b6579fa88063cb3118fa5bdc88c41ddf19eada26953818d37eeac9d6535b33efda27cb5af36624d83cc6755e1b95dbca7b707e1fdc93e7d21d761b391c5c75
-EBUILD libreoffice-5.2.7.2.ebuild 18068 SHA256
ff51e5c8c950ed05c7046eadcc362f8d1c78b1e33431c635f526125da6cdb3e1 SHA512
a3b41a682e54c6827a074927bd4bc383a4e526910eb0f4ed16bd2f8735b3ef0b3e766c75062d6df771258f5e03fe969ace47a0bbac6f5413017892532868bb8f
WHIRLPOOL
0dfc4db3891c4aecc16d0baf44194b643357b239e6793ccab2b7ec4b709d1158d3e3efbdbc037338b8ff4c4183ec431fbe7a96bda66a07f670211139f5419c14
+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
MISC metadata.xml 1506 SHA256
e9682eb8fcf1609f39f15680caa33f2b87151ecca4189964ea750a5e8a09485a SHA512
20e6d0f46aa551074f0f0b794d6c4c92e011bf6ab854c7111fad081f9f9d9fe51e370decbbbe9b2cc74a7d1369e38fe0cb3c2768c2d287fc30346c8e4d6783aa
WHIRLPOOL
ae9571006a3f933ee16ea4e34e3a3cb1b017ce1734e4e09f4ff9f421031c10ebe7c1b5ee87ff84532c13805ec7b4284e14b4aab3d06767d28268b58a768ce9c1
diff --git a/app-office/libreoffice/libreoffice-5.2.7.2.ebuild
b/app-office/libreoffice/libreoffice-5.2.7.2.ebuild
index 3fad018..2e0e5b8 100644
--- a/app-office/libreoffice/libreoffice-5.2.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.7.2.ebuild
@@ -83,7 +83,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
diff --git a/app-office/libreoffice/libreoffice-5.2.6.2.ebuild
b/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
similarity index 94%
rename from app-office/libreoffice/libreoffice-5.2.6.2.ebuild
rename to app-office/libreoffice/libreoffice-5.3.3.2.ebuild
index 2e0e5b8..8b27176 100644
--- a/app-office/libreoffice/libreoffice-5.2.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
@@ -7,7 +7,7 @@ KDE_REQUIRED="optional"
KDE_SCM="git"
CMAKE_REQUIRED="never"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
PYTHON_REQ_USE="threads,xml"
# experimental ; release ; old
@@ -56,7 +56,7 @@ unset DEV_URI
# 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
+ "${ADDONS_URI}/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.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?
@@ -83,7 +83,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
@@ -97,6 +97,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=app-text/libmspub-0.1.0
>=app-text/libmwaw-0.3.1
>=app-text/libodfgen-0.1.0
+ app-text/libstaroffice
app-text/libwpd:0.10[tools]
app-text/libwpg:0.3
>=app-text/libwps-0.4
@@ -105,11 +106,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
=dev-cpp/libcmis-0.5*
dev-db/unixODBC
dev-lang/perl
- >=dev-libs/boost-1.55:=
+ dev-libs/boost:=
dev-libs/expat
dev-libs/hyphen
dev-libs/icu:=
- =dev-libs/liborcus-0.11*
+ =dev-libs/liborcus-0.12*
dev-libs/librevenge
dev-libs/nspr
dev-libs/nss
@@ -120,34 +121,35 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/fontconfig
media-libs/freetype:2
>=media-libs/glew-1.10:=
- >=media-libs/harfbuzz-0.9.18:=[icu(+)]
+ media-libs/harfbuzz:=[graphite,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
+ media-libs/libzmf
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/jpeg:0
virtual/opengl
bluetooth? ( net-wireless/bluez )
coinmp? ( sci-libs/coinor-mp )
- collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
+ collada? ( media-libs/opencollada )
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 )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
gltf? ( media-libs/libgltf )
gnome? ( gnome-base/dconf )
gstreamer? (
@@ -161,7 +163,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
gtk3? (
dev-libs/glib:2
dev-libs/gobject-introspection
- >=x11-libs/gtk+-3.8:3
+ x11-libs/gtk+:3
)
jemalloc? ( dev-libs/jemalloc )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
@@ -204,7 +206,7 @@ DEPEND="${COMMON_DEPEND}
dev-util/cppunit
>=dev-util/gperf-3
dev-util/intltool
- >=dev-util/mdds-1.2.0:1=
+ >=dev-util/mdds-1.2.2:1=
media-libs/glm
sys-devel/bison
sys-devel/flex
@@ -239,11 +241,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
"
PATCHES=(
- # from master branch
- "${FILESDIR}/${PN}-5.2-icu58.patch"
-
# not upstreamable stuff
- "${FILESDIR}/${PN}-5.2-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3-system-pyuno.patch"
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
@@ -257,7 +256,13 @@ PATCHES=(
pkg_pretend() {
use java || \
- ewarn "If you plan to use lbase application you should enable
java or you will get various crashes."
+ 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.0.0. It is
unable to read back Firebird 2.5 data,"
+ ewarn "so embedded firebird odb files created in LibreOffice
pre-5.3 cannot be opened with LibreOffice 5.3."
+ ewarn "See also:
https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base";
+ fi
if [[ ${MERGE_TYPE} != binary ]]; then
@@ -429,6 +434,7 @@ src_configure() {
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-graphite: disabling causes build breakages
# --enable-*-link: link to the library rather than just dlopen on
runtime
@@ -453,13 +459,12 @@ src_configure() {
--enable-python=system \
--enable-randr \
--enable-release-build \
+ --disable-breakpad \
--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") \
@@ -478,7 +483,6 @@ src_configure() {
--without-myspell-dicts \
--without-help \
--with-helppack-integration \
- --without-sun-templates \
--without-system-sane \
$(use_enable bluetooth sdremote-bluetooth) \
$(use_enable coinmp) \
@@ -557,7 +561,7 @@ src_install() {
# bug 593514
if use gtk3; then
- dosym
/usr/$(get_libdir)/libreoffice/program/liblibreofficekitgtk.so \
+ dosym libreoffice/program/liblibreofficekitgtk.so \
/usr/$(get_libdir)/liblibreofficekitgtk.so
fi
