diff options
| -rw-r--r-- | misc/libreoffice/Makefile | 11 | ||||
| -rw-r--r-- | misc/libreoffice/distinfo | 44 | ||||
| -rw-r--r-- | misc/libreoffice/patches/patch-download.lst | 6 |
3 files changed, 30 insertions, 31 deletions
diff --git a/misc/libreoffice/Makefile b/misc/libreoffice/Makefile index 4afd3dd87bf..b928eb9af1b 100644 --- a/misc/libreoffice/Makefile +++ b/misc/libreoffice/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.173 2018/11/16 13:02:45 bsiegert Exp $ +# $NetBSD: Makefile,v 1.174 2018/11/18 07:11:40 ryoon Exp $ -VERREL= 6.1.2 -VERRC= 1 +VERREL= 6.1.3 +VERRC= 2 VER= ${VERREL}.${VERRC} DISTNAME= libreoffice-${VER} -PKGREVISION= 4 CATEGORIES= misc MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${VERREL}/ EXTRACT_SUFX= .tar.xz @@ -103,14 +102,14 @@ MORE_DISTFILES= \ Amiri-0.111.zip \ ReemKufi-0.7.zip -MORE_DISTFILES+= harfbuzz-1.8.8.tar.bz2 +MORE_DISTFILES+= harfbuzz-2.1.1.tar.bz2 .for md in ${MORE_DISTFILES} DISTFILES+= ${md} SITES.${md}= https://dev-www.libreoffice.org/src/ .endfor -SITES.harfbuzz-1.8.8.tar.bz2= http://www.freedesktop.org/software/harfbuzz/release/ +SITES.harfbuzz-2.1.1.tar.bz2= https://www.freedesktop.org/software/harfbuzz/release/ .include "options.mk" diff --git a/misc/libreoffice/distinfo b/misc/libreoffice/distinfo index 379b5ecf4c1..ffa508f7233 100644 --- a/misc/libreoffice/distinfo +++ b/misc/libreoffice/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.64 2018/11/10 21:35:07 mrg Exp $ +$NetBSD: distinfo,v 1.65 2018/11/18 07:11:40 ryoon Exp $ SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b @@ -160,10 +160,10 @@ SHA1 (libreoffice/graphite2-minimal-1.3.10.tgz) = a2dac9614ab6b11ba5529f9043467d RMD160 (libreoffice/graphite2-minimal-1.3.10.tgz) = 508f69ef2f6c4e8e3843d4a367aea8e1c00439e3 SHA512 (libreoffice/graphite2-minimal-1.3.10.tgz) = 0bbf2b586d3b9f09aa6f8e68575482d63ea4ebc712bd2103ba678074b581ac0e5593fdb6d26be60a74fea0261da2797d4c0db7d384d75837fbf93dd4ac3579a2 Size (libreoffice/graphite2-minimal-1.3.10.tgz) = 155690 bytes -SHA1 (libreoffice/harfbuzz-1.8.8.tar.bz2) = be496408b2bb3dc794891e8b0e977cd75f02d71d -RMD160 (libreoffice/harfbuzz-1.8.8.tar.bz2) = 3b4a94557770bc0aeb7a0a1d7fb3ac2c92830fc5 -SHA512 (libreoffice/harfbuzz-1.8.8.tar.bz2) = eb96cd710571a96473b20bc9a01dadf2a3c11224497e52c63368e8edec64a8eb7085dd847c78111b798a1e8a6a950f0a04c930209822aabf13cf86d7a53b1f79 -Size (libreoffice/harfbuzz-1.8.8.tar.bz2) = 3862626 bytes +SHA1 (libreoffice/harfbuzz-2.1.1.tar.bz2) = 14178b5d53083ea38b420ab860d49189d438393f +RMD160 (libreoffice/harfbuzz-2.1.1.tar.bz2) = 13937f4ff98d55169cb5a818cd045ed1b8b2789a +SHA512 (libreoffice/harfbuzz-2.1.1.tar.bz2) = c3fc46eaeb8c02594e2430f853b6eebb762072638e3113e27ff9b5caefce2c06534e8056d57f35d87df6dbb1027cbc0c1a08f914dec7c6a715c3f0abc0a18933 +Size (libreoffice/harfbuzz-2.1.1.tar.bz2) = 4386396 bytes SHA1 (libreoffice/language-subtag-registry-2017-12-14.tar.bz2) = a6fe98f8966d2deb6cf30009d28e39ea56b304c6 RMD160 (libreoffice/language-subtag-registry-2017-12-14.tar.bz2) = 38956930e7664d8bf942897d954901b3f32dd144 SHA512 (libreoffice/language-subtag-registry-2017-12-14.tar.bz2) = b1963b6433f720cf41959ac78b10894a19761037781c172064737ef3c44e2a8532d03788999289a32cc598507079701dc56df20d812524ac3283ab2d7855cabd @@ -180,22 +180,22 @@ SHA1 (libreoffice/libre-hebrew-1.0.tar.gz) = 88bc96881b7f5dc161ef8994cb499f13f6f RMD160 (libreoffice/libre-hebrew-1.0.tar.gz) = e44c35266105eb06023bd75d16f8f297c63e886d SHA512 (libreoffice/libre-hebrew-1.0.tar.gz) = 609c8ef29a1eab9b027ea04abf14949e9a204cf826fb0a792dadd8a83fc49ac9610a0b3a2bd4b8988e615688c63d0ec08a89436134980b2a9667e8966a75a795 Size (libreoffice/libre-hebrew-1.0.tar.gz) = 531276 bytes -SHA1 (libreoffice/libreoffice-6.1.2.1.tar.xz) = 58d22a84a5ac4ee1e103331e3e3cc51ba51d85a0 -RMD160 (libreoffice/libreoffice-6.1.2.1.tar.xz) = 248a1081c012aa36d27769a52875f27a181c472e -SHA512 (libreoffice/libreoffice-6.1.2.1.tar.xz) = b7c7839da8251fd0f01794381d77a5abd4d092f21589df046402a1d332d782608aa00ab29ad60c9a34f27f11576d70c5a678e87a0f53c5b4065ae59fe77a0367 -Size (libreoffice/libreoffice-6.1.2.1.tar.xz) = 207364016 bytes -SHA1 (libreoffice/libreoffice-dictionaries-6.1.2.1.tar.xz) = f81eff375b920c641daa398d3c800ed97e75bbdf -RMD160 (libreoffice/libreoffice-dictionaries-6.1.2.1.tar.xz) = 6859c2135d9e1ca06566d9a4a344eaddd0c1e8a9 -SHA512 (libreoffice/libreoffice-dictionaries-6.1.2.1.tar.xz) = 3fc6a743942a53451fa42134655b914ae2c0d26ed4871d4178c7306169675eb0bd360187603c502162f64a35620e28e6a2535dbd1f02c9d4f3816c6281068b2c -Size (libreoffice/libreoffice-dictionaries-6.1.2.1.tar.xz) = 42193244 bytes -SHA1 (libreoffice/libreoffice-help-6.1.2.1.tar.xz) = b1c9b84652a35c03e649781b18f9d406973fc5f8 -RMD160 (libreoffice/libreoffice-help-6.1.2.1.tar.xz) = 43cefca995266105daf8c78867b49d527fb1993b -SHA512 (libreoffice/libreoffice-help-6.1.2.1.tar.xz) = 6cabaed79d0405e4e35af3e3689561e0d447bbf98b081b6a40fd52c37bda7b0886d4df4ea1c2deaa7db56c26933b5697ae4ef796f6e763a58b7ee729debcca6e -Size (libreoffice/libreoffice-help-6.1.2.1.tar.xz) = 15757852 bytes -SHA1 (libreoffice/libreoffice-translations-6.1.2.1.tar.xz) = 4513171f28890bc32c4a6e1e28dcafcd68507bd6 -RMD160 (libreoffice/libreoffice-translations-6.1.2.1.tar.xz) = e8918af3eb098b7682e308e4b08a37af60df3d24 -SHA512 (libreoffice/libreoffice-translations-6.1.2.1.tar.xz) = 26ea250c4cfe77929b1b95026da0874f34dd161550ba78a1db99350f4234d6b5b1a8e3e0553f248151aa7344fea1ef1a1589751381a4a5ecc7ff5dc0cb3e1e59 -Size (libreoffice/libreoffice-translations-6.1.2.1.tar.xz) = 141177052 bytes +SHA1 (libreoffice/libreoffice-6.1.3.2.tar.xz) = f287f8ce717e03f8e25e1c692603a9b8b9753f72 +RMD160 (libreoffice/libreoffice-6.1.3.2.tar.xz) = ee08503331a03b3240f8c4cd2dad7aceed62a64d +SHA512 (libreoffice/libreoffice-6.1.3.2.tar.xz) = 1d3de497cbda49df6a59b550a18db5fc92f67ff522ba7432dea7052099226a260997c2efa0a59ce861c3bd921d7d569738721c5ed6efbd8a24e74c52eae5c484 +Size (libreoffice/libreoffice-6.1.3.2.tar.xz) = 207404836 bytes +SHA1 (libreoffice/libreoffice-dictionaries-6.1.3.2.tar.xz) = 1c7e849f1fef49b9a0bac0b0fb3d534f779f87f5 +RMD160 (libreoffice/libreoffice-dictionaries-6.1.3.2.tar.xz) = 309efbaedb8fba4d7b109ecf9bcad63c377cf3b6 +SHA512 (libreoffice/libreoffice-dictionaries-6.1.3.2.tar.xz) = 5ded2c03ca83cca9e49234f712c3e584509a547d28b8a2b2715388a8a69d5d5de5181c06d7b0488e6b5a9949aa98dca96b29b3cffcb7681a349799ba0e430c5f +Size (libreoffice/libreoffice-dictionaries-6.1.3.2.tar.xz) = 43859808 bytes +SHA1 (libreoffice/libreoffice-help-6.1.3.2.tar.xz) = 75902371df5826d42251ac5d70b35026ad991b00 +RMD160 (libreoffice/libreoffice-help-6.1.3.2.tar.xz) = 3814e7a88ca24a93178672b514ca7a57695120ac +SHA512 (libreoffice/libreoffice-help-6.1.3.2.tar.xz) = e52c9ff796696ab3dc6d32b468f3ca13f346b999a7bdbbffb7811eb8b7b347f4feb9ee02ff500f8b9e64cc246bc171a6166fcbd43e79a9ee75e2dafe37df9994 +Size (libreoffice/libreoffice-help-6.1.3.2.tar.xz) = 15757496 bytes +SHA1 (libreoffice/libreoffice-translations-6.1.3.2.tar.xz) = 29d4862bd747b13276e1e0b0dc5f2ae04268a479 +RMD160 (libreoffice/libreoffice-translations-6.1.3.2.tar.xz) = 85c5bb6974719bafca4536fc690a679f9794571b +SHA512 (libreoffice/libreoffice-translations-6.1.3.2.tar.xz) = a6db0d36cd6702277855a737d60a6140c3ee683f4b55441172eccee2da5431b362f9e8972a4c486fdce6d2b87ac1d57783960af2e38e8cfb427d74672d299695 +Size (libreoffice/libreoffice-translations-6.1.3.2.tar.xz) = 141258352 bytes SHA1 (libreoffice/lxml-4.1.1.tgz) = 154279bc5939d7099697887ea15c5ca921abeaeb RMD160 (libreoffice/lxml-4.1.1.tgz) = 9d093324e4dd188f9885f2e4d3c19988e709dbbc SHA512 (libreoffice/lxml-4.1.1.tgz) = 9542e5206f9b2f9e072c52ef8e6cf44d1aaae8ae3e7ca7e820c1fac12e716503308ccb3cebc52155b4c93799f3ebca247781fc491524d004378bd26f5cddb9d1 @@ -219,7 +219,7 @@ SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = f7eaf2748c6 SHA1 (patch-configure.ac) = 7e7d4b8bc3064aac7c1689026b7c210587f80bdd SHA1 (patch-desktop_scripts_soffice.sh) = 8017e34da0da404d106397288da02fae4aef4bfc SHA1 (patch-desktop_unx_source_pagein.c) = 0aa2b289df6d0fa524bf057d532aa5f9ceb6dde5 -SHA1 (patch-download.lst) = 67cca256cd426895e31285713b7538db25e05e1c +SHA1 (patch-download.lst) = e99da66b2f8f01ffb60710980c314d381fd8e69f SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = 29da683484946a7bd6e1cec2a48a020513dc42dc SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = ed0c6861fd9a61eeac05e235dd505b6bed166a3a SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = e20e0cc58153b865551a8dd2819fb141f20fcb8d diff --git a/misc/libreoffice/patches/patch-download.lst b/misc/libreoffice/patches/patch-download.lst index a95d4ab0bab..da2c1bc5673 100644 --- a/misc/libreoffice/patches/patch-download.lst +++ b/misc/libreoffice/patches/patch-download.lst @@ -1,4 +1,4 @@ -$NetBSD: patch-download.lst,v 1.8 2018/09/15 03:22:50 ryoon Exp $ +$NetBSD: patch-download.lst,v 1.9 2018/11/18 07:11:40 ryoon Exp $ --- download.lst.orig 2018-09-10 20:08:33.000000000 +0000 +++ download.lst @@ -8,8 +8,8 @@ $NetBSD: patch-download.lst,v 1.8 2018/09/15 03:22:50 ryoon Exp $ export GRAPHITE_TARBALL := graphite2-minimal-1.3.10.tgz -export HARFBUZZ_SHA256SUM := 3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd -export HARFBUZZ_TARBALL := harfbuzz-1.8.4.tar.bz2 -+export HARFBUZZ_SHA256SUM := a8e5c86e4d99e1cc9865ec1b8e9b05b98e413c2a885cd11f8e9bb9502dd3e3a9 -+export HARFBUZZ_TARBALL := harfbuzz-1.8.8.tar.bz2 ++export HARFBUZZ_SHA256SUM := 83bf5d552df72c52969332f294cd97d8f6b46b77b41b61346ca56ebb81884e14 ++export HARFBUZZ_TARBALL := harfbuzz-2.1.1.tar.bz2 export HSQLDB_SHA256SUM := d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip export HUNSPELL_SHA256SUM := 3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4 |