CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Ryo ONODERA" <ryoon%netbsd.org@localhost>
Date: Sun, 2 Jun 2019 03:11:31 +0000

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sun Jun  2 03:11:31 UTC 2019

Modified Files:
        pkgsrc/devel/pango: Makefile
        pkgsrc/fonts/harfbuzz: Makefile PLIST
        pkgsrc/misc/libreoffice: Makefile distinfo

Log Message:
Add graphite2 to librsvg via pango and harfbuzz

librsvg with pango and harfbuzz with graphite2 is required for libreoffice.
librsvg-c has the problem on NetBSD and libreoffice uses internal static
harfbuzz library. Rust-based librsvg has no problem and libreoffice use
dynamic harfbuzz from fonts/harfbuzz.

Bump PKGREVISIONs.


To generate a diff of this commit:
cvs rdiff -u -r1.217 -r1.218 pkgsrc/devel/pango/Makefile
cvs rdiff -u -r1.111 -r1.112 pkgsrc/fonts/harfbuzz/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/fonts/harfbuzz/PLIST
cvs rdiff -u -r1.194 -r1.195 pkgsrc/misc/libreoffice/Makefile
cvs rdiff -u -r1.78 -r1.79 pkgsrc/misc/libreoffice/distinfo

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

Modified files:

Index: pkgsrc/devel/pango/Makefile
diff -u pkgsrc/devel/pango/Makefile:1.217 pkgsrc/devel/pango/Makefile:1.218
--- pkgsrc/devel/pango/Makefile:1.217   Tue Nov 20 08:34:43 2018
+++ pkgsrc/devel/pango/Makefile Sun Jun  2 03:11:30 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.217 2018/11/20 08:34:43 maya Exp $
+# $NetBSD: Makefile,v 1.218 2019/06/02 03:11:30 ryoon Exp $
 
 DISTNAME=      pango-1.42.4
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    devel fonts
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/pango/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
@@ -33,6 +33,7 @@ CHECK_FILES_SKIP+=    ${PREFIX}/libdata/pan
 CHECK_PORTABILITY_SKIP+= docs/check.docs
 
 .include "options.mk"
+.include "../../lang/rust/platform.mk"
 
 BUILDLINK_API_DEPENDS.fribidi+=        fribidi>=0.19.7
 .include "../../converters/fribidi/buildlink3.mk"
@@ -45,6 +46,9 @@ BUILDLINK_API_DEPENDS.fontconfig+=    fontc
 .include "../../fonts/fontconfig/buildlink3.mk"
 BUILDLINK_API_DEPENDS.harfbuzz+= harfbuzz>=0.9.9
 .include "../../fonts/harfbuzz/buildlink3.mk"
+.if !empty(PLATFORM_SUPPORTS_RUST:M[Yy][Ee][Ss])
+.include "../../graphics/graphite2/buildlink3.mk"
+.endif
 BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.12.10
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/cairo-gobject/buildlink3.mk"

Index: pkgsrc/fonts/harfbuzz/Makefile
diff -u pkgsrc/fonts/harfbuzz/Makefile:1.111 pkgsrc/fonts/harfbuzz/Makefile:1.112
--- pkgsrc/fonts/harfbuzz/Makefile:1.111        Sun Apr  7 18:16:07 2019
+++ pkgsrc/fonts/harfbuzz/Makefile      Sun Jun  2 03:11:30 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.111 2019/04/07 18:16:07 adam Exp $
+# $NetBSD: Makefile,v 1.112 2019/06/02 03:11:30 ryoon Exp $
 
 DISTNAME=      harfbuzz-2.4.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    fonts
 MASTER_SITES=  http://www.freedesktop.org/software/harfbuzz/release/
 # XXX: 2.4.0 distfile has changed; remove on next update
@@ -13,12 +13,20 @@ HOMEPAGE=   http://harfbuzz.org/
 COMMENT=       OpenType text shaping engine
 LICENSE=       mit
 
+.include "../../mk/bsd.prefs.mk"
+PLIST_VARS+=           graphite2
+
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake pkg-config
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-cairo=no
+.if !empty(PLATFORM_SUPPORTS_RUST:M[Yy][Ee][Ss])
+CONFIGURE_ARGS+=       --with-graphite2=yes
+PLIST.graphite2=       yes
+.else
 CONFIGURE_ARGS+=       --with-graphite2=no
+.endif
 GCC_REQD+=             4.9
 
 PKGCONFIG_OVERRIDE+=   src/harfbuzz.pc.in
@@ -29,8 +37,6 @@ LDFLAGS.OpenBSD+=     -lz
 
 .include "options.mk"
 
-.include "../../mk/bsd.prefs.mk"
-
 # gcc too old
 BUILDLINK_TRANSFORM.MirBSD+=   rm:-fvisibility-inlines-hidden
 
@@ -55,12 +61,16 @@ PLIST.coretext=             yes
 .  endif
 .endif
 
+.include "../../lang/rust/platform.mk"
+
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 #cairo is only needed for the hb-view command line utility
 #BUILDLINK_API_DEPENDS.cairo+= cairo>=1.8.0
 #.include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.if !empty(PLATFORM_SUPPORTS_RUST:M[Yy][Ee][Ss])
 # graphite2 support breaks graphics/librsvg
-#.include "../../graphics/graphite2/buildlink3.mk"
+.include "../../graphics/graphite2/buildlink3.mk"
+.endif
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/harfbuzz/PLIST
diff -u pkgsrc/fonts/harfbuzz/PLIST:1.34 pkgsrc/fonts/harfbuzz/PLIST:1.35
--- pkgsrc/fonts/harfbuzz/PLIST:1.34    Tue Apr  2 08:58:47 2019
+++ pkgsrc/fonts/harfbuzz/PLIST Sun Jun  2 03:11:30 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2019/04/02 08:58:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.35 2019/06/02 03:11:30 ryoon Exp $
 bin/hb-ot-shape-closure
 bin/hb-shape
 bin/hb-subset
@@ -13,6 +13,7 @@ include/harfbuzz/hb-face.h
 include/harfbuzz/hb-font.h
 include/harfbuzz/hb-ft.h
 include/harfbuzz/hb-glib.h
+${PLIST.graphite2}include/harfbuzz/hb-graphite2.h
 ${PLIST.icu}include/harfbuzz/hb-icu.h
 include/harfbuzz/hb-map.h
 include/harfbuzz/hb-ot-color.h

Index: pkgsrc/misc/libreoffice/Makefile
diff -u pkgsrc/misc/libreoffice/Makefile:1.194 pkgsrc/misc/libreoffice/Makefile:1.195
--- pkgsrc/misc/libreoffice/Makefile:1.194      Wed May 29 19:52:50 2019
+++ pkgsrc/misc/libreoffice/Makefile    Sun Jun  2 03:11:30 2019
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.194 2019/05/29 19:52:50 adam Exp $
+# $NetBSD: Makefile,v 1.195 2019/06/02 03:11:30 ryoon Exp $
 
-VERREL=                6.2.3
+VERREL=                6.2.4
 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
@@ -110,8 +109,11 @@ SITES.${md}=               https://dev-www.libreoffic
 MORE_DISTFILES2+=              49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf
 SITES.49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf=   https://dev-www.libreoffice.org/extern/
 
+.include "../../lang/rust/platform.mk"
+.if !empty(PLATFORM_SUPPORTS_RUST:M[Nn][Oo]) || 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/
+.endif
 
 .for md2 in ${MORE_DISTFILES2}
 DISTFILES+=            ${md2}
@@ -203,8 +205,13 @@ CONFIGURE_ARGS+=   --with-system-cppunit
 # internal sane should be used because only header files are used.
 CONFIGURE_ARGS+=       --without-system-sane
 # Use internal harfbuzz because fonts/harfbuzz has no graphite2 support.
+.if !empty(PLATFORM_SUPPORTS_RUST:M[Yy][Ee][Ss])
+CONFIGURE_ARGS+=       --with-system-harfbuzz
+CONFIGURE_ARGS+=       --with-system-graphite
+.else
 CONFIGURE_ARGS+=       --without-system-harfbuzz
 CONFIGURE_ARGS+=       --without-system-graphite
+.endif
 # sbin might not be in PATH
 CONFIGURE_ARGS+=       ac_cv_path_SYSTEM_GENCCODE=${BUILDLINK_PREFIX.icu}/sbin/genccode
 CONFIGURE_ARGS+=       ac_cv_path_SYSTEM_GENCMN=${BUILDLINK_PREFIX.icu}/sbin/gencmn
@@ -320,9 +327,11 @@ BUILDLINK_API_DEPENDS.libetonyek+= libet
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 # hardbuzz with graphite2 support is required.
+.if !empty(PLATFORM_SUPPORTS_RUST:M[Yy][Ee][Ss])
 #BUILDLINK_API_DEPENDS.harfbuzz+=      harfbuzz>=1.4.2
-#.include "../../fonts/harfbuzz/buildlink3.mk"
+.include "../../fonts/harfbuzz/buildlink3.mk"
 .include "../../graphics/graphite2/buildlink3.mk"
+.endif
 # Requires JCS_EXT_BGRA
 #.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"

Index: pkgsrc/misc/libreoffice/distinfo
diff -u pkgsrc/misc/libreoffice/distinfo:1.78 pkgsrc/misc/libreoffice/distinfo:1.79
--- pkgsrc/misc/libreoffice/distinfo:1.78       Tue Apr 23 13:39:17 2019
+++ pkgsrc/misc/libreoffice/distinfo    Sun Jun  2 03:11:30 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.78 2019/04/23 13:39:17 ryoon Exp $
+$NetBSD: distinfo,v 1.79 2019/06/02 03:11:30 ryoon Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -172,22 +172,22 @@ SHA1 (libreoffice/libre-hebrew-1.0.tar.g
 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.2.3.2.tar.xz) = c66d3642131262e877828a0e7ab9e4ad90673567
-RMD160 (libreoffice/libreoffice-6.2.3.2.tar.xz) = f109ab5b111a51315cf649932b1d9c44eb2e5f3e
-SHA512 (libreoffice/libreoffice-6.2.3.2.tar.xz) = 06c7e67c521eb9d94aa1a63464a4531b61b0fa0a8f77a0ecd1584535826232557a971471bea87dbc0b794979e1cddb201dbfdf0c4a2b4261ea63730e15cd8000
-Size (libreoffice/libreoffice-6.2.3.2.tar.xz) = 214234080 bytes
-SHA1 (libreoffice/libreoffice-dictionaries-6.2.3.2.tar.xz) = 59cd9a134f751a1c5699f530ab8bc17da9e6bee7
-RMD160 (libreoffice/libreoffice-dictionaries-6.2.3.2.tar.xz) = 7edb1b7a231fb0b926a67421c269c678cfe05739
-SHA512 (libreoffice/libreoffice-dictionaries-6.2.3.2.tar.xz) = cdae39342028ccb2048a6a43ed68d0e59536ec3a7a0d7d7cb7a69ca1e38a7bfd836200adfaebf32a330ea038ab9d69ada95763caccf7ecbe7bfa54f514418c35
-Size (libreoffice/libreoffice-dictionaries-6.2.3.2.tar.xz) = 45050656 bytes
-SHA1 (libreoffice/libreoffice-help-6.2.3.2.tar.xz) = 63935b207b0209f712c13aec0b2518186ea5ed7f
-RMD160 (libreoffice/libreoffice-help-6.2.3.2.tar.xz) = 2693d0c54122b7164f72d22e1c29604f90001fbe
-SHA512 (libreoffice/libreoffice-help-6.2.3.2.tar.xz) = 3c2c05f22bebf59662ff2948b59055c2b8b962f8c717e8d894a6f0df1878cd13cce0e55d39c2cbbf7e83af61623149d757ec65495c4ed23a1e587832595be037
-Size (libreoffice/libreoffice-help-6.2.3.2.tar.xz) = 13024476 bytes
-SHA1 (libreoffice/libreoffice-translations-6.2.3.2.tar.xz) = c7d5f2997f2bfeecf200c50091ba92bbc7ffc993
-RMD160 (libreoffice/libreoffice-translations-6.2.3.2.tar.xz) = caaf1454cb483e86b4806c536bcafbafacfe10bd
-SHA512 (libreoffice/libreoffice-translations-6.2.3.2.tar.xz) = aa91ea5564cf7684dc9fe1d991a0d4de386eba1d295bd16b2f99a221b1f872f0c25a2975e90148dc5b01d5eb31117548945cf52976b90f486375bacff3701bcc
-Size (libreoffice/libreoffice-translations-6.2.3.2.tar.xz) = 141965408 bytes
+SHA1 (libreoffice/libreoffice-6.2.4.2.tar.xz) = 28c084bfe784e886c15bb372d17071eb5ecb261b
+RMD160 (libreoffice/libreoffice-6.2.4.2.tar.xz) = accfd22005b74ee1aeba58a274a06606365d0731
+SHA512 (libreoffice/libreoffice-6.2.4.2.tar.xz) = d3c28629315fa78c1a18384b9c4144773f573c9721cb33f2c1b2beccbaa73068b1096c7009353261b1a8993f1bf5296e9dfc4279605572938b749ce9c39026e5
+Size (libreoffice/libreoffice-6.2.4.2.tar.xz) = 214494968 bytes
+SHA1 (libreoffice/libreoffice-dictionaries-6.2.4.2.tar.xz) = f4b696d9cee66a4806e6b2eaa13cdfce7052bbe5
+RMD160 (libreoffice/libreoffice-dictionaries-6.2.4.2.tar.xz) = 6941eacb8c4647a684e131ff328e483fe506fa89
+SHA512 (libreoffice/libreoffice-dictionaries-6.2.4.2.tar.xz) = a5b0e06961a9b2b10401cf8692b204aa437ad113ec6991605f750f36452309fcacfc8cf98e7f886038698f7e68bf2790800441d1b90198b830281747d05b202f
+Size (libreoffice/libreoffice-dictionaries-6.2.4.2.tar.xz) = 45053148 bytes
+SHA1 (libreoffice/libreoffice-help-6.2.4.2.tar.xz) = 612a63266aee42cea84f87dbbe9d788fd5549f1e
+RMD160 (libreoffice/libreoffice-help-6.2.4.2.tar.xz) = 38e2de5cb38a2f32549dc0186d04222c9f5f8d42
+SHA512 (libreoffice/libreoffice-help-6.2.4.2.tar.xz) = d93a3cac65659575fb0a17528c5d5c0cfdf6d20b8b694908b9795cac1f1b4f2122c849a31a9e5d04f579c8a27b2b1913ec7474560300ee0fbf4e0f39d3937048
+Size (libreoffice/libreoffice-help-6.2.4.2.tar.xz) = 13024208 bytes
+SHA1 (libreoffice/libreoffice-translations-6.2.4.2.tar.xz) = dae80ec568fa65a7a78716856d5f28d775410c0f
+RMD160 (libreoffice/libreoffice-translations-6.2.4.2.tar.xz) = d0657b8fa7d81b25726643256bf2f0b403c3299c
+SHA512 (libreoffice/libreoffice-translations-6.2.4.2.tar.xz) = f7c45d26364ac813eb77d020410542622989d809413dde0deea4c54bbf289dcf577b4ebd77490af691bc9cbec541da219d5e7bc64e67bf5b724f19e3c3272bd0
+Size (libreoffice/libreoffice-translations-6.2.4.2.tar.xz) = 141985696 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

Follow-Ups:
- Re: CVS commit: pkgsrc
  - From: Leonardo Taccari

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/devel/py-pbr
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: Re: CVS commit: pkgsrc
Indexes:

Home | Main Index | Thread Index | Old Index