pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Remove libmesode, profanity. Imported.
Module Name: pkgsrc-wip
Committed By: nia <nia%netbsd.org@localhost>
Pushed By: nee
Date: Sat Sep 5 11:15:07 2020 +0200
Changeset: 550a18dd2cc99da6d98d5f59aa9952318fd38bb0
Modified Files:
Makefile
profanity/patches/patch-configure.ac
profanity/patches/patch-src_ui_inputwin.c
profanity/patches/patch-src_ui_window.c
Removed Files:
libmesode/DESCR
libmesode/Makefile
libmesode/PLIST
libmesode/buildlink3.mk
libmesode/distinfo
libmesode/patches/patch-configure.ac
profanity/DESCR
profanity/Makefile
profanity/PLIST
profanity/TODO
profanity/distinfo
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_screen.c
profanity/patches/patch-src_ui_statusbar.c
profanity/patches/patch-src_ui_win__types.h
profanity/patches/patch-src_ui_window.h
Log Message:
Remove libmesode, profanity. Imported.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=550a18dd2cc99da6d98d5f59aa9952318fd38bb0
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 2 -
libmesode/DESCR | 6 ---
libmesode/Makefile | 27 -----------
libmesode/PLIST | 4 --
libmesode/buildlink3.mk | 16 -------
libmesode/distinfo | 7 ---
libmesode/patches/patch-configure.ac | 20 ---------
profanity/DESCR | 2 -
profanity/Makefile | 39 ----------------
profanity/PLIST | 27 -----------
profanity/TODO | 5 ---
profanity/distinfo | 19 --------
profanity/patches/patch-configure.ac | 70 +++++++++--------------------
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 | 18 +++-----
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 | 27 ++++++-----
profanity/patches/patch-src_ui_window.h | 15 -------
25 files changed, 42 insertions(+), 410 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 0e49840c4c..8d323d2a4c 100644
--- a/Makefile
+++ b/Makefile
@@ -1921,7 +1921,6 @@ SUBDIR+= liblas
SUBDIR+= liblingoteach
SUBDIR+= libltc
SUBDIR+= libm4ri
-SUBDIR+= libmesode
SUBDIR+= libmirisdr-git
SUBDIR+= libmobi-git
SUBDIR+= libmpack
@@ -3020,7 +3019,6 @@ SUBDIR+= probcons
SUBDIR+= probe
SUBDIR+= procps
SUBDIR+= prodigal
-SUBDIR+= profanity
SUBDIR+= progman-git
SUBDIR+= progreiserfs
SUBDIR+= proj
diff --git a/libmesode/DESCR b/libmesode/DESCR
deleted file mode 100644
index 365db94a98..0000000000
--- a/libmesode/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-libmesode is a libstrophe fork.
-
-libstrophe is a minimal XMPP library written in C. It has almost no
-external dependencies, only an XML parsing library (expat or libxml are
-both supported).
-It is designed for both POSIX and Windows systems.
diff --git a/libmesode/Makefile b/libmesode/Makefile
deleted file mode 100644
index c2580e2335..0000000000
--- a/libmesode/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD$
-
-DISTNAME= libmesode-0.9.3
-CATEGORIES= chat
-MASTER_SITES= ${MASTER_SITE_GITHUB:=profanity-im/}
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://github.com/boothj5/libmesode
-COMMENT= Fork of libstrophe
-LICENSE= mit OR gnu-gpl-v3
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= autoconf automake autoreconf pkg-config
-USE_LANGUAGES= c c++
-
-CONFIGURE_ARGS+= --with-libxml2
-
-PKGCONFIG_OVERRIDE+= libmesode.pc.in
-
-pre-configure:
- cd ${WRKSRC} && autoreconf -i
-
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/libmesode/PLIST b/libmesode/PLIST
deleted file mode 100644
index 016e20b171..0000000000
--- a/libmesode/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD$
-include/mesode.h
-lib/libmesode.la
-lib/pkgconfig/libmesode.pc
diff --git a/libmesode/buildlink3.mk b/libmesode/buildlink3.mk
deleted file mode 100644
index 40f3fed590..0000000000
--- a/libmesode/buildlink3.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+= libmesode
-
-.if !defined(LIBMESODE_BUILDLINK3_MK)
-LIBMESODE_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.libmesode+= libmesode>=0.9.1
-BUILDLINK_PKGSRCDIR.libmesode?= ../../wip/libmesode
-
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.endif # LIBMESODE_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -libmesode
diff --git a/libmesode/distinfo b/libmesode/distinfo
deleted file mode 100644
index 648a33d281..0000000000
--- a/libmesode/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD$
-
-SHA1 (libmesode-0.9.3.tar.gz) = 1c6e12c38d02082cb2c0310a0868cf78828fd496
-RMD160 (libmesode-0.9.3.tar.gz) = 84864b542e703b0768ffeb31efe6ee1aeb95c4a9
-SHA512 (libmesode-0.9.3.tar.gz) = 572b51d762a9b7eabf8d49106219eb60613c054ac35915a54eb43ff153e434bc08c32003bc9d2277a679f246f90973bb0b47ac93af7cffcdbae07af4d2af3db8
-Size (libmesode-0.9.3.tar.gz) = 149584 bytes
-SHA1 (patch-configure.ac) = 72f6d77a9f0edbe6f681bb872e7f0ce1fefe210a
diff --git a/libmesode/patches/patch-configure.ac b/libmesode/patches/patch-configure.ac
deleted file mode 100644
index f36ceba548..0000000000
--- a/libmesode/patches/patch-configure.ac
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-Fix quoting.
-
---- configure.ac.orig 2016-09-17 16:34:38.000000000 +0000
-+++ configure.ac
-@@ -18,11 +18,11 @@ AS_CASE([$host_os],
- [PLATFORM="nix"])
-
- PKG_CHECK_MODULES([expat], [expat >= 2.0.0],
-- [PC_REQUIRES+=(expat)],
-+ [PC_REQUIRES+=expat],
- [AC_CHECK_HEADER([expat.h],
- [
- expat_LIBS="-lexpat"
-- PC_LIBS+=($expat_LIBS)
-+ PC_LIBS+=$expat_LIBS
- ],
- [AC_MSG_ERROR([expat not found; expat required.])]
- )
diff --git a/profanity/DESCR b/profanity/DESCR
deleted file mode 100644
index 14532e55d2..0000000000
--- a/profanity/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Profanity is a simple lightweight console based XMPP chat client.
-Its emphasis is on having a simple and configurable command driven UI.
diff --git a/profanity/Makefile b/profanity/Makefile
deleted file mode 100644
index 578c67fcae..0000000000
--- a/profanity/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# $NetBSD$
-
-DISTNAME= profanity-0.8.1
-CATEGORIES= chat
-MASTER_SITES= http://profanity-im.github.io/
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://profanity-im.github.io/
-COMMENT= Console based XMPP client inspired by irssi
-LICENSE= gnu-gpl-v3
-
-USE_TOOLS+= autoconf
-
-AUTOCONF_REQD= 2.69
-GNU_CONFIGURE= yes
-USE_TOOLS+= pkg-config
-
-# XXX: python-config and python are not properly checked in configure
-#CONFIGURE_ARGS+= --enable-plugins
-#CONFIGURE_ARGS+= --enable-c-plugins
-#CONFIGURE_ARGS+= --enable-python-plugins
-CONFIGURE_ARGS+= --enable-omemo
-
-pre-configure:
- cd ${WRKSRC} && autoconf
-
-.include "../../chat/libsignal-protocol-c/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libuuid/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libmesode+= libmesode>=0.9.1
-.include "../../wip/libmesode/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-#.include "../../lang/python/application.mk"
-.include "../../www/curl/buildlink3.mk"
-.include "../../chat/libotr/buildlink3.mk"
-.include "../../mk/curses.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/profanity/PLIST b/profanity/PLIST
deleted file mode 100644
index 2a6bb18562..0000000000
--- a/profanity/PLIST
+++ /dev/null
@@ -1,27 +0,0 @@
-@comment $NetBSD$
-bin/profanity
-man/man1/profanity.1
-share/profanity/icons/proIcon.png
-share/profanity/icons/proIconMsg.png
-share/profanity/themes/aqua
-share/profanity/themes/batman
-share/profanity/themes/bios
-share/profanity/themes/boothj5
-share/profanity/themes/boothj5_laptop
-share/profanity/themes/boothj5_slack
-share/profanity/themes/complex
-share/profanity/themes/forest
-share/profanity/themes/gruvbox
-share/profanity/themes/hacker
-share/profanity/themes/headache
-share/profanity/themes/joker
-share/profanity/themes/mono
-share/profanity/themes/orange
-share/profanity/themes/original
-share/profanity/themes/original_bright
-share/profanity/themes/shade
-share/profanity/themes/simple
-share/profanity/themes/solarized-dark
-share/profanity/themes/solarized-light
-share/profanity/themes/spawn
-share/profanity/themes/whiteness
diff --git a/profanity/TODO b/profanity/TODO
deleted file mode 100644
index cb97ee0495..0000000000
--- a/profanity/TODO
+++ /dev/null
@@ -1,5 +0,0 @@
-- Review curses(3) patches
-- Check if also non-monochromatic themes work
-- Re-enable Python support if handy or add a `python' option for it
- (python-config and python are not found in the configure phase and needs to
- be fixed)
diff --git a/profanity/distinfo b/profanity/distinfo
deleted file mode 100644
index 690eb27dfd..0000000000
--- a/profanity/distinfo
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-SHA1 (profanity-0.8.1.tar.gz) = 2c95e0989618091abfa4cfb67325cab3ddf53e83
-RMD160 (profanity-0.8.1.tar.gz) = 373705d3d9612cf31103d5b855270833c97e737e
-SHA512 (profanity-0.8.1.tar.gz) = e8ddfd13c4f2cd712c0cafe44f243c1dc81bdd39ae152609c4528364a81d70315e6a260725de288acbe8c1729d37397e25d1863d50e43163bac00ad34702fe40
-Size (profanity-0.8.1.tar.gz) = 809405 bytes
-SHA1 (patch-configure.ac) = dd92e85a314c92771febb20893cdb5cdefbd93bb
-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 c541acf6e0..c27aefe670 100644
--- a/profanity/patches/patch-configure.ac
+++ b/profanity/patches/patch-configure.ac
@@ -1,12 +1,19 @@
$NetBSD$
-- Use `=' operator for test(1)
-- Simplify check for readline
-- Add support for curses(3)
+- Add NetBSD as a non-libdl platform.
+- Fix == usage.
---- configure.ac.orig 2020-02-07 20:47:31.000000000 +0000
+--- configure.ac.orig 2020-07-01 16:49:19.000000000 +0000
+++ configure.ac
-@@ -81,7 +81,7 @@ elif test "x$enable_python_plugins" != x
+@@ -22,6 +22,7 @@ AC_CANONICAL_HOST
+ PLATFORM="unknown"
+ AS_CASE([$host_os],
+ [freebsd*], [PLATFORM="freebsd"],
++ [netbsd*], [PLATFORM="netbsd"],
+ [openbsd*], [PLATFORM="openbsd"],
+ [darwin*], [PLATFORM="osx"],
+ [cygwin], [PLATFORM="cygwin"],
+@@ -81,7 +82,7 @@ elif test "x$enable_python_plugins" != x
rm -f Python.framework
ln -s $PYTHON_FRAMEWORK Python.framework ])
AC_CHECK_PROG(PYTHON_CONFIG_EXISTS, python-config, yes, no)
@@ -15,47 +22,12 @@ $NetBSD$
AX_PYTHON_DEVEL
AM_CONDITIONAL([BUILD_PYTHON_API], [true])
AC_DEFINE([HAVE_PYTHON], [1], [Python support])
-@@ -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"
-
-@@ -182,23 +183,8 @@ AS_IF([test "x$enable_icons_and_clipboar
- [AC_MSG_ERROR([gtk+-2.0 or higher is required for icons])],
- [AC_MSG_NOTICE([gtk+-2.0 not found, icons and clipboard not enabled])])])])
-
--AS_IF([test "x$PLATFORM" = xosx],
-- [AC_CHECK_FILE([/usr/local/opt/readline/lib],
-- [LIBS="-lreadline $LIBS"
-- AM_CPPFLAGS="-I/usr/local/opt/readline/include $AM_CPPFLAGS"
-- AM_LDFLAGS="-L/usr/local/opt/readline/lib $AM_LDFLAGS"
-- AC_SUBST(AM_LDFLAGS)],
-- [AC_MSG_ERROR([libreadline is required for profanity])])],
--
-- [test "x$PLATFORM" = xopenbsd],
-- [AC_CHECK_FILE([/usr/local/include/ereadline],
-- [LIBS="-lereadline $LIBS"
-- AM_CPPFLAGS="-I/usr/local/include/ereadline $AM_CPPFLAGS"
-- AM_LDFLAGS="-L/usr/local/lib $AM_LDFLAGS"
-- AC_SUBST(AM_LDFLAGS)])],
--
-- [AC_CHECK_LIB([readline], [main], [],
-- [AC_MSG_ERROR([libreadline is required for profanity])])])
-+AC_CHECK_LIB([readline], [main], [],
-+ [AC_MSG_ERROR([libreadline is required for profanity])])
-
- ### Check for desktop notification support
- ### Linux/FreeBSD require libnotify
-@@ -320,6 +306,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"
+@@ -108,7 +109,7 @@ else
+ elif test "x$enable_c_plugins" != xno; then
+ # libdl doesn't exist as a separate library in OpenBSD/FreeBSD and is
+ # provided in the standard libraries.
+- AS_IF([test "x$PLATFORM" = xopenbsd -o "x$PLATFORM" = xfreebsd],
++ AS_IF([test "x$PLATFORM" = xopenbsd -o "x$PLATFORM" = xfreebsd -o "x$PLATFORM" = xnetbsd],
+ [AM_CONDITIONAL([BUILD_C_API], [true]) AC_DEFINE([HAVE_C], [1], [C support])],
+ [AC_CHECK_LIB([dl], [main],
+ [AM_CONDITIONAL([BUILD_C_API], [true]) LIBS="$LIBS -ldl" AC_DEFINE([HAVE_C], [1], [C support])],
diff --git a/profanity/patches/patch-src_common.c b/profanity/patches/patch-src_common.c
deleted file mode 100644
index a744f0d94d..0000000000
--- a/profanity/patches/patch-src_common.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index 3559782bf5..0000000000
--- a/profanity/patches/patch-src_config.h.in
+++ /dev/null
@@ -1,26 +0,0 @@
-$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
deleted file mode 100644
index 267016de8c..0000000000
--- a/profanity/patches/patch-src_config_theme.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$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
deleted file mode 100644
index 01a2d6b23c..0000000000
--- a/profanity/patches/patch-src_ui_buffer.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index 659f58d725..0000000000
--- a/profanity/patches/patch-src_ui_console.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index 7212c4a1f8..0000000000
--- a/profanity/patches/patch-src_ui_core.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
index 2d1079e71b..8d7f3d7728 100644
--- a/profanity/patches/patch-src_ui_inputwin.c
+++ b/profanity/patches/patch-src_ui_inputwin.c
@@ -1,25 +1,17 @@
$NetBSD$
-Add support for curses(3).
+Prevent NetBSD libcurses from dereferencing a null pointer.
---- src/ui/inputwin.c.orig 2019-06-10 12:19:05.000000000 +0000
+--- src/ui/inputwin.c.orig 2020-06-29 15:43:33.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)
+@@ -307,7 +307,9 @@ _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)
++ 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
deleted file mode 100644
index 44268f8054..0000000000
--- a/profanity/patches/patch-src_ui_screen.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index bb1b8418d8..0000000000
--- a/profanity/patches/patch-src_ui_statusbar.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index 4e334e6c3a..0000000000
--- a/profanity/patches/patch-src_ui_win__types.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
index 79337b6c1d..b2a08c3869 100644
--- a/profanity/patches/patch-src_ui_window.c
+++ b/profanity/patches/patch-src_ui_window.c
@@ -1,15 +1,20 @@
$NetBSD$
-Add support for curses(3).
+Prevent NetBSD libcurses from dereferencing a null pointer.
---- src/ui/window.c.orig 2017-01-28 21:10:04.000000000 +0000
+--- src/ui/window.c.orig 2020-07-01 16:49:19.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"
+@@ -1858,7 +1858,12 @@ win_sub_print(WINDOW *win, char *msg, gb
+ void
+ win_sub_newline_lazy(WINDOW *win)
+ {
+- int curx = getcurx(win);
++ int curx;
++
++ if (win == NULL) {
++ return;
++ }
++ curx = getcurx(win);
+ if (curx > 0) {
+ int cury = getcury(win);
+ wmove(win, cury+1, 0);
diff --git a/profanity/patches/patch-src_ui_window.h b/profanity/patches/patch-src_ui_window.h
deleted file mode 100644
index 3a5ecccd74..0000000000
--- a/profanity/patches/patch-src_ui_window.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$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"
Home |
Main Index |
Thread Index |
Old Index