From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 15A14158094 for ; Mon, 4 Jul 2022 19:55:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0E81CE075F; Mon, 4 Jul 2022 19:55:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D3EB0E075F for ; Mon, 4 Jul 2022 19:55:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 48B3E34150D for ; Mon, 4 Jul 2022 19:55:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CD38A4D3 for ; Mon, 4 Jul 2022 19:55:32 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1656964524.32a88d9b998dbb1dc950a8e109bb621b96c5fb6b.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/pango/files/, x11-libs/pango/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/pango/Manifest x11-libs/pango/files/1.50.8-harfbuzz-4.patch x11-libs/pango/pango-1.50.8.ebuild X-VCS-Directories: x11-libs/pango/files/ x11-libs/pango/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 32a88d9b998dbb1dc950a8e109bb621b96c5fb6b X-VCS-Branch: master Date: Mon, 4 Jul 2022 19:55:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: de5161a0-caa1-4815-af89-7dbea71b28b6 X-Archives-Hash: 206234bc1e74c3fe743f72447aa03e8f commit: 32a88d9b998dbb1dc950a8e109bb621b96c5fb6b Author: Matt Turner gentoo org> AuthorDate: Mon Jul 4 19:44:37 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Jul 4 19:55:24 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32a88d9b x11-libs/pango: Version bump to 1.50.8 Bug: https://bugs.gentoo.org/836317 Signed-off-by: Matt Turner gentoo.org> x11-libs/pango/Manifest | 1 + x11-libs/pango/files/1.50.8-harfbuzz-4.patch | 47 ++++++++++++++ x11-libs/pango/pango-1.50.8.ebuild | 91 ++++++++++++++++++++++++++++ 3 files changed, 139 insertions(+) diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest index 9b1e65aa3742..63caf519d4f8 100644 --- a/x11-libs/pango/Manifest +++ b/x11-libs/pango/Manifest @@ -1,3 +1,4 @@ DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B ec3f1a6a4de30e0864e7f0bf0950cb7a7b4bada8c3db496a8e5b1e770f221ae72b43167178445ea9cd0d6b88e51d2af49e7fdf27b2e792997fe7c37e55d429c1 SHA512 b7654c3493931e3c6d3cbd40ee49c5cbebaf403954bae75dea80e9f03e12dd5082548aff6a9e778821b8f935e227a7efaad4c1b980fa108e7258042221cadfc1 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc DIST pango-1.50.7.tar.xz 4294752 BLAKE2B 049b7c09f2ec35ca229eadcd146513d2b292fac8c2296a1635f32c1e21a2ff14979c4ce4a88f966d2d85dad55e356f089c09e00062d06373f7d0760871333046 SHA512 4d754ed753fc34074c2a8751459406af7eb1eccb227c6158287f7e2921614d918cae47d078d4a2b4c098b641e40274e81bf1ec6b6a1b147efd550626665767d3 +DIST pango-1.50.8.tar.xz 4298760 BLAKE2B 76531815c5b472823b62e0c7a44d4a6c8cf38d587527cceff46e9e7ad302c53abd5827ed4242db2f754761928632b986517ca2814a1ddb9501b2832bbadb3116 SHA512 81821e5837d5fb78a07ac8f8e360de9a9bf9b2418a3e0654f80ee3dce7f98325ea2483cc7c1d1db4a662886a1244530515d83480f4c3bc0510788a9bbbae2f91 diff --git a/x11-libs/pango/files/1.50.8-harfbuzz-4.patch b/x11-libs/pango/files/1.50.8-harfbuzz-4.patch new file mode 100644 index 000000000000..0fa9c1fb7302 --- /dev/null +++ b/x11-libs/pango/files/1.50.8-harfbuzz-4.patch @@ -0,0 +1,47 @@ +This is a revert of upstream commit 0a576fc822a3 ("Try again to fix ci"). + +Without the patch, the tests fail on my amd64 system with harfbuzz-4.3.0. + +diff --git b/tests/layouts/valid-20.layout a/tests/layouts/valid-20.layout +index db692b73..5b2bcf15 100644 +--- b/tests/layouts/valid-20.layout ++++ a/tests/layouts/valid-20.layout +@@ -40,7 +40,7 @@ + "is-wrapped" : false, + "is-ellipsized" : false, + "unknown-glyphs" : 0, +- "width" : 67584, ++ "width" : 76800, + "height" : 25600, + "log-attrs" : [ + { +@@ -138,7 +138,7 @@ + "glyphs" : [ + { + "glyph" : 244, +- "width" : 15360, ++ "width" : 18432, + "x-offset" : 14764, + "y-offset" : 3845, + "is-cluster-start" : true, +@@ -146,7 +146,7 @@ + }, + { + "glyph" : 272, +- "width" : 15360, ++ "width" : 18432, + "x-offset" : 14764, + "y-offset" : 4280, + "is-cluster-start" : true, +@@ -154,7 +154,7 @@ + }, + { + "glyph" : 273, +- "width" : 15360, ++ "width" : 18432, + "x-offset" : 14764, + "y-offset" : 3507, + "is-cluster-start" : true, +-- +2.35.1 + diff --git a/x11-libs/pango/pango-1.50.8.ebuild b/x11-libs/pango/pango-1.50.8.ebuild new file mode 100644 index 000000000000..e7b3a6a69198 --- /dev/null +++ b/x11-libs/pango/pango-1.50.8.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic gnome2-utils meson-multilib xdg + +DESCRIPTION="Internationalized text layout and rendering library" +HOMEPAGE="https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango" +SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz" + +LICENSE="LGPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +IUSE="debug +introspection sysprof test X" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}] + >=dev-libs/fribidi-1.0.6[${MULTILIB_USEDEP}] + >=media-libs/harfbuzz-2.6.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}] + >=media-libs/fontconfig-2.13.0:1.0=[${MULTILIB_USEDEP}] + >=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}] + >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] + >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] + ) +" +DEPEND="${RDEPEND} + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) + X? ( x11-base/xorg-proto ) +" +BDEPEND=" + dev-util/glib-utils + sys-apps/help2man + virtual/pkgconfig + test? ( media-fonts/cantarell ) +" + +PATCHES=( + "${FILESDIR}"/${PV}-harfbuzz-4.patch +) + +src_prepare() { + default + xdg_environment_reset + gnome2_environment_reset +} + +multilib_src_configure() { + if use debug; then + append-cflags -DPANGO_ENABLE_DEBUG + else + append-cflags -DG_DISABLE_CAST_CHECKS + fi + + local emesonargs=( + # Never use gi-docgen subproject + --wrap-mode nofallback + + -Dgtk_doc=false # we ship pregenerated docs + $(meson_native_use_feature introspection) + -Dinstall-tests=false + -Dfontconfig=enabled + $(meson_feature sysprof) + -Dlibthai=disabled + -Dcairo=enabled + $(meson_feature X xft) + -Dfreetype=enabled + ) + meson_src_configure +} + +multilib_src_install_all() { + insinto /usr/share/gtk-doc/html + # This will install PangoXft API docs regardless of USE=-X, but this is intentional + doins -r "${S}"/docs/Pango* +} + +pkg_postinst() { + xdg_pkg_postinst + + if has_version 'media-libs/freetype[-harfbuzz]' ; then + ewarn "media-libs/freetype is installed without harfbuzz support. This may" + ewarn "lead to minor font rendering problems, see bug 712374." + fi +}