pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
pango: Include Harfbuzz headerfiles from "harfbuzz" subdirectory
Module Name: pkgsrc-wip
Committed By: Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By: micha
Date: Mon Oct 7 16:57:34 2019 +0200
Changeset: 09756cfcc377c3f33886d1d82223cf81cff01042
Modified Files:
Makefile
Added Files:
pango/DESCR
pango/Makefile
pango/PLIST
pango/buildlink3.mk
pango/distinfo
pango/options.mk
pango/patches/patch-pango_pango-coverage.h
pango/patches/patch-pango_pango-font.h
pango/patches/patch-pango_pangocairo-coretextfont.c
pango/patches/patch-pango_pangocairo-coretextfontmap.c
pango/patches/patch-pango_pangocoretext-fontmap.c
pango/patches/patch-pango_pangocoretext-private.h
pango/patches/patch-pango_pangocoretext.c
pango/patches/patch-pango_pangocoretext.h
pango/patches/patch-pango_pangofc-fontmap.h
pango/patches/patch-pangocairo-coretext.h
Log Message:
pango: Include Harfbuzz headerfiles from "harfbuzz" subdirectory
Bump PKGREVISION
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=09756cfcc377c3f33886d1d82223cf81cff01042
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 +
pango/DESCR | 20 +++++++
pango/Makefile | 63 ++++++++++++++++++++
pango/PLIST | 68 ++++++++++++++++++++++
pango/buildlink3.mk | 35 +++++++++++
pango/distinfo | 16 +++++
pango/options.mk | 48 +++++++++++++++
pango/patches/patch-pango_pango-coverage.h | 15 +++++
pango/patches/patch-pango_pango-font.h | 15 +++++
.../patches/patch-pango_pangocairo-coretextfont.c | 58 ++++++++++++++++++
.../patch-pango_pangocairo-coretextfontmap.c | 18 ++++++
pango/patches/patch-pango_pangocoretext-fontmap.c | 45 ++++++++++++++
pango/patches/patch-pango_pangocoretext-private.h | 19 ++++++
pango/patches/patch-pango_pangocoretext.c | 22 +++++++
pango/patches/patch-pango_pangocoretext.h | 17 ++++++
pango/patches/patch-pango_pangofc-fontmap.h | 15 +++++
pango/patches/patch-pangocairo-coretext.h | 16 +++++
17 files changed, 491 insertions(+)
diffs:
diff --git a/Makefile b/Makefile
index 6f3624ebaf..f6cdf6e00c 100644
--- a/Makefile
+++ b/Makefile
@@ -2810,6 +2810,7 @@ SUBDIR+= pam-pwdfile
SUBDIR+= pan2-git
SUBDIR+= panda
SUBDIR+= pandoc
+SUBDIR+= pango
SUBDIR+= pangoterm
SUBDIR+= parafly
SUBDIR+= paraview
diff --git a/pango/DESCR b/pango/DESCR
new file mode 100644
index 0000000000..65e28390d3
--- /dev/null
+++ b/pango/DESCR
@@ -0,0 +1,20 @@
+Pango is a library for layout and rendering of text, with an emphasis
+on internationalization. Pango can be used anywhere that text layout
+is needed; however, most of the work on Pango-1.0 was done using the
+GTK+ widget toolkit as a test platform. Pango forms the core of text
+and font handling for GTK+-2.0.
+
+Pango is designed to be modular; the core Pango layout can be used
+with four different font backends:
+
+ - Core X windowing system fonts
+ - Client-side fonts on X using the Xft library
+ - Direct rendering of scalable fonts using the FreeType library
+ - Native fonts on Microsoft backends
+
+Dynamically loaded modules then handle text layout for particular
+combinations of script and font backend.
+
+As well as the low level layout rendering routines, Pango includes
+PangoLayout, a high level driver for laying out entire blocks of text,
+and routines to assist in editing internationalized text.
diff --git a/pango/Makefile b/pango/Makefile
new file mode 100644
index 0000000000..81497207a3
--- /dev/null
+++ b/pango/Makefile
@@ -0,0 +1,63 @@
+# $NetBSD$
+
+DISTNAME= pango-1.44.6
+PKGREVISION= 1
+CATEGORIES= devel fonts
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pango/${PKGVERSION_NOREV:R}/}
+EXTRACT_SUFX= .tar.xz
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= https://www.pango.org/
+COMMENT= Library for layout and rendering of text
+LICENSE= gnu-lgpl-v2
+
+TOOL_DEPENDS+= help2man-[0-9]*:../../converters/help2man
+
+USE_LANGUAGES= c c++
+USE_TOOLS+= gmake pkg-config
+INSTALLATION_DIRS= ${PKGMANDIR}/man1
+
+PKGCONFIG_OVERRIDE+= output/meson-private/pango.pc
+PKGCONFIG_OVERRIDE+= output/meson-private/pangocairo.pc
+PKGCONFIG_OVERRIDE+= output/meson-private/pangoft2.pc
+PKGCONFIG_OVERRIDE+= output/meson-private/pangoxft.pc
+PKGCONFIG_OVERRIDE_STAGE=pre-install
+MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/${PKGBASE}
+
+CHECK_FILES_SKIP+= ${PREFIX}/libdata/pango/pango.modules
+CHECK_PORTABILITY_SKIP+= docs/check.docs
+
+BUILDLINK_TRANSFORM+= rm:-Werror=implicit-fallthrough # clang10svn
+
+post-install:
+ ${MV} ${DESTDIR}${PREFIX}/share/man/man1/pango-view.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/pango-view.1 || ${TRUE}
+
+do-test:
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ninja -C output test
+
+.include "options.mk"
+.include "../../graphics/librsvg/available.mk"
+
+BUILDLINK_API_DEPENDS.fribidi+= fribidi>=0.19.7
+.include "../../converters/fribidi/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.59
+.include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_DEPMETHOD.gobject-introspection= build
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.11.91
+.include "../../fonts/fontconfig/buildlink3.mk"
+BUILDLINK_API_DEPENDS.harfbuzz+= harfbuzz>=2.0
+.include "../../fonts/harfbuzz/buildlink3.mk"
+.if ${LIBRSVG_TYPE} == "rust"
+.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"
+# XXX freetype versioning is insane. needs libtool version >= 21.0.15,
+# which corresponds to release version 2.8.1
+BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.8.1
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../devel/py-meson/build.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/pango/PLIST b/pango/PLIST
new file mode 100644
index 0000000000..e94b0df549
--- /dev/null
+++ b/pango/PLIST
@@ -0,0 +1,68 @@
+@comment $NetBSD$
+bin/pango-list
+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-context.h
+include/pango-1.0/pango/pango-coverage.h
+include/pango-1.0/pango/pango-direction.h
+include/pango-1.0/pango/pango-engine.h
+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.h
+include/pango-1.0/pango/pango-glyph-item.h
+include/pango-1.0/pango/pango-glyph.h
+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-matrix.h
+include/pango-1.0/pango/pango-modules.h
+include/pango-1.0/pango/pango-ot.h
+include/pango-1.0/pango/pango-renderer.h
+include/pango-1.0/pango/pango-script.h
+include/pango-1.0/pango/pango-tabs.h
+include/pango-1.0/pango/pango-types.h
+include/pango-1.0/pango/pango-utils.h
+include/pango-1.0/pango/pango-version-macros.h
+include/pango-1.0/pango/pango.h
+include/pango-1.0/pango/pangocairo.h
+${PLIST.quartz}include/pango-1.0/pango/pangocoretext.h
+include/pango-1.0/pango/pangofc-decoder.h
+include/pango-1.0/pango/pangofc-font.h
+include/pango-1.0/pango/pangofc-fontmap.h
+include/pango-1.0/pango/pangoft2.h
+${PLIST.x11}include/pango-1.0/pango/pangoxft-render.h
+${PLIST.x11}include/pango-1.0/pango/pangoxft.h
+lib/girepository-1.0/Pango-1.0.typelib
+lib/girepository-1.0/PangoCairo-1.0.typelib
+lib/girepository-1.0/PangoFT2-1.0.typelib
+lib/girepository-1.0/PangoFc-1.0.typelib
+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.4400.6
+lib/libpangocairo-1.0.so
+lib/libpangocairo-1.0.so.0
+lib/libpangocairo-1.0.so.0.4400.6
+lib/libpangoft2-1.0.so
+lib/libpangoft2-1.0.so.0
+lib/libpangoft2-1.0.so.0.4400.6
+${PLIST.x11}lib/libpangoxft-1.0.so
+${PLIST.x11}lib/libpangoxft-1.0.so.0
+${PLIST.x11}lib/libpangoxft-1.0.so.0.4400.6
+lib/pkgconfig/pango.pc
+lib/pkgconfig/pangocairo.pc
+lib/pkgconfig/pangoft2.pc
+${PLIST.x11}lib/pkgconfig/pangoxft.pc
+man/man1/pango-view.1
+share/gir-1.0/Pango-1.0.gir
+share/gir-1.0/PangoCairo-1.0.gir
+share/gir-1.0/PangoFT2-1.0.gir
+share/gir-1.0/PangoFc-1.0.gir
+share/gir-1.0/PangoOT-1.0.gir
+${PLIST.x11}share/gir-1.0/PangoXft-1.0.gir
diff --git a/pango/buildlink3.mk b/pango/buildlink3.mk
new file mode 100644
index 0000000000..0f04ec03a4
--- /dev/null
+++ b/pango/buildlink3.mk
@@ -0,0 +1,35 @@
+# $NetBSD$
+
+BUILDLINK_TREE+= pango
+
+.if !defined(PANGO_BUILDLINK3_MK)
+PANGO_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.pango+= pango>=1.6.0
+BUILDLINK_ABI_DEPENDS.pango+= pango>=1.42.4nb2
+BUILDLINK_PKGSRCDIR.pango?= ../../devel/pango
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+pkgbase := pango
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.pango:Mlibthai)
+.include "../../devel/libthai/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.pango:Mx11)
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
+.endif
+
+.include "../../converters/fribidi/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../fonts/harfbuzz/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.endif # PANGO_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -pango
diff --git a/pango/distinfo b/pango/distinfo
new file mode 100644
index 0000000000..9a2c491556
--- /dev/null
+++ b/pango/distinfo
@@ -0,0 +1,16 @@
+$NetBSD$
+
+SHA1 (pango-1.44.6.tar.xz) = 6d1067d29b314bc41fe34c9bd83867eac6df5bad
+RMD160 (pango-1.44.6.tar.xz) = ec6e791baaba57e81465a339e8ccee28bc0f45d2
+SHA512 (pango-1.44.6.tar.xz) = 141babfae7c6c762afc8c829303baac1c29d62760503b0dd1da70cc3b5f2e514436626ad6af43d02e316dcf2baff840ad92b47a86df75b1fc8e8169d90ad2e50
+Size (pango-1.44.6.tar.xz) = 521672 bytes
+SHA1 (patch-pango_pango-coverage.h) = 0de62f4e2f368a7fe53d9e2587272caba539174f
+SHA1 (patch-pango_pango-font.h) = 8842cc7a6d89dafe737028c064c84694c3baec3b
+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) = 44b65b64da1d2ae819a5e984b5c672ad9d333622
+SHA1 (patch-pango_pangocoretext.h) = d6817eb02f0020c102ab95d63202f9508a70e647
+SHA1 (patch-pango_pangofc-fontmap.h) = 1943cba634c5d2ca34725c26007f4715037bbfe1
+SHA1 (patch-pangocairo-coretext.h) = 2f7c8efad48b58398070f48e71c16d99d3d59f57
diff --git a/pango/options.mk b/pango/options.mk
new file mode 100644
index 0000000000..ab4e1fc9ed
--- /dev/null
+++ b/pango/options.mk
@@ -0,0 +1,48 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.pango
+PKG_SUPPORTED_OPTIONS= libthai quartz x11
+PKG_SUGGESTED_OPTIONS= x11
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+= coretext quartz x11 thai
+
+###
+### X11 support
+###
+.if !empty(PKG_OPTIONS:Mx11)
+# fix for pangox.pc
+PLIST.x11= yes
+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"
+.endif
+
+###
+### Thai language support
+###
+.if !empty(PKG_OPTIONS:Mlibthai)
+PLIST.thai= yes
+.include "../../devel/libthai/buildlink3.mk"
+.endif
+
+.include "../../mk/bsd.prefs.mk"
+
+###
+### Quartz "support"
+###
+.if ${OPSYS} == "Darwin"
+### always looks for system CoreText
+. if empty(MACHINE_PLATFORM:MDarwin-[1-8].*-*)
+### CoreText is only available in 10.5 or newer
+PLIST.coretext= yes
+. endif
+. if !empty(PKG_OPTIONS:Mquartz)
+### installs its coretext header file if cairo was built with "quartz" option
+PLIST.quartz= yes
+. endif
+.endif
diff --git a/pango/patches/patch-pango_pango-coverage.h b/pango/patches/patch-pango_pango-coverage.h
new file mode 100644
index 0000000000..729404b395
--- /dev/null
+++ b/pango/patches/patch-pango_pango-coverage.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Search Harfbuzz headerfile in "harfbuzz" subdirectory.
+
+--- pango/pango-coverage.h.orig 2019-09-03 12:11:42.000000000 +0000
++++ pango/pango-coverage.h
+@@ -25,7 +25,7 @@
+ #include <glib-object.h>
+
+ #include <pango/pango-version-macros.h>
+-#include <hb.h>
++#include <harfbuzz/hb.h>
+
+ G_BEGIN_DECLS
+
diff --git a/pango/patches/patch-pango_pango-font.h b/pango/patches/patch-pango_pango-font.h
new file mode 100644
index 0000000000..89a170bbb1
--- /dev/null
+++ b/pango/patches/patch-pango_pango-font.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Search Harfbuzz headerfile in "harfbuzz" subdirectory.
+
+--- pango/pango-font.h.orig 2019-09-03 12:11:42.000000000 +0000
++++ pango/pango-font.h
+@@ -26,7 +26,7 @@
+ #include <pango/pango-types.h>
+
+ #include <glib-object.h>
+-#include <hb.h>
++#include <harfbuzz/hb.h>
+
+ G_BEGIN_DECLS
+
diff --git a/pango/patches/patch-pango_pangocairo-coretextfont.c b/pango/patches/patch-pango_pangocairo-coretextfont.c
new file mode 100644
index 0000000000..62e3608094
--- /dev/null
+++ b/pango/patches/patch-pango_pangocairo-coretextfont.c
@@ -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 <Tom.Schoonjans%diamond.ac.uk@localhost>
+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)
diff --git a/pango/patches/patch-pango_pangocairo-coretextfontmap.c b/pango/patches/patch-pango_pangocairo-coretextfontmap.c
new file mode 100644
index 0000000000..1e177329f4
--- /dev/null
+++ b/pango/patches/patch-pango_pangocairo-coretextfontmap.c
@@ -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 <Tom.Schoonjans%diamond.ac.uk@localhost>
+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.;
+ }
diff --git a/pango/patches/patch-pango_pangocoretext-fontmap.c b/pango/patches/patch-pango_pangocoretext-fontmap.c
new file mode 100644
index 0000000000..9f283902e6
--- /dev/null
+++ b/pango/patches/patch-pango_pangocoretext-fontmap.c
@@ -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 <Tom.Schoonjans%diamond.ac.uk@localhost>
+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;
+ }
+
+
diff --git a/pango/patches/patch-pango_pangocoretext-private.h b/pango/patches/patch-pango_pangocoretext-private.h
new file mode 100644
index 0000000000..4e6f9a7fde
--- /dev/null
+++ b/pango/patches/patch-pango_pangocoretext-private.h
@@ -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 <Tom.Schoonjans%diamond.ac.uk@localhost>
+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);
diff --git a/pango/patches/patch-pango_pangocoretext.c b/pango/patches/patch-pango_pangocoretext.c
new file mode 100644
index 0000000000..9da773cb96
--- /dev/null
+++ b/pango/patches/patch-pango_pangocoretext.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-pango_pangocoretext.c,v 1.2 2019/08/16 10:43:24 wiz Exp $
+From 60df2b006e5d4553abc7bb5fe9a99539c91b0022 Mon Sep 17 00:00:00 2001
+From: Tom Schoonjans <Tom.Schoonjans%diamond.ac.uk@localhost>
+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 2019-08-04 01:59:02.000000000 +0000
++++ pango/pangocoretext.c
+@@ -204,7 +204,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->get_font_map = pango_core_text_font_get_font_map;
+ font_class->create_hb_font = pango_core_text_font_create_hb_font;
diff --git a/pango/patches/patch-pango_pangocoretext.h b/pango/patches/patch-pango_pangocoretext.h
new file mode 100644
index 0000000000..a037015a4a
--- /dev/null
+++ b/pango/patches/patch-pango_pangocoretext.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-pango_pangocoretext.h,v 1.3 2015/06/10 23:30:24 prlw1 Exp $
+
+Use correct CoreText header on Mac OS X.
+
+--- pango/pangocoretext.h.orig 2015-05-27 17:38:43.000000000 +0000
++++ pango/pangocoretext.h
+@@ -24,7 +24,9 @@
+ #define __PANGOCORETEXT_H__
+
+ #include <pango/pango.h>
+-#include <Carbon/Carbon.h>
++#ifndef __GI_SCANNER__
++#include <ApplicationServices/ApplicationServices.h>
++#endif
+
+ G_BEGIN_DECLS
+
diff --git a/pango/patches/patch-pango_pangofc-fontmap.h b/pango/patches/patch-pango_pangofc-fontmap.h
new file mode 100644
index 0000000000..5cb1756c90
--- /dev/null
+++ b/pango/patches/patch-pango_pangofc-fontmap.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Search Harfbuzz headerfile in "harfbuzz" subdirectory.
+
+--- pango/pangofc-fontmap.h.orig 2019-09-03 12:11:42.000000000 +0000
++++ pango/pangofc-fontmap.h
+@@ -26,7 +26,7 @@
+ #include <fontconfig/fontconfig.h>
+ #include <pango/pangofc-decoder.h>
+ #include <pango/pangofc-font.h>
+-#include <hb.h>
++#include <harfbuzz/hb.h>
+
+ G_BEGIN_DECLS
+
diff --git a/pango/patches/patch-pangocairo-coretext.h b/pango/patches/patch-pangocairo-coretext.h
new file mode 100644
index 0000000000..1a08f133bb
--- /dev/null
+++ b/pango/patches/patch-pangocairo-coretext.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-pangocairo-coretext.h,v 1.1 2012/05/15 15:07:23 adam Exp $
+
+Let g-ir-scanner skip this header file, since it cannot inspect frameworks.
+
+--- pango/pangocairo-coretext.h.orig 2012-05-15 14:55:59.000000000 +0000
++++ pango/pangocairo-coretext.h
+@@ -25,7 +25,9 @@
+
+ #include "pangocoretext-private.h"
+ #include <pango/pangocairo.h>
++#ifndef __GI_SCANNER__
+ #include <cairo-quartz.h>
++#endif
+
+ G_BEGIN_DECLS
+
Home |
Main Index |
Thread Index |
Old Index