CVS commit: pkgsrc/misc/libreoffice

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Jul  2 13:03:11 UTC 2019

Modified Files:
        pkgsrc/misc/libreoffice: Makefile distinfo
        pkgsrc/misc/libreoffice/patches: patch-download.lst

Log Message:
Sync internal harfbuzz with fonts/harfbuzz-2.5.3. Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.197 -r1.198 pkgsrc/misc/libreoffice/Makefile
cvs rdiff -u -r1.81 -r1.82 pkgsrc/misc/libreoffice/distinfo
cvs rdiff -u -r1.12 -r1.13 pkgsrc/misc/libreoffice/patches/patch-download.lst

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/libreoffice/Makefile
diff -u pkgsrc/misc/libreoffice/Makefile:1.197 pkgsrc/misc/libreoffice/Makefile:1.198
--- pkgsrc/misc/libreoffice/Makefile:1.197      Mon Jul  1 04:08:35 2019
+++ pkgsrc/misc/libreoffice/Makefile    Tue Jul  2 13:03:11 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.197 2019/07/01 04:08:35 ryoon Exp $
+# $NetBSD: Makefile,v 1.198 2019/07/02 13:03:11 ryoon Exp $
 
 VERREL=                6.2.4
 VERRC=         2
 VER=           ${VERREL}.${VERRC}
 DISTNAME=      libreoffice-${VER}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    misc
 MASTER_SITES=  http://download.documentfoundation.org/libreoffice/src/${VERREL}/
 EXTRACT_SUFX=  .tar.xz
@@ -112,8 +112,8 @@ SITES.49a64f3bcf20a7909ba2751349231d6652
 
 .include "../../graphics/librsvg/available.mk"
 .if ${LIBRSVG_TYPE} == "c" || make(distinfo) || make(mdi)
-MORE_DISTFILES2+=              harfbuzz-2.4.0.tar.bz2
-SITES.harfbuzz-2.4.0.tar.bz2=  https://www.freedesktop.org/software/harfbuzz/release/
+MORE_DISTFILES2+=              harfbuzz-2.5.3.tar.xz
+SITES.harfbuzz-2.5.3.tar.xz=   https://www.freedesktop.org/software/harfbuzz/release/
 .endif
 
 .for md2 in ${MORE_DISTFILES2}

Index: pkgsrc/misc/libreoffice/distinfo
diff -u pkgsrc/misc/libreoffice/distinfo:1.81 pkgsrc/misc/libreoffice/distinfo:1.82
--- pkgsrc/misc/libreoffice/distinfo:1.81       Thu Jun 27 13:50:49 2019
+++ pkgsrc/misc/libreoffice/distinfo    Tue Jul  2 13:03:11 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.81 2019/06/27 13:50:49 ryoon Exp $
+$NetBSD: distinfo,v 1.82 2019/07/02 13:03:11 ryoon Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -144,10 +144,10 @@ SHA1 (libreoffice/graphite2-minimal-1.3.
 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-2.4.0.tar.bz2) = 76a229231d35145fab8f3862dd5395a9a61c62aa
-RMD160 (libreoffice/harfbuzz-2.4.0.tar.bz2) = 884745083c4dcaa9acdde63c6eabf009488c4eaa
-SHA512 (libreoffice/harfbuzz-2.4.0.tar.bz2) = daeaf029bd5d0d0674f930a8d0dcdc4e0b1253b2369c732c7b4fd130ab9438d0d9526967224a583ee58974c3b492874acaccdac13c71b58c950f0b3f031e505c
-Size (libreoffice/harfbuzz-2.4.0.tar.bz2) = 17919355 bytes
+SHA1 (libreoffice/harfbuzz-2.5.3.tar.xz) = 85d7fc0cf7c55c5ae21575fd188f827fc8b2c46a
+RMD160 (libreoffice/harfbuzz-2.5.3.tar.xz) = d3e57a0c2b0b43df571200db8635c88ae1959d5b
+SHA512 (libreoffice/harfbuzz-2.5.3.tar.xz) = a2e6cedbe0e505fa31b540e0d0bc6c0b07080bd39879c27e04d351103e21201d75a809dd2fad559bf994b82b311f67ad85778cbbfb670d7e2580beafa09e93ff
+Size (libreoffice/harfbuzz-2.5.3.tar.xz) = 5685712 bytes
 SHA1 (libreoffice/language-subtag-registry-2018-04-23.tar.bz2) = 9414d32c4898e2c424dce590bab6e925df151a17
 RMD160 (libreoffice/language-subtag-registry-2018-04-23.tar.bz2) = 8b10fc6ec25128a79274a67e84c2585aad540ee8
 SHA512 (libreoffice/language-subtag-registry-2018-04-23.tar.bz2) = 94972420f4227933c27789b5a808071d11e9ee53f5184a47452772ac235ed17c1ac02c8a8d24a3f3c1067f75161d524fb587097e348c144ae50ee539b4e78cd7
@@ -219,7 +219,7 @@ SHA1 (patch-bridges_source_cpp__uno_gcc3
 SHA1 (patch-configure.ac) = c9b10c86e809961f9312d1dbd925c6bc77042f56
 SHA1 (patch-desktop_scripts_soffice.sh) = e6342e08781ca8dac72a1f28407517d79155577c
 SHA1 (patch-desktop_unx_source_pagein.c) = 0aa2b289df6d0fa524bf057d532aa5f9ceb6dde5
-SHA1 (patch-download.lst) = f6db8e621d9fee8652e62d5bb637d54618bfdb04
+SHA1 (patch-download.lst) = 67ce8ba0ff3fe376f862d6ed603cd56af8a96646
 SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = 5c5d965558f3c431cde6fc280438b23494b22607
 SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = 01798842e3f573f627be31660195edbac802df89
 SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = e20e0cc58153b865551a8dd2819fb141f20fcb8d

Index: pkgsrc/misc/libreoffice/patches/patch-download.lst
diff -u pkgsrc/misc/libreoffice/patches/patch-download.lst:1.12 pkgsrc/misc/libreoffice/patches/patch-download.lst:1.13
--- pkgsrc/misc/libreoffice/patches/patch-download.lst:1.12     Wed Apr  3 13:36:30 2019
+++ pkgsrc/misc/libreoffice/patches/patch-download.lst  Tue Jul  2 13:03:11 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-download.lst,v 1.12 2019/04/03 13:36:30 ryoon Exp $
+$NetBSD: patch-download.lst,v 1.13 2019/07/02 13:03:11 ryoon Exp $
 
 --- download.lst.orig  2019-01-23 19:35:25.000000000 +0000
 +++ download.lst
@@ -8,8 +8,8 @@ $NetBSD: patch-download.lst,v 1.12 2019/
  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 := 9035005903da74667d28bb181986e879e11da3d5986722759fa145cca781ead6
-+export HARFBUZZ_TARBALL := harfbuzz-2.4.0.tar.bz2
++export HARFBUZZ_SHA256SUM := fed00dc797b7ba3ca943225f0a854baaed4c1640fff8a31d455cd3b5caec855c
++export HARFBUZZ_TARBALL := harfbuzz-2.5.3.tar.xz
  export HSQLDB_SHA256SUM := d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
  export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
  export HUNSPELL_SHA256SUM := 57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951