CVS commit: pkgsrc/devel/pango

["pin" <pin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pin
Date:           Thu Dec 26 05:54:35 UTC 2024

Modified Files:
        pkgsrc/devel/pango: Makefile PLIST distinfo
        pkgsrc/devel/pango/patches: patch-pango_pangocairo-coretextfont.c
            patch-pango_pangocoretext.c patch-utils_meson.build

Log Message:
devel/pango: update to 1.55.5

Overview of changes in 1.55.5, 10-12-2024
=========================================

- Test release, no changes

Overview of changes in 1.55, 26-11-2024
=======================================
- Support Unicode 16
- Add pango_font_map_add_font_file
- fontconfig: Reject patterns without FC_FILE
- coretext: Actually use .AppleSystemUIFont
- coretext: Keep track of variations
- win32: Use font options for caching
- win32: Keep variations in PangoWin32Font
- build: Require harfbuzz 8.4.0
- build: Require fontconfig 2.15
- build: Require meson 1.2.0
- build: Require Window 10


To generate a diff of this commit:
cvs rdiff -u -r1.266 -r1.267 pkgsrc/devel/pango/Makefile
cvs rdiff -u -r1.93 -r1.94 pkgsrc/devel/pango/PLIST
cvs rdiff -u -r1.145 -r1.146 pkgsrc/devel/pango/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/pango/patches/patch-pango_pangocairo-coretextfont.c \
    pkgsrc/devel/pango/patches/patch-utils_meson.build
cvs rdiff -u -r1.3 -r1.4 \
    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.

Modified files:

Index: pkgsrc/devel/pango/Makefile
diff -u pkgsrc/devel/pango/Makefile:1.266 pkgsrc/devel/pango/Makefile:1.267
--- pkgsrc/devel/pango/Makefile:1.266   Sun Jun 30 21:56:30 2024
+++ pkgsrc/devel/pango/Makefile Thu Dec 26 05:54:35 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.266 2024/06/30 21:56:30 wiz Exp $
+# $NetBSD: Makefile,v 1.267 2024/12/26 05:54:35 pin Exp $
 
-DISTNAME=      pango-1.54.0
+DISTNAME=      pango-1.55.5
 CATEGORIES=    devel fonts
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/pango/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
@@ -23,7 +23,7 @@ SUBST_VARS.wrksrc=    WRKSRC
 
 .include "../../mk/bsd.prefs.mk"
 
-MESON_REQD+=           0.55.3
+MESON_REQD+=           1.2.0
 MESON_ARGS+=           -Dcairo=enabled
 MESON_ARGS+=           -Dfontconfig=enabled
 
@@ -69,9 +69,9 @@ BUILDLINK_API_DEPENDS.fribidi+=       fribidi>
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.60
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.fontconfig+=     fontconfig>=2.11.91
+BUILDLINK_API_DEPENDS.fontconfig+=     fontconfig>=2.15.0
 .include "../../fonts/fontconfig/buildlink3.mk"
-BUILDLINK_API_DEPENDS.harfbuzz+= harfbuzz>=2.7.2
+BUILDLINK_API_DEPENDS.harfbuzz+= harfbuzz>=8.4.0
 .include "../../fonts/harfbuzz/buildlink3.mk"
 .if ${LIBRSVG_TYPE} == "rust"
 .include "../../graphics/graphite2/buildlink3.mk"

Index: pkgsrc/devel/pango/PLIST
diff -u pkgsrc/devel/pango/PLIST:1.93 pkgsrc/devel/pango/PLIST:1.94
--- pkgsrc/devel/pango/PLIST:1.93       Sun Jun 30 21:56:30 2024
+++ pkgsrc/devel/pango/PLIST    Thu Dec 26 05:54:35 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.93 2024/06/30 21:56:30 wiz Exp $
+@comment $NetBSD: PLIST,v 1.94 2024/12/26 05:54:35 pin Exp $
 bin/pango-list
 bin/pango-segmentation
 bin/pango-view
@@ -48,16 +48,16 @@ ${PLIST.introspection}lib/girepository-1
 ${PLIST.introspection}${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.5400.0
+lib/libpango-1.0.so.0.5505.0
 lib/libpangocairo-1.0.so
 lib/libpangocairo-1.0.so.0
-lib/libpangocairo-1.0.so.0.5400.0
+lib/libpangocairo-1.0.so.0.5505.0
 lib/libpangoft2-1.0.so
 lib/libpangoft2-1.0.so.0
-lib/libpangoft2-1.0.so.0.5400.0
+lib/libpangoft2-1.0.so.0.5505.0
 ${PLIST.x11}lib/libpangoxft-1.0.so
 ${PLIST.x11}lib/libpangoxft-1.0.so.0
-${PLIST.x11}lib/libpangoxft-1.0.so.0.5400.0
+${PLIST.x11}lib/libpangoxft-1.0.so.0.5505.0
 lib/pkgconfig/pango.pc
 lib/pkgconfig/pangocairo.pc
 lib/pkgconfig/pangofc.pc

Index: pkgsrc/devel/pango/distinfo
diff -u pkgsrc/devel/pango/distinfo:1.145 pkgsrc/devel/pango/distinfo:1.146
--- pkgsrc/devel/pango/distinfo:1.145   Sun Jun 30 21:56:30 2024
+++ pkgsrc/devel/pango/distinfo Thu Dec 26 05:54:35 2024
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.145 2024/06/30 21:56:30 wiz Exp $
+$NetBSD: distinfo,v 1.146 2024/12/26 05:54:35 pin Exp $
 
-BLAKE2s (pango-1.54.0.tar.xz) = a9b9de35add4fa0831bb3678402697eebe9823a2e94388b6af2d48f0c4ae884b
-SHA512 (pango-1.54.0.tar.xz) = b08792a811e033b2dc9ae78278ea522fad1064de3a4d33460271eb0502613ee21d2c82349f8e7d8f59d59e0c020b7a3a8efa194572e16e2e78db422956fd97ea
-Size (pango-1.54.0.tar.xz) = 1963180 bytes
-SHA1 (patch-pango_pangocairo-coretextfont.c) = cfef0e1372d5770d5988af411d435ee87fdfd0bd
+BLAKE2s (pango-1.55.5.tar.xz) = 7403afb9edf0007d5e892809f122818e3cb9a64f95ee22f4b0f826d02287c470
+SHA512 (pango-1.55.5.tar.xz) = 7c73b463e8062c2aeac6bf04c7c536229d67894eea4aa4d1d34c9a14f23da2b90b5be66c8056fcfafd0125e43a85dc06d81aae658e07700bf8077885a6be9eb7
+Size (pango-1.55.5.tar.xz) = 1878652 bytes
+SHA1 (patch-pango_pangocairo-coretextfont.c) = 32fddb025bf2896d23d22814b6edd91042fd58b5
 SHA1 (patch-pango_pangocairo-coretextfontmap.c) = 395cb1f8472a319c4b1c58ea137e36452bc44cc6
 SHA1 (patch-pango_pangocoretext-private.h) = 0d7d61cd7e7b9da34bf8a0d5d1c6e7734341cadf
-SHA1 (patch-pango_pangocoretext.c) = 465a66b5027c3dda5dd97c0cf33edebb4e173a1e
+SHA1 (patch-pango_pangocoretext.c) = deb37c157f8fb517e2e367a685c4dcab1b93c7c2
 SHA1 (patch-pango_pangocoretext.h) = d6817eb02f0020c102ab95d63202f9508a70e647
 SHA1 (patch-pangocairo-coretext.h) = 2f7c8efad48b58398070f48e71c16d99d3d59f57
-SHA1 (patch-utils_meson.build) = 4c2564d54209b4bed286db3d85963c78897ceb49
+SHA1 (patch-utils_meson.build) = 5ad3aa09c27daea2d116576a7147673e14dba90c

Index: pkgsrc/devel/pango/patches/patch-pango_pangocairo-coretextfont.c
diff -u pkgsrc/devel/pango/patches/patch-pango_pangocairo-coretextfont.c:1.1 pkgsrc/devel/pango/patches/patch-pango_pangocairo-coretextfont.c:1.2
--- pkgsrc/devel/pango/patches/patch-pango_pangocairo-coretextfont.c:1.1        Tue Nov 20 08:34:43 2018
+++ pkgsrc/devel/pango/patches/patch-pango_pangocairo-coretextfont.c    Thu Dec 26 05:54:35 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-pango_pangocairo-coretextfont.c,v 1.1 2018/11/20 08:34:43 maya Exp $
+$NetBSD: patch-pango_pangocairo-coretextfont.c,v 1.2 2024/12/26 05:54:35 pin Exp $
 
 From 60df2b006e5d4553abc7bb5fe9a99539c91b0022 Mon Sep 17 00:00:00 2001
 From: Tom Schoonjans <Tom.Schoonjans%diamond.ac.uk@localhost>
@@ -7,7 +7,7 @@ Subject: [PATCH] Revert "Restore scaling
 
 This reverts commit f661cdbf8cfbdb2ba7241d8dfa4a579c6dfe0a94.
 
---- pango/pangocairo-coretextfont.c.orig       2018-07-16 00:50:43.000000000 +0000
+--- pango/pangocairo-coretextfont.c.orig       2024-12-06 11:15:23.694779478 +0000
 +++ pango/pangocairo-coretextfont.c
 @@ -36,7 +36,6 @@ struct _PangoCairoCoreTextFont
  {
@@ -17,7 +17,7 @@ This reverts commit f661cdbf8cfbdb2ba724
  };
  
  struct _PangoCairoCoreTextFontClass
-@@ -163,17 +162,6 @@ pango_cairo_core_text_font_create_base_m
+@@ -121,17 +120,6 @@ pango_cairo_core_text_font_create_base_m
    return metrics;
  }
  
@@ -26,7 +26,7 @@ This reverts commit f661cdbf8cfbdb2ba724
 -{
 -  PangoCairoCoreTextFont *cafont = (PangoCairoCoreTextFont *)font;
 -  PangoFontDescription *desc = pango_font_describe (font);
--  
+-
 -  pango_font_description_set_absolute_size (desc, cafont->abs_size);
 -
 -  return desc;
@@ -35,7 +35,7 @@ This reverts commit f661cdbf8cfbdb2ba724
  static void
  pango_cairo_core_text_font_finalize (GObject *object)
  {
-@@ -191,10 +179,9 @@ pango_cairo_core_text_font_class_init (P
+@@ -149,10 +137,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;
@@ -47,7 +47,7 @@ This reverts commit f661cdbf8cfbdb2ba724
  }
  
  static void
-@@ -232,8 +219,6 @@ _pango_cairo_core_text_font_new (PangoCa
+@@ -192,8 +179,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);
  
Index: pkgsrc/devel/pango/patches/patch-utils_meson.build
diff -u pkgsrc/devel/pango/patches/patch-utils_meson.build:1.1 pkgsrc/devel/pango/patches/patch-utils_meson.build:1.2
--- pkgsrc/devel/pango/patches/patch-utils_meson.build:1.1      Mon Feb 24 17:08:31 2020
+++ pkgsrc/devel/pango/patches/patch-utils_meson.build  Thu Dec 26 05:54:35 2024
@@ -1,14 +1,14 @@
-$NetBSD: patch-utils_meson.build,v 1.1 2020/02/24 17:08:31 brook Exp $
+$NetBSD: patch-utils_meson.build,v 1.2 2024/12/26 05:54:35 pin 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.orig     2024-12-06 11:10:58.416813497 +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,
++       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'

Index: pkgsrc/devel/pango/patches/patch-pango_pangocoretext.c
diff -u pkgsrc/devel/pango/patches/patch-pango_pangocoretext.c:1.3 pkgsrc/devel/pango/patches/patch-pango_pangocoretext.c:1.4
--- pkgsrc/devel/pango/patches/patch-pango_pangocoretext.c:1.3  Thu Apr  8 08:38:55 2021
+++ pkgsrc/devel/pango/patches/patch-pango_pangocoretext.c      Thu Dec 26 05:54:35 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-pango_pangocoretext.c,v 1.3 2021/04/08 08:38:55 adam Exp $
+$NetBSD: patch-pango_pangocoretext.c,v 1.4 2024/12/26 05:54:35 pin Exp $
 
 From 60df2b006e5d4553abc7bb5fe9a99539c91b0022 Mon Sep 17 00:00:00 2001
 From: Tom Schoonjans <Tom.Schoonjans%diamond.ac.uk@localhost>
@@ -7,16 +7,12 @@ Subject: [PATCH] Revert "Restore scaling
 
 This reverts commit f661cdbf8cfbdb2ba7241d8dfa4a579c6dfe0a94.
 
---- pango/pangocoretext.c.orig 2019-08-04 01:59:02.000000000 +0000
+--- pango/pangocoretext.c.orig 2024-12-06 11:13:47.621384791 +0000
 +++ pango/pangocoretext.c
-@@ -204,7 +204,10 @@ pango_core_text_font_class_init (PangoCo
-   object_class->finalize = pango_core_text_font_finalize;
+@@ -244,6 +244,7 @@ pango_core_text_font_class_init (PangoCo
  
    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 is left virtual for PangoCairoCoreTextFont. */
 +  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;