From patchwork Mon Feb 10 18:07:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Maja_K=C4=85dzio=C5=82ka?= X-Patchwork-Id: 20210 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 6D80A17B60; Mon, 10 Feb 2020 18:08:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 2A22C17B3C for ; Mon, 10 Feb 2020 18:08:14 +0000 (GMT) Received: from localhost ([::1]:37098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1DTh-0002Lo-HE for patchwork@mira.cbaines.net; Mon, 10 Feb 2020 13:08:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35504) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1DTY-0002JN-5V for guix-patches@gnu.org; Mon, 10 Feb 2020 13:08:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j1DTW-0003sz-T2 for guix-patches@gnu.org; Mon, 10 Feb 2020 13:08:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49397) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j1DTW-0003sn-Pl for guix-patches@gnu.org; Mon, 10 Feb 2020 13:08:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j1DTW-00068C-Kn for guix-patches@gnu.org; Mon, 10 Feb 2020 13:08:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39548] [PATCH] gnu: vim: Update to 8.2.0236. Resent-From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 Feb 2020 18:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 39548 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39548@debbugs.gnu.org Cc: me@tobias.gr X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158135804523518 (code B ref -1); Mon, 10 Feb 2020 18:08:02 +0000 Received: (at submit) by debbugs.gnu.org; 10 Feb 2020 18:07:25 +0000 Received: from localhost ([127.0.0.1]:55370 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j1DSv-00067F-Bq for submit@debbugs.gnu.org; Mon, 10 Feb 2020 13:07:25 -0500 Received: from lists.gnu.org ([209.51.188.17]:60913) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j1DSt-000678-GC for submit@debbugs.gnu.org; Mon, 10 Feb 2020 13:07:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34777) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1DSs-00021k-5r for guix-patches@gnu.org; Mon, 10 Feb 2020 13:07:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j1DSq-00039b-SB for guix-patches@gnu.org; Mon, 10 Feb 2020 13:07:22 -0500 Received: from pat.zlotemysli.pl ([37.59.186.212]:38606) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1j1DSq-00037m-JP for guix-patches@gnu.org; Mon, 10 Feb 2020 13:07:20 -0500 Received: (qmail 24194 invoked by uid 1009); 10 Feb 2020 19:07:17 +0100 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25719. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.020528 secs); 10 Feb 2020 18:07:17 -0000 Received: from unknown (HELO localhost.localdomain) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 10 Feb 2020 19:07:17 +0100 From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Date: Mon, 10 Feb 2020 19:07:38 +0100 Message-Id: <20200210180738.22984-1-kuba@kadziolka.net> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.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/vim.scm (vim): Update to 8.2.0236. (vim-full)[arguments]: Add a -lexpat linker argument through #:make-flags. Add a new phase to skip a test (see comment). --- gnu/packages/vim.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index f130ae4392..1d4a7a3f94 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 HiPhish ;;; Copyright © 2019 Julien Lepiller -;;; Copyright © 2019 Jakub Kądziołka +;;; Copyright © 2019, 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -68,7 +68,7 @@ (define-public vim (package (name "vim") - (version "8.2.0069") + (version "8.2.0236") (source (origin (method git-fetch) (uri (git-reference @@ -77,7 +77,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0kxzfcpv96s1lbx97g6451p1i7yanws5bvzl05jh1ywaqv5f4y7g")))) + "0ixwr7kkxc1cj837v1bbgghkd68gbynfn7pc4rb87ah9sm6bgaz3")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -189,9 +189,20 @@ with the editor vim."))) "--enable-xim" "--disable-selinux" "--enable-gui") + ;; This flag fixes the following error: + ;; .../libpython3.7m.a(pyexpat.o): undefined reference to symbol 'XML_FreeContentModel' + ;; .../libexpat.so.1: error adding symbols: DSO missing from command line + #:make-flags '("LDFLAGS=-lexpat") ,@(substitute-keyword-arguments (package-arguments vim) ((#:phases phases) `(modify-phases ,phases + (add-before 'check 'skip-previewpopup + ;; This test fails when the path to the source is long. See: + ;; https://github.com/vim/vim/issues/5615 + (lambda _ + (substitute* "src/testdir/test_popupwin.vim" + ((".*Test_previewpopup.*" line) + (string-append line "return\n"))))) (add-before 'check 'skip-test87 ;; This test fails for unknown reasons after switching ;; to a git checkout.