| 1 |
commit: d3d7b6a3dfb8b5da150f290ce1e5b418e166aec5 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 5 14:31:40 2016 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 5 14:33:24 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3d7b6a3 |
| 7 |
|
| 8 |
app-editors/joe: Revbump to fix linking against sys-libs/ncurses[tinfo] |
| 9 |
|
| 10 |
Also get rid of remaining QA issues as pointed out by Soap__ again. |
| 11 |
This hopefully fixes bug #579172 as well. |
| 12 |
|
| 13 |
Package-Manager: portage-2.3.0 |
| 14 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 15 |
|
| 16 |
app-editors/joe/files/joe-4.3-tinfo.patch | 30 ++++++++++++++++++++++ |
| 17 |
.../joe/{joe-4.3.ebuild => joe-4.3-r1.ebuild} | 9 ++++++- |
| 18 |
2 files changed, 38 insertions(+), 1 deletion(-) |
| 19 |
|
| 20 |
diff --git a/app-editors/joe/files/joe-4.3-tinfo.patch b/app-editors/joe/files/joe-4.3-tinfo.patch |
| 21 |
new file mode 100644 |
| 22 |
index 00000000..fd259e1 |
| 23 |
--- /dev/null |
| 24 |
+++ b/app-editors/joe/files/joe-4.3-tinfo.patch |
| 25 |
@@ -0,0 +1,30 @@ |
| 26 |
+# HG changeset patch |
| 27 |
+# User Lars Wendler <polynomial-c@g.o> |
| 28 |
+# Date 1473084371 -7200 |
| 29 |
+# Mon Sep 05 16:06:11 2016 +0200 |
| 30 |
+# Node ID ae8afbceeed4e446a63ad3111291a98d1390ade2 |
| 31 |
+# Parent 57c0a14aedcb8eef82d5828721b55aac02847ee7 |
| 32 |
+configure.ac: search for ncurses' tinfo library if available |
| 33 |
+ |
| 34 |
+ncurses can be built to split out the lowlevel terminfo library |
| 35 |
+from ncurses library. In this case there's a libtinfo.so file |
| 36 |
+alongside the usual libncurses*.so files. |
| 37 |
+This patch adds tinfo to AC_SEARCH_LIBS when ncurses support |
| 38 |
+is enabled. Without this patch configure silently fails to find |
| 39 |
+tgetflag and thus does not link to ncurses at all. |
| 40 |
+I've tested this change on both, ncurses with separate tinfo lib |
| 41 |
+and ncurses without separate tinfo lib and in both cases joe |
| 42 |
+successfully links against ncurses. |
| 43 |
+ |
| 44 |
+diff --git a/configure.ac b/configure.ac |
| 45 |
+--- a/configure.ac |
| 46 |
++++ b/configure.ac |
| 47 |
+@@ -39,7 +39,7 @@ |
| 48 |
+ curses=$enableval, curses=yes) |
| 49 |
+ |
| 50 |
+ if test "$curses" = "yes"; then |
| 51 |
+- search_libs="ncurses curses" |
| 52 |
++ search_libs="tinfo ncurses curses" |
| 53 |
+ fi |
| 54 |
+ |
| 55 |
+ AC_ARG_ENABLE(termcap, |
| 56 |
|
| 57 |
diff --git a/app-editors/joe/joe-4.3.ebuild b/app-editors/joe/joe-4.3-r1.ebuild |
| 58 |
similarity index 88% |
| 59 |
rename from app-editors/joe/joe-4.3.ebuild |
| 60 |
rename to app-editors/joe/joe-4.3-r1.ebuild |
| 61 |
index c1aed9e..446ac94 100644 |
| 62 |
--- a/app-editors/joe/joe-4.3.ebuild |
| 63 |
+++ b/app-editors/joe/joe-4.3-r1.ebuild |
| 64 |
@@ -4,6 +4,8 @@ |
| 65 |
|
| 66 |
EAPI=6 |
| 67 |
|
| 68 |
+inherit autotools |
| 69 |
+ |
| 70 |
DESCRIPTION="A free ASCII-Text Screen Editor for UNIX" |
| 71 |
HOMEPAGE="https://sourceforge.net/projects/joe-editor/" |
| 72 |
SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz" |
| 73 |
@@ -14,19 +16,24 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86- |
| 74 |
IUSE="xterm" |
| 75 |
|
| 76 |
DEPEND=">=sys-libs/ncurses-5.2-r2:0=" |
| 77 |
-RDEPEND="xterm? ( >=x11-terms/xterm-239 )" |
| 78 |
+RDEPEND="${DEPEND} |
| 79 |
+ xterm? ( >=x11-terms/xterm-239 )" |
| 80 |
|
| 81 |
DOCS=( README.md NEWS.md docs/hacking.md docs/man.md ) |
| 82 |
|
| 83 |
+PATCHES=( "${FILESDIR}/${PN}-4.3-tinfo.patch" ) |
| 84 |
+ |
| 85 |
src_prepare() { |
| 86 |
default |
| 87 |
# Enable xterm mouse support in the rc files |
| 88 |
if use xterm; then |
| 89 |
cd "${S}"/rc || die |
| 90 |
+ local i |
| 91 |
for i in *rc*.in; do |
| 92 |
sed -e 's/^ -\(mouse\|joexterm\)/-\1/' -i "${i}" || die |
| 93 |
done |
| 94 |
fi |
| 95 |
+ eautoreconf |
| 96 |
} |
| 97 |
|
| 98 |
pkg_postinst() { |
Archives