diff --git a/devel/pango/Makefile b/devel/pango/Makefile index 42ef11e71f15..e219be4e0f35 100644 --- a/devel/pango/Makefile +++ b/devel/pango/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.248 2022/02/15 10:12:55 adam Exp $ +# $NetBSD: Makefile,v 1.249 2022/03/09 14:07:28 ryoon Exp $ -DISTNAME= pango-1.48.11 +DISTNAME= pango-1.50.5 CATEGORIES= devel fonts MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pango/${PKGVERSION_NOREV:R}/} EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= https://www.pango.org/ +HOMEPAGE= https://pango.gnome.org/ COMMENT= Library for layout and rendering of text LICENSE= gnu-lgpl-v2 diff --git a/devel/pango/PLIST b/devel/pango/PLIST index 12b3c91f4915..26d5ec86059e 100644 --- a/devel/pango/PLIST +++ b/devel/pango/PLIST @@ -1,10 +1,11 @@ -@comment $NetBSD: PLIST,v 1.82 2022/02/15 10:12:55 adam Exp $ +@comment $NetBSD: PLIST,v 1.83 2022/03/09 14:07:28 ryoon Exp $ bin/pango-list bin/pango-segmentation bin/pango-view include/pango-1.0/pango/pango-attributes.h include/pango-1.0/pango/pango-bidi-type.h include/pango-1.0/pango/pango-break.h +include/pango-1.0/pango/pango-color.h include/pango-1.0/pango/pango-context.h include/pango-1.0/pango/pango-coverage.h include/pango-1.0/pango/pango-direction.h @@ -13,6 +14,7 @@ include/pango-1.0/pango/pango-enum-types.h include/pango-1.0/pango/pango-features.h include/pango-1.0/pango/pango-font.h include/pango-1.0/pango/pango-fontmap.h +include/pango-1.0/pango/pango-fontset-simple.h include/pango-1.0/pango/pango-fontset.h include/pango-1.0/pango/pango-glyph-item.h include/pango-1.0/pango/pango-glyph.h @@ -20,6 +22,7 @@ include/pango-1.0/pango/pango-gravity.h include/pango-1.0/pango/pango-item.h include/pango-1.0/pango/pango-language.h include/pango-1.0/pango/pango-layout.h +include/pango-1.0/pango/pango-markup.h include/pango-1.0/pango/pango-matrix.h include/pango-1.0/pango/pango-modules.h include/pango-1.0/pango/pango-ot.h @@ -45,16 +48,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.4800.11 +lib/libpango-1.0.so.0.5000.5 lib/libpangocairo-1.0.so lib/libpangocairo-1.0.so.0 -lib/libpangocairo-1.0.so.0.4800.11 +lib/libpangocairo-1.0.so.0.5000.5 lib/libpangoft2-1.0.so lib/libpangoft2-1.0.so.0 -lib/libpangoft2-1.0.so.0.4800.11 +lib/libpangoft2-1.0.so.0.5000.5 ${PLIST.x11}lib/libpangoxft-1.0.so ${PLIST.x11}lib/libpangoxft-1.0.so.0 -${PLIST.x11}lib/libpangoxft-1.0.so.0.4800.11 +${PLIST.x11}lib/libpangoxft-1.0.so.0.5000.5 lib/pkgconfig/pango.pc lib/pkgconfig/pangocairo.pc lib/pkgconfig/pangofc.pc diff --git a/devel/pango/distinfo b/devel/pango/distinfo index 7f0213214a11..d8c415da5ed8 100644 --- a/devel/pango/distinfo +++ b/devel/pango/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.134 2022/02/15 10:12:55 adam Exp $ +$NetBSD: distinfo,v 1.135 2022/03/09 14:07:28 ryoon Exp $ -BLAKE2s (pango-1.48.11.tar.xz) = efcfe5930e344f9476b90d66a4ef47a0e7397d96ab13f3038300ee4eef15cf8d -SHA512 (pango-1.48.11.tar.xz) = b3199fcf9cbb794b717ec25a9a5a7181c61a3ef4a868dc062c83ac2cdfbe65eca72e0d6ebc5efaa9b79db837f4b20143dcfff0ff3dcc525535007366d042f426 -Size (pango-1.48.11.tar.xz) = 2922564 bytes +BLAKE2s (pango-1.50.5.tar.xz) = daf8c629b301534e68148233fc15249be42379b903cf15f3f5710ef7b970a82a +SHA512 (pango-1.50.5.tar.xz) = 6e898945ca9682ad113cea8a5702068d6141d39bc51a27093c6c1627c10825005155c73778cb5acab99551689dd1b47069f7d5ea102db11f00416ddcf747b8c6 +Size (pango-1.50.5.tar.xz) = 4291708 bytes SHA1 (patch-pango_pangocairo-coretextfont.c) = cfef0e1372d5770d5988af411d435ee87fdfd0bd SHA1 (patch-pango_pangocairo-coretextfontmap.c) = 395cb1f8472a319c4b1c58ea137e36452bc44cc6 -SHA1 (patch-pango_pangocoretext-fontmap.c) = dcac1ad8c187523f7ab30b105cf541a5e421130c SHA1 (patch-pango_pangocoretext-private.h) = 0d7d61cd7e7b9da34bf8a0d5d1c6e7734341cadf SHA1 (patch-pango_pangocoretext.c) = 465a66b5027c3dda5dd97c0cf33edebb4e173a1e SHA1 (patch-pango_pangocoretext.h) = d6817eb02f0020c102ab95d63202f9508a70e647 diff --git a/devel/pango/patches/patch-pango_pangocoretext-fontmap.c b/devel/pango/patches/patch-pango_pangocoretext-fontmap.c deleted file mode 100644 index ac640aa63e48..000000000000 --- a/devel/pango/patches/patch-pango_pangocoretext-fontmap.c +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-pango_pangocoretext-fontmap.c,v 1.2 2021/04/08 08:38:55 adam Exp $ - -From 60df2b006e5d4553abc7bb5fe9a99539c91b0022 Mon Sep 17 00:00:00 2001 -From: Tom Schoonjans -Date: Fri, 20 Jul 2018 12:30:34 +0100 -Subject: [PATCH] Revert "Restore scaling of CoreText fonts." - -This reverts commit f661cdbf8cfbdb2ba7241d8dfa4a579c6dfe0a94. - ---- pango/pangocoretext-fontmap.c.orig 2018-08-06 02:47:22.000000000 +0000 -+++ pango/pangocoretext-fontmap.c -@@ -806,7 +806,6 @@ get_context_matrix (PangoContext *contex - /* - * Helper functions for PangoCoreTextFontsetKey - */ --static const double ppi = 72.0; /* typographic points per inch */ - - static double - pango_core_text_font_map_get_resolution (PangoCoreTextFontMap *fontmap, -@@ -818,7 +817,7 @@ pango_core_text_font_map_get_resolution - /* FIXME: acquire DPI from CoreText using some deafault font */ - g_warning ("FIXME: returning default DPI"); - -- return ppi; -+ return 72.0; - } - - static int -@@ -827,16 +826,8 @@ get_scaled_size (PangoCoreTextFontMap - const PangoFontDescription *desc) - { - double size = pango_font_description_get_size (desc); -- PangoMatrix *matrix = pango_context_get_matrix (context); -- double scale_factor = pango_matrix_get_font_scale_factor (matrix); -- -- if (!pango_font_description_get_size_is_absolute(desc)) -- { -- double dpi = pango_core_text_font_map_get_resolution (fontmap, context); -- size *= (dpi/ppi); -- } - -- return .5 + scale_factor * size; -+ return .5 + pango_matrix_get_font_scale_factor (pango_context_get_matrix (context)) * size; - } - -