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