Fri Aug 16 10:43:24 2019 UTC ()
pango: update to 1.44.3.

Switch to meson, autoconf build support was removed.

Overview of changes in 1.44.3
=============================
- Install pango-ot headers
- Make subpixel positioning optional
- fc: Ignore fonts with unsupported formats

Overview of changes in 1.44.2
=============================
- Disable ligatures when letterspacing
- Set design coords on hb_font_t
- Expose more font options in pango-view
- OS X: Make 'system-ui' font work
- Keep deprecated pango-fc apis in headers
- Make hex boxes work, always
- introspection: Various build fixes
- introspection: Add PangoPT, PangoFT2 namespaces
- layout: Make the new line-spacing opt-in

Overview of changes in 1.44.1
=============================
- Fix a crash with allow_break attributes
- Fix Emoji spacing
- Fix up includes and pkg-config requires
- Correct some cases for hyphen insertion

Overview of changes in 1.44.0
=============================
- Use harfbuzz for shaping on all platforms
- Stop using freetype for font loading; this
    drops support for type1 and bitmap fonts
- Add a getter for hb_font_t
- Make PangoCoverage a GObject
- Add a pango_tailor_break api
- font metrics: Add line height
- layout: Support line spacing
- layout: Draw hyphens for line breaks
- Add an attribute to suppress line breaking
- cairo: Don't render hex boxes for space
- Add an attribute to show invisible characters
- Stop quantizing glyph positions
- Add tests for itemization and line breaking
- Remove language and shape engine remnants
- Rename meson options: gtk_doc, introspection
- Require GLib 2.59.2
- Require Harfbuzz 2.0

Overview of changes in 1.43.0
=============================
- Drop autotools
- Drop Visual Studio build
- Build with meson everywhere
- Update Emoji tables for Unicode 11
- Update test data for Unicode 11
- Fix a crash with Thai breaking
- Fix a crash with font variations
- Deprecate bidi apis in favor of fribidi
- Add a variable font family api
- Improve font fallback handling on win32


(wiz)
diff -r1.221 -r1.222 pkgsrc/devel/pango/Makefile
diff -r1.69 -r1.70 pkgsrc/devel/pango/PLIST
diff -r1.119 -r1.120 pkgsrc/devel/pango/distinfo
diff -r1.16 -r1.17 pkgsrc/devel/pango/options.mk
diff -r1.1 -r1.2 pkgsrc/devel/pango/patches/patch-pango_pangocoretext.c
cvs diff -r1.221 -r1.222 pkgsrc/devel/pango/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/pango/Makefile 2019/08/01 10:09:38 1.221
+++ pkgsrc/devel/pango/Makefile 2019/08/16 10:43:24 1.222
@@ -1,59 +1,59 @@ @@ -1,59 +1,59 @@
1# $NetBSD: Makefile,v 1.221 2019/08/01 10:09:38 maya Exp $ 1# $NetBSD: Makefile,v 1.222 2019/08/16 10:43:24 wiz Exp $
2 2
3DISTNAME= pango-1.42.4 3DISTNAME= pango-1.44.3
4PKGREVISION= 5 
5CATEGORIES= devel fonts 4CATEGORIES= devel fonts
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pango/${PKGVERSION_NOREV:R}/} 5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pango/${PKGVERSION_NOREV:R}/}
7EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.pango.org/ 9HOMEPAGE= https://www.pango.org/
11COMMENT= Library for layout and rendering of text 10COMMENT= Library for layout and rendering of text
12LICENSE= gnu-lgpl-v2 11LICENSE= gnu-lgpl-v2
13 12
14BUILD_DEPENDS+= help2man-[0-9]*:../../converters/help2man 13TOOL_DEPENDS+= help2man-[0-9]*:../../converters/help2man
15 14
16# 1.42.4: one test failure, test-layout 15# 1.42.4: one test failure, test-layout
17TEST_TARGET= check 16TEST_TARGET= check
18USE_LIBTOOL= yes 
19USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
20USE_TOOLS+= gmake pkg-config 18USE_TOOLS+= gmake pkg-config
21GNU_CONFIGURE= yes 19INSTALLATION_DIRS= ${PKGMANDIR}/man1
22CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata 20
23# Carbon has been obsoleted; force turning it off 21PKGCONFIG_OVERRIDE+= output/meson-private/pango.pc
24#CONFIGURE_ENV+= ac_cv_header_Carbon_Carbon_h=no 22PKGCONFIG_OVERRIDE+= output/meson-private/pangocairo.pc
25 23PKGCONFIG_OVERRIDE+= output/meson-private/pangoft2.pc
26PKGCONFIG_OVERRIDE+= pango.pc.in 24PKGCONFIG_OVERRIDE+= output/meson-private/pangoxft.pc
27PKGCONFIG_OVERRIDE+= pangocairo.pc.in 25PKGCONFIG_OVERRIDE_STAGE=pre-install
28PKGCONFIG_OVERRIDE+= pangoft2.pc.in 26MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/${PKGBASE}
29PKGCONFIG_OVERRIDE+= pangowin32.pc.in 
30PKGCONFIG_OVERRIDE+= pangoxft.pc.in 
31 27
32CHECK_FILES_SKIP+= ${PREFIX}/libdata/pango/pango.modules 28CHECK_FILES_SKIP+= ${PREFIX}/libdata/pango/pango.modules
33CHECK_PORTABILITY_SKIP+= docs/check.docs 29CHECK_PORTABILITY_SKIP+= docs/check.docs
34 30
 31post-install:
 32 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/pango-view.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/pango-view.1
 33
35.include "options.mk" 34.include "options.mk"
36.include "../../graphics/librsvg/available.mk" 35.include "../../graphics/librsvg/available.mk"
37 36
38BUILDLINK_API_DEPENDS.fribidi+= fribidi>=0.19.7 37BUILDLINK_API_DEPENDS.fribidi+= fribidi>=0.19.7
39.include "../../converters/fribidi/buildlink3.mk" 38.include "../../converters/fribidi/buildlink3.mk"
40BUILDLINK_API_DEPENDS.glib2+= glib2>=2.33.12 39BUILDLINK_API_DEPENDS.glib2+= glib2>=2.59
41.include "../../devel/glib2/buildlink3.mk" 40.include "../../devel/glib2/buildlink3.mk"
42BUILDLINK_DEPMETHOD.gobject-introspection:= build 41BUILDLINK_DEPMETHOD.gobject-introspection= build
43.include "../../devel/gobject-introspection/buildlink3.mk" 42.include "../../devel/gobject-introspection/buildlink3.mk"
44.include "../../devel/zlib/buildlink3.mk" 43.include "../../devel/zlib/buildlink3.mk"
45BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.11.91 44BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.11.91
46.include "../../fonts/fontconfig/buildlink3.mk" 45.include "../../fonts/fontconfig/buildlink3.mk"
47BUILDLINK_API_DEPENDS.harfbuzz+= harfbuzz>=0.9.9 46BUILDLINK_API_DEPENDS.harfbuzz+= harfbuzz>=2.0
48.include "../../fonts/harfbuzz/buildlink3.mk" 47.include "../../fonts/harfbuzz/buildlink3.mk"
49.if ${LIBRSVG_TYPE} == "rust" 48.if ${LIBRSVG_TYPE} == "rust"
50.include "../../graphics/graphite2/buildlink3.mk" 49.include "../../graphics/graphite2/buildlink3.mk"
51.endif 50.endif
52BUILDLINK_API_DEPENDS.cairo+= cairo>=1.12.10 51BUILDLINK_API_DEPENDS.cairo+= cairo>=1.12.10
53.include "../../graphics/cairo/buildlink3.mk" 52.include "../../graphics/cairo/buildlink3.mk"
54.include "../../graphics/cairo-gobject/buildlink3.mk" 53.include "../../graphics/cairo-gobject/buildlink3.mk"
55# XXX freetype versioning is insane. needs libtool version >= 21.0.15, 54# XXX freetype versioning is insane. needs libtool version >= 21.0.15,
56# which corresponds to release version 2.8.1 55# which corresponds to release version 2.8.1
57BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.8.1 56BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.8.1
58.include "../../graphics/freetype2/buildlink3.mk" 57.include "../../graphics/freetype2/buildlink3.mk"
 58.include "../../devel/py-meson/build.mk"
59.include "../../mk/bsd.pkg.mk" 59.include "../../mk/bsd.pkg.mk"
cvs diff -r1.69 -r1.70 pkgsrc/devel/pango/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/pango/PLIST 2018/08/16 12:24:09 1.69
+++ pkgsrc/devel/pango/PLIST 2019/08/16 10:43:24 1.70
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1@comment $NetBSD: PLIST,v 1.69 2018/08/16 12:24:09 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.70 2019/08/16 10:43:24 wiz Exp $
2bin/pango-list 2bin/pango-list
3bin/pango-view 3bin/pango-view
4include/pango-1.0/pango/pango-attributes.h 4include/pango-1.0/pango/pango-attributes.h
5include/pango-1.0/pango/pango-bidi-type.h 5include/pango-1.0/pango/pango-bidi-type.h
6include/pango-1.0/pango/pango-break.h 6include/pango-1.0/pango/pango-break.h
7include/pango-1.0/pango/pango-context.h 7include/pango-1.0/pango/pango-context.h
8include/pango-1.0/pango/pango-coverage.h 8include/pango-1.0/pango/pango-coverage.h
 9include/pango-1.0/pango/pango-direction.h
9include/pango-1.0/pango/pango-engine.h 10include/pango-1.0/pango/pango-engine.h
10include/pango-1.0/pango/pango-enum-types.h 11include/pango-1.0/pango/pango-enum-types.h
11include/pango-1.0/pango/pango-features.h 12include/pango-1.0/pango/pango-features.h
12include/pango-1.0/pango/pango-font.h 13include/pango-1.0/pango/pango-font.h
13include/pango-1.0/pango/pango-fontmap.h 14include/pango-1.0/pango/pango-fontmap.h
14include/pango-1.0/pango/pango-fontset.h 15include/pango-1.0/pango/pango-fontset.h
15include/pango-1.0/pango/pango-glyph-item.h 16include/pango-1.0/pango/pango-glyph-item.h
16include/pango-1.0/pango/pango-glyph.h 17include/pango-1.0/pango/pango-glyph.h
17include/pango-1.0/pango/pango-gravity.h 18include/pango-1.0/pango/pango-gravity.h
18include/pango-1.0/pango/pango-item.h 19include/pango-1.0/pango/pango-item.h
19include/pango-1.0/pango/pango-language.h 20include/pango-1.0/pango/pango-language.h
20include/pango-1.0/pango/pango-layout.h 21include/pango-1.0/pango/pango-layout.h
21include/pango-1.0/pango/pango-matrix.h 22include/pango-1.0/pango/pango-matrix.h
@@ -30,71 +31,34 @@ include/pango-1.0/pango/pango-version-ma @@ -30,71 +31,34 @@ include/pango-1.0/pango/pango-version-ma
30include/pango-1.0/pango/pango.h 31include/pango-1.0/pango/pango.h
31include/pango-1.0/pango/pangocairo.h 32include/pango-1.0/pango/pangocairo.h
32${PLIST.quartz}include/pango-1.0/pango/pangocoretext.h 33${PLIST.quartz}include/pango-1.0/pango/pangocoretext.h
33include/pango-1.0/pango/pangofc-decoder.h 34include/pango-1.0/pango/pangofc-decoder.h
34include/pango-1.0/pango/pangofc-font.h 35include/pango-1.0/pango/pangofc-font.h
35include/pango-1.0/pango/pangofc-fontmap.h 36include/pango-1.0/pango/pangofc-fontmap.h
36include/pango-1.0/pango/pangoft2.h 37include/pango-1.0/pango/pangoft2.h
37${PLIST.x11}include/pango-1.0/pango/pangoxft-render.h 38${PLIST.x11}include/pango-1.0/pango/pangoxft-render.h
38${PLIST.x11}include/pango-1.0/pango/pangoxft.h 39${PLIST.x11}include/pango-1.0/pango/pangoxft.h
39lib/girepository-1.0/Pango-1.0.typelib 40lib/girepository-1.0/Pango-1.0.typelib
40lib/girepository-1.0/PangoCairo-1.0.typelib 41lib/girepository-1.0/PangoCairo-1.0.typelib
41lib/girepository-1.0/PangoFT2-1.0.typelib 42lib/girepository-1.0/PangoFT2-1.0.typelib
42${PLIST.x11}lib/girepository-1.0/PangoXft-1.0.typelib 43${PLIST.x11}lib/girepository-1.0/PangoXft-1.0.typelib
43lib/libpango-1.0.la 44lib/libpango-1.0.so
44lib/libpangocairo-1.0.la 45lib/libpango-1.0.so.0
45lib/libpangoft2-1.0.la 46lib/libpango-1.0.so.0.4400.3
46${PLIST.x11}lib/libpangoxft-1.0.la 47lib/libpangocairo-1.0.so
 48lib/libpangocairo-1.0.so.0
 49lib/libpangocairo-1.0.so.0.4400.3
 50lib/libpangoft2-1.0.so
 51lib/libpangoft2-1.0.so.0
 52lib/libpangoft2-1.0.so.0.4400.3
 53${PLIST.x11}lib/libpangoxft-1.0.so
 54${PLIST.x11}lib/libpangoxft-1.0.so.0
 55${PLIST.x11}lib/libpangoxft-1.0.so.0.4400.3
47lib/pkgconfig/pango.pc 56lib/pkgconfig/pango.pc
48lib/pkgconfig/pangocairo.pc 57lib/pkgconfig/pangocairo.pc
49lib/pkgconfig/pangoft2.pc 58lib/pkgconfig/pangoft2.pc
50${PLIST.x11}lib/pkgconfig/pangoxft.pc 59${PLIST.x11}lib/pkgconfig/pangoxft.pc
51man/man1/pango-view.1 60man/man1/pango-view.1
52share/gir-1.0/Pango-1.0.gir 61share/gir-1.0/Pango-1.0.gir
53share/gir-1.0/PangoCairo-1.0.gir 62share/gir-1.0/PangoCairo-1.0.gir
54share/gir-1.0/PangoFT2-1.0.gir 63share/gir-1.0/PangoFT2-1.0.gir
55${PLIST.x11}share/gir-1.0/PangoXft-1.0.gir 64${PLIST.x11}share/gir-1.0/PangoXft-1.0.gir
56share/gtk-doc/html/pango/PangoEngineLang.html 
57share/gtk-doc/html/pango/PangoEngineShape.html 
58share/gtk-doc/html/pango/PangoFcDecoder.html 
59share/gtk-doc/html/pango/PangoFcFont.html 
60share/gtk-doc/html/pango/PangoFcFontMap.html 
61share/gtk-doc/html/pango/PangoMarkupFormat.html 
62share/gtk-doc/html/pango/PangoRenderer.html 
63share/gtk-doc/html/pango/annotation-glossary.html 
64share/gtk-doc/html/pango/api-index-full.html 
65share/gtk-doc/html/pango/home.png 
66share/gtk-doc/html/pango/index.html 
67share/gtk-doc/html/pango/layout.gif 
68share/gtk-doc/html/pango/left-insensitive.png 
69share/gtk-doc/html/pango/left.png 
70share/gtk-doc/html/pango/lowlevel.html 
71share/gtk-doc/html/pango/pango-Bidirectional-Text.html 
72share/gtk-doc/html/pango/pango-Cairo-Rendering.html 
73share/gtk-doc/html/pango/pango-CoreText-Fonts.html 
74share/gtk-doc/html/pango/pango-Coverage-Maps.html 
75share/gtk-doc/html/pango/pango-Engines.html 
76share/gtk-doc/html/pango/pango-Fonts.html 
77share/gtk-doc/html/pango/pango-FreeType-Fonts-and-Rendering.html 
78share/gtk-doc/html/pango/pango-Glyph-Storage.html 
79share/gtk-doc/html/pango/pango-Layout-Objects.html 
80share/gtk-doc/html/pango/pango-Miscellaneous-Utilities.html 
81share/gtk-doc/html/pango/pango-Modules.html 
82share/gtk-doc/html/pango/pango-OpenType-Font-Handling.html 
83share/gtk-doc/html/pango/pango-Scripts-and-Languages.html 
84share/gtk-doc/html/pango/pango-Tab-Stops.html 
85share/gtk-doc/html/pango/pango-Text-Attributes.html 
86share/gtk-doc/html/pango/pango-Text-Processing.html 
87share/gtk-doc/html/pango/pango-Version-Checking.html 
88share/gtk-doc/html/pango/pango-Vertical-Text.html 
89share/gtk-doc/html/pango/pango-Win32-Fonts-and-Rendering.html 
90share/gtk-doc/html/pango/pango-Xft-Fonts-and-Rendering.html 
91share/gtk-doc/html/pango/pango-hierarchy.html 
92share/gtk-doc/html/pango/pango.devhelp2 
93share/gtk-doc/html/pango/pango.html 
94share/gtk-doc/html/pango/rendering.html 
95share/gtk-doc/html/pango/right-insensitive.png 
96share/gtk-doc/html/pango/right.png 
97share/gtk-doc/html/pango/rotated-text.png 
98share/gtk-doc/html/pango/style.css 
99share/gtk-doc/html/pango/up-insensitive.png 
100share/gtk-doc/html/pango/up.png 
cvs diff -r1.119 -r1.120 pkgsrc/devel/pango/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/pango/distinfo 2019/08/01 10:09:38 1.119
+++ pkgsrc/devel/pango/distinfo 2019/08/16 10:43:24 1.120
@@ -1,14 +1,13 @@ @@ -1,14 +1,13 @@
1$NetBSD: distinfo,v 1.119 2019/08/01 10:09:38 maya Exp $ 1$NetBSD: distinfo,v 1.120 2019/08/16 10:43:24 wiz Exp $
2 2
3SHA1 (pango-1.42.4.tar.xz) = 240942b1307eaa3819e6e534596271c57cd75457 3SHA1 (pango-1.44.3.tar.xz) = e6b54a203de9909ca5a7a972d9611877d2d9ef2e
4RMD160 (pango-1.42.4.tar.xz) = e91880e0e9a459bbc2c280ac747ab31f80352000 4RMD160 (pango-1.44.3.tar.xz) = 60b5643edf36c65b2e64472486414e31b6d4215b
5SHA512 (pango-1.42.4.tar.xz) = 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc 5SHA512 (pango-1.44.3.tar.xz) = 6050dfa2b5dc9be2a89bffa810059a7eb16ee751d04b9da51fdbebd5437dc2eb5d7fcecba22b7cada6c151557a6201ebe8a2e96529b3cb74db856b7a9adfbf12
6Size (pango-1.42.4.tar.xz) = 833876 bytes 6Size (pango-1.44.3.tar.xz) = 496668 bytes
7SHA1 (patch-pango_pango-bidi-type.c) = 3e2c657b89d7d7399d731669cf822e3140877ebd 
8SHA1 (patch-pango_pangocairo-coretextfont.c) = cfef0e1372d5770d5988af411d435ee87fdfd0bd 7SHA1 (patch-pango_pangocairo-coretextfont.c) = cfef0e1372d5770d5988af411d435ee87fdfd0bd
9SHA1 (patch-pango_pangocairo-coretextfontmap.c) = 395cb1f8472a319c4b1c58ea137e36452bc44cc6 8SHA1 (patch-pango_pangocairo-coretextfontmap.c) = 395cb1f8472a319c4b1c58ea137e36452bc44cc6
10SHA1 (patch-pango_pangocoretext-fontmap.c) = 643dfdb0e9672382d4d5259c90e451a829b9875e 9SHA1 (patch-pango_pangocoretext-fontmap.c) = 643dfdb0e9672382d4d5259c90e451a829b9875e
11SHA1 (patch-pango_pangocoretext-private.h) = 554d80a4f9b63cda37745a6fbb3dcc348f986e9c 10SHA1 (patch-pango_pangocoretext-private.h) = 554d80a4f9b63cda37745a6fbb3dcc348f986e9c
12SHA1 (patch-pango_pangocoretext.c) = 140ea81d008cec28d5e2b60a58e75c3eac5ff303 11SHA1 (patch-pango_pangocoretext.c) = 44b65b64da1d2ae819a5e984b5c672ad9d333622
13SHA1 (patch-pango_pangocoretext.h) = d6817eb02f0020c102ab95d63202f9508a70e647 12SHA1 (patch-pango_pangocoretext.h) = d6817eb02f0020c102ab95d63202f9508a70e647
14SHA1 (patch-pangocairo-coretext.h) = 2f7c8efad48b58398070f48e71c16d99d3d59f57 13SHA1 (patch-pangocairo-coretext.h) = 2f7c8efad48b58398070f48e71c16d99d3d59f57
cvs diff -r1.16 -r1.17 pkgsrc/devel/pango/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/pango/options.mk 2014/08/30 11:20:38 1.16
+++ pkgsrc/devel/pango/options.mk 2019/08/16 10:43:24 1.17
@@ -1,39 +1,35 @@ @@ -1,39 +1,35 @@
1# $NetBSD: options.mk,v 1.16 2014/08/30 11:20:38 adam Exp $ 1# $NetBSD: options.mk,v 1.17 2019/08/16 10:43:24 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.pango 3PKG_OPTIONS_VAR= PKG_OPTIONS.pango
4PKG_SUPPORTED_OPTIONS= libthai quartz x11 4PKG_SUPPORTED_OPTIONS= libthai quartz x11
5PKG_SUGGESTED_OPTIONS= x11 5PKG_SUGGESTED_OPTIONS= x11
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= coretext quartz x11 thai 9PLIST_VARS+= coretext quartz x11 thai
10 10
11### 11###
12### X11 support 12### X11 support
13### 13###
14.if !empty(PKG_OPTIONS:Mx11) 14.if !empty(PKG_OPTIONS:Mx11)
15# fix for pangox.pc 15# fix for pangox.pc
16CONFIGURE_ENV+= X_EXTRA_LIBS=${COMPILER_RPATH_FLAG}${X11BASE}/lib 
17PLIST.x11= yes 16PLIST.x11= yes
18BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.7nb3 17BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.7nb3
19.include "../../x11/libXft/buildlink3.mk" 18.include "../../x11/libXft/buildlink3.mk"
20.include "../../x11/libXrender/buildlink3.mk" 19.include "../../x11/libXrender/buildlink3.mk"
21.include "../../x11/libX11/buildlink3.mk" 20.include "../../x11/libX11/buildlink3.mk"
22BUILDLINK_DEPMETHOD.libXt?= build # only for configure 21BUILDLINK_DEPMETHOD.libXt?= build # only for configure
23.include "../../x11/libXt/buildlink3.mk" 22.include "../../x11/libXt/buildlink3.mk"
24.else 
25CONFIGURE_ARGS+= --without-x 
26CONFIGURE_ARGS+= --without-xft 
27.endif 23.endif
28 24
29### 25###
30### Thai language support 26### Thai language support
31### 27###
32.if !empty(PKG_OPTIONS:Mlibthai) 28.if !empty(PKG_OPTIONS:Mlibthai)
33PLIST.thai= yes 29PLIST.thai= yes
34.include "../../devel/libthai/buildlink3.mk" 30.include "../../devel/libthai/buildlink3.mk"
35.endif 31.endif
36 32
37.include "../../mk/bsd.prefs.mk" 33.include "../../mk/bsd.prefs.mk"
38 34
39### 35###
cvs diff -r1.1 -r1.2 pkgsrc/devel/pango/patches/patch-pango_pangocoretext.c (expand / switch to unified diff)

--- pkgsrc/devel/pango/patches/patch-pango_pangocoretext.c 2018/11/20 08:34:43 1.1
+++ pkgsrc/devel/pango/patches/patch-pango_pangocoretext.c 2019/08/16 10:43:24 1.2
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-pango_pangocoretext.c,v 1.1 2018/11/20 08:34:43 maya Exp $ 1$NetBSD: patch-pango_pangocoretext.c,v 1.2 2019/08/16 10:43:24 wiz Exp $
2From 60df2b006e5d4553abc7bb5fe9a99539c91b0022 Mon Sep 17 00:00:00 2001 2From 60df2b006e5d4553abc7bb5fe9a99539c91b0022 Mon Sep 17 00:00:00 2001
3From: Tom Schoonjans <Tom.Schoonjans%diamond.ac.uk@localhost> 3From: Tom Schoonjans <Tom.Schoonjans%diamond.ac.uk@localhost>
4Date: Fri, 20 Jul 2018 12:30:34 +0100 4Date: Fri, 20 Jul 2018 12:30:34 +0100
5Subject: [PATCH] Revert "Restore scaling of CoreText fonts." 5Subject: [PATCH] Revert "Restore scaling of CoreText fonts."
6 6
7This reverts commit f661cdbf8cfbdb2ba7241d8dfa4a579c6dfe0a94. 7This reverts commit f661cdbf8cfbdb2ba7241d8dfa4a579c6dfe0a94.
8 8
9--- pango/pangocoretext.c.orig 2018-07-16 00:50:43.000000000 +0000 9--- pango/pangocoretext.c.orig 2019-08-04 01:59:02.000000000 +0000
10+++ pango/pangocoretext.c 10+++ pango/pangocoretext.c
11@@ -225,7 +225,10 @@ pango_core_text_font_class_init (PangoCo 11@@ -204,7 +204,10 @@ pango_core_text_font_class_init (PangoCo
12 object_class->finalize = pango_core_text_font_finalize; 12 object_class->finalize = pango_core_text_font_finalize;
13  13
14 font_class->describe = pango_core_text_font_describe; 14 font_class->describe = pango_core_text_font_describe;
15- /* font_class->describe_absolute is left virtual for PangoCairoCoreTextFont. */ 15- /* font_class->describe_absolute is left virtual for PangoCairoCoreTextFont. */
16+ /* In CoreText the device unit is points so describe_absoulute and 16+ /* In CoreText the device unit is points so describe_absoulute and
17+ * describe are the same. 17+ * describe are the same.
18+ */ 18+ */
19+ font_class->describe_absolute = pango_core_text_font_describe; 19+ font_class->describe_absolute = pango_core_text_font_describe;
20 font_class->get_coverage = pango_core_text_font_get_coverage; 20 font_class->get_coverage = pango_core_text_font_get_coverage;
21 font_class->find_shaper = pango_core_text_font_find_shaper; 
22 font_class->get_font_map = pango_core_text_font_get_font_map; 21 font_class->get_font_map = pango_core_text_font_get_font_map;
 22 font_class->create_hb_font = pango_core_text_font_create_hb_font;