mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 18:58:08 -07:00
x11-libs/cairo: Drop old versions
Signed-off-by: Matt Turner <mattst88@gentoo.org>
This commit is contained in:
Matt Turner
@@ -1,2 +1 @@
|
||||
DIST cairo-1.18.2.tar.bz2 42905863 BLAKE2B 2788b9b90aeee1ad906e36ec13c0e0dba5b87b88433bc2cd408ed427ebcab49ee3d63ded3bc4eb7dc51c63aba91a6c30de77c052235bc5b669eef268f706de36 SHA512 8db31b675791b892379bc5fca7f421d3e8ebca9c3cbcdc27fa80efb1274f12d89276a54fa1ec18008f81de9b1dc2fafb9fbee9ee368e893e8b035a332d07e141
|
||||
DIST cairo-1.18.4.tar.bz2 42897394 BLAKE2B 711142573cde2f0b2c4c7731d4de142fe5c199fbf3512a6c5cb83aa0cdeb1877f83c36c6f1d0b28db71dd263f957912149edbb3c537290205a3aed2985dd033f SHA512 27b98a17510b4d6f0187fcb280fea1b47ae31243f6999081a7ac94f8cf3c789c05fa6eb0fe65844808ef9ac11bcd29a4c3688c871a6950d888667840385acf9b
|
||||
|
||||
@@ -1,96 +0,0 @@
|
||||
# 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
|
||||
}
|
||||
@@ -1,32 +0,0 @@
|
||||
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
|
||||
Reference in New Issue
Block a user