From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E6AFD138359 for ; Sat, 7 Nov 2020 04:07:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2BFB9E0819; Sat, 7 Nov 2020 04:07:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 06EEBE0819 for ; Sat, 7 Nov 2020 04:07:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8687D340F21 for ; Sat, 7 Nov 2020 04:07:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0B1B43C7 for ; Sat, 7 Nov 2020 04:07:55 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1604722065.1b848fb4b8210856956b26752c71762d833e2a7b.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/, sci-visualization/gnuplot/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-visualization/gnuplot/files/gnuplot-5.4.0-no-mouse.patch sci-visualization/gnuplot/gnuplot-5.4.0-r1.ebuild sci-visualization/gnuplot/gnuplot-5.4.0-r100.ebuild sci-visualization/gnuplot/gnuplot-5.4.0-r2.ebuild sci-visualization/gnuplot/gnuplot-5.5.9999.ebuild X-VCS-Directories: sci-visualization/gnuplot/files/ sci-visualization/gnuplot/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 1b848fb4b8210856956b26752c71762d833e2a7b X-VCS-Branch: master Date: Sat, 7 Nov 2020 04:07:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0d531de9-a262-470b-924e-33c0df10a0bb X-Archives-Hash: 33288a6c0834e580c52d73363feb1f5f commit: 1b848fb4b8210856956b26752c71762d833e2a7b Author: Ulrich Müller gentoo org> AuthorDate: Sat Nov 7 04:05:36 2020 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sat Nov 7 04:07:45 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b848fb4 sci-visualization/gnuplot: Fix test failure. Patch from upstream. Closes: https://bugs.gentoo.org/753314 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Ulrich Müller gentoo.org> .../gnuplot/files/gnuplot-5.4.0-no-mouse.patch | 27 ++++++++++++++++++++++ .../gnuplot/gnuplot-5.4.0-r100.ebuild | 6 ++--- ...lot-5.4.0-r1.ebuild => gnuplot-5.4.0-r2.ebuild} | 6 ++--- sci-visualization/gnuplot/gnuplot-5.5.9999.ebuild | 3 +-- 4 files changed, 34 insertions(+), 8 deletions(-) diff --git a/sci-visualization/gnuplot/files/gnuplot-5.4.0-no-mouse.patch b/sci-visualization/gnuplot/files/gnuplot-5.4.0-no-mouse.patch new file mode 100644 index 00000000000..8133c3516ed --- /dev/null +++ b/sci-visualization/gnuplot/files/gnuplot-5.4.0-no-mouse.patch @@ -0,0 +1,27 @@ +From cfd9ff9408949ee58be9ba5a18b74ce4562f374a Mon Sep 17 00:00:00 2001 +From: Ethan A Merritt +Date: Fri, 6 Nov 2020 13:06:21 -0800 +Subject: [PATCH] make sure warning message about no mouse support is non-fatal + +Bug #2350 +--- + src/set.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/set.c b/src/set.c +index a697925bc..a6acf8fc6 100644 +--- a/src/set.c ++++ b/src/set.c +@@ -3130,7 +3130,8 @@ set_mouse() + PM_update_menu_items(); + #endif + #else /* USE_MOUSE */ +- c_token++; ++ while (!END_OF_COMMAND) ++ c_token++; + int_warn(NO_CARET, "this copy of gnuplot has no mouse support"); + #endif /* USE_MOUSE */ + } +-- +2.29.2 + diff --git a/sci-visualization/gnuplot/gnuplot-5.4.0-r100.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.0-r100.ebuild index 3b108facf8b..0e0cdd80bfb 100644 --- a/sci-visualization/gnuplot/gnuplot-5.4.0-r100.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.4.0-r100.ebuild @@ -76,7 +76,8 @@ TEXMF="${EPREFIX}/usr/share/texmf-site" PATCHES=( "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch "${FILESDIR}"/${PN}-5.0.6-no-picins.patch - "${FILESDIR}"/${PN}-5.4.0-pkg-config.patch + "${FILESDIR}"/${P}-pkg-config.patch + "${FILESDIR}"/${P}-no-mouse.patch ) pkg_setup() { @@ -198,8 +199,7 @@ src_install() { } src_test() { - #GNUTERM="unknown" emake check # spiderplot and isosurface tests fail - GNUTERM="dumb" emake check + emake check GNUTERM="dumb" } pkg_postinst() { diff --git a/sci-visualization/gnuplot/gnuplot-5.4.0-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.0-r2.ebuild similarity index 97% rename from sci-visualization/gnuplot/gnuplot-5.4.0-r1.ebuild rename to sci-visualization/gnuplot/gnuplot-5.4.0-r2.ebuild index 5b9eabee4ca..c064f8bbff5 100644 --- a/sci-visualization/gnuplot/gnuplot-5.4.0-r1.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.4.0-r2.ebuild @@ -73,7 +73,8 @@ TEXMF="${EPREFIX}/usr/share/texmf-site" PATCHES=( "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch "${FILESDIR}"/${PN}-5.0.6-no-picins.patch - "${FILESDIR}"/${PN}-5.4.0-pkg-config.patch + "${FILESDIR}"/${P}-pkg-config.patch + "${FILESDIR}"/${P}-no-mouse.patch ) src_prepare() { @@ -191,8 +192,7 @@ src_install() { } src_test() { - #GNUTERM="unknown" emake check # spiderplot and isosurface tests fail - GNUTERM="dumb" emake check + emake check GNUTERM="dumb" } pkg_postinst() { diff --git a/sci-visualization/gnuplot/gnuplot-5.5.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.5.9999.ebuild index 697da1fe767..0b2af9540d4 100644 --- a/sci-visualization/gnuplot/gnuplot-5.5.9999.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.5.9999.ebuild @@ -190,8 +190,7 @@ src_install() { } src_test() { - #GNUTERM="unknown" emake check # spiderplot and isosurface tests fail - GNUTERM="dumb" emake check + emake check GNUTERM="dumb" } pkg_postinst() {