profanity: Readd curses(3) support

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: profanity: Readd curses(3) support
From: Leonardo Taccari <leot%NetBSD.org@localhost>
Date: Sun, 08 Sep 2019 17:41:37 +0000
Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sun Sep 8 19:41:37 2019 +0200
Changeset:	05bd0a7452f6ea4d8739275ee6fb39b8057d5fd8

Modified Files:
	profanity/distinfo
	profanity/patches/patch-configure.ac
Added Files:
	profanity/patches/patch-src_common.c
	profanity/patches/patch-src_config.h.in
	profanity/patches/patch-src_config_theme.c
	profanity/patches/patch-src_ui_buffer.c
	profanity/patches/patch-src_ui_console.c
	profanity/patches/patch-src_ui_core.c
	profanity/patches/patch-src_ui_inputwin.c
	profanity/patches/patch-src_ui_screen.c
	profanity/patches/patch-src_ui_statusbar.c
	profanity/patches/patch-src_ui_win__types.h
	profanity/patches/patch-src_ui_window.c
	profanity/patches/patch-src_ui_window.h

Log Message:
profanity: Readd curses(3) support

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=05bd0a7452f6ea4d8739275ee6fb39b8057d5fd8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 profanity/distinfo                          | 14 +++++++++++++-
 profanity/patches/patch-configure.ac        | 21 ++++++++++++++++++++-
 profanity/patches/patch-src_common.c        | 15 +++++++++++++++
 profanity/patches/patch-src_config.h.in     | 26 ++++++++++++++++++++++++++
 profanity/patches/patch-src_config_theme.c  | 19 +++++++++++++++++++
 profanity/patches/patch-src_ui_buffer.c     | 15 +++++++++++++++
 profanity/patches/patch-src_ui_console.c    | 15 +++++++++++++++
 profanity/patches/patch-src_ui_core.c       | 15 +++++++++++++++
 profanity/patches/patch-src_ui_inputwin.c   | 25 +++++++++++++++++++++++++
 profanity/patches/patch-src_ui_screen.c     | 13 +++++++++++++
 profanity/patches/patch-src_ui_statusbar.c  | 15 +++++++++++++++
 profanity/patches/patch-src_ui_win__types.h | 15 +++++++++++++++
 profanity/patches/patch-src_ui_window.c     | 15 +++++++++++++++
 profanity/patches/patch-src_ui_window.h     | 15 +++++++++++++++
 14 files changed, 236 insertions(+), 2 deletions(-)

diffs:
diff --git a/profanity/distinfo b/profanity/distinfo
index 4a859e9a4f..b85d07f0d5 100644
--- a/profanity/distinfo
+++ b/profanity/distinfo
@@ -4,4 +4,16 @@ SHA1 (profanity-0.7.0.tar.gz) = da71a8352a8a34db29f0fdbf6e11abe5ef55bbc3
 RMD160 (profanity-0.7.0.tar.gz) = b136b747aef0e7ac32f37565647d2b701d98318a
 SHA512 (profanity-0.7.0.tar.gz) = d4be02ad560f53ba59f6d814b6489fe8b7fe59a9c26e72867e23aa33d8badadfd518bc27a1f63266cb5f651f422a5de70f474ff551f5e97f5eab7b643f3a9106
 Size (profanity-0.7.0.tar.gz) = 789373 bytes
-SHA1 (patch-configure.ac) = 5bf25dd8a896c8fb4fe42c0c573539a15aac0cef
+SHA1 (patch-configure.ac) = 16b2c5c64e0b227bd615121f133968024326ac3a
+SHA1 (patch-src_common.c) = 1df8ee42b0548c0a0f01e19361ddb6321deca0c9
+SHA1 (patch-src_config.h.in) = a6597f343bbb06128ce97849f02a6f6f2b57d25e
+SHA1 (patch-src_config_theme.c) = f85b6d1950c3601970642ecc9bf641d9ccf61025
+SHA1 (patch-src_ui_buffer.c) = 00b5296abdd8db3f42cf9fa1f7844118843805bd
+SHA1 (patch-src_ui_console.c) = eb0f3da92040e26f118afd0a174b3504a0b1fb75
+SHA1 (patch-src_ui_core.c) = 3b4ed47456650f9378cdb355c045a728bc32e4c0
+SHA1 (patch-src_ui_inputwin.c) = 224126b562c0294ca5bd43dd0011d78582ab1138
+SHA1 (patch-src_ui_screen.c) = cc16715425c5b7cefc625c0bfccba67b8dbe80f1
+SHA1 (patch-src_ui_statusbar.c) = 69138eae73758d8c70eda3d7fc6b575bb091ef9f
+SHA1 (patch-src_ui_win__types.h) = ad130a3acd1fcf74526958a511e90e354acb3d0e
+SHA1 (patch-src_ui_window.c) = f221ed015ed53aee2d01ac179730cd87822cb84f
+SHA1 (patch-src_ui_window.h) = ae95e732f4bef7628de8423bfb8c6468ad3aba33
diff --git a/profanity/patches/patch-configure.ac b/profanity/patches/patch-configure.ac
index a53418e525..44c9551b60 100644
--- a/profanity/patches/patch-configure.ac
+++ b/profanity/patches/patch-configure.ac
@@ -1,6 +1,7 @@
 $NetBSD$
 
 - Use `=' operator for test(1)
+- Add support for curses(3)
 - Simplify check for readline
 
 --- configure.ac.orig	2019-07-31 08:53:34.000000000 +0000
@@ -14,7 +15,17 @@ $NetBSD$
          AX_PYTHON_DEVEL
          AM_CONDITIONAL([BUILD_PYTHON_API], [true])
          AC_DEFINE([HAVE_PYTHON], [1], [Python support])
-@@ -179,23 +179,8 @@ AS_IF([test "x$enable_icons" != xno],
+@@ -138,7 +138,8 @@ PKG_CHECK_MODULES([ncursesw], [ncursesw]
+         [NCURSES_CFLAGS="$ncurses_CFLAGS"; NCURSES_LIBS="$ncurses_LIBS"; NCURSES="ncurses"],
+         [AC_CHECK_LIB([ncursesw], [main], [],
+             [AC_CHECK_LIB([ncurses], [main], [],
+-            	[AC_MSG_ERROR([ncurses is required for profanity])])])])])
++                [AC_CHECK_LIB([curses], [main], [],
++            	    [AC_MSG_ERROR([ncurses is required for profanity])])])])])])
+ AM_CPPFLAGS="$AM_CPPFLAGS $NCURSES_CFLAGS"
+ LIBS="$NCURSES_LIBS $LIBS"
+ 
+@@ -179,23 +180,8 @@ AS_IF([test "x$enable_icons" != xno],
              [AC_MSG_ERROR([gtk+-2.0 or higher is required for icons])],
              [AC_MSG_NOTICE([gtk+-2.0 not found, icons not enabled])])])])
  
@@ -40,3 +51,11 @@ $NetBSD$
  
  ### Check for desktop notification support
  ### Linux/FreeBSD require libnotify
+@@ -317,6 +303,7 @@ AC_CHECK_LIB([expect], [main], [AM_CONDI
+ ### Check for ncursesw/ncurses.h first, Arch linux uses ncurses.h for ncursesw
+ AC_CHECK_HEADERS([ncursesw/ncurses.h], [], [])
+ AC_CHECK_HEADERS([ncurses.h], [], [])
++AC_CHECK_HEADERS([curses.h], [], [])
+ 
+ ### Default parameters
+ AM_CFLAGS="-Wall -Wno-deprecated-declarations"
diff --git a/profanity/patches/patch-src_common.c b/profanity/patches/patch-src_common.c
new file mode 100644
index 0000000000..a744f0d94d
--- /dev/null
+++ b/profanity/patches/patch-src_common.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Add support for curses(3).
+
+--- src/common.c.orig	2017-01-28 21:10:04.000000000 +0000
++++ src/common.c
+@@ -51,6 +51,8 @@
+ #include <ncursesw/ncurses.h>
+ #elif HAVE_NCURSES_H
+ #include <ncurses.h>
++#elif HAVE_CURSES_H
++#include <curses.h>
+ #endif
+ 
+ #include "log.h"
diff --git a/profanity/patches/patch-src_config.h.in b/profanity/patches/patch-src_config.h.in
new file mode 100644
index 0000000000..3559782bf5
--- /dev/null
+++ b/profanity/patches/patch-src_config.h.in
@@ -0,0 +1,26 @@
+$NetBSD$
+
+Add support for curses(3).
+
+--- src/config.h.in.orig	2017-01-28 21:11:20.000000000 +0000
++++ src/config.h.in
+@@ -6,6 +6,9 @@
+ /* C support */
+ #undef HAVE_C
+ 
++/* Define to 1 if you have the <curses.h> header file. */
++#undef HAVE_CURSES_H
++
+ /* Define to 1 if you have the <dlfcn.h> header file. */
+ #undef HAVE_DLFCN_H
+ 
+@@ -21,6 +24,9 @@
+ /* Define to 1 if you have the `curl' library (-lcurl). */
+ #undef HAVE_LIBCURL
+ 
++/* Define to 1 if you have the `curses' library (-lcurses). */
++#undef HAVE_LIBCURSES
++
+ /* Have libgpgme */
+ #undef HAVE_LIBGPGME
+ 
diff --git a/profanity/patches/patch-src_config_theme.c b/profanity/patches/patch-src_config_theme.c
new file mode 100644
index 0000000000..267016de8c
--- /dev/null
+++ b/profanity/patches/patch-src_config_theme.c
@@ -0,0 +1,19 @@
+$NetBSD$
+
+Add support for curses(3).
+
+--- src/config/theme.c.orig	2017-01-28 21:10:04.000000000 +0000
++++ src/config/theme.c
+@@ -43,6 +43,12 @@
+ #include <ncursesw/ncurses.h>
+ #elif HAVE_NCURSES_H
+ #include <ncurses.h>
++#elif HAVE_CURSES_H
++#include <curses.h>
++#endif
++
++#ifndef NCURSES_COLOR_T
++#define NCURSES_COLOR_T short
+ #endif
+ 
+ #include "common.h"
diff --git a/profanity/patches/patch-src_ui_buffer.c b/profanity/patches/patch-src_ui_buffer.c
new file mode 100644
index 0000000000..01a2d6b23c
--- /dev/null
+++ b/profanity/patches/patch-src_ui_buffer.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Add support for curses(3).
+
+--- src/ui/buffer.c.orig	2017-01-28 21:10:04.000000000 +0000
++++ src/ui/buffer.c
+@@ -44,6 +44,8 @@
+ #include <ncursesw/ncurses.h>
+ #elif HAVE_NCURSES_H
+ #include <ncurses.h>
++#elif HAVE_CURSES_H
++#include <curses.h>
+ #endif
+ 
+ #include "ui/window.h"
diff --git a/profanity/patches/patch-src_ui_console.c b/profanity/patches/patch-src_ui_console.c
new file mode 100644
index 0000000000..659f58d725
--- /dev/null
+++ b/profanity/patches/patch-src_ui_console.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Add support for curses(3).
+
+--- src/ui/console.c.orig	2017-01-28 21:10:04.000000000 +0000
++++ src/ui/console.c
+@@ -41,6 +41,8 @@
+ #include <ncursesw/ncurses.h>
+ #elif HAVE_NCURSES_H
+ #include <ncurses.h>
++#elif HAVE_CURSES_H
++#include <curses.h>
+ #endif
+ 
+ #include "common.h"
diff --git a/profanity/patches/patch-src_ui_core.c b/profanity/patches/patch-src_ui_core.c
new file mode 100644
index 0000000000..7212c4a1f8
--- /dev/null
+++ b/profanity/patches/patch-src_ui_core.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Add support for curses(3).
+
+--- src/ui/core.c.orig	2017-01-28 21:10:04.000000000 +0000
++++ src/ui/core.c
+@@ -54,6 +54,8 @@
+ #include <ncursesw/ncurses.h>
+ #elif HAVE_NCURSES_H
+ #include <ncurses.h>
++#elif HAVE_CURSES_H
++#include <curses.h>
+ #endif
+ 
+ #include "log.h"
diff --git a/profanity/patches/patch-src_ui_inputwin.c b/profanity/patches/patch-src_ui_inputwin.c
new file mode 100644
index 0000000000..2d1079e71b
--- /dev/null
+++ b/profanity/patches/patch-src_ui_inputwin.c
@@ -0,0 +1,25 @@
+$NetBSD$
+
+Add support for curses(3).
+
+--- src/ui/inputwin.c.orig	2019-06-10 12:19:05.000000000 +0000
++++ src/ui/inputwin.c
+@@ -51,6 +51,8 @@
+ #include <ncursesw/ncurses.h>
+ #elif HAVE_NCURSES_H
+ #include <ncurses.h>
++#elif HAVE_CURSES_H
++#include <curses.h>
+ #endif
+ 
+ #include "profanity.h"
+@@ -285,7 +287,8 @@ _inp_win_update_virtual(void)
+ {
+     int wcols = getmaxx(stdscr);
+     int row = screen_inputwin_row();
+-    pnoutrefresh(inp_win, 0, pad_start, row, 0, row, wcols-2);
++    if (inp_win != NULL)
++        pnoutrefresh(inp_win, 0, pad_start, row, 0, row, wcols-2);
+ }
+ 
+ static void
diff --git a/profanity/patches/patch-src_ui_screen.c b/profanity/patches/patch-src_ui_screen.c
new file mode 100644
index 0000000000..44268f8054
--- /dev/null
+++ b/profanity/patches/patch-src_ui_screen.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/ui/screen.c.orig	2019-06-10 12:19:05.000000000 +0000
++++ src/ui/screen.c
+@@ -38,6 +38,8 @@
+ #include <ncursesw/ncurses.h>
+ #elif HAVE_NCURSES_H
+ #include <ncurses.h>
++#elif HAVE_CURSES_H
++#include <curses.h>
+ #endif
+ 
+ #include "config/preferences.h"
diff --git a/profanity/patches/patch-src_ui_statusbar.c b/profanity/patches/patch-src_ui_statusbar.c
new file mode 100644
index 0000000000..bb1b8418d8
--- /dev/null
+++ b/profanity/patches/patch-src_ui_statusbar.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Add support for curses(3).
+
+--- src/ui/statusbar.c.orig	2017-01-28 21:10:04.000000000 +0000
++++ src/ui/statusbar.c
+@@ -42,6 +42,8 @@
+ #include <ncursesw/ncurses.h>
+ #elif HAVE_NCURSES_H
+ #include <ncurses.h>
++#elif HAVE_CURSES_H
++#include <curses.h>
+ #endif
+ 
+ #include "config/theme.h"
diff --git a/profanity/patches/patch-src_ui_win__types.h b/profanity/patches/patch-src_ui_win__types.h
new file mode 100644
index 0000000000..4e334e6c3a
--- /dev/null
+++ b/profanity/patches/patch-src_ui_win__types.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Add support for curses(3).
+
+--- src/ui/win_types.h.orig	2017-01-28 21:10:04.000000000 +0000
++++ src/ui/win_types.h
+@@ -44,6 +44,8 @@
+ #include <ncursesw/ncurses.h>
+ #elif HAVE_NCURSES_H
+ #include <ncurses.h>
++#elif HAVE_CURSES_H
++#include <curses.h>
+ #endif
+ 
+ #include "tools/autocomplete.h"
diff --git a/profanity/patches/patch-src_ui_window.c b/profanity/patches/patch-src_ui_window.c
new file mode 100644
index 0000000000..79337b6c1d
--- /dev/null
+++ b/profanity/patches/patch-src_ui_window.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Add support for curses(3).
+
+--- src/ui/window.c.orig	2017-01-28 21:10:04.000000000 +0000
++++ src/ui/window.c
+@@ -46,6 +46,8 @@
+ #include <ncursesw/ncurses.h>
+ #elif HAVE_NCURSES_H
+ #include <ncurses.h>
++#elif HAVE_CURSES_H
++#include <curses.h>
+ #endif
+ 
+ #include "config/theme.h"
diff --git a/profanity/patches/patch-src_ui_window.h b/profanity/patches/patch-src_ui_window.h
new file mode 100644
index 0000000000..3a5ecccd74
--- /dev/null
+++ b/profanity/patches/patch-src_ui_window.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Add support for curses(3).
+
+--- src/ui/window.h.orig	2017-01-28 21:10:04.000000000 +0000
++++ src/ui/window.h
+@@ -43,6 +43,8 @@
+ #include <ncursesw/ncurses.h>
+ #elif HAVE_NCURSES_H
+ #include <ncurses.h>
++#elif HAVE_CURSES_H
++#include <curses.h>
+ #endif
+ 
+ #include "ui/ui.h"
Prev by Date: profanity: Readd `==' vs `=' test(1) hunk and document patch-configure.ac
Next by Date: wip/gnunet: Update to 0.11.6
Previous by Thread: profanity: Readd `==' vs `=' test(1) hunk and document patch-configure.ac
Next by Thread: wip/gnunet: Update to 0.11.6
Indexes:
Home | Main Index | Thread Index | Old Index