NetBSD Problem Report #55673

From www@netbsd.org  Mon Sep 21 00:43:09 2020
Return-Path: <www@netbsd.org>
Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified))
	by mollari.NetBSD.org (Postfix) with ESMTPS id 6A1041A9217
	for <gnats-bugs@gnats.NetBSD.org>; Mon, 21 Sep 2020 00:43:09 +0000 (UTC)
Message-Id: <20200921004308.6DFD11A9239@mollari.NetBSD.org>
Date: Mon, 21 Sep 2020 00:43:08 +0000 (UTC)
From: snow@datagirl.xyz
Reply-To: snow@datagirl.xyz
To: gnats-bugs@NetBSD.org
Subject: Add optional feature support to chat/profanity
X-Send-Pr-Version: www-1.0

>Number:         55673
>Category:       pkg
>Synopsis:       Add optional feature support to chat/profanity
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          closed
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Sep 21 00:45:00 +0000 2020
>Closed-Date:    Thu Jan 14 12:50:39 +0000 2021
>Last-Modified:  Thu Jan 14 12:55:01 +0000 2021
>Originator:     snow flurry
>Release:        trunk (2020-09-20)
>Organization:
>Environment:

>Description:
Profanity has additional support for desktop notifications (via libnotify), a tray icon (via gtk2+), and auto-away on screen lock (via libXScrnSaver), but additional dependencies are needed than what is included in chat/profanity-0.9.5.
>How-To-Repeat:

>Fix:
The following patch provides this support via PKG_OPTIONS.profanity, since they all rely on X11 and the package as-is doesn't. This also adds NetBSD as a libnotify platform in patch-configure.ac.

--- a/chat/profanity/Makefile
+++ b/chat/profanity/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.2 2020/09/08 19:13:49 nia Exp $

 DISTNAME=	profanity-0.9.5
+PKGREVISION=	1
 CATEGORIES=	chat
 MASTER_SITES=	https://profanity-im.github.io/

@@ -30,6 +31,8 @@ CONFIGURE_ARGS+=	--enable-c-plugins
 CONFIGURE_ARGS+=	--enable-python-plugins
 CONFIGURE_ARGS+=	--enable-omemo

+.include "options.mk"
+
 pre-configure:
 	cd ${WRKSRC} && autoconf

diff --git a/chat/profanity/distinfo b/chat/profanity/distinfo
index 137ae7d96..0be9b1784 100644
--- a/chat/profanity/distinfo
+++ b/chat/profanity/distinfo
@@ -4,7 +4,7 @@ SHA1 (profanity-0.9.5.tar.gz) = 88f3bcb483f25710cb35ab3e3f227f11b5d1225a
 RMD160 (profanity-0.9.5.tar.gz) = 39c0a1b7f50e5000bfc649a0461d7f2d45230b16
 SHA512 (profanity-0.9.5.tar.gz) = 79305ee488d3a9b87bb422d6525bfaae62c4969d466b968c86941ed5bf0c0080e349758f2e1ead144693513b5d19a635372e73aa1fe9e362836b9245e1d2b898
 Size (profanity-0.9.5.tar.gz) = 830966 bytes
-SHA1 (patch-configure.ac) = 7f3ec4182d82cb6836d4e0ecb0b023e56ce3b91d
+SHA1 (patch-configure.ac) = d7d07f7c62755bc46e318df216932d7273a0c34c
 SHA1 (patch-src_ui_inputwin.c) = ccdfc1b1fe932ba09eafaf54ed10af453b1a6c80
 SHA1 (patch-src_ui_rosterwin.c) = 1e31cbd7dc0bdaebe9e3fcddbecceeb60b70faf2
 SHA1 (patch-src_ui_window.c) = 5844f276517260beb2ea767523f44c46d6b562d2
diff --git a/chat/profanity/options.mk b/chat/profanity/options.mk
new file mode 100644
index 000000000..a665ff46c
--- /dev/null
+++ b/chat/profanity/options.mk
@@ -0,0 +1,23 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.profanity
+PKG_SUPPORTED_OPTIONS=	libnotify gtk2 xscrnsaver
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.options.mk"
+
+# gtk2
+.if !empty(PKG_OPTIONS:Mgtk2)
+.include "../../x11/gtk2/buildlink3.mk"
+.endif
+
+# libnotify
+.if !empty(PKG_OPTIONS:Mlibnotify)
+.include "../../sysutils/libnotify/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-notifications
+.endif
+
+# xscrnsaver
+.if !empty(PKG_OPTIONS:Mxscrnsaver)
+.include "../../x11/libXScrnSaver/buildlink3.mk"
+.endif
diff --git a/chat/profanity/patches/patch-configure.ac b/chat/profanity/patches/patch-configure.ac
index 8e02c4d32..f68ac1619 100644
--- a/chat/profanity/patches/patch-configure.ac
+++ b/chat/profanity/patches/patch-configure.ac
@@ -1,10 +1,11 @@
-$NetBSD: patch-configure.ac,v 1.2 2020/09/11 20:44:17 js Exp $
+$NetBSD$

 - Add NetBSD as a non-libdl platform.
 - Fix == usage.
 - Remove hardcoded homebrew path on macOS.
+- Add NetBSD as a libnotify platform.

---- configure.ac.orig	2020-07-01 16:49:19.000000000 +0000
+--- configure.ac.orig	2020-09-19 01:06:20.595094431 +0000
 +++ configure.ac
 @@ -22,6 +22,7 @@ AC_CANONICAL_HOST
  PLATFORM="unknown"
@@ -49,3 +50,12 @@ $NetBSD: patch-configure.ac,v 1.2 2020/09/11 20:44:17 js Exp $
        [AC_CHECK_FILE([/usr/local/include/ereadline],
            [LIBS="-lereadline $LIBS"
                AM_CPPFLAGS="-I/usr/local/include/ereadline $AM_CPPFLAGS"
+@@ -246,7 +239,7 @@ AS_IF([test "x$PLATFORM" = xosx],
+                     [AC_MSG_ERROR([terminal-notifier not found, required for desktop notifications.])],
+                     [AC_MSG_NOTICE([Desktop notifications not supported.])])],
+                 [AC_DEFINE([HAVE_OSXNOTIFY], [1], [terminal notifier])])])],
+-    [test "x$PLATFORM" = xnix -o "x$PLATFORM" = xfreebsd],
++    [test "x$PLATFORM" = xnix -o "x$PLATFORM" = xfreebsd -o "x$PLATFORM" = xnetbsd],
+         [AS_IF([test "x$enable_notifications" != xno],
+             [PKG_CHECK_MODULES([libnotify], [libnotify],
+                 [AC_DEFINE([HAVE_LIBNOTIFY], [1], [libnotify module])],

>Release-Note:

>Audit-Trail:

State-Changed-From-To: open->closed
State-Changed-By: nia@NetBSD.org
State-Changed-When: Thu, 14 Jan 2021 12:50:39 +0000
State-Changed-Why:
applied, thanks!


From: "Nia Alarie" <nia@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/55673 CVS commit: pkgsrc/chat/profanity
Date: Thu, 14 Jan 2021 12:50:25 +0000

 Module Name:	pkgsrc
 Committed By:	nia
 Date:		Thu Jan 14 12:50:25 UTC 2021

 Modified Files:
 	pkgsrc/chat/profanity: Makefile distinfo
 	pkgsrc/chat/profanity/patches: patch-configure.ac
 Added Files:
 	pkgsrc/chat/profanity: options.mk

 Log Message:
 profanity: add some optional (off-by-default) GUI features.

 Patch provided by snow flurry in PR pkg/55673


 To generate a diff of this commit:
 cvs rdiff -u -r1.5 -r1.6 pkgsrc/chat/profanity/Makefile
 cvs rdiff -u -r1.2 -r1.3 pkgsrc/chat/profanity/distinfo
 cvs rdiff -u -r0 -r1.1 pkgsrc/chat/profanity/options.mk
 cvs rdiff -u -r1.2 -r1.3 pkgsrc/chat/profanity/patches/patch-configure.ac

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

>Unformatted:

Home	PR Database Search