From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH v2 1/2] cairo: Update to 1.16.0
Date: Fri, 20 Mar 2020 13:37:50 +0000 [thread overview]
Message-ID: <20200320133751.2861-1-michael.tremer@ipfire.org> (raw)
In-Reply-To: <073c253b-ced9-e92f-2b91-ced6d1043c6b@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 4500 bytes --]
This updates the package and adds a patch so that it compiles
with binutils 2.34.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/rootfiles/common/cairo | 11 +++++------
lfs/cairo | 5 +++--
src/patches/cairo-1.16.0-binutils-2.34.patch | 20 ++++++++++++++++++++
3 files changed, 28 insertions(+), 8 deletions(-)
create mode 100644 src/patches/cairo-1.16.0-binutils-2.34.patch
diff --git a/config/rootfiles/common/cairo b/config/rootfiles/common/cairo
index 12934cead..7cbb434d1 100644
--- a/config/rootfiles/common/cairo
+++ b/config/rootfiles/common/cairo
@@ -15,23 +15,21 @@
#usr/lib/cairo/libcairo-trace.a
#usr/lib/cairo/libcairo-trace.la
#usr/lib/cairo/libcairo-trace.so
-usr/lib/cairo/libcairo-trace.so.0
-usr/lib/cairo/libcairo-trace.so.0.0.0
#usr/lib/libcairo-gobject.a
#usr/lib/libcairo-gobject.la
#usr/lib/libcairo-gobject.so
usr/lib/libcairo-gobject.so.2
-usr/lib/libcairo-gobject.so.2.11400.8
+usr/lib/libcairo-gobject.so.2.11600.0
#usr/lib/libcairo-script-interpreter.a
#usr/lib/libcairo-script-interpreter.la
#usr/lib/libcairo-script-interpreter.so
usr/lib/libcairo-script-interpreter.so.2
-usr/lib/libcairo-script-interpreter.so.2.11400.8
+usr/lib/libcairo-script-interpreter.so.2.11600.0
#usr/lib/libcairo.a
#usr/lib/libcairo.la
#usr/lib/libcairo.so
usr/lib/libcairo.so.2
-usr/lib/libcairo.so.2.11400.8
+usr/lib/libcairo.so.2.11600.0
#usr/lib/pkgconfig/cairo-fc.pc
#usr/lib/pkgconfig/cairo-ft.pc
#usr/lib/pkgconfig/cairo-gobject.pc
@@ -65,6 +63,7 @@ usr/lib/libcairo.so.2.11400.8
#usr/share/gtk-doc/html/cairo/cairo-Regions.html
#usr/share/gtk-doc/html/cairo/cairo-SVG-Surfaces.html
#usr/share/gtk-doc/html/cairo/cairo-Script-Surfaces.html
+#usr/share/gtk-doc/html/cairo/cairo-Tags-and-Links.html
#usr/share/gtk-doc/html/cairo/cairo-Transformations.html
#usr/share/gtk-doc/html/cairo/cairo-Types.html
#usr/share/gtk-doc/html/cairo/cairo-User-Fonts.html
@@ -92,13 +91,13 @@ usr/lib/libcairo.so.2.11400.8
#usr/share/gtk-doc/html/cairo/index-1.10.html
#usr/share/gtk-doc/html/cairo/index-1.12.html
#usr/share/gtk-doc/html/cairo/index-1.14.html
+#usr/share/gtk-doc/html/cairo/index-1.16.html
#usr/share/gtk-doc/html/cairo/index-1.2.html
#usr/share/gtk-doc/html/cairo/index-1.4.html
#usr/share/gtk-doc/html/cairo/index-1.6.html
#usr/share/gtk-doc/html/cairo/index-1.8.html
#usr/share/gtk-doc/html/cairo/index-all.html
#usr/share/gtk-doc/html/cairo/index.html
-#usr/share/gtk-doc/html/cairo/index.sgml
#usr/share/gtk-doc/html/cairo/language-bindings.html
#usr/share/gtk-doc/html/cairo/left-insensitive.png
#usr/share/gtk-doc/html/cairo/left.png
diff --git a/lfs/cairo b/lfs/cairo
index 0d28b5405..082cc4edd 100644
--- a/lfs/cairo
+++ b/lfs/cairo
@@ -24,7 +24,7 @@
include Config
-VER = 1.14.8
+VER = 1.16.0
THISAPP = cairo-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 4ef0db2eacb271c74f8a3fd87822aa98
+$(DL_FILE)_MD5 = f19e0353828269c22bd72e271243a552
install : $(TARGET)
@@ -70,6 +70,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cairo-1.16.0-binutils-2.34.patch
cd $(DIR_APP) && ./configure --prefix=/usr \
--disable-win32 --disable-os2 --disable-beos
cd $(DIR_APP) && make $(MAKETUNING)
diff --git a/src/patches/cairo-1.16.0-binutils-2.34.patch b/src/patches/cairo-1.16.0-binutils-2.34.patch
new file mode 100644
index 000000000..03daac0ec
--- /dev/null
+++ b/src/patches/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;
+
--
2.20.1
next prev parent reply other threads:[~2020-03-20 13:37 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-07 10:36 [PATCH] binutils: update to 2.34 Peter Müller
2020-03-08 11:37 ` Michael Tremer
2020-03-20 13:37 ` Michael Tremer [this message]
2020-03-20 13:37 ` [PATCH v2 2/2] " Michael Tremer
2020-03-20 17:21 ` [PATCH v2 1/2] cairo: Update to 1.16.0 Peter Müller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200320133751.2861-1-michael.tremer@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox