| 1 |
commit: 66be6eece6fb20cd720d5c0490eedfc947c918bc |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 4 09:02:14 2020 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 4 09:03:23 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66be6eec |
| 7 |
|
| 8 |
x11-libs/cairo: tweak for binutils-2.34, bug #707960 |
| 9 |
|
| 10 |
Reported-by: Hugo Ribeiro |
| 11 |
Closes: https://bugs.gentoo.org/707960 |
| 12 |
Package-Manager: Portage-2.3.87, Repoman-2.3.20 |
| 13 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 14 |
|
| 15 |
x11-libs/cairo/cairo-1.16.0-r3.ebuild | 6 +++++- |
| 16 |
x11-libs/cairo/cairo-9999.ebuild | 6 +++++- |
| 17 |
.../cairo/files/cairo-1.16.0-binutils-2.34.patch | 20 ++++++++++++++++++++ |
| 18 |
3 files changed, 30 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild b/x11-libs/cairo/cairo-1.16.0-r3.ebuild |
| 21 |
index 275c687dcf5..2d3601c7a39 100644 |
| 22 |
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild |
| 23 |
+++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-# Copyright 1999-2019 Gentoo Authors |
| 26 |
+# Copyright 1999-2020 Gentoo Authors |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
EAPI=7 |
| 30 |
@@ -67,6 +67,10 @@ PATCHES=( |
| 31 |
src_prepare() { |
| 32 |
default |
| 33 |
|
| 34 |
+ if has_version ">=sys-libs/binutils-libs-2.34"; then |
| 35 |
+ eapply "${FILESDIR}"/${PN}-1.16.0-binutils-2.34.patch |
| 36 |
+ fi |
| 37 |
+ |
| 38 |
# tests and perf tools require X, bug #483574 |
| 39 |
if ! use X; then |
| 40 |
sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die |
| 41 |
|
| 42 |
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild |
| 43 |
index d5022d1759a..29d74b12d97 100644 |
| 44 |
--- a/x11-libs/cairo/cairo-9999.ebuild |
| 45 |
+++ b/x11-libs/cairo/cairo-9999.ebuild |
| 46 |
@@ -1,4 +1,4 @@ |
| 47 |
-# Copyright 1999-2019 Gentoo Authors |
| 48 |
+# Copyright 1999-2020 Gentoo Authors |
| 49 |
# Distributed under the terms of the GNU General Public License v2 |
| 50 |
|
| 51 |
EAPI=7 |
| 52 |
@@ -65,6 +65,10 @@ PATCHES=( |
| 53 |
src_prepare() { |
| 54 |
default |
| 55 |
|
| 56 |
+ if has_version ">=sys-libs/binutils-libs-2.34"; then |
| 57 |
+ eapply "${FILESDIR}"/${PN}-1.16.0-binutils-2.34.patch |
| 58 |
+ fi |
| 59 |
+ |
| 60 |
# tests and perf tools require X, bug #483574 |
| 61 |
if ! use X; then |
| 62 |
sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die |
| 63 |
|
| 64 |
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 |
| 65 |
new file mode 100644 |
| 66 |
index 00000000000..03daac0eca4 |
| 67 |
--- /dev/null |
| 68 |
+++ b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch |
| 69 |
@@ -0,0 +1,20 @@ |
| 70 |
+--- a/util/cairo-trace/lookup-symbol.c |
| 71 |
++++ b/util/cairo-trace/lookup-symbol.c |
| 72 |
+@@ -145,14 +145,14 @@ find_address_in_section (bfd *abfd, |
| 73 |
+ if (symbol->found) |
| 74 |
+ return; |
| 75 |
+ |
| 76 |
+- if ((bfd_get_section_flags (symtab->bfd, section) & SEC_ALLOC) == 0) |
| 77 |
++ if ((bfd_section_flags (section) & SEC_ALLOC) == 0) |
| 78 |
+ return; |
| 79 |
+ |
| 80 |
+- vma = bfd_get_section_vma (symtab->bfd, section); |
| 81 |
++ vma = bfd_section_vma (section); |
| 82 |
+ if (symbol->pc < vma) |
| 83 |
+ return; |
| 84 |
+ |
| 85 |
+- size = bfd_section_size (symtab->bfd, section); |
| 86 |
++ size = bfd_section_size (section); |
| 87 |
+ if (symbol->pc >= vma + size) |
| 88 |
+ return; |
| 89 |
+ |
Archives