From 2719f73b6813d11d13a9650cdd2ab8ec6e69385d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Jul 2022 15:43:36 +0100 Subject: gentoo resync : 09.07.2022 --- x11-libs/pango/Manifest | 3 + x11-libs/pango/files/1.50.8-harfbuzz-4.patch | 47 ++++++++++++++ x11-libs/pango/pango-1.50.8.ebuild | 91 ++++++++++++++++++++++++++++ 3 files changed, 141 insertions(+) create mode 100644 x11-libs/pango/files/1.50.8-harfbuzz-4.patch create mode 100644 x11-libs/pango/pango-1.50.8.ebuild (limited to 'x11-libs/pango') diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest index c1f3bea8d324..feabb78fd9dd 100644 --- a/x11-libs/pango/Manifest +++ b/x11-libs/pango/Manifest @@ -1,9 +1,12 @@ AUX 1.42.4-CVE-2019-1010238.patch 1088 BLAKE2B 7517b2b4c3502546a554d3b592c8c48af444bf2797fcffd18bd63fb97023f3fff666c70359d4935cf179d7e98be12b885e5a2937d882b27f213e17658002e0a9 SHA512 24f46b5d14dd589b0d5ca992169fb46a696d0251c63cf3c0210bfded534f4f35d20bcd158c4397d6ebe828ae995a5321daca4ecc634f0d5f38bc7f5ccf8f2fee AUX 1.42.4-pango-view.1.in 2771 BLAKE2B 6cc529600d8bc0479a972046c0680139d1910fbeb1629ca66e9d50a80d6c805db1dc8bb1c6de77e73197f98b2b5ec8b8afeb4128ab588b155019fd287cee3105 SHA512 e26c20b889784a3f7aea0287ced559e25fdd23fd915949ab9c538f10d0a6c7200457132ed48061d2c47e004858f7307cf4c7c1027d6b2abd642911f5e81f72c6 AUX 1.50.7-harfbuzz-4.patch 2168 BLAKE2B 3aab03d810e6cb6b540c9381b310ef76cde1b4d3053db40fbf28f3bcb1a5de979927ff12d19639ad95af84dcf2b45eae5f2e148c00fb3d4243148ba928285176 SHA512 cdd895141817d4e0e363a3e9f2ae0df03c0cf379b6868689fa39fbd63b090864d59f74c1c432e55479e45ca0e14d4254cd2f4758b80f9f7cdb383285e953866c +AUX 1.50.8-harfbuzz-4.patch 1364 BLAKE2B 8f6d83da81854922ab04673e1590fc7a4e04628f325579ffdeff151a3e3b604bbe0d6e4ad4d59c7aa05fda71c0669653bc76fed12d324c0329c43431188ca514 SHA512 9eae987a563d590afd3e9d6aba02ac09e89d6cbfa9e9d797a58da6868f3b80c64e475b9ed1a24d56b839c0ffb34b2cde3d20e793d084ec7202fd1ee51e030845 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 EBUILD pango-1.42.4-r2.ebuild 2317 BLAKE2B 7bbc0227f8b846c1e51cc142e7a3088ec88c2fdc35fff8970daf3699e94e369de66380fc140aca039accd546270be27c809e13c0a71d42ae8df19f64198d22c8 SHA512 8c1c0f11ad9ecbe7f464e7b839de614e4f266d2674b843d133489b882270f02754c61b05f2624a2b4c9d571b7824d2a142ccc2105e2c7e968fc26e97e2936c1d EBUILD pango-1.50.7.ebuild 2393 BLAKE2B e71c83d31bb46754c830caf45f3c30ab369cb9225400b406fd0f75a4fe0cb854fdfe2338a9fc9431256415128846ddad0b81b9e4b0b6f87183752aaa1a3870c9 SHA512 d15bc369f30091885a59ec14c870210d0592eddb359ea1c00f2d03d3be793098bd6185475db358f48ebd8a770315b879b95ceaa7d6e60169f13037459344248d +EBUILD pango-1.50.8.ebuild 2416 BLAKE2B 1f8a875bfe31d7a393a204da9c3e4345815de3ed7f752b78cc9617098c94272068b6b96aa2b86b93e22b490999b4f21e08de21ccf72364fec77455c918893131 SHA512 bcaa743dd20bdd53f73e5c94d0024c7a35c360b90ed9eb957699ec7b6cff42cb0d3c3651ed018ee487159bc79569e2d8d49a8793434a9a07a41a1f855cd003f8 MISC metadata.xml 523 BLAKE2B 623788e7504fe89c7d8604eaa2a6b1ab5fb022965eaa3044dd2a94b6f68638453011257659c0f17b7ced9b6945acb3eb4767f9fd3ce9686b69b3b60b867dcdfb SHA512 a60feab6e4e50cb9b477f388d4534eed4616fac6aca4f6eae450fac42bfa9ca0d7382e36b98a159732f9c6926162cb2ea55d72a644bc77629ff09fd0097226eb 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 +} -- cgit v1.2.3