From nobody Wed Jan 22 13:49:46 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YdQRv1H6wz5lW5G; Wed, 22 Jan 2025 13:49:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YdQRt5DZvz3TLq; Wed, 22 Jan 2025 13:49:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737553786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NkGLWNcrr78yQRinjpFuH9EOJPGPK4fihcW9xbsUnvM=; b=n24fSoHmTaQ933qKBEjbeS59kAJy3C7AQNl/nPYmQi7W2y/a86maDfG0jkgvzmVE7pd8ZR zYFAJWdiJMn6AxKRd0c/t/sz0jlzXdnpwTVNxtIzfGn9bgDkdJc/VpUmeEONwG94hOKhLL 3LIRhURx2BmcmNNG6xRouD5S0ysKuquPh+jIyYPBgWEEadppO+nquDEbHY41jytxzrMgn6 19IEJuclhOzq18c6bNOwD0YkRA5ApyIc1TJwxORsVYrljLOsHKOU4m+UZWvDmsppRIftHS NswljrkdJyoIwLOcQwIbTpHHssGtACM4ResUpRyRz8aCTnv8lujSI3hZXUcMSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737553786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NkGLWNcrr78yQRinjpFuH9EOJPGPK4fihcW9xbsUnvM=; b=svCWXEwGrbdFHez3EMUSrXTdIEwW2PTFF1U7POuqA9NVDH4XCrPgmPR56mzK4gWI5AKEpd WSRXLxzRsJWPaHw2PkZszYyeSgX6dhJcQ+CeOJdhypgofsmLadhV/CzhLUYeNOA1ytY52l wLpeak0g72clCp6Gf0D0aNdEyWT/1kmidknBNbF24bpZjpDaH+1lyIin4ugV001ix1EYRZ +o/AVGuuFLV0Wu5x3lFA5BahgS7LHrB3WXt+ZedGnWXJpnVPD9aub9rWZfuvAn3sWgyIbP /05kJVz4BJ0GMG2YSLoOhyheeUV8rsT9AfJXu+IyjnbPv2iT4jxF8kRAc4HsZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737553786; a=rsa-sha256; cv=none; b=B7SLjqP4tmgWt3x6+qii/aHsJGii4bsMe0jSGGq7Q2BV9XHFKVy0SFEBZi8xHOHj8bKRTl NblLM8DcfvHuOastV7y4e2izLxWDYJcwL9SjpcKHTNGd0VJpDq3iVWoRSD/1PnRD+hUwQY YsesIuZL9ISk0TX6lpXaDQO1k/DoTzFKlvdu5xlghD3nx4tCr6hpQpYKK8HGPsaERTVQI2 eR+UmTzXtO/B1a6Qwrq96xIizV2tE2hjYCSqIpHait2IUOgCspxeVpODCGbzv8zURKs3Gd DRFpHTiEgFMZJVCswfeGuh2AsUZ6ZG3r6+Uc+hkweOOognXAkCrOU5S59lHMxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YdQRt4YV6zvmv; Wed, 22 Jan 2025 13:49:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50MDnklw009303; Wed, 22 Jan 2025 13:49:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50MDnkss009300; Wed, 22 Jan 2025 13:49:46 GMT (envelope-from git) Date: Wed, 22 Jan 2025 13:49:46 GMT Message-Id: <202501221349.50MDnkss009300@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 4efd0565e804 - main - x11-toolkits/pango: Update to 1.56.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4efd0565e8044231ec969e363708d75404eb5cda Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=4efd0565e8044231ec969e363708d75404eb5cda commit 4efd0565e8044231ec969e363708d75404eb5cda Author: Jason E. Hale AuthorDate: 2025-01-22 13:20:20 +0000 Commit: Jason E. Hale CommitDate: 2025-01-22 13:49:40 +0000 x11-toolkits/pango: Update to 1.56.1 Avoid manual intervention for PLIST_SUB variables for the forseeable future to ease maintenance. Upstream has been following a predictable pattern in shared object naming for many years. Drop the VERSION sub; it hasn't been used for 10+ years now. Rename the custom THAI option to the standard LANG_TH option. Whitespace-align blocks and fix tests. https://gitlab.gnome.org/GNOME/pango/-/blob/1.56.1/NEWS --- x11-toolkits/pango/Makefile | 29 ++++++++++----------- x11-toolkits/pango/distinfo | 6 ++--- .../pango/files/patch-tests_fontsets_cantarell | 30 ++++++++++++++++++++++ x11-toolkits/pango/files/patch-tests_fontsets_mono | 28 ++++++++++++++++++++ .../pango/files/patch-tests_fontsets_mono2 | 28 ++++++++++++++++++++ 5 files changed, 102 insertions(+), 19 deletions(-) diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index 0f9e7eff0caa..6b2ea8448555 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -1,5 +1,5 @@ PORTNAME= pango -PORTVERSION= 1.56.0 +PORTVERSION= 1.56.1 CATEGORIES= x11-toolkits MASTER_SITES= GNOME DIST_SUBDIR= gnome @@ -24,31 +24,28 @@ USE_LDCONFIG= yes PORTSCOUT= limit:^1\.[^9] -VERSION= 1.8.0 -LIBVERSION= 0.5600.0 -PLIST_SUB= LIBVERSION=${LIBVERSION} \ - VERSION=${VERSION} +PLIST_SUB= LIBVERSION=0.${PORTVERSION:R:E}00.${PORTVERSION:E} -OPTIONS_DEFINE= X11 DOCS MANPAGES THAI -OPTIONS_DEFAULT=X11 MANPAGES THAI -OPTIONS_SUB= yes - -THAI_DESC= Thai language support via libThai +OPTIONS_DEFINE= DOCS LANG_TH MANPAGES X11 +OPTIONS_DEFAULT= LANG_TH MANPAGES X11 +OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= gi-docgen:textproc/py-gi-docgen \ rst2man:textproc/py-docutils DOCS_MESON_TRUE= documentation +LANG_TH_LIB_DEPENDS= libthai.so:devel/libthai +LANG_TH_MESON_ENABLED= libthai + MANPAGES_MESON_TRUE= man-pages MANPAGES_IMPLIES= DOCS -THAI_LIB_DEPENDS= libthai.so:devel/libthai -THAI_MESON_ENABLED= libthai - -X11_USES= xorg -X11_USE= XORG=x11,xft,xrender +X11_USES= xorg +X11_USE= XORG=x11,xft,xrender X11_MESON_ENABLED= xft -TESTING_UNSAFE= 1 out of 24 tests fail +pre-test: +# Don't test backup files. Silly Meson. + @${FIND} ${WRKSRC}/tests/fontsets/ -name "*.orig" -delete .include diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo index 1d7a3974e62f..8ebe09073e01 100644 --- a/x11-toolkits/pango/distinfo +++ b/x11-toolkits/pango/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1737147625 -SHA256 (gnome/pango-1.56.0.tar.xz) = 1fb98b338ee6f7cf8ef96153b7d242f4568fe60f9b7434524eca630a57bd538b -SIZE (gnome/pango-1.56.0.tar.xz) = 1882244 +TIMESTAMP = 1737540288 +SHA256 (gnome/pango-1.56.1.tar.xz) = 426be66460c98b8378573e7f6b0b2ab450f6bb6d2ec7cecc33ae81178f246480 +SIZE (gnome/pango-1.56.1.tar.xz) = 1882616 diff --git a/x11-toolkits/pango/files/patch-tests_fontsets_cantarell b/x11-toolkits/pango/files/patch-tests_fontsets_cantarell new file mode 100644 index 000000000000..60a936762d85 --- /dev/null +++ b/x11-toolkits/pango/files/patch-tests_fontsets_cantarell @@ -0,0 +1,30 @@ +Fix tests as reported by ${WRKSRC}/_build/meson-logs/testlog.txt + +# Contents don't match expected contents +# --- /tmp/.MP5Y02 2025-01-22 06:33:26.338209000 -0500 +# +++ /tmp/.ZM5Y02 2025-01-22 06:33:26.338311000 -0500 +# @@ -1,8 +1,8 @@ +# Cantarell 11 +# +# Cantarell 11 +# -DejaVu Sans 11 +# DejaVu Sans Mono 11 +# +DejaVu Sans 11 +# Noto Sans CJK JP 11 +# Droid Sans Japanese 11 +# Amiri 11 +# +not ok 2 /fontsets/cantarell + +--- tests/fontsets/cantarell.orig 2025-01-18 22:41:03 UTC ++++ tests/fontsets/cantarell +@@ -1,8 +1,8 @@ Cantarell 11 + Cantarell 11 + + Cantarell 11 +-DejaVu Sans 11 + DejaVu Sans Mono 11 ++DejaVu Sans 11 + Noto Sans CJK JP 11 + Droid Sans Japanese 11 + Amiri 11 diff --git a/x11-toolkits/pango/files/patch-tests_fontsets_mono b/x11-toolkits/pango/files/patch-tests_fontsets_mono new file mode 100644 index 000000000000..5dc01560a02b --- /dev/null +++ b/x11-toolkits/pango/files/patch-tests_fontsets_mono @@ -0,0 +1,28 @@ +Fix tests as reported by ${WRKSRC}/_build/meson-logs/testlog.txt + +# Contents don't match expected contents +# --- /tmp/.NT7X02 2025-01-22 06:33:26.361596000 -0500 +# +++ /tmp/.DQ7X02 2025-01-22 06:33:26.361680000 -0500 +# @@ -4,7 +4,7 @@ +# DejaVu Sans 20 +# Noto Sans CJK JP 20 +# Droid Sans Japanese 20 +# -Cantarell 20 +# +Cantarell 20 @wght=400 +# Amiri 20 +# DejaVu Sans Bold 20 +# Font Awesome 5 Free Solid Heavy 20 +# +not ok 4 /fontsets/mono + +--- tests/fontsets/mono.orig 2025-01-18 22:41:03 UTC ++++ tests/fontsets/mono +@@ -4,7 +4,7 @@ Droid Sans Japanese 20 + DejaVu Sans 20 + Noto Sans CJK JP 20 + Droid Sans Japanese 20 +-Cantarell 20 ++Cantarell 20 @wght=400 + Amiri 20 + DejaVu Sans Bold 20 + Font Awesome 5 Free Solid Heavy 20 diff --git a/x11-toolkits/pango/files/patch-tests_fontsets_mono2 b/x11-toolkits/pango/files/patch-tests_fontsets_mono2 new file mode 100644 index 000000000000..11c02449d261 --- /dev/null +++ b/x11-toolkits/pango/files/patch-tests_fontsets_mono2 @@ -0,0 +1,28 @@ +Fix tests as reported by ${WRKSRC}/_build/meson-logs/testlog.txt + +# Contents don't match expected contents +# --- /tmp/.XSRW02 2025-01-22 06:33:26.302100000 -0500 +# +++ /tmp/.0ORW02 2025-01-22 06:33:26.302186000 -0500 +# @@ -4,7 +4,7 @@ +# DejaVu Sans 20 +# Noto Sans CJK JP 20 +# Droid Sans Japanese 20 +# -Cantarell 20 +# +Cantarell 20 @wght=400 +# Amiri 20 +# DejaVu Sans Bold 20 +# Font Awesome 5 Free Solid Heavy 20 +# +not ok 1 /fontsets/mono2 + +--- tests/fontsets/mono2.orig 2025-01-18 22:41:03 UTC ++++ tests/fontsets/mono2 +@@ -4,7 +4,7 @@ Droid Sans Japanese 20 + DejaVu Sans 20 + Noto Sans CJK JP 20 + Droid Sans Japanese 20 +-Cantarell 20 ++Cantarell 20 @wght=400 + Amiri 20 + DejaVu Sans Bold 20 + Font Awesome 5 Free Solid Heavy 20