diff options
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/Manifest.gz | bin | 17888 -> 17885 bytes | |||
-rw-r--r-- | x11-libs/cairo/Manifest | 2 | ||||
-rw-r--r-- | x11-libs/cairo/cairo-1.18.2-r1.ebuild | 96 | ||||
-rw-r--r-- | x11-libs/cairo/files/cairo-1.18.2-cups.patch | 32 |
4 files changed, 130 insertions, 0 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz Binary files differindex 340356e00071..31141d3c1667 100644 --- a/x11-libs/Manifest.gz +++ b/x11-libs/Manifest.gz diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest index ed19e1ba5e0f..5c5f9bc8e80e 100644 --- a/x11-libs/cairo/Manifest +++ b/x11-libs/cairo/Manifest @@ -1,7 +1,9 @@ +AUX cairo-1.18.2-cups.patch 1181 BLAKE2B 8790ce088616c33312bf54aa3f86a19f80c2f9bfae04e4862cc432d7e5891d167e824ef54716735bf521cecc02a2711a865ae41b5fabc414886dcefbf7bed073 SHA512 9f889cb37e60dfcd483edbc624702bb8b65dbfdbc06bc7077b09672e1c2ec89a2df9a53b84afa8541da67d6be80164bbd39871bd03e01dd510df9793572a398f AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0fd4981a07a25122387c2f1b6ca4cd89a830360357953706dee62e4233126cd0630e4622f0682f6782cd27fa31f20ecc SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e DIST cairo-1.18.0.tar.bz2 43979246 BLAKE2B 1afb01a934a41c9f4c2cac0d6f1fd842bfd3297378b7692a0c38786d151ca568a63707ceee4b220da7ec9a605f65eb87b546a78392c5fe652345e749e6d3da6b SHA512 bd702f3b64061f8add954c243c9b59f5d44271adfa76d997941ddab629ff8018c2a1d3368edf2362573e0018c342c61483de58240c63e15e1e6035d2511d3e40 DIST cairo-1.18.2.tar.bz2 42905863 BLAKE2B 2788b9b90aeee1ad906e36ec13c0e0dba5b87b88433bc2cd408ed427ebcab49ee3d63ded3bc4eb7dc51c63aba91a6c30de77c052235bc5b669eef268f706de36 SHA512 8db31b675791b892379bc5fca7f421d3e8ebca9c3cbcdc27fa80efb1274f12d89276a54fa1ec18008f81de9b1dc2fafb9fbee9ee368e893e8b035a332d07e141 EBUILD cairo-1.18.0.ebuild 2690 BLAKE2B c54dd04e02cab2765d84b38a0322bf30973ead942d1a5c8ea6c74a8135a1b5044dfc840795e60b3db73b268f886ffc1c648ccde2b0dfdf1309a33e4564b34625 SHA512 261778a01724e25efd0615d653d188d71ef14934e3396844422b1c5593e6f48b5b41eb6e15c8eb7b23e6e04a69f276c54651785318d0e59aefd4e81b0b17ab95 +EBUILD cairo-1.18.2-r1.ebuild 2728 BLAKE2B 239b0105e665a7026b7b347eb1478892d2e5bd2edc0f4a20d85ed69bb5a8136cdbb31f8610d61e933146244ee6207fabee219be10c210a545a211b2de299db6c SHA512 035e8d53314cadd99d84d0dbb9f8285c72e8ddbcb12a97eb8b19d7815f96692afdd2f86db293f21523ef46a73cb67f87914e7f9a9c402b375547fdb5ca53320f EBUILD cairo-1.18.2.ebuild 2697 BLAKE2B 66fa4f151a2bdd05110a54982273aeeb080e148715f7e6d2ead0d7574256f3e345521eea7c3340125db606f234d4e8f18b803626beb235869018d4f3bc431257 SHA512 0295111a82323029bebde475485a94252753056017ba551b0b03bcda65d6bd0390932239e6f6f9525ac6d9b9228ab934512aa51745750d782340e087865e671c EBUILD cairo-9999.ebuild 2697 BLAKE2B 66fa4f151a2bdd05110a54982273aeeb080e148715f7e6d2ead0d7574256f3e345521eea7c3340125db606f234d4e8f18b803626beb235869018d4f3bc431257 SHA512 0295111a82323029bebde475485a94252753056017ba551b0b03bcda65d6bd0390932239e6f6f9525ac6d9b9228ab934512aa51745750d782340e087865e671c MISC metadata.xml 484 BLAKE2B 44ea5fe06e0b252b5d0cf71ccf53f76ca6f1f29432886ac0a66af9df19ed72358b91c6ff399ba418d051b5fa5380ff281647ffd050f1471578699ddfa87085ab SHA512 a575a5e6f807ac4527dbcf62e6e4a70c0e6012a6b52d7772ab167ffc29a55718bd35e52b1d0bf61be89ed82f38959e63e7ef198e7b2c1f48889df9dd2c4c8988 diff --git a/x11-libs/cairo/cairo-1.18.2-r1.ebuild b/x11-libs/cairo/cairo-1.18.2-r1.ebuild new file mode 100644 index 000000000000..9bcd379e8859 --- /dev/null +++ b/x11-libs/cairo/cairo-1.18.2-r1.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson-multilib + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git" +else + SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +DESCRIPTION="A vector graphics library with cross-device output support" +HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo" +LICENSE="|| ( LGPL-2.1 MPL-1.1 )" +SLOT="0" +IUSE="X aqua debug +glib gtk-doc test" +# Tests need more wiring up like e.g. https://gitlab.freedesktop.org/cairo/cairo/-/blob/master/.gitlab-ci.yml +# any2ppm tests seem to hang for now. +RESTRICT="test !test? ( test )" + +RDEPEND=" + >=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}] + >=media-libs/fontconfig-2.13.92[${MULTILIB_USEDEP}] + >=media-libs/freetype-2.13:2[png,${MULTILIB_USEDEP}] + >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + >=x11-libs/pixman-0.42.3[${MULTILIB_USEDEP}] + debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] ) + glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) + X? ( + >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}] + )" +DEPEND="${RDEPEND} + test? ( + app-text/ghostscript-gpl + app-text/poppler[cairo] + gnome-base/librsvg + ) + X? ( x11-base/xorg-proto )" +BDEPEND=" + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc )" + +PATCHES=( + "${FILESDIR}"/${PN}-respect-fontconfig.patch + "${FILESDIR}"/${P}-cups.patch +) + +multilib_src_configure() { + local emesonargs=( + -Ddwrite=disabled + -Dfontconfig=enabled + -Dfreetype=enabled + -Dpng=enabled + $(meson_feature aqua quartz) + $(meson_feature X tee) + $(meson_feature X xcb) + $(meson_feature X xlib) + -Dxlib-xcb=disabled + -Dzlib=enabled + + # Requires poppler-glib (poppler[cairo]) which isn't available in multilib + $(meson_native_use_feature test tests) + + -Dgtk2-utils=disabled + + $(meson_feature glib) + -Dspectre=disabled # only used for tests + $(meson_feature debug symbol-lookup) + + $(meson_use gtk-doc gtk_doc) + ) + + meson_src_configure +} + +multilib_src_test() { + multilib_is_native_abi && meson_src_test +} + +multilib_src_install_all() { + einstalldocs + + if use gtk-doc; then + mkdir -p "${ED}"/usr/share/gtk-doc/cairo || die + mv "${ED}"/usr/share/gtk-doc/{html/cairo,cairo/html} || die + rmdir "${ED}"/usr/share/gtk-doc/html || die + fi +} diff --git a/x11-libs/cairo/files/cairo-1.18.2-cups.patch b/x11-libs/cairo/files/cairo-1.18.2-cups.patch new file mode 100644 index 000000000000..6a34c28a6250 --- /dev/null +++ b/x11-libs/cairo/files/cairo-1.18.2-cups.patch @@ -0,0 +1,32 @@ +https://bugs.gentoo.org/939607 +https://gitlab.freedesktop.org/cairo/cairo/-/issues/870 +https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/595 +https://gitlab.freedesktop.org/cairo/cairo/-/commit/f19e2fe080ddcfce93c8234a919fd882f3d63362 + +From f19e2fe080ddcfce93c8234a919fd882f3d63362 Mon Sep 17 00:00:00 2001 +From: Adrian Johnson <ajohnson@redneon.com> +Date: Fri, 13 Sep 2024 06:28:39 +0930 +Subject: [PATCH] cff: Don't fail if no local subs + +Fixes: #870 +--- a/src/cairo-cff-subset.c ++++ b/src/cairo-cff-subset.c +@@ -952,9 +952,13 @@ cairo_cff_font_read_private_dict (cairo_cff_font_t *font, + decode_number (operand, nominal_width); + + num_subs = _cairo_array_num_elements (local_sub_index); +- *local_subs_used = _cairo_calloc_ab (num_subs, sizeof (cairo_bool_t)); +- if (unlikely (*local_subs_used == NULL)) +- return _cairo_error (CAIRO_STATUS_NO_MEMORY); ++ if (num_subs > 0) { ++ *local_subs_used = _cairo_calloc_ab (num_subs, sizeof (cairo_bool_t)); ++ if (unlikely (*local_subs_used == NULL)) ++ return _cairo_error (CAIRO_STATUS_NO_MEMORY); ++ } else { ++ *local_subs_used = NULL; ++ } + + if (num_subs < 1240) + *local_sub_bias = 107; +-- +GitLab |