UPDATE: net/profanity

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: net/profanity

Rafael Sadowski
Simple update to the latest stable version 0.8.0. Changelog:

https://profanity-im.github.io/blog/post/release-080/

Quick test on amd64.

Feedback, OK?

RS

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/profanity/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- Makefile 2 Oct 2019 17:34:33 -0000 1.12
+++ Makefile 7 Feb 2020 05:39:17 -0000
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.12 2019/10/02 17:34:33 rsadowski Exp $
 
 COMMENT = console based XMPP client
-DISTNAME = profanity-0.7.1
+DISTNAME = profanity-0.8.0
 CATEGORIES = net
 
 HOMEPAGE = https://profanity-im.github.io/
@@ -12,10 +12,12 @@ PERMIT_PACKAGE = Yes
 
 MASTER_SITES = https://profanity-im.github.io/
 
-WANTLIB += assuan c crypto curl curses ereadline expat ffi gcrypt
-WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gpg-error
-WANTLIB += gpgme iconv intl m mesode nghttp2 otr pcre pthread
-WANTLIB += signal-protocol-c ssl util z ${MODPY_WANTLIB}
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender assuan c crypto curl curses ereadline
+WANTLIB += expat ffi fontconfig freetype gcrypt gio-2.0 glib-2.0
+WANTLIB += gmodule-2.0 gobject-2.0 gpg-error gpgme iconv intl
+WANTLIB += m mesode nghttp2 otr pcre pixman-1 pthread ${MODPY_WANTLIB}
+WANTLIB += signal-protocol-c ssl util xcb xcb-render xcb-shm z
 
 MODULES += lang/python
 
@@ -27,7 +29,8 @@ LIB_DEPENDS += devel/glib2 \
  net/libmesode \
  net/libsignal-protocol-c \
  security/gpgme \
- security/libotr
+ security/libotr \
+ www/nghttp2
 
 # Only needed for tests, but cannot be a TEST_DEPENDS.
 # Check must be present at build time for tests to work.
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/profanity/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo 2 Oct 2019 17:34:33 -0000 1.6
+++ distinfo 7 Feb 2020 05:39:17 -0000
@@ -1,2 +1,2 @@
-SHA256 (profanity-0.7.1.tar.gz) = P+RClI/y7iWGgcOBLoeNORedz5LhxnvI/g74iWRAsFs=
-SIZE (profanity-0.7.1.tar.gz) = 788754
+SHA256 (profanity-0.8.0.tar.gz) = Gq10Ft7jS3SRzMuk/W96dEwORobZx+rgYeSHaooNt8c=
+SIZE (profanity-0.8.0.tar.gz) = 809438
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/net/profanity/patches/patch-configure_ac,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-configure_ac
--- patches/patch-configure_ac 13 Sep 2019 09:04:05 -0000 1.4
+++ patches/patch-configure_ac 7 Feb 2020 05:39:17 -0000
@@ -12,7 +12,7 @@ Index: configure.ac
      if test "$PYTHON_CONFIG_EXISTS" == "yes"; then
          AX_PYTHON_DEVEL
          AM_CONDITIONAL([BUILD_PYTHON_API], [true])
-@@ -188,10 +188,10 @@ AS_IF([test "x$PLATFORM" = xosx],
+@@ -191,10 +191,10 @@ AS_IF([test "x$PLATFORM" = xosx],
          [AC_MSG_ERROR([libreadline is required for profanity])])],
 
        [test "x$PLATFORM" = xopenbsd],
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/profanity/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 3 Mar 2019 19:40:04 -0000 1.3
+++ pkg/PLIST 7 Feb 2020 05:39:17 -0000
@@ -16,6 +16,7 @@ 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
@@ -25,5 +26,7 @@ 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

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: net/profanity

clematis
On Fri, Feb 07, 2020 at 06:40:54AM +0100, Rafael Sadowski wrote:
> Simple update to the latest stable version 0.8.0. Changelog:
> https://profanity-im.github.io/blog/post/release-080/
> Quick test on amd64.
> Feedback, OK?

Hi Rafael,
Just quick feedback to say it also build/install/run OK for me on amd64.
Thanks for the update. Also nice to have
+share/profanity/themes/solarized-dark  :)
Thanks,
--
clematis (0x7e96fd2400fe7b59)

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: net/profanity

Lucas-2
In reply to this post by Rafael Sadowski
Rafael Sadowski <[hidden email]> wrote:
> Simple update to the latest stable version 0.8.0. Changelog:
>
> https://profanity-im.github.io/blog/post/release-080/

0.8.1 was released on 07 February ^^

Changes:

 * Fix ending ncurses colors in rosterwin
 * Fix segfault when consistent nick colors where never in config
   (#1236)
 * Improve /clear behaviour to also clear the buffer. So a redraw
   doesn't bring the content back.
 * Use unique IDs in stanzas when requesting avatars

Also, between 0.7.1 and 0.8.0, --enable-icons was renamed, resulting in
it being autodetected, which probably is the responsible for pulling in
all those X libs in WANTLIB. Patch below also fixes that, and disables
desktop notifications at compile time, too.

BTW, why was www/nghttp2 added to LIB_DEPEND? Is it for bringing HTTP/2
support to libcurl?

Tested and works on amd64. clematis also slightly tested this 0.8.1 and
helped me resolve an issue related to bump in libgpg-error. <3

-Lucas

Index: Makefile
===================================================================
RCS file: /home/cvs/ports/net/profanity/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- Makefile 2 Oct 2019 17:34:33 -0000 1.12
+++ Makefile 8 Feb 2020 23:12:30 -0000
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.12 2019/10/02 17:34:33 rsadowski Exp $
 
 COMMENT = console based XMPP client
-DISTNAME = profanity-0.7.1
+DISTNAME = profanity-0.8.1
 CATEGORIES = net
 
 HOMEPAGE = https://profanity-im.github.io/
@@ -27,7 +27,8 @@ LIB_DEPENDS += devel/glib2 \
  net/libmesode \
  net/libsignal-protocol-c \
  security/gpgme \
- security/libotr
+ security/libotr \
+ www/nghttp2
 
 # Only needed for tests, but cannot be a TEST_DEPENDS.
 # Check must be present at build time for tests to work.
@@ -41,7 +42,8 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}
  LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 CONFIGURE_ARGS += --with-xscreensaver=no \
- --enable-icons=no \
+ --enable-icons-and-clipboard=no \
+ --enable-notifications=no \
  --enable-plugins=yes \
  --enable-omemo=yes \
  --enable-otr=yes
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/net/profanity/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo 2 Oct 2019 17:34:33 -0000 1.6
+++ distinfo 8 Feb 2020 22:30:58 -0000
@@ -1,2 +1,2 @@
-SHA256 (profanity-0.7.1.tar.gz) = P+RClI/y7iWGgcOBLoeNORedz5LhxnvI/g74iWRAsFs=
-SIZE (profanity-0.7.1.tar.gz) = 788754
+SHA256 (profanity-0.8.1.tar.gz) = a3/x8PG1TtOlXvzkAjfbd1/pR1ryduXk7TQukaPo2Zc=
+SIZE (profanity-0.8.1.tar.gz) = 809405
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/net/profanity/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 3 Mar 2019 19:40:04 -0000 1.3
+++ pkg/PLIST 8 Feb 2020 23:06:58 -0000
@@ -16,6 +16,7 @@ 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
@@ -25,5 +26,7 @@ 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

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: net/profanity

Stuart Henderson
On 2020/02/08 23:43, Lucas wrote:
> BTW, why was www/nghttp2 added to LIB_DEPEND? Is it for bringing HTTP/2
> support to libcurl?

That's probably why but it doesn't make sense. Libraries should only be
in LIB_DEPENDS if they are used directly by a port, not by a dependency.

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: net/profanity

Lucas-2
Stuart Henderson <[hidden email]> wrote:
> On 2020/02/08 23:43, Lucas wrote:
> > BTW, why was www/nghttp2 added to LIB_DEPEND? Is it for bringing HTTP/2
> > support to libcurl?
>
> That's probably why but it doesn't make sense. Libraries should only be
> in LIB_DEPENDS if they are used directly by a port, not by a dependency.

From what I understood after a quick internet search, you have to set up
HTTP/2 support with

        curl_easy_setopt(hnd, CURLOPT_HTTP_VERSION,
            CURL_HTTP_VERSION_2_0);

which doesn't happen anywhere in the code. I propose dropping it.
Tested and it still work.

nghttp2 is in WANTLIB since rev 1.4. Without it, port-lib-depends-check
complains. It seems it's being linked in anyways because libcurl.so
references it.

-Lucas

Index: Makefile
===================================================================
RCS file: /home/cvs/ports/net/profanity/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- Makefile 2 Oct 2019 17:34:33 -0000 1.12
+++ Makefile 9 Feb 2020 16:08:26 -0000
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.12 2019/10/02 17:34:33 rsadowski Exp $
 
 COMMENT = console based XMPP client
-DISTNAME = profanity-0.7.1
+DISTNAME = profanity-0.8.1
 CATEGORIES = net
 
 HOMEPAGE = https://profanity-im.github.io/
@@ -41,7 +41,8 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}
  LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 CONFIGURE_ARGS += --with-xscreensaver=no \
- --enable-icons=no \
+ --enable-icons-and-clipboard=no \
+ --enable-notifications=no \
  --enable-plugins=yes \
  --enable-omemo=yes \
  --enable-otr=yes
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/net/profanity/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo 2 Oct 2019 17:34:33 -0000 1.6
+++ distinfo 9 Feb 2020 15:55:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (profanity-0.7.1.tar.gz) = P+RClI/y7iWGgcOBLoeNORedz5LhxnvI/g74iWRAsFs=
-SIZE (profanity-0.7.1.tar.gz) = 788754
+SHA256 (profanity-0.8.1.tar.gz) = a3/x8PG1TtOlXvzkAjfbd1/pR1ryduXk7TQukaPo2Zc=
+SIZE (profanity-0.8.1.tar.gz) = 809405
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/net/profanity/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 3 Mar 2019 19:40:04 -0000 1.3
+++ pkg/PLIST 8 Feb 2020 23:06:58 -0000
@@ -16,6 +16,7 @@ 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
@@ -25,5 +26,7 @@ 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