[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/, x11-libs/cairo/files/
commit: a1706f49e1fd8c1605c4af96774563e3da549fd4
Author: Matt Turner gentoo org>
AuthorDate: Sat Dec 2 16:22:03 2023 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Dec 2 16:22:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1706f49
x11-libs/cairo: Drop old versions
Bug: https://bugs.gentoo.org/717778
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/Manifest| 1 -
x11-libs/cairo/cairo-1.17.8.ebuild | 100 ---
.../1.17.8-tee-Fix-cairo-wrapper-functions.patch | 109 -
3 files changed, 210 deletions(-)
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 5536b5d0d0f9..644677d49780 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,2 +1 @@
-DIST cairo-1.17.8.tar.bz2 43730163 BLAKE2B
6089b3488425c577ad70896bb82eaad1d26cbbb38b4b38902d1eaf82a47c11170a2b0f0a6439e2cf0efa53db1f49ed74d801f7023de25d381d17e26a185a7bf9
SHA512
86d59c60c0436dde1cced60f11774e08bc483b3310faa066f9cb1cd60e64c4b7d61a27d1f5d4781187b1a3839c7b3e490a7503d09f25dbdcd5be21290f066cf8
DIST cairo-1.18.0.tar.bz2 43979246 BLAKE2B
1afb01a934a41c9f4c2cac0d6f1fd842bfd3297378b7692a0c38786d151ca568a63707ceee4b220da7ec9a605f65eb87b546a78392c5fe652345e749e6d3da6b
SHA512
bd702f3b64061f8add954c243c9b59f5d44271adfa76d997941ddab629ff8018c2a1d3368edf2362573e0018c342c61483de58240c63e15e1e6035d2511d3e40
diff --git a/x11-libs/cairo/cairo-1.17.8.ebuild
b/x11-libs/cairo/cairo-1.17.8.ebuild
deleted file mode 100644
index 0a245be4edad..
--- a/x11-libs/cairo/cairo-1.17.8.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson-multilib
-
-if [[ ${PV} == ** ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git;
- SRC_URI=""
-else
-
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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.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/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- >=x11-libs/pixman-0.36[${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
-
- # Upstream
- "${FILESDIR}"/${PV}-tee-Fix-cairo-wrapper-functions.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
- -Dxml=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
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/, x11-libs/cairo/files/
commit: 19503f976ef7032187350847b70aace960173ec8
Author: Matt Turner gentoo org>
AuthorDate: Wed Mar 1 19:27:47 2023 +
Commit: Matt Turner gentoo org>
CommitDate: Wed Mar 1 20:43:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19503f97
x11-libs/cairo: Version bump to 1.17.8
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/Manifest| 1 +
x11-libs/cairo/cairo-1.17.8.ebuild | 86
.../1.17.8-tee-Fix-cairo-wrapper-functions.patch | 109 +
3 files changed, 196 insertions(+)
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 7a62019cb85a..8de7a387b7f5 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1 +1,2 @@
DIST cairo-1.17.6.tar.bz2 43700076 BLAKE2B
05ac766d33e9bdfc5df0347e9a80611554d64886715d1620fbe6f05f36f0134e46e1e6107738d260b380fab5ef2ac609922dce9ebcac01234710d8e2a76e9724
SHA512
1537b34ca49b853f4f60a7ceac0c1b878e7e2874f1ca3a37ab6ccbb704a37872314447016ad07b82312b302bb6df86b71265232a802ccdb9fb8cd18f211ff185
+DIST cairo-1.17.8.tar.bz2 43730163 BLAKE2B
6089b3488425c577ad70896bb82eaad1d26cbbb38b4b38902d1eaf82a47c11170a2b0f0a6439e2cf0efa53db1f49ed74d801f7023de25d381d17e26a185a7bf9
SHA512
86d59c60c0436dde1cced60f11774e08bc483b3310faa066f9cb1cd60e64c4b7d61a27d1f5d4781187b1a3839c7b3e490a7503d09f25dbdcd5be21290f066cf8
diff --git a/x11-libs/cairo/cairo-1.17.8.ebuild
b/x11-libs/cairo/cairo-1.17.8.ebuild
new file mode 100644
index ..a27acb5ec771
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.17.8.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+if [[ ${PV} == ** ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git;
+ SRC_URI=""
+else
+
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
+ 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 +glib gtk-doc test"
+RESTRICT="!test? ( test ) test" # Requires poppler-glib, which isn't available
in multilib
+
+RDEPEND="
+ >=dev-libs/lzo-2.06-r1:2[${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/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/pixman-0.36[${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}
+ X? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-respect-fontconfig.patch
+
+ # Upstream
+ "${FILESDIR}"/${PV}-tee-Fix-cairo-wrapper-functions.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
+ -Dxml=disabled
+ -Dzlib=enabled
+
+ $(meson_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_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/1.17.8-tee-Fix-cairo-wrapper-functions.patch
b/x11-libs/cairo/files/1.17.8-tee-Fix-cairo-wrapper-functions.patch
new file mode 100644
index ..a9bf577f9616
--- /dev/null
+++ b/x11-libs/cairo/files/1.17.8-tee-Fix-cairo-wrapper-functions.patch
@@ -0,0 +1,109 @@
+From
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/, x11-libs/cairo/files/
commit: 3392d007e80240e76b457782760e558afb1b2a4f
Author: Sam James gentoo org>
AuthorDate: Sun Sep 4 18:06:13 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Sep 4 18:06:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3392d007
x11-libs/cairo: fix build with binutils-2.39
Closes: https://bugs.gentoo.org/868405
Signed-off-by: Sam James gentoo.org>
x11-libs/cairo/cairo-1.16.0-r5.ebuild | 1 +
.../files/cairo-1.16.0-binutils-2.39-ptr.patch | 29 ++
2 files changed, 30 insertions(+)
diff --git a/x11-libs/cairo/cairo-1.16.0-r5.ebuild
b/x11-libs/cairo/cairo-1.16.0-r5.ebuild
index bf5a7256fd4b..dc8e73c91275 100644
--- a/x11-libs/cairo/cairo-1.16.0-r5.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r5.ebuild
@@ -63,6 +63,7 @@ PATCHES=(
"${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() {
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
new file mode 100644
index ..6749786d23bd
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.39-ptr.patch
@@ -0,0 +1,29 @@
+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
+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
+--- 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, ))
+ goto BAIL;
+
+-symcount = bfd_read_minisymbols (symtab->bfd, false, (PTR) >syms,
);
++symcount = bfd_read_minisymbols (symtab->bfd, false, (void **)
>syms, );
+ if (symcount == 0) {
+ symcount = bfd_read_minisymbols (symtab->bfd, true /* dynamic */ ,
+- (PTR) >syms, );
++ (void **) >syms, );
+ }
+ if (symcount < 0)
+ goto BAIL;
+GitLab
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/, x11-libs/cairo/files/
commit: 75aebadc586d4bbce67e1bb948a10da28b5c703d
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sat Jun 13 20:11:50 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sat Jun 13 20:13:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75aebadc
x11-libs/cairo: detect 'strings' with AC_CHECK_TOOL
This way all binutils tools are detected with $CHOST prefix
if exist. Fixes 64-bit build on sys-devel/binutils-config[-native-symlinks]
system.
Closes: https://bugs.gentoo.org/726200
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich gentoo.org>
x11-libs/cairo/cairo-1.16.0-r4.ebuild | 135
x11-libs/cairo/files/cairo-1.16.0-strings.patch | 19
2 files changed, 154 insertions(+)
diff --git a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
new file mode 100644
index 000..d9108285f73
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic autotools multilib-minimal
+
+if [[ ${PV} == ** ]]; 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 ~m68k ~mips ~ppc ~ppc64
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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} == ** ]] && 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[${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} == ** ]] && 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
+)
+
+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} == ** ]]; 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
+
+ use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
+
+ # [[ ${PV} == ** ]] && 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
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/, x11-libs/cairo/files/
commit: 66be6eece6fb20cd720d5c0490eedfc947c918bc
Author: Sergei Trofimovich gentoo org>
AuthorDate: Tue Feb 4 09:02:14 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Tue Feb 4 09:03:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66be6eec
x11-libs/cairo: tweak for binutils-2.34, bug #707960
Reported-by: Hugo Ribeiro
Closes: https://bugs.gentoo.org/707960
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich gentoo.org>
x11-libs/cairo/cairo-1.16.0-r3.ebuild| 6 +-
x11-libs/cairo/cairo-.ebuild | 6 +-
.../cairo/files/cairo-1.16.0-binutils-2.34.patch | 20
3 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
index 275c687dcf5..2d3601c7a39 100644
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -67,6 +67,10 @@ PATCHES=(
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
diff --git a/x11-libs/cairo/cairo-.ebuild b/x11-libs/cairo/cairo-.ebuild
index d5022d1759a..29d74b12d97 100644
--- a/x11-libs/cairo/cairo-.ebuild
+++ b/x11-libs/cairo/cairo-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -65,6 +65,10 @@ PATCHES=(
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
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
new file mode 100644
index 000..03daac0eca4
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch
@@ -0,0 +1,20 @@
+--- a/util/cairo-trace/lookup-symbol.c
b/util/cairo-trace/lookup-symbol.c
+@@ -145,14 +145,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;
+
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/, x11-libs/cairo/files/
commit: 8e27a74b58384414d920401521f7460a240ea37a
Author: Matt Turner gentoo org>
AuthorDate: Sat Mar 30 02:00:30 2019 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Mar 30 02:03:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e27a74b
x11-libs/cairo: Pull in a few fixes from upstream
Bug: https://bugs.gentoo.org/672908
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/cairo-1.16.0-r3.ebuild | 132 +
...one_MM_Var-instead-of-free-when-available.patch | 30 +
.../files/cairo-1.16.0-pdf-add-missing-flush.patch | 29 +
3 files changed, 191 insertions(+)
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
new file mode 100644
index 000..127a9e7d75f
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic autotools multilib-minimal
+
+if [[ ${PV} == ** ]]; 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 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-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 +glib opengl static-libs +svg utils valgrind xcb"
+# gtk-doc regeneration doesn't seem to work with out-of-source builds
+#[[ ${PV} == ** ]] && 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"
+
+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[${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? ( >=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,${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}]
+ )
+ xcb? (
+ >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=sys-devel/libtool-2
+ X? ( x11-base/xorg-proto )"
+#[[ ${PV} == ** ]] && DEPEND="${DEPEND}
+# doc? (
+# >=dev-util/gtk-doc-1.6
+# ~app-text/docbook-xml-dtd-4.2
+# )"
+
+REQUIRED_USE="
+ gles2? ( !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
+)
+
+src_prepare() {
+ default
+
+ # 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} == ** ]]; 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
+
+ use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
+
+ # [[ ${PV} == ** ]] && myopts+=" $(use_enable doc gtk-doc)"
+
+ ECONF_SOURCE="${S}" \
+ econf \
+ --disable-dependency-tracking \
+ $(use_with X x) \
+ $(use_enable X tee) \
+ $(use_enable X xlib) \
+ $(use_enable X xlib-xrender) \
+ $(use_enable aqua quartz) \
+ $(use_enable aqua quartz-image) \
+ $(use_enable debug test-surfaces) \
+ $(use_enable gles2 glesv2) \
+ $(use_enable glib gobject) \
+ $(use_enable opengl gl) \
+ $(use_enable static-libs static) \
+ $(use_enable svg) \
+ $(use_enable utils trace) \
+
