diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2015-08-06 08:36:58 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2015-08-06 08:37:34 +0000 |
| commit | fe7df1f5b5fcad5b584b923f449b7388a7f6b79c (patch) | |
| tree | 99e32010334d53ffd3c4913b8935701a14a7234b /main/libreoffice | |
| parent | 9be57e8f98c8e0e5e3ba4ddcb638c476c4338c06 (diff) | |
| download | aports-fe7df1f5b5fcad5b584b923f449b7388a7f6b79c.tar.bz2 aports-fe7df1f5b5fcad5b584b923f449b7388a7f6b79c.tar.xz | |
main/libreoffice: upgrade to 5.0.0.5
update patches, and disable unit tests
Diffstat (limited to 'main/libreoffice')
| -rw-r--r-- | main/libreoffice/APKBUILD | 30 | ||||
| -rw-r--r-- | main/libreoffice/linux-musl.patch | 8 |
2 files changed, 15 insertions, 23 deletions
diff --git a/main/libreoffice/APKBUILD b/main/libreoffice/APKBUILD index 1e028d888c..558c0e9cf5 100644 --- a/main/libreoffice/APKBUILD +++ b/main/libreoffice/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: pkgname=libreoffice -pkgver=4.4.5.2 -pkgrel=1 +pkgver=5.0.0.5 +pkgrel=0 pkgdesc="LibreOffice - Meta package for the full office suite" url="http://www.libreoffice.org/" arch="all" @@ -133,7 +133,7 @@ build() { --disable-gltf \ --disable-liblangtag \ || return 1 - make || return 1 + make build-nocheck || return 1 } package() { @@ -204,24 +204,24 @@ writer() { _split writer } -md5sums="9bcb92fc06b3e2676a841420079598bd libreoffice-4.4.5.2.tar.xz -4c82bc306d11d2bedf27780656300af3 libreoffice-translations-4.4.5.2.tar.xz -84ff615f57ff189ca5e1bb61480e271d libreoffice-dictionaries-4.4.5.2.tar.xz +md5sums="e8e79a7706fd22416d5f3b58195b0ee7 libreoffice-5.0.0.5.tar.xz +bdf1f534ae937786dda2cf186f83d1a3 libreoffice-dictionaries-5.0.0.5.tar.xz +232bbb0e98de27f9fd3500e9d7558176 libreoffice-translations-5.0.0.5.tar.xz 1f24ab1d39f4a51faf22244c94a6203f 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz -69bef53b6dc9d39d59d1514d02dbbcf7 linux-musl.patch +bfde50b1b04c715cd172be03a204521f linux-musl.patch 1cff63a520d1b037edddf1b4de4799dc fix-execinfo.patch 2410b3fef56a2163a0d3142330ecbcdc fix-includes.patch" -sha256sums="3aeb4f08918c6ca6ec12fc47c2be690d2180c2e41cc3136b6ed36185b89cec0d libreoffice-4.4.5.2.tar.xz -7f4529914e4dfa960243ada641ada808619e193e1187f10f67e379063236d2a7 libreoffice-translations-4.4.5.2.tar.xz -fb7ecff75e4668a9435f6111e658d1a5316154e34a8b93cd37b29b927f8bffdc libreoffice-dictionaries-4.4.5.2.tar.xz +sha256sums="9b17f5848ecbe5302ff676abaa187f49ddc35bed1a56898b7e3e0b3e152dce10 libreoffice-5.0.0.5.tar.xz +252517f39b4db5feb9ad85a34c4f7849834c7a7f43ff7faea274f6f175c9ed64 libreoffice-dictionaries-5.0.0.5.tar.xz +f57acd2478b579ad7410c1a45567acdab4b8f3730ce722e47cd23ee882db0675 libreoffice-translations-5.0.0.5.tar.xz 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz -5cf5a446e5769f6a2df01c5c10702514fe9178334d1e53d3c7df843ca72c6fa2 linux-musl.patch +fd0778cfd18b034a415a8966f7a3d8437c3f2ba1c6cfde8220ba663261b9c67f linux-musl.patch 7171dfa651a7ee81b4e13a9fd9131428d9a65af138cac4cb428ae6c3e4bcb1f3 fix-execinfo.patch 2044d4c997472a46e95c68fa8bec19c1424e9074fad05df9f1c0d220dec00281 fix-includes.patch" -sha512sums="15abecb02d8ca478cb7d006834c8670b9e42d3e5d8ec772e9a1d805dbd2ef1145092d1d4e3a6531f21eeb75210c1354e91c4d3abeec97103ad4c3092b7b7273b libreoffice-4.4.5.2.tar.xz -c23ab491b93e9011074ea163ebe891d0d79925089aef71db7ef6b2f35d0b1ee50a55f2b66da30cba7aaa4e74ee9b4922931904762feea26405f9fa85dadf5816 libreoffice-translations-4.4.5.2.tar.xz -67e11a04bdad74021523e34ba149ace425c1975ace1f42b50d4d430e3aa1df4633ce6b1ecdd35c0d99d13fd98ff536cbe12134e15800c660807a38d61469c97d libreoffice-dictionaries-4.4.5.2.tar.xz +sha512sums="e7dc99f5c055ef4507ba5b61e39d242cf0337f30b525d172b54f7ce1b4e2ed2c6757bb2a5a3f18b9a8593d6bd43436ea1d067ea653735918812e7820f50996e8 libreoffice-5.0.0.5.tar.xz +c9e2894d3514518c67bdcf466295af46b6b52465dd840576d373e28a83851192075c7304081a4a0f566c2eb7116fe3297226be5a4c0c2983bf0d326d9253045f libreoffice-dictionaries-5.0.0.5.tar.xz +de30079fffaec0a64213f6d86dbaf6e8b8b1491c449c759e7f7b7f80b52aa82463399249d2fce4d665c4dea8056ca419ecfce13258134c5cbaae6c72de5e4dc8 libreoffice-translations-5.0.0.5.tar.xz 5664203e6426880041cdb227e91f79f00d2ca7ae28c6997f61b72cc599aac55838d082d2b2b551bd7a228424c350ddea5d41599b8ca58d444a2cd46c9206ea91 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz -5fb4d5bf5cab21a0c95a9e51a4a138b427a08677c34bc14287c3eb74926b606345d5185c76bbe8957043d79dc33d46cf4aaa5182642c7fb9136dc48ed9e7fabb linux-musl.patch +6abfd9c6cf1917e9ee89695086013c94f5ec68f9732ad60faeeaabe6f3765f5ff19df575a3ef0098d6dd6ba3c76369cec871770396f5cd84829031c3e38485a8 linux-musl.patch 567123f990c4a47c2e4cebf99f3486150740015e647ca2b2521e606f3350fc55ceda6c7ac031302da34e8fc90747d66619334fcfda4e7b8998456fe3619ab860 fix-execinfo.patch 15defc8362fb0e53db32b75d9c4ece73e1ee8bd1cc05b4dd8f072f808e6943b385a5415513b237d3daa130dedce3c6ac6370e05ec0b4a25065ce27aadd269e92 fix-includes.patch" diff --git a/main/libreoffice/linux-musl.patch b/main/libreoffice/linux-musl.patch index 5c8ab52976..f9b6bd7646 100644 --- a/main/libreoffice/linux-musl.patch +++ b/main/libreoffice/linux-musl.patch @@ -58,11 +58,3 @@ if test "$ENABLE_JAVA" != "" -a "$JDK"!="gcj"; then pathmunge "$JAVA_HOME/bin" "after" fi -@@ -12789,7 +12774,6 @@ - esac - - pathmunge "$SRC_ROOT/solenv/bin" "before" -- pathmunge "." "before" - fi - - AC_SUBST(LO_PATH) |