diff options
| -rw-r--r-- | sci-visualization/gnuplot/files/gnuplot-5.4.0-no-mouse.patch | 27 | ||||
| -rw-r--r-- | sci-visualization/gnuplot/gnuplot-5.4.0-r100.ebuild | 6 | ||||
| -rw-r--r-- | sci-visualization/gnuplot/gnuplot-5.4.0-r2.ebuild (renamed from sci-visualization/gnuplot/gnuplot-5.4.0-r1.ebuild) | 6 | ||||
| -rw-r--r-- | 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 000000000000..8133c3516edf --- /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 <merritt@u.washington.edu> +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 3b108facf8bf..0e0cdd80bfb8 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 index 5b9eabee4ca7..c064f8bbff52 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 697da1fe7672..0b2af9540d46 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() { |