CVS commit: pkgsrc/devel/pango

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Mon Jan 11 09:43:21 UTC 2021

Modified Files:
        pkgsrc/devel/pango: Makefile PLIST distinfo options.mk

Log Message:
Update pango to 1.48.0

Overview of changes in 1.48.0
=============================
- docs: Clarify use of PangoAnalysis in shaping
- fontconfig: Make pango_font_family_get_face more reliable
- introspection: Fix use of PangoFcSubstituteFunc
- introspection: Skip fontconfig types
- build: Use yielding meson feature for introspection

Overview of changes in 1.47.0
=============================
- Add pango_language_get_preferred
- Add pango_fc_font_get_languages
- Sort faces of a family by slant and weight

Overview of changes in 1.46.2
=============================
- Fix pango_win32_font_map_load_font with falback families
- Fix an assertion in pango_language_get_scripts
- Fix a crash in get_items_log_attrs
- Fix attribute iterators with overlapping attributes
- Fix rendering of Emoji keycap sequences
- ci: Run the testsuite under asan and fix all reported issues
- build: Make libthai, cairo, xft, fontconfig, freetype
  dependencies meson features


To generate a diff of this commit:
cvs rdiff -u -r1.236 -r1.237 pkgsrc/devel/pango/Makefile
cvs rdiff -u -r1.74 -r1.75 pkgsrc/devel/pango/PLIST
cvs rdiff -u -r1.125 -r1.126 pkgsrc/devel/pango/distinfo
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/pango/options.mk

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.236 pkgsrc/devel/pango/Makefile:1.237
--- pkgsrc/devel/pango/Makefile:1.236   Tue Sep 15 10:45:41 2020
+++ pkgsrc/devel/pango/Makefile Mon Jan 11 09:43:21 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.236 2020/09/15 10:45:41 prlw1 Exp $
+# $NetBSD: Makefile,v 1.237 2021/01/11 09:43:21 prlw1 Exp $
 
-DISTNAME=      pango-1.46.1
+DISTNAME=      pango-1.48.0
 CATEGORIES=    devel fonts
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/pango/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
@@ -21,6 +21,10 @@ SUBST_STAGE.wrksrc=  pre-configure
 SUBST_FILES.wrksrc=    output/utils/pango-view.sh
 SUBST_VARS.wrksrc=     WRKSRC
 
+MESON_ARGS+=           -Dcairo=enabled
+MESON_ARGS+=           -Dfontconfig=enabled
+MESON_ARGS+=           -Dintrospection=enabled
+
 PKGCONFIG_OVERRIDE+=           output/meson-private/pango.pc
 PKGCONFIG_OVERRIDE+=           output/meson-private/pangocairo.pc
 PKGCONFIG_OVERRIDE+=           output/meson-private/pangofc.pc

Index: pkgsrc/devel/pango/PLIST
diff -u pkgsrc/devel/pango/PLIST:1.74 pkgsrc/devel/pango/PLIST:1.75
--- pkgsrc/devel/pango/PLIST:1.74       Fri Sep  4 11:14:08 2020
+++ pkgsrc/devel/pango/PLIST    Mon Jan 11 09:43:21 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.74 2020/09/04 11:14:08 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.75 2021/01/11 09:43:21 prlw1 Exp $
 bin/pango-list
 bin/pango-view
 include/pango-1.0/pango/pango-attributes.h
@@ -45,16 +45,16 @@ lib/girepository-1.0/PangoOT-1.0.typelib
 ${PLIST.x11}lib/girepository-1.0/PangoXft-1.0.typelib
 lib/libpango-1.0.so
 lib/libpango-1.0.so.0
-lib/libpango-1.0.so.0.4600.1
+lib/libpango-1.0.so.0.4800.0
 lib/libpangocairo-1.0.so
 lib/libpangocairo-1.0.so.0
-lib/libpangocairo-1.0.so.0.4600.1
+lib/libpangocairo-1.0.so.0.4800.0
 lib/libpangoft2-1.0.so
 lib/libpangoft2-1.0.so.0
-lib/libpangoft2-1.0.so.0.4600.1
+lib/libpangoft2-1.0.so.0.4800.0
 ${PLIST.x11}lib/libpangoxft-1.0.so
 ${PLIST.x11}lib/libpangoxft-1.0.so.0
-${PLIST.x11}lib/libpangoxft-1.0.so.0.4600.1
+${PLIST.x11}lib/libpangoxft-1.0.so.0.4800.0
 lib/pkgconfig/pango.pc
 lib/pkgconfig/pangocairo.pc
 lib/pkgconfig/pangofc.pc

Index: pkgsrc/devel/pango/distinfo
diff -u pkgsrc/devel/pango/distinfo:1.125 pkgsrc/devel/pango/distinfo:1.126
--- pkgsrc/devel/pango/distinfo:1.125   Fri Sep  4 11:14:08 2020
+++ pkgsrc/devel/pango/distinfo Mon Jan 11 09:43:21 2021
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.125 2020/09/04 11:14:08 prlw1 Exp $
+$NetBSD: distinfo,v 1.126 2021/01/11 09:43:21 prlw1 Exp $
 
-SHA1 (pango-1.46.1.tar.xz) = e6706b1499e8dd7df58a1f767aaa9c5c072a5dd9
-RMD160 (pango-1.46.1.tar.xz) = 62982b413af8ade225d4a0ce634b449debebb611
-SHA512 (pango-1.46.1.tar.xz) = a08d5f4f24076aa7c3f92497a7afb70f4fcda92a0affb2455dc11ea88890c786534fd7755074bc570912e51e63f7922cef67726458612366b024b270cdfd041e
-Size (pango-1.46.1.tar.xz) = 533108 bytes
+SHA1 (pango-1.48.0.tar.xz) = 6167e5a5b0273f8ffc7217d057aa432b63bf8372
+RMD160 (pango-1.48.0.tar.xz) = 4a9a829e9506839b900ef6df55f3dea2cf507cb1
+SHA512 (pango-1.48.0.tar.xz) = 4819575a583134083819c1548d86bba71af97fd927f7cac05e3903b6d1c84de0ab1b593eea1e17b974f194e2d81123aa46e3af942eef258ad1bd14c72322342e
+Size (pango-1.48.0.tar.xz) = 536136 bytes
 SHA1 (patch-pango_pangocairo-coretextfont.c) = cfef0e1372d5770d5988af411d435ee87fdfd0bd
 SHA1 (patch-pango_pangocairo-coretextfontmap.c) = 395cb1f8472a319c4b1c58ea137e36452bc44cc6
 SHA1 (patch-pango_pangocoretext-fontmap.c) = 643dfdb0e9672382d4d5259c90e451a829b9875e

Index: pkgsrc/devel/pango/options.mk
diff -u pkgsrc/devel/pango/options.mk:1.17 pkgsrc/devel/pango/options.mk:1.18
--- pkgsrc/devel/pango/options.mk:1.17  Fri Aug 16 10:43:24 2019
+++ pkgsrc/devel/pango/options.mk       Mon Jan 11 09:43:21 2021
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.17 2019/08/16 10:43:24 wiz Exp $
+# $NetBSD: options.mk,v 1.18 2021/01/11 09:43:21 prlw1 Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.pango
 PKG_SUPPORTED_OPTIONS= libthai quartz x11
@@ -6,7 +6,7 @@ PKG_SUGGESTED_OPTIONS=  x11
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           coretext quartz x11 thai
+PLIST_VARS+=           coretext quartz x11
 
 ###
 ### X11 support
@@ -14,20 +14,25 @@ PLIST_VARS+=                coretext quartz x11 thai
 .if !empty(PKG_OPTIONS:Mx11)
 # fix for pangox.pc
 PLIST.x11=             yes
+MESON_ARGS+=   -Dxft=enabled
 BUILDLINK_API_DEPENDS.Xft2+=   Xft2>=2.1.7nb3
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXt?=    build # only for configure
 .include "../../x11/libXt/buildlink3.mk"
+.else
+MESON_ARGS+=   -Dxft=disabled
 .endif
 
 ###
 ### Thai language support
 ###
 .if !empty(PKG_OPTIONS:Mlibthai)
-PLIST.thai=            yes
+MESON_ARGS+=   -Dlibthai=enabled
 .include "../../devel/libthai/buildlink3.mk"
+.else
+MESON_ARGS+=   -Dlibthai=disabled
 .endif
 
 .include "../../mk/bsd.prefs.mk"