pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

profanity 0.7.0

Module Name:	pkgsrc-wip
Committed By:	Jonathan Schleifer <js%heap.zone@localhost>
Pushed By:	js
Date:		Sun Sep 8 14:21:44 2019 +0200
Changeset:	0c6d8b51cb340ac9f73c0c50399426f9349d7faa

Modified Files:
	profanity/Makefile
	profanity/PLIST
	profanity/distinfo
	profanity/patches/patch-configure.ac
Removed 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_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 0.7.0

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

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

diffstat:
 profanity/Makefile                          |  7 ++---
 profanity/PLIST                             |  1 +
 profanity/distinfo                          | 21 +++----------
 profanity/patches/patch-configure.ac        | 49 ++++++++---------------------
 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_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 ---------
 15 files changed, 22 insertions(+), 246 deletions(-)

diffs:
diff --git a/profanity/Makefile b/profanity/Makefile
index 06e8c88bd0..d6b33592f7 100644
--- a/profanity/Makefile
+++ b/profanity/Makefile
@@ -1,12 +1,11 @@
 # $NetBSD$
 
-DISTNAME=	profanity-0.5.1
-PKGREVISION=	2
+DISTNAME=	profanity-0.7.0
 CATEGORIES=	chat
-MASTER_SITES=	http://www.profanity.im/
+MASTER_SITES=	http://profanity-im.github.io/
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	http://www.profanity.im/
+HOMEPAGE=	http://profanity-im.github.io/
 COMMENT=	Console based XMPP client inspired by irssi
 LICENSE=	gnu-gpl-v3
 
diff --git a/profanity/PLIST b/profanity/PLIST
index 230dea9da5..7835a4ca46 100644
--- a/profanity/PLIST
+++ b/profanity/PLIST
@@ -9,6 +9,7 @@ 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
diff --git a/profanity/distinfo b/profanity/distinfo
index 4852fa64ba..63ba1909fa 100644
--- a/profanity/distinfo
+++ b/profanity/distinfo
@@ -1,18 +1,7 @@
 $NetBSD$
 
-SHA1 (profanity-0.5.1.tar.gz) = b53cac6ae205eae09537d0d855ee92aca9541221
-RMD160 (profanity-0.5.1.tar.gz) = 5ce5f5cb21ceb78ed55d4ca30e285aa9e2cc34ad
-SHA512 (profanity-0.5.1.tar.gz) = fcafa7e1dcf0948d7fa30ba33665e1ec0e8bb9e0246df2d1cf3fe5d7f2bd25b07fa2cb0fd383ee23fc720850ff295159537567f175c21f1c93f50da0099e209d
-Size (profanity-0.5.1.tar.gz) = 691508 bytes
-SHA1 (patch-configure.ac) = f16f95aa1bc4ef9eee36d5e89a2ffc707371a4cb
-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) = 0db3e6ad0fb8f4f3749052d94e15e1651a41a085
-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
+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) = 4d9d60f2a354cae7f9c817a6afdd4ba1027d9ec1
diff --git a/profanity/patches/patch-configure.ac b/profanity/patches/patch-configure.ac
index 37c696d425..cafe322f21 100644
--- a/profanity/patches/patch-configure.ac
+++ b/profanity/patches/patch-configure.ac
@@ -1,53 +1,30 @@
 $NetBSD$
 
-chunk 1: test(1) operator portability
-chunk 2: Add support for curses(3)
-chunk 3: simplify check for readline
-
---- configure.ac.orig	2017-01-28 21:10:55.000000000 +0000
+--- configure.ac.orig	2019-07-31 08:53:34.000000000 +0000
 +++ configure.ac
-@@ -78,7 +78,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)
--    if test "$PYTHON_CONFIG_EXISTS" == "yes"; then
-+    if test "$PYTHON_CONFIG_EXISTS" = "yes"; then
-         AX_PYTHON_DEVEL
-         AM_CONDITIONAL([BUILD_PYTHON_API], [true])
-         AC_DEFINE([HAVE_PYTHON], [1], [Python support])
-@@ -135,7 +135,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"
- 
-@@ -172,15 +173,8 @@ AS_IF([test "x$enable_icons" != xno],
+@@ -179,23 +179,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])])])])
  
--AS_IF([test "x$PLATFORM" != xosx],
--    [AC_CHECK_LIB([readline], [main], [],
--        [AC_MSG_ERROR([libreadline is required for profanity])])],
+-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
-@@ -280,6 +274,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
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
deleted file mode 100644
index 73135ff99d..0000000000
--- a/profanity/patches/patch-src_ui_inputwin.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-Add support for curses(3).
-
---- src/ui/inputwin.c.orig	2017-01-28 21:10:04.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"
-@@ -282,7 +284,8 @@ _inp_win_update_virtual(void)
- {
-     int wrows, wcols;
-     getmaxyx(stdscr, wrows, wcols);
--    pnoutrefresh(inp_win, 0, pad_start, wrows-1, 0, wrows-1, wcols-2);
-+    if (inp_win != NULL)
-+	    pnoutrefresh(inp_win, 0, pad_start, wrows-1, 0, wrows-1, wcols-2);
- }
- 
- static void
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
deleted file mode 100644
index 79337b6c1d..0000000000
--- a/profanity/patches/patch-src_ui_window.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
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