Received: by mail.netbsd.org (Postfix, from userid 605) id 7136184E51; Tue, 20 Nov 2018 08:34:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 70FFE84E50 for ; Tue, 20 Nov 2018 08:34:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 5hGD5teLak4Z for ; Tue, 20 Nov 2018 08:34:44 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id D09C884E4A for ; Tue, 20 Nov 2018 08:34:43 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C70F2FB1F; Tue, 20 Nov 2018 08:34:43 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_154270288370670" MIME-Version: 1.0 Date: Tue, 20 Nov 2018 08:34:43 +0000 From: "Maya Rashish" Subject: CVS commit: pkgsrc/devel/pango To: pkgsrc-changes@NetBSD.org Reply-To: maya@netbsd.org X-Mailer: log_accum Message-Id: <20181120083443.C70F2FB1F@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_154270288370670 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: maya Date: Tue Nov 20 08:34:43 UTC 2018 Modified Files: pkgsrc/devel/pango: Makefile distinfo Added Files: pkgsrc/devel/pango/patches: patch-pango_pangocairo-coretextfont.c patch-pango_pangocairo-coretextfontmap.c patch-pango_pangocoretext-fontmap.c patch-pango_pangocoretext-private.h patch-pango_pangocoretext.c Log Message: pango: backport upstream commit (revert) to fix font scaling with (Apple's) CoreText fonts. Bump PKGREVISION. From Jonathan Schleifer in PR pkg/53730 To generate a diff of this commit: cvs rdiff -u -r1.216 -r1.217 pkgsrc/devel/pango/Makefile cvs rdiff -u -r1.117 -r1.118 pkgsrc/devel/pango/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/devel/pango/patches/patch-pango_pangocairo-coretextfont.c \ pkgsrc/devel/pango/patches/patch-pango_pangocairo-coretextfontmap.c \ pkgsrc/devel/pango/patches/patch-pango_pangocoretext-fontmap.c \ pkgsrc/devel/pango/patches/patch-pango_pangocoretext-private.h \ pkgsrc/devel/pango/patches/patch-pango_pangocoretext.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_154270288370670 Content-Disposition: inline Content-Length: 9928 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/pango/Makefile diff -u pkgsrc/devel/pango/Makefile:1.216 pkgsrc/devel/pango/Makefile:1.217 --- pkgsrc/devel/pango/Makefile:1.216 Wed Nov 14 22:21:19 2018 +++ pkgsrc/devel/pango/Makefile Tue Nov 20 08:34:43 2018 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.216 2018/11/14 22:21:19 kleink Exp $ +# $NetBSD: Makefile,v 1.217 2018/11/20 08:34:43 maya Exp $ DISTNAME= pango-1.42.4 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= devel fonts MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pango/${PKGVERSION_NOREV:R}/} EXTRACT_SUFX= .tar.xz Index: pkgsrc/devel/pango/distinfo diff -u pkgsrc/devel/pango/distinfo:1.117 pkgsrc/devel/pango/distinfo:1.118 --- pkgsrc/devel/pango/distinfo:1.117 Sun Sep 2 08:44:36 2018 +++ pkgsrc/devel/pango/distinfo Tue Nov 20 08:34:43 2018 @@ -1,8 +1,13 @@ -$NetBSD: distinfo,v 1.117 2018/09/02 08:44:36 wiz Exp $ +$NetBSD: distinfo,v 1.118 2018/11/20 08:34:43 maya Exp $ SHA1 (pango-1.42.4.tar.xz) = 240942b1307eaa3819e6e534596271c57cd75457 RMD160 (pango-1.42.4.tar.xz) = e91880e0e9a459bbc2c280ac747ab31f80352000 SHA512 (pango-1.42.4.tar.xz) = 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc Size (pango-1.42.4.tar.xz) = 833876 bytes +SHA1 (patch-pango_pangocairo-coretextfont.c) = cfef0e1372d5770d5988af411d435ee87fdfd0bd +SHA1 (patch-pango_pangocairo-coretextfontmap.c) = 395cb1f8472a319c4b1c58ea137e36452bc44cc6 +SHA1 (patch-pango_pangocoretext-fontmap.c) = 643dfdb0e9672382d4d5259c90e451a829b9875e +SHA1 (patch-pango_pangocoretext-private.h) = 554d80a4f9b63cda37745a6fbb3dcc348f986e9c +SHA1 (patch-pango_pangocoretext.c) = 140ea81d008cec28d5e2b60a58e75c3eac5ff303 SHA1 (patch-pango_pangocoretext.h) = d6817eb02f0020c102ab95d63202f9508a70e647 SHA1 (patch-pangocairo-coretext.h) = 2f7c8efad48b58398070f48e71c16d99d3d59f57 Added files: Index: pkgsrc/devel/pango/patches/patch-pango_pangocairo-coretextfont.c diff -u /dev/null pkgsrc/devel/pango/patches/patch-pango_pangocairo-coretextfont.c:1.1 --- /dev/null Tue Nov 20 08:34:43 2018 +++ pkgsrc/devel/pango/patches/patch-pango_pangocairo-coretextfont.c Tue Nov 20 08:34:43 2018 @@ -0,0 +1,58 @@ +$NetBSD: patch-pango_pangocairo-coretextfont.c,v 1.1 2018/11/20 08:34:43 maya 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/pangocairo-coretextfont.c.orig 2018-07-16 00:50:43.000000000 +0000 ++++ pango/pangocairo-coretextfont.c +@@ -36,7 +36,6 @@ struct _PangoCairoCoreTextFont + { + PangoCoreTextFont font; + PangoCairoFontPrivate cf_priv; +- int abs_size; + }; + + struct _PangoCairoCoreTextFontClass +@@ -163,17 +162,6 @@ pango_cairo_core_text_font_create_base_m + return metrics; + } + +-static PangoFontDescription * +-pango_cairo_core_text_font_describe_absolute (PangoFont *font) +-{ +- PangoCairoCoreTextFont *cafont = (PangoCairoCoreTextFont *)font; +- PangoFontDescription *desc = pango_font_describe (font); +- +- pango_font_description_set_absolute_size (desc, cafont->abs_size); +- +- return desc; +-} +- + static void + pango_cairo_core_text_font_finalize (GObject *object) + { +@@ -191,10 +179,9 @@ pango_cairo_core_text_font_class_init (P + PangoFontClass *font_class = PANGO_FONT_CLASS (class); + + object_class->finalize = pango_cairo_core_text_font_finalize; +- /* font_class->describe defined by parent class PangoCoreTextFont. */ ++ + font_class->get_glyph_extents = pango_cairo_core_text_font_get_glyph_extents; + font_class->get_metrics = _pango_cairo_font_get_metrics; +- font_class->describe_absolute = pango_cairo_core_text_font_describe_absolute; + } + + static void +@@ -232,8 +219,6 @@ _pango_cairo_core_text_font_new (PangoCa + cafont = g_object_new (PANGO_TYPE_CAIRO_CORE_TEXT_FONT, NULL); + cfont = PANGO_CORE_TEXT_FONT (cafont); + +- cafont->abs_size = pango_core_text_font_key_get_size (key); +- + _pango_core_text_font_set_ctfont (cfont, font_ref); + + if (synthesize_italic) Index: pkgsrc/devel/pango/patches/patch-pango_pangocairo-coretextfontmap.c diff -u /dev/null pkgsrc/devel/pango/patches/patch-pango_pangocairo-coretextfontmap.c:1.1 --- /dev/null Tue Nov 20 08:34:43 2018 +++ pkgsrc/devel/pango/patches/patch-pango_pangocairo-coretextfontmap.c Tue Nov 20 08:34:43 2018 @@ -0,0 +1,18 @@ +$NetBSD: patch-pango_pangocairo-coretextfontmap.c,v 1.1 2018/11/20 08:34:43 maya 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/pangocairo-coretextfontmap.c.orig 2018-07-16 00:50:43.000000000 +0000 ++++ pango/pangocairo-coretextfontmap.c +@@ -186,5 +186,5 @@ static void + pango_cairo_core_text_font_map_init (PangoCairoCoreTextFontMap *cafontmap) + { + cafontmap->serial = 1; +- cafontmap->dpi = 96.; ++ cafontmap->dpi = 72.; + } Index: pkgsrc/devel/pango/patches/patch-pango_pangocoretext-fontmap.c diff -u /dev/null pkgsrc/devel/pango/patches/patch-pango_pangocoretext-fontmap.c:1.1 --- /dev/null Tue Nov 20 08:34:43 2018 +++ pkgsrc/devel/pango/patches/patch-pango_pangocoretext-fontmap.c Tue Nov 20 08:34:43 2018 @@ -0,0 +1,45 @@ +$NetBSD: patch-pango_pangocoretext-fontmap.c,v 1.1 2018/11/20 08:34:43 maya 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; + } + + Index: pkgsrc/devel/pango/patches/patch-pango_pangocoretext-private.h diff -u /dev/null pkgsrc/devel/pango/patches/patch-pango_pangocoretext-private.h:1.1 --- /dev/null Tue Nov 20 08:34:43 2018 +++ pkgsrc/devel/pango/patches/patch-pango_pangocoretext-private.h Tue Nov 20 08:34:43 2018 @@ -0,0 +1,19 @@ +$NetBSD: patch-pango_pangocoretext-private.h,v 1.1 2018/11/20 08:34:43 maya 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-private.h.orig 2018-07-16 00:50:43.000000000 +0000 ++++ pango/pangocoretext-private.h +@@ -99,8 +99,6 @@ void _pango_core_text_f + PangoFontDescription *_pango_core_text_font_description_from_ct_font_descriptor (CTFontDescriptorRef desc); + + _PANGO_EXTERN +-int pango_core_text_font_key_get_size (const PangoCoreTextFontKey *key); +-_PANGO_EXTERN + int pango_core_text_font_key_get_size (const PangoCoreTextFontKey *key); + _PANGO_EXTERN + double pango_core_text_font_key_get_resolution (const PangoCoreTextFontKey *key); Index: pkgsrc/devel/pango/patches/patch-pango_pangocoretext.c diff -u /dev/null pkgsrc/devel/pango/patches/patch-pango_pangocoretext.c:1.1 --- /dev/null Tue Nov 20 08:34:43 2018 +++ pkgsrc/devel/pango/patches/patch-pango_pangocoretext.c Tue Nov 20 08:34:43 2018 @@ -0,0 +1,22 @@ +$NetBSD: patch-pango_pangocoretext.c,v 1.1 2018/11/20 08:34:43 maya 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.c.orig 2018-07-16 00:50:43.000000000 +0000 ++++ pango/pangocoretext.c +@@ -225,7 +225,10 @@ pango_core_text_font_class_init (PangoCo + object_class->finalize = pango_core_text_font_finalize; + + font_class->describe = pango_core_text_font_describe; +- /* font_class->describe_absolute is left virtual for PangoCairoCoreTextFont. */ ++ /* In CoreText the device unit is points so describe_absoulute and ++ * describe are the same. ++ */ ++ font_class->describe_absolute = pango_core_text_font_describe; + font_class->get_coverage = pango_core_text_font_get_coverage; + font_class->find_shaper = pango_core_text_font_find_shaper; + font_class->get_font_map = pango_core_text_font_get_font_map; --_----------=_154270288370670--