summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2020-08-10 07:47:57 +0200
committerLars Wendler <polynomial-c@gentoo.org>2020-08-10 07:47:57 +0200
commit9bdf49f5b5c4c0b23c07799557d6d7495e16a9cf (patch)
tree651c1ff6081e446183b0d53ef4c9f86362540e22 /net-misc/dhcpcd-ui
parentdesktop/package.use: net-misc/dhcdpcd-ui: Disable libnotify (diff)
downloadgentoo-9bdf49f5b5c4c0b23c07799557d6d7495e16a9cf.tar.gz
gentoo-9bdf49f5b5c4c0b23c07799557d6d7495e16a9cf.tar.bz2
gentoo-9bdf49f5b5c4c0b23c07799557d6d7495e16a9cf.zip
net-misc/dhcpcd-ui: Improved tinfo patch
Package-Manager: Portage-3.0.2, Repoman-2.3.23 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'net-misc/dhcpcd-ui')
-rw-r--r--net-misc/dhcpcd-ui/files/dhcpcd-ui-0.7.7-tinfo.patch40
1 files changed, 27 insertions, 13 deletions
diff --git a/net-misc/dhcpcd-ui/files/dhcpcd-ui-0.7.7-tinfo.patch b/net-misc/dhcpcd-ui/files/dhcpcd-ui-0.7.7-tinfo.patch
index ca7c284e428e..675b1edad4a9 100644
--- a/net-misc/dhcpcd-ui/files/dhcpcd-ui-0.7.7-tinfo.patch
+++ b/net-misc/dhcpcd-ui/files/dhcpcd-ui-0.7.7-tinfo.patch
@@ -1,25 +1,39 @@
-From 28eeb5e4a5d92ff913e3956550bff56f615c97df Mon Sep 17 00:00:00 2001
+From 988c171aa06bee85e393b28a482c894ccbbf8f58 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sat, 21 Dec 2019 15:17:56 +0100
-Subject: [PATCH] Fix build against ncurses with separate tinfo lib
+Date: Mon, 10 Aug 2020 07:45:34 +0200
+Subject: [PATCH] configure: Fix build against ncurses with separate tinfo lib
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---
- configure | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ configure | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
diff --git a/configure b/configure
-index ed83221..bae1180 100755
+index ed83221..f77bde5 100755
--- a/configure
+++ b/configure
-@@ -469,7 +469,7 @@ int main(void) {
- }
- EOF
- if $XCC _curses.c -o _curses -lcurses 2>&3; then
-- LIB_CURSES=-lcurses
-+ LIB_CURSES="-lcurses -ltinfo"
+@@ -472,6 +472,21 @@ EOF
+ LIB_CURSES=-lcurses
fi
rm -f _curses.c _curses
++
++ #Check for -ltinfo requirement
++ cat <<EOF >_curses.c
++#include <curses.h>
++int main(void) {
++ curs_set(1);
++ return 0;
++}
++EOF
++ if ! $XCC _curses.c -o _curses -lcurses 2>&3; then
++ if $XCC _curses.c -o _curses -ltinfo 2>&3; then
++ LIB_CURSES="$LIB_CURSES -ltinfo"
++ fi
++ fi
++ rm -f _curses.c _curses
fi
+ if [ -n "$LIB_CURSES" ]; then
+ echo "$LIB_CURSES"
--
-2.24.1
+2.28.0