From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#39548] [PATCH] gnu: vim: Update to 8.2.0236. Resent-Message-ID: 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 From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Date: Mon, 10 Feb 2020 19:07:38 +0100 Message-Id: <20200210180738.22984-1-kuba@kadziolka.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39548@debbugs.gnu.org Cc: me@tobias.gr * 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. -- 2.25.0