pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
devel/pango: update to 1.51.0
Module Name: pkgsrc-wip
Committed By: pin <voidpin%protonmail.com@localhost>
Pushed By: pin
Date: Tue Dec 19 13:38:23 2023 +0100
Changeset: d30c02fcc4928e283695c258af8aa0f00b34ae8b
Modified Files:
Makefile
Added Files:
pango/DESCR
pango/Makefile
pango/PLIST
pango/buildlink3.mk
pango/distinfo
pango/files/pango-view.sh
pango/options.mk
pango/patches/patch-pango_pangocairo-coretextfont.c
pango/patches/patch-pango_pangocairo-coretextfontmap.c
pango/patches/patch-pango_pangocoretext-private.h
pango/patches/patch-pango_pangocoretext.c
pango/patches/patch-pango_pangocoretext.h
pango/patches/patch-pangocairo-coretext.h
pango/patches/patch-utils_meson.build
Log Message:
devel/pango: update to 1.51.0
Store here until freeze is over.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d30c02fcc4928e283695c258af8aa0f00b34ae8b
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 | 73 +++++++++++++++++++++
pango/PLIST | 74 ++++++++++++++++++++++
pango/buildlink3.mk | 35 ++++++++++
pango/distinfo | 12 ++++
pango/files/pango-view.sh | 16 +++++
pango/options.mk | 38 +++++++++++
.../patches/patch-pango_pangocairo-coretextfont.c | 58 +++++++++++++++++
.../patch-pango_pangocairo-coretextfontmap.c | 18 ++++++
pango/patches/patch-pango_pangocoretext-private.h | 20 ++++++
pango/patches/patch-pango_pangocoretext.c | 23 +++++++
pango/patches/patch-pango_pangocoretext.h | 17 +++++
pango/patches/patch-pangocairo-coretext.h | 16 +++++
pango/patches/patch-utils_meson.build | 17 +++++
15 files changed, 438 insertions(+)
diffs:
diff --git a/Makefile b/Makefile
index 1a5e622c53..5875820026 100644
--- a/Makefile
+++ b/Makefile
@@ -2856,6 +2856,7 @@ SUBDIR+= pam-pop3
SUBDIR+= pam-pwdfile
SUBDIR+= pan2-git
SUBDIR+= panda
+SUBDIR+= pango
SUBDIR+= pangoterm
SUBDIR+= papp
SUBDIR+= parafly
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..7080cbe82b
--- /dev/null
+++ b/pango/Makefile
@@ -0,0 +1,73 @@
+# $NetBSD: Makefile,v 1.259 2023/11/14 14:01:39 wiz Exp $
+
+DISTNAME= pango-1.51.0
+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://pango.gnome.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+= pkg-config
+INSTALLATION_DIRS= ${PKGMANDIR}/man1
+
+SUBST_CLASSES+= wrksrc
+SUBST_STAGE.wrksrc= pre-configure
+SUBST_FILES.wrksrc= output/utils/pango-view.sh
+SUBST_VARS.wrksrc= WRKSRC
+
+MESON_REQD+= 0.55.3
+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
+PKGCONFIG_OVERRIDE+= output/meson-private/pangoft2.pc
+PKGCONFIG_OVERRIDE+= output/meson-private/pangoot.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
+
+PYTHON_FOR_BUILD_ONLY= tool
+
+BUILDLINK_TRANSFORM+= rm:-Werror=implicit-fallthrough # clang10svn
+
+post-extract:
+ ${MKDIR} -p ${WRKSRC}/output/utils
+ ${CP} ${FILESDIR}/pango-view.sh ${WRKSRC}/output/utils
+
+post-install:
+ ${MV} ${DESTDIR}${PREFIX}/share/man/man1/pango-view.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/pango-view.1 || ${TRUE}
+
+.include "options.mk"
+.include "../../graphics/librsvg/available.mk"
+
+BUILDLINK_API_DEPENDS.fribidi+= fribidi>=1.0.6
+.include "../../converters/fribidi/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.60
+.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.7.2
+.include "../../fonts/harfbuzz/buildlink3.mk"
+.if ${LIBRSVG_TYPE} == "rust"
+.include "../../graphics/graphite2/buildlink3.mk"
+.endif
+BUILDLINK_API_DEPENDS.cairo+= cairo>=1.18
+.include "../../graphics/cairo/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../devel/meson/build.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/pango/PLIST b/pango/PLIST
new file mode 100644
index 0000000000..5ecee86efd
--- /dev/null
+++ b/pango/PLIST
@@ -0,0 +1,74 @@
+@comment $NetBSD$
+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
+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-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
+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
+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
+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
+include/pango-1.0/pango/pangoxft-render.h
+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
+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.5100.0
+lib/libpangocairo-1.0.so
+lib/libpangocairo-1.0.so.0
+lib/libpangocairo-1.0.so.0.5100.0
+lib/libpangoft2-1.0.so
+lib/libpangoft2-1.0.so.0
+lib/libpangoft2-1.0.so.0.5100.0
+lib/libpangoxft-1.0.so
+lib/libpangoxft-1.0.so.0
+lib/libpangoxft-1.0.so.0.5100.0
+lib/pkgconfig/pango.pc
+lib/pkgconfig/pangocairo.pc
+lib/pkgconfig/pangofc.pc
+lib/pkgconfig/pangoft2.pc
+lib/pkgconfig/pangoot.pc
+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
+share/gir-1.0/PangoXft-1.0.gir
+@pkgdir share/man/man1
diff --git a/pango/buildlink3.mk b/pango/buildlink3.mk
new file mode 100644
index 0000000000..7a31aa6bf3
--- /dev/null
+++ b/pango/buildlink3.mk
@@ -0,0 +1,35 @@
+# $NetBSD: buildlink3.mk,v 1.60 2023/11/14 14:01:39 wiz Exp $
+
+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.51.0
+BUILDLINK_PKGSRCDIR.pango?= ../../devel/pango
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+pkgbase := pango
+.include "../../mk/pkg-build-options.mk"
+
+.if ${PKG_BUILD_OPTIONS.pango:Mlibthai}
+.include "../../devel/libthai/buildlink3.mk"
+.endif
+
+.if ${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..9820ee78e9
--- /dev/null
+++ b/pango/distinfo
@@ -0,0 +1,12 @@
+$NetBSD: distinfo,v 1.141 2023/06/26 19:49:32 adam Exp $
+
+BLAKE2s (pango-1.51.0.tar.xz) = 97533e4dd1605563c509e158910a250746470b619e4b27892ccbc622e20278af
+SHA512 (pango-1.51.0.tar.xz) = a427e93cdc00bf4bc97da2e1897363a53688886f112c8732684cc66c67b16fe82a84cf581ffa6c18a206e8e37bd54db4104856fdab8afa5a50a8bc0470e5d282
+Size (pango-1.51.0.tar.xz) = 1942044 bytes
+SHA1 (patch-pango_pangocairo-coretextfont.c) = cfef0e1372d5770d5988af411d435ee87fdfd0bd
+SHA1 (patch-pango_pangocairo-coretextfontmap.c) = 395cb1f8472a319c4b1c58ea137e36452bc44cc6
+SHA1 (patch-pango_pangocoretext-private.h) = 0d7d61cd7e7b9da34bf8a0d5d1c6e7734341cadf
+SHA1 (patch-pango_pangocoretext.c) = 465a66b5027c3dda5dd97c0cf33edebb4e173a1e
+SHA1 (patch-pango_pangocoretext.h) = d6817eb02f0020c102ab95d63202f9508a70e647
+SHA1 (patch-pangocairo-coretext.h) = 2f7c8efad48b58398070f48e71c16d99d3d59f57
+SHA1 (patch-utils_meson.build) = 4c2564d54209b4bed286db3d85963c78897ceb49
diff --git a/pango/files/pango-view.sh b/pango/files/pango-view.sh
new file mode 100755
index 0000000000..0e48e6b16b
--- /dev/null
+++ b/pango/files/pango-view.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+# $NetBSD: pango-view.sh,v 1.1 2020/02/24 17:08:31 brook Exp $
+#
+# Run pango-view with LD_LIBRARY_PATH
+#
+# During the build process, help2man is used to create a man page for
+# pango-view, which it does by running pango-view. On some platforms
+# (notably Darwin) this fails because pango-view requires access to a
+# shared library just built and rpath is not set appropriately.
+# Therefore, LD_LIBRARY_PATH must be set, which cannot be done in
+# meson.build, because help2man does not propagate the environment to
+# programs it runs. The solution is to wrap pango-view in this script
+# and provide LD_LIBRARY_PATH here.
+#
+
+env LD_LIBRARY_PATH=@WRKSRC@/output/pango @WRKSRC@/output/utils/pango-view ${*}
diff --git a/pango/options.mk b/pango/options.mk
new file mode 100644
index 0000000000..b1580b6afa
--- /dev/null
+++ b/pango/options.mk
@@ -0,0 +1,38 @@
+# $NetBSD: options.mk,v 1.20 2021/03/22 07:03:57 adam Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.pango
+PKG_SUPPORTED_OPTIONS= libthai x11
+PKG_SUGGESTED_OPTIONS= x11
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+= x11
+
+###
+### X11 support
+###
+.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)
+MESON_ARGS+= -Dlibthai=enabled
+.include "../../devel/libthai/buildlink3.mk"
+.else
+MESON_ARGS+= -Dlibthai=disabled
+.endif
+
+.include "../../mk/bsd.prefs.mk"
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-private.h b/pango/patches/patch-pango_pangocoretext-private.h
new file mode 100644
index 0000000000..07a6052c07
--- /dev/null
+++ b/pango/patches/patch-pango_pangocoretext-private.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-pango_pangocoretext-private.h,v 1.2 2021/04/08 08:38:55 adam 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..7f813526fc
--- /dev/null
+++ b/pango/patches/patch-pango_pangocoretext.c
@@ -0,0 +1,23 @@
+$NetBSD: patch-pango_pangocoretext.c,v 1.3 2021/04/08 08:38:55 adam 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-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
+
diff --git a/pango/patches/patch-utils_meson.build b/pango/patches/patch-utils_meson.build
new file mode 100644
index 0000000000..f137f0e61d
--- /dev/null
+++ b/pango/patches/patch-utils_meson.build
@@ -0,0 +1,17 @@
+$NetBSD: patch-utils_meson.build,v 1.1 2020/02/24 17:08:31 brook Exp $
+
+Make help2man execute a wrapper script so that LD_LIBRARY_PATH can be defined.
+
+--- utils/meson.build.orig 2019-10-25 03:45:11.000000000 +0000
++++ utils/meson.build
+@@ -52,8 +52,9 @@ if help2man.found() and not meson.is_cro
+
+ custom_target('pango-view.1',
+ output: 'pango-view.1',
++ depends: pango_view,
+ command: [
+- help2man, help2man_opts, '--output=@OUTPUT@', pango_view
++ help2man, help2man_opts, '--output=@OUTPUT@', '--no-discard-stderr', meson.current_build_dir() + '/pango-view.sh'
+ ],
+ install: true,
+ install_dir: join_paths(pango_datadir, 'man/man1'))
Home |
Main Index |
Thread Index |
Old Index