commit: a86d7fa81e5e287e69d380daddcef043a1261b6f Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Thu Jan 26 17:30:28 2023 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Thu Jan 26 17:46:09 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a86d7fa8
x11-libs/cairo: Drop old versions Bug: https://bugs.gentoo.org/777123 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> x11-libs/cairo/Manifest | 1 - x11-libs/cairo/cairo-1.16.0-r6.ebuild | 134 --------------------- .../files/cairo-1.12.18-disable-test-suite.patch | 15 --- .../cairo/files/cairo-1.16.0-binutils-2.34.patch | 72 ----------- .../files/cairo-1.16.0-binutils-2.39-ptr.patch | 29 ----- ...one_MM_Var-instead-of-free-when-available.patch | 30 ----- .../files/cairo-1.16.0-pdf-add-missing-flush.patch | 29 ----- x11-libs/cairo/files/cairo-1.16.0-strings.patch | 39 ------ x11-libs/cairo/metadata.xml | 2 - 9 files changed, 351 deletions(-) diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest index e13c60cdc610..7a62019cb85a 100644 --- a/x11-libs/cairo/Manifest +++ b/x11-libs/cairo/Manifest @@ -1,2 +1 @@ -DIST cairo-1.16.0.tar.xz 41997432 BLAKE2B aa37edf7fdf0c952484fd0adc9281724227db93958d6e4919216b30e9017fab670bc2340e3b975737080f1f67dec24025fe0e4680e275ab7703cfb9235eb1fe0 SHA512 9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f DIST cairo-1.17.6.tar.bz2 43700076 BLAKE2B 05ac766d33e9bdfc5df0347e9a80611554d64886715d1620fbe6f05f36f0134e46e1e6107738d260b380fab5ef2ac609922dce9ebcac01234710d8e2a76e9724 SHA512 1537b34ca49b853f4f60a7ceac0c1b878e7e2874f1ca3a37ab6ccbb704a37872314447016ad07b82312b302bb6df86b71265232a802ccdb9fb8cd18f211ff185 diff --git a/x11-libs/cairo/cairo-1.16.0-r6.ebuild b/x11-libs/cairo/cairo-1.16.0-r6.ebuild deleted file mode 100644 index 299a8c20e695..000000000000 --- a/x11-libs/cairo/cairo-1.16.0-r6.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic autotools multilib-minimal - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"; - SRC_URI="" -else - SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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 gles2-only +glib opengl static-libs +svg utils valgrind" -# gtk-doc regeneration doesn't seem to work with out-of-source builds -#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate - -# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it -RESTRICT="test" - -BDEPEND=" - virtual/pkgconfig - >=sys-devel/libtool-2" -RDEPEND=" - >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] - >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] - >=media-libs/freetype-2.5.0.1:2[png,${MULTILIB_USEDEP}] - >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] - sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}] - gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] ) - glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) - opengl? ( >=media-libs/mesa-9.1.6[egl(+),X(+),${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} - X? ( x11-base/xorg-proto )" -#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND} -# doc? ( -# >=dev-util/gtk-doc-1.6 -# ~app-text/docbook-xml-dtd-4.2 -# )" - -REQUIRED_USE=" - gles2-only? ( !opengl ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch - "${FILESDIR}"/${PN}-respect-fontconfig.patch - "${FILESDIR}"/${P}-pdf-add-missing-flush.patch - "${FILESDIR}"/${P}-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch - "${FILESDIR}"/${P}-strings.patch - "${FILESDIR}"/${P}-binutils-2.39-ptr.patch -) - -src_prepare() { - default - - if has_version ">=sys-libs/binutils-libs-2.34"; then - eapply "${FILESDIR}"/${PN}-1.16.0-binutils-2.34.patch - fi - - # tests and perf tools require X, bug #483574 - if ! use X; then - sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die - fi - - # Slightly messed build system YAY - if [[ ${PV} == *9999* ]]; then - touch boilerplate/Makefile.am.features - touch src/Makefile.am.features - touch ChangeLog - fi - - eautoreconf -} - -multilib_src_configure() { - local myopts - - [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT - - # [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)" - - ECONF_SOURCE="${S}" \ - econf \ - $(use_with X x) \ - $(use_enable X tee) \ - $(use_enable X xlib) \ - $(use_enable X xlib-xrender) \ - $(use_enable X xcb) \ - $(use_enable X xcb-shm) \ - $(use_enable aqua quartz) \ - $(use_enable aqua quartz-image) \ - $(use_enable debug test-surfaces) \ - $(use_enable gles2-only glesv2) \ - $(use_enable glib gobject) \ - $(use_enable opengl gl) \ - $(use_enable static-libs static) \ - --enable-svg \ - $(use_enable utils trace) \ - $(use_enable valgrind) \ - --enable-ft \ - --enable-interpreter \ - --enable-pdf \ - --enable-png \ - --enable-ps \ - --enable-script \ - --disable-drm \ - --disable-directfb \ - --disable-gallium \ - --disable-qt \ - --disable-vg \ - --disable-xlib-xcb \ - ${myopts} -} - -multilib_src_install_all() { - find "${D}" -name '*.la' -delete || die - einstalldocs -} diff --git a/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch b/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch deleted file mode 100644 index 6822121ce495..000000000000 --- a/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 03fa352..7e11d24 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -18,10 +18,6 @@ ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS} - - DIST_SUBDIRS = src doc util boilerplate test perf - SUBDIRS = src doc util --# libpng is required for our test programs --if CAIRO_HAS_PNG_FUNCTIONS --SUBDIRS += boilerplate test perf --endif - - configure: cairo-version.h - diff --git a/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch deleted file mode 100644 index a10cad5ee553..000000000000 --- a/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch +++ /dev/null @@ -1,72 +0,0 @@ -From e30259f6237571c61992433c110bc6e1ef900244 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <t...@centricular.com> -Date: Tue, 23 Feb 2021 11:36:24 +0000 -Subject: [PATCH] cairo-trace: fix build with newer versions of bfd - -And update configure/meson checks to check for the new function. - -Drop libiberty.h check since it's only needed by backtrace-symbols.c -which we're about to remove. - -Closes #391, #460 ---- - Makefile.am | 1 + - configure.ac | 8 +++++++- - meson-cc-tests/bfd-section-flags.c | 9 +++++++++ - meson.build | 11 ++++++----- - util/cairo-trace/lookup-symbol.c | 7 +++---- - 5 files changed, 26 insertions(+), 10 deletions(-) - create mode 100644 meson-cc-tests/bfd-section-flags.c - -diff --git a/configure.ac b/configure.ac -index 18e4a305f..6444a3da3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -826,7 +826,13 @@ CAIRO_ENABLE(interpreter, cairo-script-interpreter, yes, [ - AC_CHECK_LIB(bfd, bfd_openr, - [AC_CHECK_HEADER(bfd.h, [have_bfd=yes], - [have_bfd=no])], [have_bfd=no]) --AC_CHECK_HEADER(libiberty.h,, [have_bfd=no]) -+dnl bfd_section_flags is an inline func so we don't bother with linking the lib in -+AC_LINK_IFELSE([AC_LANG_PROGRAM([ -+ #include <bfd.h> -+ asection *s; -+],[ -+ return bfd_section_flags(s) == 0; -+])],[],[have_bfd=no]) - if test "x$have_bfd" = "xyes"; then - AC_DEFINE([HAVE_BFD], [1], [Define to 1 if you have the binutils development files installed]) - BFD_LIBS=-lbfd -diff --git a/util/cairo-trace/lookup-symbol.c b/util/cairo-trace/lookup-symbol.c -index f9665b36f..9af0b5944 100644 ---- a/util/cairo-trace/lookup-symbol.c -+++ b/util/cairo-trace/lookup-symbol.c -@@ -65,7 +65,6 @@ - - #if HAVE_BFD - #include <bfd.h> --#include <libiberty.h> - - struct symtab { - bfd *bfd; -@@ -145,14 +144,14 @@ find_address_in_section (bfd *abfd, - if (symbol->found) - return; - -- if ((bfd_get_section_flags (symtab->bfd, section) & SEC_ALLOC) == 0) -+ if ((bfd_section_flags (section) & SEC_ALLOC) == 0) - return; - -- vma = bfd_get_section_vma (symtab->bfd, section); -+ vma = bfd_section_vma (section); - if (symbol->pc < vma) - return; - -- size = bfd_section_size (symtab->bfd, section); -+ size = bfd_section_size (section); - if (symbol->pc >= vma + size) - return; - --- -2.34.1 - diff --git a/x11-libs/cairo/files/cairo-1.16.0-binutils-2.39-ptr.patch b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.39-ptr.patch deleted file mode 100644 index 6749786d23bd..000000000000 --- a/x11-libs/cairo/files/cairo-1.16.0-binutils-2.39-ptr.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://gitlab.freedesktop.org/cairo/cairo/-/commit/74f2da7b70179a363b5a4649b9c5d6fd18d9cbc0 -https://bugs.gentoo.org/868405 - -From 24996e6ee241ebcd303dd34a2b06b37a6dd0c217 Mon Sep 17 00:00:00 2001 -From: Simon McVittie <s...@debian.org> -Date: Wed, 13 Jul 2022 21:26:57 +0100 -Subject: [PATCH] Fix build with newer binutils-dev installed - -It seems the PTR typedef (or macro?) has been removed from newer versions -of libbfd. - -Resolves: https://gitlab.freedesktop.org/cairo/cairo/-/issues/581 -Signed-off-by: Simon McVittie <s...@debian.org> ---- a/util/cairo-trace/lookup-symbol.c -+++ b/util/cairo-trace/lookup-symbol.c -@@ -106,10 +106,10 @@ _symtab_init (struct symtab *symtab, const char *filename) - if (! bfd_check_format_matches (symtab->bfd, bfd_object, &matching)) - goto BAIL; - -- symcount = bfd_read_minisymbols (symtab->bfd, false, (PTR) &symtab->syms, &size); -+ symcount = bfd_read_minisymbols (symtab->bfd, false, (void **) &symtab->syms, &size); - if (symcount == 0) { - symcount = bfd_read_minisymbols (symtab->bfd, true /* dynamic */ , -- (PTR) &symtab->syms, &size); -+ (void **) &symtab->syms, &size); - } - if (symcount < 0) - goto BAIL; -GitLab diff --git a/x11-libs/cairo/files/cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch b/x11-libs/cairo/files/cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch deleted file mode 100644 index 3709c5a90f80..000000000000 --- a/x11-libs/cairo/files/cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001 -From: Carlos Garcia Campos <cgar...@igalia.com> -Date: Mon, 19 Nov 2018 12:33:07 +0100 -Subject: [PATCH] ft: Use FT_Done_MM_Var instead of free when available in - cairo_ft_apply_variations - -Fixes a crash when using freetype >= 2.9 ---- - src/cairo-ft-font.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c -index 325dd61b4..981973f78 100644 ---- a/src/cairo-ft-font.c -+++ b/src/cairo-ft-font.c -@@ -2393,7 +2393,11 @@ skip: - done: - free (coords); - free (current_coords); -+#if HAVE_FT_DONE_MM_VAR -+ FT_Done_MM_Var (face->glyph->library, ft_mm_var); -+#else - free (ft_mm_var); -+#endif - } - } - --- -2.19.2 - diff --git a/x11-libs/cairo/files/cairo-1.16.0-pdf-add-missing-flush.patch b/x11-libs/cairo/files/cairo-1.16.0-pdf-add-missing-flush.patch deleted file mode 100644 index 19345f141872..000000000000 --- a/x11-libs/cairo/files/cairo-1.16.0-pdf-add-missing-flush.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 4c8813f0eaacc32c27126ad2296951a626300b89 Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohn...@redneon.com> -Date: Thu, 25 Oct 2018 18:46:17 +1030 -Subject: [PATCH] pdf: add missing flush - -Issue #342 ---- - src/cairo-pdf-surface.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c -index 7eb61aa1e..939b2d2d7 100644 ---- a/src/cairo-pdf-surface.c -+++ b/src/cairo-pdf-surface.c -@@ -7711,6 +7711,11 @@ _cairo_pdf_surface_mask (void *abstract_surface, - * and most common, case to handle. */ - if (_cairo_pattern_is_constant_alpha (mask, &extents.bounded, &alpha) && - _can_paint_pattern (source)) { -+ -+ status = _cairo_pdf_operators_flush (&surface->pdf_operators); -+ if (unlikely (status)) -+ goto cleanup; -+ - _cairo_output_stream_printf (surface->output, "q\n"); - status = _cairo_pdf_surface_paint_pattern (surface, - op, --- -2.19.2 - diff --git a/x11-libs/cairo/files/cairo-1.16.0-strings.patch b/x11-libs/cairo/files/cairo-1.16.0-strings.patch deleted file mode 100644 index 2c4742887e36..000000000000 --- a/x11-libs/cairo/files/cairo-1.16.0-strings.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 23b6e8bb5798c77550da613fadc3da8b3be14573 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <sly...@gentoo.org> -Date: Sun, 14 Jun 2020 09:58:52 +0100 -Subject: [PATCH] build/aclocal.float.m4: detect 'strings' with AC_CHECK_TOOL - -This way all binutils tools are detected with $CHOST prefix -if exist. And strings is allowed to be substituted with -STRINGS environment override, so 'llvm-strings' (or other) -alternative can be used. - -Bug: https://bugs.gentoo.org/726200 -Signed-off-by: Sergei Trofimovich <sly...@gentoo.org> ---- - build/aclocal.float.m4 | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/build/aclocal.float.m4 b/build/aclocal.float.m4 -index f92db03e6..d9728c123 100644 ---- a/build/aclocal.float.m4 -+++ b/build/aclocal.float.m4 -@@ -31,10 +31,13 @@ int main() { return 0; } - - ]])], [ - --if strings -a conftest$ac_exeext | grep noonsees >/dev/null ; then -+# allow users to override default 'strings' with 'llvm-strings' -+# or ${CHOST}-strings. -+AC_CHECK_TOOL(STRINGS, strings) -+if $STRINGS -a conftest$ac_exeext | grep noonsees >/dev/null ; then - ax_cv_c_float_words_bigendian=yes - fi --if strings -a conftest$ac_exeext | grep seesnoon >/dev/null ; then -+if $STRINGS -a conftest$ac_exeext | grep seesnoon >/dev/null ; then - if test "$ax_cv_c_float_words_bigendian" = unknown; then - ax_cv_c_float_words_bigendian=no - else --- -2.34.1 - diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml index 605713de435c..bdaadf1326b7 100644 --- a/x11-libs/cairo/metadata.xml +++ b/x11-libs/cairo/metadata.xml @@ -10,8 +10,6 @@ <flag name="gles2-only">Build the OpenGL ES 2 backend</flag> <flag name="gles3" restrict=">=x11-libs/cairo-1.17">Use OpenGL ES 3.0 features (instead of ES 2.0; requires USE=gles2-only)</flag> <flag name="glib">Compile with GLib Object System support</flag> - <flag name="utils">Build support for Cairo script and trace utilities</flag> - <flag name="valgrind">Built-in support to mark memory regions</flag> </use> <upstream> <remote-id type="cpe">cpe:/a:cairographics:cairo</remote-id>
