From patchwork Fri Mar 20 13:37:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2844 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48kPwz6djdz3yBm for ; Fri, 20 Mar 2020 13:38:11 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48kPww6Lf1zc; Fri, 20 Mar 2020 13:38:08 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48kPww3SnLz2yCT; Fri, 20 Mar 2020 13:38:08 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48kPwv14qGz2yCT for ; Fri, 20 Mar 2020 13:38:07 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48kPwt4N4bzc; Fri, 20 Mar 2020 13:38:06 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1584711486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SjRBM12lKtFQ5nJHabBjHIoEijCN9Ek2jGE8Z8LO0YM=; b=LDDXqVLT7lw9Q6tG18VnT/ChiEIWTj4X8u9GBiIwQ5d3I3mohcQUTYu9yYyrdb4NUw+BCg 7w+SnEYkg3rKXVBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1584711486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SjRBM12lKtFQ5nJHabBjHIoEijCN9Ek2jGE8Z8LO0YM=; b=PQPrE+eRkqizKnbVzP1ENDAmlUId2A8RdAZ0QafdFM4GC8q/YasVNRnQCwRg1CSOeN16Ia 9qrNnQVsr6Cvi2KpWofJy2zPso12cnrBlS2kqczJRQ0fvGIUitixZFsS2d0Km2EMzSsJCh 7V/bMxbzWC9iRgEr3jA1pMyx+uPkNNrHyBbs50tjwJR4blxKQ9azhZhG5wMCpzqRXS0Iz0 QcQivZzLTq3345vyZ8Ga6Z2wS3FGFRL18PKpt5XfZmMYuUo3GMzerXFJQW3mw1RLznTZPB FKF6bZjJbAAdUFr3Kabr51XNgPK4eKsDzZIkK68RVMpBEcQjNLWK1KyJkzDBEA== From: Michael Tremer 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 Message-Id: <20200320133751.2861-1-michael.tremer@ipfire.org> In-Reply-To: <073c253b-ced9-e92f-2b91-ced6d1043c6b@ipfire.org> References: <073c253b-ced9-e92f-2b91-ced6d1043c6b@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This updates the package and adds a patch so that it compiles with binutils 2.34. Signed-off-by: Michael Tremer Reviewed-by: Peter Müller --- 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; +