From patchwork Sat Feb 16 17:40:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 1102 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1F31616C49; Sat, 16 Feb 2019 17:41:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id B4B8316C47 for ; Sat, 16 Feb 2019 17:41:08 +0000 (GMT) Received: from localhost ([127.0.0.1]:58633 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gv3xc-0004mq-9c for patchwork@mira.cbaines.net; Sat, 16 Feb 2019 12:41:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36105) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gv3xX-0004mh-5V for guix-patches@gnu.org; Sat, 16 Feb 2019 12:41:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gv3xW-0006xf-5P for guix-patches@gnu.org; Sat, 16 Feb 2019 12:41:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51217) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gv3xW-0006xT-1o for guix-patches@gnu.org; Sat, 16 Feb 2019 12:41:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gv3xV-0005X4-SA for guix-patches@gnu.org; Sat, 16 Feb 2019 12:41:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34500] [PATCH staging] gnu: librsvg: Update to 2.44.12. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Feb 2019 17:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34500 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34500@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155033881821196 (code B ref -1); Sat, 16 Feb 2019 17:41:01 +0000 Received: (at submit) by debbugs.gnu.org; 16 Feb 2019 17:40:18 +0000 Received: from localhost ([127.0.0.1]:50493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gv3wk-0005Vj-6Y for submit@debbugs.gnu.org; Sat, 16 Feb 2019 12:40:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49835) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gv3wi-0005VS-1g for submit@debbugs.gnu.org; Sat, 16 Feb 2019 12:40:12 -0500 Received: from lists.gnu.org ([209.51.188.17]:46222) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gv3wc-0006ZS-Sy for submit@debbugs.gnu.org; Sat, 16 Feb 2019 12:40:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35978) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gv3wb-0004ed-PU for guix-patches@gnu.org; Sat, 16 Feb 2019 12:40:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gv3wa-0006YI-Mq for guix-patches@gnu.org; Sat, 16 Feb 2019 12:40:05 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:54793) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gv3wa-0006Xv-2C for guix-patches@gnu.org; Sat, 16 Feb 2019 12:40:04 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id AD5D03184 for ; Sat, 16 Feb 2019 12:40:02 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sat, 16 Feb 2019 12:40:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=fm2; bh=lkRIXDKGfPglwEQeEPUIz12MZ8 Hw+4zs9H6KKuTFzFs=; b=mfAMZsTKO3SqddkZyizY9Gyuk7mrd0qXX4SvaAeRJb T6/vwg93uhHzc9bIdQs5Ko7qgF1Eyq977mbjtVQN+0rDWqJkOvXrIun9ymUldXuh TTne2PAh6lifYacoPOSZzgABEiV+MvWVKbF1gzKmfeSyaDg4DPx4UOqn+9TLvR5c OljQpYYYel2XS6wsyT5zT8HZGL3SPRhnWasUor2mnC4FHTtigSk6HnM1CAUB6Azy SheQfgLClAKipsFU8qRa0N2NS3ohM/nkBO6/0gKRPbah/Es+AnLJuq2v2SUmoOL/ 4sM9B8PD3l9S70QEYB9n3ZdCDgneEr0ZRytfpz9kPowA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=lkRIXDKGfPglwEQeE PUIz12MZ8Hw+4zs9H6KKuTFzFs=; b=RWpS/2KVtbfHFuwL2Bso27mdTJl6j+HFy UMgv8w02wXgow0zTDS1NC7gvFoUZCk2knv4gbHTPqf2uwbjQ75uS7P8sELCzUH8X jnt9gCZQhDPQcp16ktDR9Hl6an6tNA7/pzZlV2drgSMv7VI5YUy9Tj5OuIOWx28s tMjl2gRvu6YaJqqVITNNn3CpuwWpTg8unVmu2tQJuPrvrnqIEPZU1oOq3iSOSO0H LFzoCDCRma3IXkHeX79J8trh1CN0zbs5qVsfxi7AXE4QQsm8r35zP77R0IYCSfBT GLbQS/RCdmAERwmnOhtc5HlGZAWBnjOIy8Z/G15I2TgxGPDY+TmWg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledruddtledguddtiecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthenuceurghilhhouhhtmecu fedttdenucenucfjughrpefhvffufffkofgggfestdekredtredttdenucfhrhhomhepof grrhhiuhhsuceurghkkhgvuceomhgsrghkkhgvsehfrghsthhmrghilhdrtghomheqnecu kfhppeeivddrudeirddvvdeirddugedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmsg grkhhkvgesfhgrshhtmhgrihhlrdgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id 8B188E46AC for ; Sat, 16 Feb 2019 12:40:01 -0500 (EST) From: Marius Bakke Date: Sat, 16 Feb 2019 18:40:00 +0100 Message-Id: <20190216174000.31653-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnome.scm (librsvg): Update to 2.44.12. [arguments]: Replace patching phases with a custom variant. Delete five new tests. [native-inputs]: Add RUST-1.27 and RUST-1.27:CARGO. --- gnu/packages/gnome.scm | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3a34356beb..466b986635 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -127,6 +128,7 @@ #:use-module (gnu packages rdesktop) #:use-module (gnu packages readline) #:use-module (gnu packages ruby) + #:use-module (gnu packages rust) #:use-module (gnu packages samba) #:use-module (gnu packages scanner) #:use-module (gnu packages selinux) @@ -1218,7 +1220,7 @@ dealing with different structured file formats.") (define-public librsvg (package (name "librsvg") - (version "2.40.20") + (version "2.44.12") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1226,11 +1228,22 @@ dealing with different structured file formats.") name "-" version ".tar.xz")) (sha256 (base32 - "0ay9himvw1l1swcf3h1312d2iqzfl65kpbfgiyfykgvq7cydvx6g")))) + "1h3qnqhr0l7pd2bxg69ki6ckl4srdwgr471dpp4jq9i4784hp0v6")))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:make-flags '("CC=gcc") + #:phases (modify-phases %standard-phases + ;; Don't patch anything in vendor/ to avoid having to + ;; recompute Cargo checksums. TODO: Unbundle those. + (delete 'patch-source-shebangs) + (delete 'patch-generated-file-shebangs) + (delete 'patch-usr-bin-file) + (add-before 'configure 'patch-all-the-things + (lambda _ + (for-each patch-shebang '("tap-driver.sh" "tap-test")) + (patch-/usr/bin/file "configure") + #t)) (add-before 'configure 'pre-configure (lambda* (#:key inputs #:allow-other-keys) (substitute* "gdk-pixbuf-loader/Makefile.in" @@ -1244,22 +1257,32 @@ dealing with different structured file formats.") (("gdk_pixbuf_cache_file = .*$") "gdk_pixbuf_cache_file = $(TMPDIR)/loaders.cache\n")) #t)) - (add-after 'unpack 'remove-failing-tests + (add-before 'check 'remove-failing-tests (lambda _ (with-directory-excursion "tests/fixtures/reftests" (for-each delete-file - '(;; This test fails on i686: + '(;; The images produced by these tests differ + ;; slightly from their reference counterparts due + ;; to differences in the build environment (missing + ;; fonts, etc). See for details. + ;; These fail on x86_64. + "svg1.1/coords-viewattr-02-b.svg" + "svg1.1/filters-composite-04-f.svg" + "svg1.1/filters-image-01-b.svg" + "svg1.1/filters-conv-02-f.svg" + "svg1.1/filters-conv-04-f.svg" + ;; This test fails on i686: "svg1.1/masking-path-04-b.svg" - "svg1.1/masking-path-04-b-ref.png" ;; This test fails on armhf: "svg1.1/masking-mask-01-b.svg" - "svg1.1/masking-mask-01-b-ref.png" ;; This test fails on aarch64: - "bugs/777834-empty-text-children.svg" - "bugs/777834-empty-text-children-ref.png"))) + "bugs/777834-empty-text-children.svg"))) #t))))) (native-inputs `(("pkg-config" ,pkg-config) + ;; This is the minimum supported Rust version in Librsvg 2.44. + ("rust" ,rust-1.27) + ("cargo" ,rust-1.27 "cargo") ("glib" ,glib "bin") ; glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc. (inputs