Received: by mail.netbsd.org (Postfix, from userid 605) id 9BE5084D84; Fri, 16 Aug 2019 10:43:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 21CB384D81 for ; Fri, 16 Aug 2019 10:43:26 +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 Qm1mFbz6ewVx for ; Fri, 16 Aug 2019 10:43:25 +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 EF7D684CDA for ; Fri, 16 Aug 2019 10:43:24 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E42AAFBF4; Fri, 16 Aug 2019 10:43:24 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1565952204123810" MIME-Version: 1.0 Date: Fri, 16 Aug 2019 10:43:24 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/devel/pango To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20190816104324.E42AAFBF4@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. --_----------=_1565952204123810 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Fri Aug 16 10:43:24 UTC 2019 Modified Files: pkgsrc/devel/pango: Makefile PLIST distinfo options.mk pkgsrc/devel/pango/patches: patch-pango_pangocoretext.c Log Message: pango: update to 1.44.3. Switch to meson, autoconf build support was removed. Overview of changes in 1.44.3 ============================= - Install pango-ot headers - Make subpixel positioning optional - fc: Ignore fonts with unsupported formats Overview of changes in 1.44.2 ============================= - Disable ligatures when letterspacing - Set design coords on hb_font_t - Expose more font options in pango-view - OS X: Make 'system-ui' font work - Keep deprecated pango-fc apis in headers - Make hex boxes work, always - introspection: Various build fixes - introspection: Add PangoPT, PangoFT2 namespaces - layout: Make the new line-spacing opt-in Overview of changes in 1.44.1 ============================= - Fix a crash with allow_break attributes - Fix Emoji spacing - Fix up includes and pkg-config requires - Correct some cases for hyphen insertion Overview of changes in 1.44.0 ============================= - Use harfbuzz for shaping on all platforms - Stop using freetype for font loading; this drops support for type1 and bitmap fonts - Add a getter for hb_font_t - Make PangoCoverage a GObject - Add a pango_tailor_break api - font metrics: Add line height - layout: Support line spacing - layout: Draw hyphens for line breaks - Add an attribute to suppress line breaking - cairo: Don't render hex boxes for space - Add an attribute to show invisible characters - Stop quantizing glyph positions - Add tests for itemization and line breaking - Remove language and shape engine remnants - Rename meson options: gtk_doc, introspection - Require GLib 2.59.2 - Require Harfbuzz 2.0 Overview of changes in 1.43.0 ============================= - Drop autotools - Drop Visual Studio build - Build with meson everywhere - Update Emoji tables for Unicode 11 - Update test data for Unicode 11 - Fix a crash with Thai breaking - Fix a crash with font variations - Deprecate bidi apis in favor of fribidi - Add a variable font family api - Improve font fallback handling on win32 To generate a diff of this commit: cvs rdiff -u -r1.221 -r1.222 pkgsrc/devel/pango/Makefile cvs rdiff -u -r1.69 -r1.70 pkgsrc/devel/pango/PLIST cvs rdiff -u -r1.119 -r1.120 pkgsrc/devel/pango/distinfo cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/pango/options.mk cvs rdiff -u -r1.1 -r1.2 \ 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. --_----------=_1565952204123810 Content-Disposition: inline Content-Length: 11322 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.221 pkgsrc/devel/pango/Makefile:1.222 --- pkgsrc/devel/pango/Makefile:1.221 Thu Aug 1 10:09:38 2019 +++ pkgsrc/devel/pango/Makefile Fri Aug 16 10:43:24 2019 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.221 2019/08/01 10:09:38 maya Exp $ +# $NetBSD: Makefile,v 1.222 2019/08/16 10:43:24 wiz Exp $ -DISTNAME= pango-1.42.4 -PKGREVISION= 5 +DISTNAME= pango-1.44.3 CATEGORIES= devel fonts MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pango/${PKGVERSION_NOREV:R}/} EXTRACT_SUFX= .tar.xz @@ -11,40 +10,40 @@ HOMEPAGE= https://www.pango.org/ COMMENT= Library for layout and rendering of text LICENSE= gnu-lgpl-v2 -BUILD_DEPENDS+= help2man-[0-9]*:../../converters/help2man +TOOL_DEPENDS+= help2man-[0-9]*:../../converters/help2man # 1.42.4: one test failure, test-layout TEST_TARGET= check -USE_LIBTOOL= yes USE_LANGUAGES= c c++ USE_TOOLS+= gmake pkg-config -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata -# Carbon has been obsoleted; force turning it off -#CONFIGURE_ENV+= ac_cv_header_Carbon_Carbon_h=no - -PKGCONFIG_OVERRIDE+= pango.pc.in -PKGCONFIG_OVERRIDE+= pangocairo.pc.in -PKGCONFIG_OVERRIDE+= pangoft2.pc.in -PKGCONFIG_OVERRIDE+= pangowin32.pc.in -PKGCONFIG_OVERRIDE+= pangoxft.pc.in +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 +post-install: + ${MV} ${DESTDIR}${PREFIX}/share/man/man1/pango-view.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/pango-view.1 + .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.33.12 +BUILDLINK_API_DEPENDS.glib2+= glib2>=2.59 .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_DEPMETHOD.gobject-introspection:= build +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>=0.9.9 +BUILDLINK_API_DEPENDS.harfbuzz+= harfbuzz>=2.0 .include "../../fonts/harfbuzz/buildlink3.mk" .if ${LIBRSVG_TYPE} == "rust" .include "../../graphics/graphite2/buildlink3.mk" @@ -56,4 +55,5 @@ BUILDLINK_API_DEPENDS.cairo+= cairo>=1.1 # 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" Index: pkgsrc/devel/pango/PLIST diff -u pkgsrc/devel/pango/PLIST:1.69 pkgsrc/devel/pango/PLIST:1.70 --- pkgsrc/devel/pango/PLIST:1.69 Thu Aug 16 12:24:09 2018 +++ pkgsrc/devel/pango/PLIST Fri Aug 16 10:43:24 2019 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.69 2018/08/16 12:24:09 wiz Exp $ +@comment $NetBSD: PLIST,v 1.70 2019/08/16 10:43:24 wiz Exp $ bin/pango-list bin/pango-view include/pango-1.0/pango/pango-attributes.h @@ -6,6 +6,7 @@ include/pango-1.0/pango/pango-bidi-type. 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 @@ -40,10 +41,18 @@ lib/girepository-1.0/Pango-1.0.typelib lib/girepository-1.0/PangoCairo-1.0.typelib lib/girepository-1.0/PangoFT2-1.0.typelib ${PLIST.x11}lib/girepository-1.0/PangoXft-1.0.typelib -lib/libpango-1.0.la -lib/libpangocairo-1.0.la -lib/libpangoft2-1.0.la -${PLIST.x11}lib/libpangoxft-1.0.la +lib/libpango-1.0.so +lib/libpango-1.0.so.0 +lib/libpango-1.0.so.0.4400.3 +lib/libpangocairo-1.0.so +lib/libpangocairo-1.0.so.0 +lib/libpangocairo-1.0.so.0.4400.3 +lib/libpangoft2-1.0.so +lib/libpangoft2-1.0.so.0 +lib/libpangoft2-1.0.so.0.4400.3 +${PLIST.x11}lib/libpangoxft-1.0.so +${PLIST.x11}lib/libpangoxft-1.0.so.0 +${PLIST.x11}lib/libpangoxft-1.0.so.0.4400.3 lib/pkgconfig/pango.pc lib/pkgconfig/pangocairo.pc lib/pkgconfig/pangoft2.pc @@ -53,48 +62,3 @@ share/gir-1.0/Pango-1.0.gir share/gir-1.0/PangoCairo-1.0.gir share/gir-1.0/PangoFT2-1.0.gir ${PLIST.x11}share/gir-1.0/PangoXft-1.0.gir -share/gtk-doc/html/pango/PangoEngineLang.html -share/gtk-doc/html/pango/PangoEngineShape.html -share/gtk-doc/html/pango/PangoFcDecoder.html -share/gtk-doc/html/pango/PangoFcFont.html -share/gtk-doc/html/pango/PangoFcFontMap.html -share/gtk-doc/html/pango/PangoMarkupFormat.html -share/gtk-doc/html/pango/PangoRenderer.html -share/gtk-doc/html/pango/annotation-glossary.html -share/gtk-doc/html/pango/api-index-full.html -share/gtk-doc/html/pango/home.png -share/gtk-doc/html/pango/index.html -share/gtk-doc/html/pango/layout.gif -share/gtk-doc/html/pango/left-insensitive.png -share/gtk-doc/html/pango/left.png -share/gtk-doc/html/pango/lowlevel.html -share/gtk-doc/html/pango/pango-Bidirectional-Text.html -share/gtk-doc/html/pango/pango-Cairo-Rendering.html -share/gtk-doc/html/pango/pango-CoreText-Fonts.html -share/gtk-doc/html/pango/pango-Coverage-Maps.html -share/gtk-doc/html/pango/pango-Engines.html -share/gtk-doc/html/pango/pango-Fonts.html -share/gtk-doc/html/pango/pango-FreeType-Fonts-and-Rendering.html -share/gtk-doc/html/pango/pango-Glyph-Storage.html -share/gtk-doc/html/pango/pango-Layout-Objects.html -share/gtk-doc/html/pango/pango-Miscellaneous-Utilities.html -share/gtk-doc/html/pango/pango-Modules.html -share/gtk-doc/html/pango/pango-OpenType-Font-Handling.html -share/gtk-doc/html/pango/pango-Scripts-and-Languages.html -share/gtk-doc/html/pango/pango-Tab-Stops.html -share/gtk-doc/html/pango/pango-Text-Attributes.html -share/gtk-doc/html/pango/pango-Text-Processing.html -share/gtk-doc/html/pango/pango-Version-Checking.html -share/gtk-doc/html/pango/pango-Vertical-Text.html -share/gtk-doc/html/pango/pango-Win32-Fonts-and-Rendering.html -share/gtk-doc/html/pango/pango-Xft-Fonts-and-Rendering.html -share/gtk-doc/html/pango/pango-hierarchy.html -share/gtk-doc/html/pango/pango.devhelp2 -share/gtk-doc/html/pango/pango.html -share/gtk-doc/html/pango/rendering.html -share/gtk-doc/html/pango/right-insensitive.png -share/gtk-doc/html/pango/right.png -share/gtk-doc/html/pango/rotated-text.png -share/gtk-doc/html/pango/style.css -share/gtk-doc/html/pango/up-insensitive.png -share/gtk-doc/html/pango/up.png Index: pkgsrc/devel/pango/distinfo diff -u pkgsrc/devel/pango/distinfo:1.119 pkgsrc/devel/pango/distinfo:1.120 --- pkgsrc/devel/pango/distinfo:1.119 Thu Aug 1 10:09:38 2019 +++ pkgsrc/devel/pango/distinfo Fri Aug 16 10:43:24 2019 @@ -1,14 +1,13 @@ -$NetBSD: distinfo,v 1.119 2019/08/01 10:09:38 maya Exp $ +$NetBSD: distinfo,v 1.120 2019/08/16 10:43:24 wiz 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_pango-bidi-type.c) = 3e2c657b89d7d7399d731669cf822e3140877ebd +SHA1 (pango-1.44.3.tar.xz) = e6b54a203de9909ca5a7a972d9611877d2d9ef2e +RMD160 (pango-1.44.3.tar.xz) = 60b5643edf36c65b2e64472486414e31b6d4215b +SHA512 (pango-1.44.3.tar.xz) = 6050dfa2b5dc9be2a89bffa810059a7eb16ee751d04b9da51fdbebd5437dc2eb5d7fcecba22b7cada6c151557a6201ebe8a2e96529b3cb74db856b7a9adfbf12 +Size (pango-1.44.3.tar.xz) = 496668 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.c) = 44b65b64da1d2ae819a5e984b5c672ad9d333622 SHA1 (patch-pango_pangocoretext.h) = d6817eb02f0020c102ab95d63202f9508a70e647 SHA1 (patch-pangocairo-coretext.h) = 2f7c8efad48b58398070f48e71c16d99d3d59f57 Index: pkgsrc/devel/pango/options.mk diff -u pkgsrc/devel/pango/options.mk:1.16 pkgsrc/devel/pango/options.mk:1.17 --- pkgsrc/devel/pango/options.mk:1.16 Sat Aug 30 11:20:38 2014 +++ pkgsrc/devel/pango/options.mk Fri Aug 16 10:43:24 2019 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.16 2014/08/30 11:20:38 adam Exp $ +# $NetBSD: options.mk,v 1.17 2019/08/16 10:43:24 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.pango PKG_SUPPORTED_OPTIONS= libthai quartz x11 @@ -13,7 +13,6 @@ PLIST_VARS+= coretext quartz x11 thai ### .if !empty(PKG_OPTIONS:Mx11) # fix for pangox.pc -CONFIGURE_ENV+= X_EXTRA_LIBS=${COMPILER_RPATH_FLAG}${X11BASE}/lib PLIST.x11= yes BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.7nb3 .include "../../x11/libXft/buildlink3.mk" @@ -21,9 +20,6 @@ BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.7 .include "../../x11/libX11/buildlink3.mk" BUILDLINK_DEPMETHOD.libXt?= build # only for configure .include "../../x11/libXt/buildlink3.mk" -.else -CONFIGURE_ARGS+= --without-x -CONFIGURE_ARGS+= --without-xft .endif ### Index: pkgsrc/devel/pango/patches/patch-pango_pangocoretext.c diff -u pkgsrc/devel/pango/patches/patch-pango_pangocoretext.c:1.1 pkgsrc/devel/pango/patches/patch-pango_pangocoretext.c:1.2 --- pkgsrc/devel/pango/patches/patch-pango_pangocoretext.c:1.1 Tue Nov 20 08:34:43 2018 +++ pkgsrc/devel/pango/patches/patch-pango_pangocoretext.c Fri Aug 16 10:43:24 2019 @@ -1,4 +1,4 @@ -$NetBSD: patch-pango_pangocoretext.c,v 1.1 2018/11/20 08:34:43 maya Exp $ +$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 Date: Fri, 20 Jul 2018 12:30:34 +0100 @@ -6,9 +6,9 @@ Subject: [PATCH] Revert "Restore scaling This reverts commit f661cdbf8cfbdb2ba7241d8dfa4a579c6dfe0a94. ---- pango/pangocoretext.c.orig 2018-07-16 00:50:43.000000000 +0000 +--- pango/pangocoretext.c.orig 2019-08-04 01:59:02.000000000 +0000 +++ pango/pangocoretext.c -@@ -225,7 +225,10 @@ pango_core_text_font_class_init (PangoCo +@@ -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; @@ -18,5 +18,5 @@ This reverts commit f661cdbf8cfbdb2ba724 + */ + 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; + font_class->create_hb_font = pango_core_text_font_create_hb_font; --_----------=_1565952204123810--