Re: Update: net/profanity 0.9.4 -> 0.9.5
On Sat, 11 Jul 2020 15:27:33 + Lucas wrote: > Collaboration-wise, always CC the MAINTAINER. Although I always read > most of ports@, I missed this email. Tips to a friend for pointing it > out. > I didn't know you should do that, will remember next time, thanks.
Re: Update: net/profanity 0.9.4 -> 0.9.5
3un0s <3u...@dismail.de> wrote: > This release fixes a segfault when running "/theme properties". > > Tests pass. > > Any comments or OK? Port-wise, only detail is that REVISION must be removed on version bump. Collaboration-wise, always CC the MAINTAINER. Although I always read most of ports@, I missed this email. Tips to a friend for pointing it out. That being said, thanks for sending the update. I originally held back for a while to send it, as I understood there was another minor release coming quite soon after 0.9.5, but it isn't the case. Update looks good to me. Updated patch with REVISION removed. -Lucas Index: Makefile === RCS file: /home/cvs/ports/net/profanity/Makefile,v retrieving revision 1.16 diff -u -p -r1.16 Makefile --- Makefile3 Jul 2020 21:13:00 - 1.16 +++ Makefile11 Jul 2020 16:13:03 - @@ -1,9 +1,8 @@ # $OpenBSD: Makefile,v 1.16 2020/07/03 21:13:00 sthen Exp $ COMMENT = console based XMPP client -DISTNAME = profanity-0.9.4 +DISTNAME = profanity-0.9.5 CATEGORIES = net -REVISION = 0 HOMEPAGE = https://profanity-im.github.io/ Index: distinfo === RCS file: /home/cvs/ports/net/profanity/distinfo,v retrieving revision 1.9 diff -u -p -r1.9 distinfo --- distinfo29 Jun 2020 04:54:59 - 1.9 +++ distinfo11 Jul 2020 15:56:07 - @@ -1,2 +1,2 @@ -SHA256 (profanity-0.9.4.tar.gz) = ZVcKAV5EE3+H2Q2q3R4+vHyNpQ8lMlsGqksT9YuThfo= -SIZE (profanity-0.9.4.tar.gz) = 830413 +SHA256 (profanity-0.9.5.tar.gz) = I/ey5cbPhZE7nnoiiAK8qeyx0c87+PjyhelnYXaiSQI= +SIZE (profanity-0.9.5.tar.gz) = 830966
Update: net/profanity 0.9.4 -> 0.9.5
This release fixes a segfault when running "/theme properties". Tests pass. Any comments or OK? Index: Makefile === RCS file: /cvs/ports/net/profanity/Makefile,v retrieving revision 1.16 diff -u -p -u -r1.16 Makefile --- Makefile 3 Jul 2020 21:13:00 - 1.16 +++ Makefile 8 Jul 2020 12:53:34 - @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.16 2020/07/03 21:13:00 sthen Exp $ COMMENT = console based XMPP client -DISTNAME = profanity-0.9.4 +DISTNAME = profanity-0.9.5 CATEGORIES = net REVISION = 0 Index: distinfo === RCS file: /cvs/ports/net/profanity/distinfo,v retrieving revision 1.9 diff -u -p -u -r1.9 distinfo --- distinfo 29 Jun 2020 04:54:59 - 1.9 +++ distinfo 8 Jul 2020 12:53:50 - @@ -1,2 +1,2 @@ -SHA256 (profanity-0.9.4.tar.gz) = ZVcKAV5EE3+H2Q2q3R4+vHyNpQ8lMlsGqksT9YuThfo= -SIZE (profanity-0.9.4.tar.gz) = 830413 +SHA256 (profanity-0.9.5.tar.gz) = I/ey5cbPhZE7nnoiiAK8qeyx0c87+PjyhelnYXaiSQI= +SIZE (profanity-0.9.5.tar.gz) = 830966
Re: UPDATE net/profanity 0.9.4 and take MAINTAINER
This is a simple update to 0.9.4, with some bug fixes since 0.9.0.
* Make legacy auth optional (0.9.1)
* Dont manipulate pointer from getenv (0.9.2)
* Fix reading/writing linked files (0.9.2)
* Use gnu99 C standard (0.9.2)
* Fix expansion in eval_password (0.9.3)
* Fix NULL terminated list (0.9.4)
* Add missing string.h (0.9.4)
* Fix gcc warnings for cygwin (0.9.4)
I also addressed the patch update as gsoares@ pointed out.
-Lucas
Index: Makefile
===
RCS file: /home/cvs/ports/net/profanity/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile18 Jun 2020 20:44:16 - 1.14
+++ Makefile27 Jun 2020 22:03:17 -
@@ -1,10 +1,12 @@
# $OpenBSD: Makefile,v 1.14 2020/06/18 20:44:16 rsadowski Exp $
COMMENT = console based XMPP client
-DISTNAME = profanity-0.9.0
+DISTNAME = profanity-0.9.4
CATEGORIES = net
HOMEPAGE = https://profanity-im.github.io/
+
+MAINTAINER = Lucas
SHARED_LIBS += profanity 0.0 # 0.0
Index: distinfo
===
RCS file: /home/cvs/ports/net/profanity/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo18 Jun 2020 20:44:16 - 1.8
+++ distinfo28 Jun 2020 13:30:48 -
@@ -1,2 +1,2 @@
-SHA256 (profanity-0.9.0.tar.gz) = sq93MqdTXUbfccMjGc0Elds9HyutlnGbSN0/MieT6LA=
-SIZE (profanity-0.9.0.tar.gz) = 830056
+SHA256 (profanity-0.9.4.tar.gz) = ZVcKAV5EE3+H2Q2q3R4+vHyNpQ8lMlsGqksT9YuThfo=
+SIZE (profanity-0.9.4.tar.gz) = 830413
Index: patches/patch-configure_ac
===
RCS file: /home/cvs/ports/net/profanity/patches/patch-configure_ac,v
retrieving revision 1.5
diff -u -p -r1.5 patch-configure_ac
--- patches/patch-configure_ac 18 Jun 2020 20:44:16 - 1.5
+++ patches/patch-configure_ac 28 Jun 2020 14:49:36 -
@@ -1,5 +1,8 @@
$OpenBSD: patch-configure_ac,v 1.5 2020/06/18 20:44:16 rsadowski Exp $
+Use ${LOCALBASE} instead of hard-coded /usr/local
+Use ${MODPY_VERSION} to pick up our python-config
+
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -12,7 +15,7 @@ Index: configure.ac
if test "$PYTHON_CONFIG_EXISTS" == "yes"; then
AX_PYTHON_DEVEL
AM_CONDITIONAL([BUILD_PYTHON_API], [true])
-@@ -214,10 +214,10 @@ AS_IF([test "x$PLATFORM" = xosx],
+@@ -223,10 +223,10 @@ AS_IF([test "x$PLATFORM" = xosx],
[AC_MSG_ERROR([libreadline is required for profanity])])],
[test "x$PLATFORM" = xopenbsd],
Re: UPDATE net/profanity 0.9.3 and take MAINTAINER
Gleydson Soares wrote: > looks fine, it's missing `make update-patches' though. > > diff -u -p -r1.5 patch-configure_ac > --- patches/patch-configure_ac 18 Jun 2020 20:44:16 - 1.5 > +++ patches/patch-configure_ac 25 Jun 2020 14:19:12 - Good catch. I'll send an update diff later on. Today there was a 0.9.4 release but the tarball is borked. Upstream said they'll fix it tomorrow. Thanks for taking a look at it. -Lucas
Re: UPDATE net/profanity 0.9.3 and take MAINTAINER
On Thu, Jun 25, 2020 at 03:01:47AM +, Lucas wrote: > Hello ports, > > This is a simple update to 0.9.3, with some bug fixes since 0.9.0. > > * Make legacy auth optional (0.9.1) > * Dont manipulate pointer from getenv (0.9.2) > * Fix reading/writing linked files (0.9.2) > * Use gnu99 C standard (0.9.2) > * Fix expansion in eval_password (0.9.3) > > While there, take maintainership. Rafael asked privately to do it in > the past and was my intention after 0.9.0 release, but he beated me to > send the patch. ^^ looks fine, it's missing `make update-patches' though. diff -u -p -r1.5 patch-configure_ac --- patches/patch-configure_ac 18 Jun 2020 20:44:16 - 1.5 +++ patches/patch-configure_ac 25 Jun 2020 14:19:12 -
UPDATE net/profanity 0.9.3 and take MAINTAINER
Hello ports, This is a simple update to 0.9.3, with some bug fixes since 0.9.0. * Make legacy auth optional (0.9.1) * Dont manipulate pointer from getenv (0.9.2) * Fix reading/writing linked files (0.9.2) * Use gnu99 C standard (0.9.2) * Fix expansion in eval_password (0.9.3) While there, take maintainership. Rafael asked privately to do it in the past and was my intention after 0.9.0 release, but he beated me to send the patch. ^^ -Lucas Index: Makefile === RCS file: /home/cvs/ports/net/profanity/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- Makefile18 Jun 2020 20:44:16 - 1.14 +++ Makefile25 Jun 2020 02:45:27 - @@ -1,10 +1,12 @@ # $OpenBSD: Makefile,v 1.14 2020/06/18 20:44:16 rsadowski Exp $ COMMENT = console based XMPP client -DISTNAME = profanity-0.9.0 +DISTNAME = profanity-0.9.3 CATEGORIES = net HOMEPAGE = https://profanity-im.github.io/ + +MAINTAINER = Lucas SHARED_LIBS += profanity 0.0 # 0.0 Index: distinfo === RCS file: /home/cvs/ports/net/profanity/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo18 Jun 2020 20:44:16 - 1.8 +++ distinfo21 Jun 2020 15:51:48 - @@ -1,2 +1,2 @@ -SHA256 (profanity-0.9.0.tar.gz) = sq93MqdTXUbfccMjGc0Elds9HyutlnGbSN0/MieT6LA= -SIZE (profanity-0.9.0.tar.gz) = 830056 +SHA256 (profanity-0.9.3.tar.gz) = dWcNrIdm5MktETxsyZ9PiL3NFS5ZpPAIuM0180cDGck= +SIZE (profanity-0.9.3.tar.gz) = 830781
Update: net/profanity
Simple update to the latest stable version. Changelog:
https://github.com/profanity-im/profanity/releases/tag/0.9.0
Remove me as maintainer, XMPP is mostly dead for me.
Rafael
Index: Makefile
===
RCS file: /cvs/ports/net/profanity/Makefile,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 Makefile
--- Makefile10 Feb 2020 05:56:59 - 1.13
+++ Makefile11 Jun 2020 04:53:58 -
@@ -1,11 +1,12 @@
# $OpenBSD: Makefile,v 1.13 2020/02/10 05:56:59 rsadowski Exp $
COMMENT = console based XMPP client
-DISTNAME = profanity-0.8.1
+DISTNAME = profanity-0.9.0
CATEGORIES = net
HOMEPAGE = https://profanity-im.github.io/
-MAINTAINER = Rafael Sadowski
+
+SHARED_LIBS += profanity 0.0 # 0.0
# GPLv3+
PERMIT_PACKAGE = Yes
@@ -15,13 +16,14 @@ MASTER_SITES = https://profanity-im.gith
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 += ${MODPY_WANTLIB} signal-protocol-c sqlite3 ssl util z
MODULES += lang/python
MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
-LIB_DEPENDS += devel/glib2 \
+LIB_DEPENDS += databases/sqlite3 \
+ devel/glib2 \
devel/readline \
net/curl \
net/libmesode \
Index: distinfo
===
RCS file: /cvs/ports/net/profanity/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- distinfo10 Feb 2020 05:56:59 - 1.7
+++ distinfo11 Jun 2020 04:53:58 -
@@ -1,2 +1,2 @@
-SHA256 (profanity-0.8.1.tar.gz) = a3/x8PG1TtOlXvzkAjfbd1/pR1ryduXk7TQukaPo2Zc=
-SIZE (profanity-0.8.1.tar.gz) = 809405
+SHA256 (profanity-0.9.0.tar.gz) = sq93MqdTXUbfccMjGc0Elds9HyutlnGbSN0/MieT6LA=
+SIZE (profanity-0.9.0.tar.gz) = 830056
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 - 1.4
+++ patches/patch-configure_ac 11 Jun 2020 04:53:58 -
@@ -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],
+@@ -214,10 +214,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.4
diff -u -p -u -p -r1.4 PLIST
--- pkg/PLIST 10 Feb 2020 05:56:59 - 1.4
+++ pkg/PLIST 11 Jun 2020 04:53:58 -
@@ -1,5 +1,9 @@
@comment $OpenBSD: PLIST,v 1.4 2020/02/10 05:56:59 rsadowski Exp $
@bin bin/profanity
+include/profapi.h
+@static-lib lib/libprofanity.a
+lib/libprofanity.la
+@lib lib/libprofanity.so.${LIBprofanity_VERSION}
@man man/man1/profanity.1
share/examples/profanity/
share/examples/profanity/profrc.example
@@ -20,6 +24,7 @@ share/profanity/themes/gruvbox
share/profanity/themes/hacker
share/profanity/themes/headache
share/profanity/themes/joker
+share/profanity/themes/jubalian
share/profanity/themes/mono
share/profanity/themes/orange
share/profanity/themes/original
Re: UPDATE: net/profanity
Stuart Henderson 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
--- Makefile2 Oct 2019 17:34:33 - 1.12
+++ Makefile9 Feb 2020 16:08:26 -
@@ -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
--- distinfo2 Oct 2019 17:34:33 - 1.6
+++ distinfo9 Feb 2020 15:55:11 -
@@ -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 - 1.3
+++ pkg/PLIST 8 Feb 2020 23:06:58 -
@@ -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
Re: UPDATE: net/profanity
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.
Re: UPDATE: net/profanity
Rafael Sadowski 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
--- Makefile2 Oct 2019 17:34:33 - 1.12
+++ Makefile8 Feb 2020 23:12:30 -
@@ -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
--- distinfo2 Oct 2019 17:34:33 - 1.6
+++ distinfo8 Feb 2020 22:30:58 -
@@ -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 - 1.3
+++ pkg/PLIST 8 Feb 2020 23:06:58 -
@@ -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
Re: UPDATE: net/profanity
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)
UPDATE: net/profanity
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
--- Makefile2 Oct 2019 17:34:33 - 1.12
+++ Makefile7 Feb 2020 05:39:17 -
@@ -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
--- distinfo2 Oct 2019 17:34:33 - 1.6
+++ distinfo7 Feb 2020 05:39:17 -
@@ -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 - 1.4
+++ patches/patch-configure_ac 7 Feb 2020 05:39:17 -
@@ -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 - 1.3
+++ pkg/PLIST 7 Feb 2020 05:39:17 -
@@ -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
Re: UPDATE: net/profanity
Rafael Sadowski wrote: > Bugfix update which includes the following fixes: > > Fix copyright/info displayed email > Fix typos in OMEMO logs > Fix crash when jid has no not part (#1153, #1193) > > -- https://github.com/profanity-im/profanity/releases > > Feedback, ok!? Builds, passes tests and runs fine. -Lucas > Index: Makefile > === > RCS file: /cvs/ports/net/profanity/Makefile,v > retrieving revision 1.11 > diff -u -p -u -p -r1.11 Makefile > --- Makefile 13 Sep 2019 09:04:05 - 1.11 > +++ Makefile 27 Sep 2019 10:59:25 - > @@ -1,7 +1,7 @@ > # $OpenBSD: Makefile,v 1.11 2019/09/13 09:04:05 rsadowski Exp $ > > COMMENT =console based XMPP client > -DISTNAME = profanity-0.7.0 > +DISTNAME = profanity-0.7.1 > CATEGORIES = net > > HOMEPAGE = https://profanity-im.github.io/ > Index: distinfo > === > RCS file: /cvs/ports/net/profanity/distinfo,v > retrieving revision 1.5 > diff -u -p -u -p -r1.5 distinfo > --- distinfo 13 Sep 2019 09:04:05 - 1.5 > +++ distinfo 27 Sep 2019 10:59:25 - > @@ -1,2 +1,2 @@ > -SHA256 (profanity-0.7.0.tar.gz) = > 8euZvgFoPUG4kbD5l/TIc8m7h7C2uEALf8y45VPVFLs= > -SIZE (profanity-0.7.0.tar.gz) = 789373 > +SHA256 (profanity-0.7.1.tar.gz) = > P+RClI/y7iWGgcOBLoeNORedz5LhxnvI/g74iWRAsFs= > +SIZE (profanity-0.7.1.tar.gz) = 788754
UPDATE: net/profanity
Bugfix update which includes the following fixes: Fix copyright/info displayed email Fix typos in OMEMO logs Fix crash when jid has no not part (#1153, #1193) -- https://github.com/profanity-im/profanity/releases Feedback, ok!? Index: Makefile === RCS file: /cvs/ports/net/profanity/Makefile,v retrieving revision 1.11 diff -u -p -u -p -r1.11 Makefile --- Makefile13 Sep 2019 09:04:05 - 1.11 +++ Makefile27 Sep 2019 10:59:25 - @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.11 2019/09/13 09:04:05 rsadowski Exp $ COMMENT = console based XMPP client -DISTNAME = profanity-0.7.0 +DISTNAME = profanity-0.7.1 CATEGORIES = net HOMEPAGE = https://profanity-im.github.io/ Index: distinfo === RCS file: /cvs/ports/net/profanity/distinfo,v retrieving revision 1.5 diff -u -p -u -p -r1.5 distinfo --- distinfo13 Sep 2019 09:04:05 - 1.5 +++ distinfo27 Sep 2019 10:59:25 - @@ -1,2 +1,2 @@ -SHA256 (profanity-0.7.0.tar.gz) = 8euZvgFoPUG4kbD5l/TIc8m7h7C2uEALf8y45VPVFLs= -SIZE (profanity-0.7.0.tar.gz) = 789373 +SHA256 (profanity-0.7.1.tar.gz) = P+RClI/y7iWGgcOBLoeNORedz5LhxnvI/g74iWRAsFs= +SIZE (profanity-0.7.1.tar.gz) = 788754
Re: update net/profanity
OK kn
Re: update net/profanity
Stuart Henderson wrote:
> Usual approach is to patch and use SUBST_CMD on the file; the problem
> with sed expressions is they tend to get stale after an update or two,
> whereas patching means that changes in the surrounding area in the
> file will be obvious when updating patches. Exception would be if there
> are a large number of files involved, or if the same change is made a
> very large number of times in one file, in which case sed makes more
> sense.
Thanks for explaining this.
> Diff below does that, removes the surplus AUTOMAKE_VERSION variable,
> and groups the autoconf-related variables together in the Makefile,
> otherwise as-is from yours.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/profanity/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- Makefile 12 Jul 2019 20:48:44 - 1.10
> +++ Makefile 6 Sep 2019 11:01:18 -
> @@ -1,34 +1,31 @@
> # $OpenBSD: Makefile,v 1.10 2019/07/12 20:48:44 sthen Exp $
>
> COMMENT =console based XMPP client
> -DISTNAME = profanity-0.6.0
> +DISTNAME = profanity-0.7.0
> CATEGORIES = net
> -REVISION = 0
>
> -HOMEPAGE = http://www.profanity.im/
> +HOMEPAGE = https://profanity-im.github.io/
> MAINTAINER = Rafael Sadowski
>
> # GPLv3+
> PERMIT_PACKAGE = Yes
>
> -MASTER_SITES = http://www.profanity.im/
> +MASTER_SITES = ${HOMEPAGE}
>
> 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 += ${MODPY_WANTLIB} ssl util z
> +WANTLIB += signal-protocol-c ssl util z ${MODPY_WANTLIB}
>
> MODULES += lang/python
>
> MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
>
> -BUILD_DEPENDS +=${MODGNU_AUTOCONF_DEPENDS} \
> - ${MODGNU_AUTOMAKE_DEPENDS}
> -
> LIB_DEPENDS += devel/glib2 \
> devel/readline \
> net/curl \
> net/libmesode \
> + net/libsignal-protocol-c \
> security/gpgme \
> security/libotr
>
> @@ -36,7 +33,9 @@ LIB_DEPENDS += devel/glib2 \
> # Check must be present at build time for tests to work.
> BUILD_DEPENDS += devel/cmocka
>
> -CONFIGURE_STYLE = autoconf
> +CONFIGURE_STYLE =autoconf
> +AUTOCONF_VERSION = 2.69
> +SEPARATE_BUILD = Yes
>
> CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
> LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
> @@ -44,21 +43,14 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}
> CONFIGURE_ARGS +=--with-xscreensaver=no \
> --enable-icons=no \
> --enable-plugins=yes \
> + --enable-omemo=yes \
> --enable-otr=yes
>
> MAKE_FLAGS = CC="${CC}" \
> CFLAGS="${CFLAGS}"
>
> -AUTOCONF_VERSION = 2.69
> -AUTOMAKE_VERSION = 1.11
> -
> -SEPARATE_BUILD = Yes
> -
> -# there is no stub_ui.h and is not needed
> post-patch:
> - find ${WRKSRC} -type f -name "*.c" \
> - -exec sed -i '/stub\_ui.h/d' "{}" \;
> - sed -i s,${TRUEPREFIX},${LOCALBASE}, ${WRKSRC}/configure.ac
> + ${SUBST_CMD} ${WRKSRC}/configure.ac
>
> post-install:
> ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/profanity/
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/profanity/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- distinfo 3 Mar 2019 19:40:04 - 1.4
> +++ distinfo 6 Sep 2019 11:01:18 -
> @@ -1,2 +1,2 @@
> -SHA256 (profanity-0.6.0.tar.gz) =
> 8bJ3O3nrKUKXaG85E+lInCDv+uXjozXIlW2xj27i9mA=
> -SIZE (profanity-0.6.0.tar.gz) = 741812
> +SHA256 (profanity-0.7.0.tar.gz) =
> 8euZvgFoPUG4kbD5l/TIc8m7h7C2uEALf8y45VPVFLs=
> +SIZE (profanity-0.7.0.tar.gz) = 789373
> Index: patches/patch-configure_ac
> ===
> RCS file: patches/patch-configure_ac
> diff -N patches/patch-configure_ac
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-configure_ac6 Sep 2019 11:01:18 -
> @@ -0,0 +1,28 @@
> +$OpenBSD$
> +
> +Index: configure.ac
> +--- configure.ac.orig
> configure.ac
> +@@ -80,7 +80,7 @@ elif test "x$enable_python_plugins" != xno; then
> + AC_MSG_NOTICE([Symlinking Python.framework to $PYTHON_FRAMEWORK])
> + rm -f Python.framework
> + ln -s $PYTHON_FRAMEWORK Python.framework ])
> +-AC_CHECK_PROG(PYTHON_CONFIG_EXISTS, python-config, yes, no)
> ++AC_CHECK_PROG(PYTHON_CONFIG_EXISTS, python${MODPY_VERSION}-config, yes,
> no)
> + 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],
> + [AC_MSG_ERROR([libreadline is required for
Re: update net/profanity
On 2019/09/06 01:11, Lucas wrote:
> Rafael Sadowski wrote:
> > I think if you do this in post-configure your are to late and the party
> > is over but I'm not very familiar with the GNU autotools.
>
> Ugh, meant to say post-patch in there. Anyway, find an updated patch
> incorporating the fixes below.
>
> I opted to stick to CONFIGURE_STYLE=autoconf to have working python
> support: current ports' profanity can't load python plugins and isn't
> linked against python because I assume that the build machines doesn't
> have such symbolic links. Patching the generated configure seemed more
> difficult.
The build machines don't have those symlinks, and neither should ports
developers.
> While there, I removed
>
> BUILD_DEPENDS +=${MODGNU_AUTOCONF_DEPENDS} \
> ${MODGNU_AUTOMAKE_DEPENDS}
>
> as CONFIGURE_STYLE=autoconf does add ${MODGNU_AUTOCONF_DEPENDS} to
> BUILD_DEPENDS, and it builds and works fine without
> ${MODGNU_AUTOMAKE_DEPENDS}. Still, let me know if doing so is a mistake
> for other reasons.
Yes that's correct.
> Also I changed the non-default localbase install fix to substitute
> /usr/local instead of ${TRUEPREFIX}, as /usr/local is hard-coded in
> configure.ac.
Usual approach is to patch and use SUBST_CMD on the file; the problem
with sed expressions is they tend to get stale after an update or two,
whereas patching means that changes in the surrounding area in the
file will be obvious when updating patches. Exception would be if there
are a large number of files involved, or if the same change is made a
very large number of times in one file, in which case sed makes more
sense.
Diff below does that, removes the surplus AUTOMAKE_VERSION variable,
and groups the autoconf-related variables together in the Makefile,
otherwise as-is from yours.
(As the patches directory is added, use -p0 if applying with patch
so that it creates the directory properly).
> * Change HOMEPAGE to GitHub's site, as it's updated more frequently (old
> HOMEPAGE still show 0.6.0 as latest version, despite 0.7.0 being
> released more than a month ago) and the repo description points to it.
> * Enable OMEMO support by default
> * Remove the deletion of #include "ui/stub_ui.h" from test files.
> * Synchronize feature list with the one in the site.
> * Fix non-default localbase correction.
> * Fix python detection, actually enabling support for python plugins.
> * No PLIST changes.
Index: Makefile
===
RCS file: /cvs/ports/net/profanity/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile12 Jul 2019 20:48:44 - 1.10
+++ Makefile6 Sep 2019 11:01:18 -
@@ -1,34 +1,31 @@
# $OpenBSD: Makefile,v 1.10 2019/07/12 20:48:44 sthen Exp $
COMMENT = console based XMPP client
-DISTNAME = profanity-0.6.0
+DISTNAME = profanity-0.7.0
CATEGORIES = net
-REVISION = 0
-HOMEPAGE = http://www.profanity.im/
+HOMEPAGE = https://profanity-im.github.io/
MAINTAINER = Rafael Sadowski
# GPLv3+
PERMIT_PACKAGE = Yes
-MASTER_SITES = http://www.profanity.im/
+MASTER_SITES = ${HOMEPAGE}
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 += ${MODPY_WANTLIB} ssl util z
+WANTLIB += signal-protocol-c ssl util z ${MODPY_WANTLIB}
MODULES += lang/python
MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
-BUILD_DEPENDS +=${MODGNU_AUTOCONF_DEPENDS} \
- ${MODGNU_AUTOMAKE_DEPENDS}
-
LIB_DEPENDS += devel/glib2 \
devel/readline \
net/curl \
net/libmesode \
+ net/libsignal-protocol-c \
security/gpgme \
security/libotr
@@ -36,7 +33,9 @@ LIB_DEPENDS +=devel/glib2 \
# Check must be present at build time for tests to work.
BUILD_DEPENDS += devel/cmocka
-CONFIGURE_STYLE = autoconf
+CONFIGURE_STYLE = autoconf
+AUTOCONF_VERSION = 2.69
+SEPARATE_BUILD = Yes
CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
@@ -44,21 +43,14 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}
CONFIGURE_ARGS += --with-xscreensaver=no \
--enable-icons=no \
--enable-plugins=yes \
+ --enable-omemo=yes \
--enable-otr=yes
MAKE_FLAGS = CC="${CC}" \
CFLAGS="${CFLAGS}"
-AUTOCONF_VERSION = 2.69
-AUTOMAKE_VERSION = 1.11
-
-SEPARATE_BUILD = Yes
-
-# there is no stub_ui.h and is not needed
post-patch:
- find ${WRKSRC} -type f -name "*.c" \
- -exec sed -i '/stub\_ui.h/d' "{}" \;
- sed -i s,${TRUEPREFIX},${LOCALBASE}, ${WRKSRC}/configure.ac
+ ${SUBST_CMD} ${WRKSRC}/configure.ac
post-install:
Re: update net/profanity
Rafael Sadowski wrote:
> I think if you do this in post-configure your are to late and the party
> is over but I'm not very familiar with the GNU autotools.
Ugh, meant to say post-patch in there. Anyway, find an updated patch
incorporating the fixes below.
I opted to stick to CONFIGURE_STYLE=autoconf to have working python
support: current ports' profanity can't load python plugins and isn't
linked against python because I assume that the build machines doesn't
have such symbolic links. Patching the generated configure seemed more
difficult.
While there, I removed
BUILD_DEPENDS +=${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
as CONFIGURE_STYLE=autoconf does add ${MODGNU_AUTOCONF_DEPENDS} to
BUILD_DEPENDS, and it builds and works fine without
${MODGNU_AUTOMAKE_DEPENDS}. Still, let me know if doing so is a mistake
for other reasons.
Also I changed the non-default localbase install fix to substitute
/usr/local instead of ${TRUEPREFIX}, as /usr/local is hard-coded in
configure.ac.
Changes list:
* Change HOMEPAGE to GitHub's site, as it's updated more frequently (old
HOMEPAGE still show 0.6.0 as latest version, despite 0.7.0 being
released more than a month ago) and the repo description points to it.
* Enable OMEMO support by default
* Remove the deletion of #include "ui/stub_ui.h" from test files.
* Synchronize feature list with the one in the site.
* Fix non-default localbase correction.
* Fix python detection, actually enabling support for python plugins.
* No PLIST changes.
-Lucas
Index: net/profanity/Makefile
===
RCS file: /cvs/ports/net/profanity/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- net/profanity/Makefile 12 Jul 2019 20:48:44 - 1.10
+++ net/profanity/Makefile 6 Sep 2019 01:09:10 -
@@ -1,34 +1,31 @@
# $OpenBSD: Makefile,v 1.10 2019/07/12 20:48:44 sthen Exp $
COMMENT = console based XMPP client
-DISTNAME = profanity-0.6.0
+DISTNAME = profanity-0.7.0
CATEGORIES = net
-REVISION = 0
-HOMEPAGE = http://www.profanity.im/
+HOMEPAGE = https://profanity-im.github.io/
MAINTAINER = Rafael Sadowski
# GPLv3+
PERMIT_PACKAGE = Yes
-MASTER_SITES = http://www.profanity.im/
+MASTER_SITES = ${HOMEPAGE}
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 += ${MODPY_WANTLIB} ssl util z
+WANTLIB += signal-protocol-c ssl util z ${MODPY_WANTLIB}
MODULES += lang/python
MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
-BUILD_DEPENDS +=${MODGNU_AUTOCONF_DEPENDS} \
- ${MODGNU_AUTOMAKE_DEPENDS}
-
LIB_DEPENDS += devel/glib2 \
devel/readline \
net/curl \
net/libmesode \
+ net/libsignal-protocol-c \
security/gpgme \
security/libotr
@@ -44,6 +41,7 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}
CONFIGURE_ARGS += --with-xscreensaver=no \
--enable-icons=no \
--enable-plugins=yes \
+ --enable-omemo=yes \
--enable-otr=yes
MAKE_FLAGS = CC="${CC}" \
@@ -54,11 +52,13 @@ AUTOMAKE_VERSION = 1.11
SEPARATE_BUILD = Yes
-# there is no stub_ui.h and is not needed
+# * Assumes that devel/readline is installed in the default LOCALBASE.
+# * Assumes there is a python-config, while we usually have
+# python$VERSION-config
post-patch:
- find ${WRKSRC} -type f -name "*.c" \
- -exec sed -i '/stub\_ui.h/d' "{}" \;
- sed -i s,${TRUEPREFIX},${LOCALBASE}, ${WRKSRC}/configure.ac
+ sed -i -e s,/usr/local,${LOCALBASE}, \
+ -e s,python-config,python${MODPY_VERSION}-config, \
+ ${WRKSRC}/configure.ac
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/profanity/
Index: net/profanity/distinfo
===
RCS file: /cvs/ports/net/profanity/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- net/profanity/distinfo 3 Mar 2019 19:40:04 - 1.4
+++ net/profanity/distinfo 6 Sep 2019 01:09:10 -
@@ -1,2 +1,2 @@
-SHA256 (profanity-0.6.0.tar.gz) = 8bJ3O3nrKUKXaG85E+lInCDv+uXjozXIlW2xj27i9mA=
-SIZE (profanity-0.6.0.tar.gz) = 741812
+SHA256 (profanity-0.7.0.tar.gz) = 8euZvgFoPUG4kbD5l/TIc8m7h7C2uEALf8y45VPVFLs=
+SIZE (profanity-0.7.0.tar.gz) = 789373
Index: net/profanity/pkg/DESCR
===
RCS file: /cvs/ports/net/profanity/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 DESCR
--- net/profanity/pkg/DESCR 25 Apr 2016 17:46:38 - 1.1.1.1
+++ net/profanity/pkg/DESCR 6 Sep 2019 01:09:10 -
@@ -3,14 +3,10 @@ libstrophe,
Re: update net/profanity
On Tue Sep 03, 2019 at 10:38:17PM +, Lucas wrote:
> Stuart Henderson wrote:
> > Please only use GH_* if using github's autogenerated tarball. If you are
> > setting MASTER_SITES anyway then it's not wanted/needed - for this it should
> > just have DISTNAME/MASTER_SITES/HOMEPAGE.
>
> Fixed. There are some other packages that define both GH_* and
> MASTER_SITES and could be fixed. If there is interest, I can send a
> different email addressing that.
>
> Maybe it should be added to bsd.port.mk(5)?
First of all thanks for your work here. Please just replace the out-dated URL:
Index: Makefile
===
RCS file: /cvs/ports/net/profanity/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile12 Jul 2019 20:48:44 - 1.10
+++ Makefile3 Sep 2019 19:41:22 -
@@ -1,22 +1,21 @@
# $OpenBSD: Makefile,v 1.10 2019/07/12 20:48:44 sthen Exp $
COMMENT = console based XMPP client
-DISTNAME = profanity-0.6.0
+DISTNAME = profanity-0.7.0
CATEGORIES = net
-REVISION = 0
-HOMEPAGE = http://www.profanity.im/
+HOMEPAGE = https://profanity-im.github.io/
MAINTAINER = Rafael Sadowski
# GPLv3+
PERMIT_PACKAGE = Yes
-MASTER_SITES = http://www.profanity.im/
+MASTER_SITES = https://profanity-im.github.io/
>
> > This is because of the post-patch target using a sed -i on configure.ac,
> > causing it to have a newer timestamp than the generated files. This
> > can be fixed by removing that post-patch target (it doesn't make sense
> > anyway), the AUTO* lines, and change to CONFIGURE_STYLE=gnu.
>
> Thanks for pointing this. As you said, removing that target and setting
> CONFIGURE_STYLE=gnu builds, passes the tests and runs fine. Also we can
> drop BUILD_DEPENDS+=${MODGNU_AUTO*} because of it.
>
> That line was changed from /usr/local to ${TRUEPREFIX} in r1.4, and I
> think it tries to address a hardcoded /usr/local in the project's
> configure.ac, line 190:
>
> [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)])],
Exactly, that was the idea.
>
> I think that using ${TRUEPREFIX} in that line is a mistake, but I'm not
> sure (out of ignorance) if such replacement doesn't make sense. Maybe
> the correct approach is to try to upstream a fix for it, relying on
> pkg_info -qe devel/readline.
This was my solution better diffs welcome. I think pkg_info is not the
right way.
>
> > > 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 += ${MODPY_WANTLIB} ssl util z
> > > +WANTLIB += ${MODPY_WANTLIB} signal-protocol-c ssl util z
> >
> > "make port-lib-depends-check" says this:
> >
> > profanity-0.7.0(net/profanity):
> > Extra: python3.7m.0 util.13
> >
> > This isn't new but from what I see it's not building any of the python
> > parts. rsadowski, any idea what's going on there?
I don't have the problem, because placed the links:
ln -sf /usr/local/bin/python3.7 /usr/local/bin/python
ln -sf /usr/local/bin/python3.7-config /usr/local/bin/python-config
ln -sf /usr/local/bin/pydoc3.7 /usr/local/bin/pydoc
on my system.
>
> Dunno if it helps, but configure shows
>
> checking for python-config... no
> configure: Python development package not found, Python plugin support
> disabled.
>
> This happens on line 83 of configure.ac, which just check for
> python-config instead of python[23]-config. I went back to autoconf
> configure and added
>
> sed -i s,python-config,python${MODPY_VERSION}-config, \
> ${WRKSRC}/configure.ac
This works for me without my placed links.
>
> to post-configure. It correctly detects python support and builds fine,
> passes the tests, runs and can load and use python plugins, thing that
> didn't happen before.
>
> Now, I don't know if patching configure.ac in post-configure target is
> the right thing(TM). Is it correct to override pre-configure instead?
I think if you do this in post-configure your are to late and the party
is over but I'm not very familiar with the GNU autotools.
> Should I use patch target and write a proper patch for configure.ac?
>
> After we have consensus about all this I'll send an updated patch.
>
> Thanks for all the input!
>
> -Lucas
>
Re: update net/profanity
Stuart Henderson wrote:
> Please only use GH_* if using github's autogenerated tarball. If you are
> setting MASTER_SITES anyway then it's not wanted/needed - for this it should
> just have DISTNAME/MASTER_SITES/HOMEPAGE.
Fixed. There are some other packages that define both GH_* and
MASTER_SITES and could be fixed. If there is interest, I can send a
different email addressing that.
Maybe it should be added to bsd.port.mk(5)?
> This is because of the post-patch target using a sed -i on configure.ac,
> causing it to have a newer timestamp than the generated files. This
> can be fixed by removing that post-patch target (it doesn't make sense
> anyway), the AUTO* lines, and change to CONFIGURE_STYLE=gnu.
Thanks for pointing this. As you said, removing that target and setting
CONFIGURE_STYLE=gnu builds, passes the tests and runs fine. Also we can
drop BUILD_DEPENDS+=${MODGNU_AUTO*} because of it.
That line was changed from /usr/local to ${TRUEPREFIX} in r1.4, and I
think it tries to address a hardcoded /usr/local in the project's
configure.ac, line 190:
[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)])],
I think that using ${TRUEPREFIX} in that line is a mistake, but I'm not
sure (out of ignorance) if such replacement doesn't make sense. Maybe
the correct approach is to try to upstream a fix for it, relying on
pkg_info -qe devel/readline.
> > 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 += ${MODPY_WANTLIB} ssl util z
> > +WANTLIB += ${MODPY_WANTLIB} signal-protocol-c ssl util z
>
> "make port-lib-depends-check" says this:
>
> profanity-0.7.0(net/profanity):
> Extra: python3.7m.0 util.13
>
> This isn't new but from what I see it's not building any of the python
> parts. rsadowski, any idea what's going on there?
Dunno if it helps, but configure shows
checking for python-config... no
configure: Python development package not found, Python plugin support disabled.
This happens on line 83 of configure.ac, which just check for
python-config instead of python[23]-config. I went back to autoconf
configure and added
sed -i s,python-config,python${MODPY_VERSION}-config, \
${WRKSRC}/configure.ac
to post-configure. It correctly detects python support and builds fine,
passes the tests, runs and can load and use python plugins, thing that
didn't happen before.
Now, I don't know if patching configure.ac in post-configure target is
the right thing(TM). Is it correct to override pre-configure instead?
Should I use patch target and write a proper patch for configure.ac?
After we have consensus about all this I'll send an updated patch.
Thanks for all the input!
-Lucas
Re: update net/profanity
CC'ing maintainer.
On 2019/09/03 14:01, Lucas wrote:
> Hello ports@,
>
> Here is an update for profanity to release 0.7.0, including OMEMO
> support. It builds, passes the tests and runs fine on amd64.
>
> While there:
> * Change HOMEPAGE to GitHub's site, as it's updated more frequently (old
> HOMEPAGE still shows 0.6.0 as latest version, despite 0.7.0 being
> released more than a month ago) and the repo description points to it.
> * Change the port to GH_*.
> * Add a master site, as the release tarball is different from the source
> tarball.
Please only use GH_* if using github's autogenerated tarball. If you are
setting MASTER_SITES anyway then it's not wanted/needed - for this it should
just have DISTNAME/MASTER_SITES/HOMEPAGE.
> * Tried to remove AUTO{CONF,MAKE}_VERSION but built failed with:
>
> Running autoconf-2.13 in /home/cvs/ports/pobj/profanity-0.7.0/profanity-0.7.0
> fgrep: configure.in: No such file or directory
> autoconf: configure.in: No such file or directory
>
> Also tried setting CONFIGURE_STYLE to gnu, which runs configure just
> fine but then fails building:
>
> WARNING: 'aclocal-1.16' is missing on your system.
> You should only need it if you modified 'acinclude.m4' or
> 'configure.ac' or m4 files included by 'configure.ac'.
> The 'aclocal' program is part of the GNU Automake package:
>
> It also requires GNU Autoconf, GNU m4 and Perl in order to run:
>
>
update net/profanity
Hello ports@,
Here is an update for profanity to release 0.7.0, including OMEMO
support. It builds, passes the tests and runs fine on amd64.
While there:
* Change HOMEPAGE to GitHub's site, as it's updated more frequently (old
HOMEPAGE still shows 0.6.0 as latest version, despite 0.7.0 being
released more than a month ago) and the repo description points to it.
* Change the port to GH_*.
* Add a master site, as the release tarball is different from the source
tarball.
* Enable OMEMO support by default. Thought about making a flavor but OTR
is already enabled by default, so followed that route.
* Remove the deletion of #include "ui/stub_ui.h" from test files. Tests
build and run fine with it. That line comes from first import, which
points to release 0.4.7. Even there, I couldn't find the reasaon
behind "there is no stub_ui.h", as it was present in the repo. Didn't
check the release tarball tho.
* Synchronize feature list with the one in the site.
* Tried to remove AUTO{CONF,MAKE}_VERSION but built failed with:
Running autoconf-2.13 in /home/cvs/ports/pobj/profanity-0.7.0/profanity-0.7.0
fgrep: configure.in: No such file or directory
autoconf: configure.in: No such file or directory
Also tried setting CONFIGURE_STYLE to gnu, which runs configure just
fine but then fails building:
WARNING: 'aclocal-1.16' is missing on your system.
You should only need it if you modified 'acinclude.m4' or
'configure.ac' or m4 files included by 'configure.ac'.
The 'aclocal' program is part of the GNU Automake package:
It also requires GNU Autoconf, GNU m4 and Perl in order to run:
Re: UPDATE: net/profanity (replaces net/libstrophe with NEW net/libmesode)
Thank you!
Re: UPDATE: net/profanity (replaces net/libstrophe with NEW net/libmesode)
On Sun, Mar 03, 2019 at 12:19:57PM +0100, Rafael Sadowski wrote:
> please find attached libmesode-0.9.2 as tarball. libmesode is a fork of
> net/libstrophe for use in profanity. Reasons for forking:
>
> - Remove Windows support
> - Support only one XML Parser implementation (expat)
> - Support only one SSL implementation (OpenSSL)
>
> More: https://github.com/boothj5/libmesode
Tests pass for both, looks OK; some nits:
- Please break MAKE_FLAGS into one variable per line for both ports.
- Also perhaps move CONFIGURE_* together as per Makefile.template.
- You can set SEPARATE_BUILD=yes for both ports.
- libmesode's do-gen target should use ./bootstrap.sh.
- port-lib-depends-check says
profanity-0.6.0(net/profanity):
Extra: m.10 python3.6m.0 util.13/
- Several profanity dependencies require minimal versions as per
configure.ac, you could specify them (all our versions in tree are
more up to date but I still appreciate careful dependency tracking,
as requirements might change with upates)
- ${WRKSRC}/profc.example is worth installing
- with the new python module, I'd pin the version to 3.x right away,
works fine
> I would like remove libstrophe and import libmesode as replacement.
> There are no other consumers and libstrophe was only imported for
> profanity. Below you can find the profanity update diff which replace
> libstrophe with libmesode.
OK.
UPDATE: net/profanity (replaces net/libstrophe with NEW net/libmesode)
Hi XMPP OpenBSD users,
please find attached libmesode-0.9.2 as tarball. libmesode is a fork of
net/libstrophe for use in profanity. Reasons for forking:
- Remove Windows support
- Support only one XML Parser implementation (expat)
- Support only one SSL implementation (OpenSSL)
More: https://github.com/boothj5/libmesode
Profanity with libmesode supports TLS now. Tested with @jabber.ccc.de
I would like remove libstrophe and import libmesode as replacement.
There are no other consumers and libstrophe was only imported for
profanity. Below you can find the profanity update diff which replace
libstrophe with libmesode.
Tests and OK's welcome!
Index: Makefile
===
RCS file: /cvs/ports/net/profanity/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile1 Jul 2018 11:52:40 - 1.7
+++ Makefile3 Mar 2019 11:01:14 -
@@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.7 2018/07/01 11:52:40 rsadowski Exp $
COMMENT = console based XMPP client
-DISTNAME = profanity-0.5.1
+DISTNAME = profanity-0.6.0
CATEGORIES = net
-REVISION = 1
HOMEPAGE = http://www.profanity.im/
MAINTAINER = Rafael Sadowski
@@ -13,33 +12,35 @@ PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = http://www.profanity.im/
-WANTLIB += assuan c crypto curl ereadline expat ffi gcrypt gdk_pixbuf-2.0
+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 ncursesw nghttp2 notify otr
-WANTLIB += pcre png pthread ssl strophe util z ${MODPY_WANTLIB}
-MODULES = lang/python
+WANTLIB += gpgme iconv intl m mesode nghttp2 otr pcre pthread
+WANTLIB += ${MODPY_WANTLIB} ssl util z
+
+MODULES += lang/python
BUILD_DEPENDS +=${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
LIB_DEPENDS += devel/glib2 \
- devel/libnotify \
- devel/readline>=6.1p2 \
- graphics/gdk-pixbuf2 \
+ devel/readline \
net/curl \
- net/libstrophe>=0.9.1 \
+ net/libmesode \
security/gpgme \
security/libotr
-TEST_DEPENDS = devel/cmocka
+# Only needed for tests, but cannot be a TEST_DEPENDS.
+# Check must be present at build time for tests to work.
+BUILD_DEPENDS += devel/cmocka
CONFIGURE_STYLE = autoconf
+
CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-CONFIGURE_ARGS = --with-xscreensaver=no \
+CONFIGURE_ARGS += --with-xscreensaver=no \
--enable-icons=no \
- --enable-notifications=yes \
+ --enable-plugins=yes \
--enable-otr=yes
MAKE_FLAGS = CC="${CC}" CFLAGS="${CFLAGS}"
Index: distinfo
===
RCS file: /cvs/ports/net/profanity/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo6 Feb 2017 21:57:55 - 1.3
+++ distinfo3 Mar 2019 11:01:14 -
@@ -1,2 +1,2 @@
-SHA256 (profanity-0.5.1.tar.gz) = 41E3E+dOwzY/vbrCkZvcF+JJmIeAzFpFidFCWAen/rg=
-SIZE (profanity-0.5.1.tar.gz) = 691508
+SHA256 (profanity-0.6.0.tar.gz) = 8bJ3O3nrKUKXaG85E+lInCDv+uXjozXIlW2xj27i9mA=
+SIZE (profanity-0.6.0.tar.gz) = 741812
Index: patches/patch-configure_ac
===
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- patches/patch-configure_ac 29 Nov 2016 22:26:57 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,52 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.2 2016/11/29 22:26:57 tb Exp $
configure.ac.orig Wed Sep 14 22:52:04 2016
-+++ configure.ac Sun Sep 25 21:17:03 2016
-@@ -22,6 +22,7 @@ AC_CANONICAL_HOST
- PLATFORM="unknown"
- AS_CASE([$host_os],
- [freebsd*], [PLATFORM="freebsd"],
-+[openbsd*], [PLATFORM="openbsd"],
- [darwin*], [PLATFORM="osx"],
- [cygwin], [PLATFORM="cygwin"],
- [PLATFORM="nix"])
-@@ -172,15 +173,22 @@ 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])])],
--[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])])])
-+AS_IF([test "x$PLATFORM" = xosx],
-+ [AC_CHECK_FILE([/usr/local/opt/readline/lib],
-+
Re: UPDATE: net/profanity
> I think I understand the magic. I had not set symbolic links for python > like: /usr/ports/lang/python/2.7/pkg/MESSAGE-main. If you set the > symbolic links, profanity will find you python stuff. Can you reproduce > it? ah, that was it, thanks. i just committed the port with feinerer's fixes > I would like to add a py FLAVOR in profanity!? What do you think about > that? That would be probably a good idea. The port has grown quite fat over the last year. I would also appreciate a small version of the port, i.e., one that just does jabber/otr (if such a thing makes sense) and in particular doesn't insist on firing up a gpg-agent without asking me...
Re: UPDATE: net/profanity
On Mon Feb 06, 2017 at 07:32:40PM +0100, Theo Buehler wrote:
> On Mon, Feb 06, 2017 at 09:27:45AM +0100, Ingo Feinerer wrote:
> > Hi,
> >
> > regarding your profanity update
> > (https://marc.info/?l=openbsd-ports=148632353126979=2) 'make
> > port-lib-depends-check' complains that WANTLIB lacks 'util python2.7'.
> >
> > This is because configure picks up python and enables Python plugins:
> >
> > $ profanity -v
> > ...
> > Build information:
> > XMPP library: libstrophe
> > Desktop notification support: Enabled
> > OTR support: Enabled
> > PGP support: Enabled
> > C plugins: Disabled
> > Python plugins: Enabled
> > GTK icons: Disabled
> >
> > So I have
> >
> > +WANTLIB += pcre png pthread ssl strophe util z ${MODPY_WANTLIB}
> > +MODULES = lang/python
> >
> > in my diff now. Alternatively, disable plugins via CONFIGURE_ARGS.
>
> Hm. I still don't understand the magic here and what one is supposed to
> do. I tested Rafael's diff yesterday and got no errors. When I made the
> changes to WANTLIB and MODULES you suggested, port-lib-depends-check
> started to complain about Extra: python2.7.0 util.12.
I think I understand the magic. I had not set symbolic links for python
like: /usr/ports/lang/python/2.7/pkg/MESSAGE-main. If you set the
symbolic links, profanity will find you python stuff. Can you reproduce
it?
I would like to add a py FLAVOR in profanity!? What do you think about
that?
Cheers,
Rafael
Re: UPDATE: net/profanity
On Mon, Feb 06, 2017 at 09:27:45AM +0100, Ingo Feinerer wrote:
> Hi,
>
> regarding your profanity update
> (https://marc.info/?l=openbsd-ports=148632353126979=2) 'make
> port-lib-depends-check' complains that WANTLIB lacks 'util python2.7'.
>
> This is because configure picks up python and enables Python plugins:
>
> $ profanity -v
> ...
> Build information:
> XMPP library: libstrophe
> Desktop notification support: Enabled
> OTR support: Enabled
> PGP support: Enabled
> C plugins: Disabled
> Python plugins: Enabled
> GTK icons: Disabled
>
> So I have
>
> +WANTLIB += pcre png pthread ssl strophe util z ${MODPY_WANTLIB}
> +MODULES = lang/python
>
> in my diff now. Alternatively, disable plugins via CONFIGURE_ARGS.
Hm. I still don't understand the magic here and what one is supposed to
do. I tested Rafael's diff yesterday and got no errors. When I made the
changes to WANTLIB and MODULES you suggested, port-lib-depends-check
started to complain about Extra: python2.7.0 util.12.
Re: UPDATE: net/profanity
Hi,
regarding your profanity update
(https://marc.info/?l=openbsd-ports=148632353126979=2) 'make
port-lib-depends-check' complains that WANTLIB lacks 'util python2.7'.
This is because configure picks up python and enables Python plugins:
$ profanity -v
...
Build information:
XMPP library: libstrophe
Desktop notification support: Enabled
OTR support: Enabled
PGP support: Enabled
C plugins: Disabled
Python plugins: Enabled
GTK icons: Disabled
So I have
+WANTLIB += pcre png pthread ssl strophe util z ${MODPY_WANTLIB}
+MODULES = lang/python
in my diff now. Alternatively, disable plugins via CONFIGURE_ARGS.
(You might also want to bring your two patches upstream.)
Works fine for me on amd64.
Besides the WANTLIB issue: OK feinerer@
Best regards,
Ingo
UPDATE: net/profanity
Hi All! Update for property to 0.5.1. CHANGELOG 0.5.1: - Add prof.get_room_nick plugins api function - Add main.help.header theme option - Look for system TLS certificate path by default (/tls certpath) - Use service discovery to set account muc property - Allow clearing account muc and resource properties - Allow plugins to complete file paths with prof.filepath_completer_add function - Add encryption settings functions to plugins api - Allow plugins to block message sending on pre message send hooks - Bug fixes: https://github.com/boothj5/profanity/milestone/15?closed=1 Best regards, Rafael Index: Makefile === RCS file: /cvs/ports/net/profanity/Makefile,v retrieving revision 1.4 diff -u -p -u -p -r1.4 Makefile --- Makefile29 Nov 2016 22:26:57 - 1.4 +++ Makefile5 Feb 2017 19:27:14 - @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.4 2016/11/29 22:26:57 tb Exp $ COMMENT = console based XMPP client -DISTNAME = profanity-0.5.0 +DISTNAME = profanity-0.5.1 CATEGORIES = net HOMEPAGE = http://www.profanity.im/ Index: distinfo === RCS file: /cvs/ports/net/profanity/distinfo,v retrieving revision 1.2 diff -u -p -u -p -r1.2 distinfo --- distinfo29 Nov 2016 22:26:57 - 1.2 +++ distinfo5 Feb 2017 19:27:14 - @@ -1,2 +1,2 @@ -SHA256 (profanity-0.5.0.tar.gz) = eDvoqm6rcZL8IR8ArawTayHlgOpS2cBxKDEqlgmTlmg= -SIZE (profanity-0.5.0.tar.gz) = 687169 +SHA256 (profanity-0.5.1.tar.gz) = 41E3E+dOwzY/vbrCkZvcF+JJmIeAzFpFidFCWAen/rg= +SIZE (profanity-0.5.1.tar.gz) = 691508 Index: patches/patch-tests_unittests_tools_stub_http_upload_c === RCS file: /cvs/ports/net/profanity/patches/patch-tests_unittests_tools_stub_http_upload_c,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-tests_unittests_tools_stub_http_upload_c --- patches/patch-tests_unittests_tools_stub_http_upload_c 29 Nov 2016 22:26:57 - 1.1 +++ patches/patch-tests_unittests_tools_stub_http_upload_c 5 Feb 2017 19:27:14 - @@ -2,9 +2,9 @@ $OpenBSD: patch-tests_unittests_tools_st fix missing include tests/unittests/tools/stub_http_upload.c.orig Wed Sep 28 22:32:21 2016 -+++ tests/unittests/tools/stub_http_upload.c Wed Sep 28 22:33:12 2016 -@@ -37,6 +37,8 @@ +--- tests/unittests/tools/stub_http_upload.c.orig Sat Jan 28 22:10:04 2017 tests/unittests/tools/stub_http_upload.c Sun Feb 5 20:17:59 2017 +@@ -3,6 +3,8 @@ #include
Re: UPDATE: net/profanity
On Tue, Oct 18, 2016 at 09:24:38PM +0200, Theo Buehler wrote: > On Wed, Oct 05, 2016 at 03:05:52PM +0200, Theo Buehler wrote: > > On Fri, Sep 30, 2016 at 07:56:08AM +0200, Rafael Sadowski wrote: > > > New diff: > > > > > > - without e2fsprogs and nghttp2 LIB_DEPENDS > > > -- port-lib-depends-check looks good > > > - replace /usr/local with $TRUEPREFIX > > > - portcheck is happy again > > > > This looks good to me: tested this since Friday on amd64. The > > individual build targets work without issues, no compiler warnings, > > except the usual string stuff, tests all pass and portcheck is happy. > > > > sthen, if this looks good to you as well and you want to import this and s/import/update/ > > its dependency libstrophe, ok tb > > > > ping ping > > > > > Rafael, one question: there are two test suites bundled: unit tests and > > functional tests. We currently only run the unit tests. Have you looked > > into the functional tests? > > > > The functional tests have two additional dependencies that currently > > don't have ports, libstabber https://github.com/boothj5/stabber (which > > looks very much like WIP and would currently probably only be useful for > > this and libmicrohttpd https://www.gnu.org/software/libmicrohttpd/ > > (which might be useful otherwise). I do have a working port of > > libmicrohttpd ready, I can send it if there's any interest. > > >
Re: UPDATE: net/profanity
On Wed, Oct 05, 2016 at 03:05:52PM +0200, Theo Buehler wrote: > On Fri, Sep 30, 2016 at 07:56:08AM +0200, Rafael Sadowski wrote: > > New diff: > > > > - without e2fsprogs and nghttp2 LIB_DEPENDS > > -- port-lib-depends-check looks good > > - replace /usr/local with $TRUEPREFIX > > - portcheck is happy again > > This looks good to me: tested this since Friday on amd64. The > individual build targets work without issues, no compiler warnings, > except the usual string stuff, tests all pass and portcheck is happy. > > sthen, if this looks good to you as well and you want to import this and > its dependency libstrophe, ok tb > ping > > Rafael, one question: there are two test suites bundled: unit tests and > functional tests. We currently only run the unit tests. Have you looked > into the functional tests? > > The functional tests have two additional dependencies that currently > don't have ports, libstabber https://github.com/boothj5/stabber (which > looks very much like WIP and would currently probably only be useful for > this and libmicrohttpd https://www.gnu.org/software/libmicrohttpd/ > (which might be useful otherwise). I do have a working port of > libmicrohttpd ready, I can send it if there's any interest. >
Re: UPDATE: net/profanity
On Fri, Sep 30, 2016 at 07:56:08AM +0200, Rafael Sadowski wrote: > New diff: > > - without e2fsprogs and nghttp2 LIB_DEPENDS > -- port-lib-depends-check looks good > - replace /usr/local with $TRUEPREFIX > - portcheck is happy again This looks good to me: tested this since Friday on amd64. The individual build targets work without issues, no compiler warnings, except the usual string stuff, tests all pass and portcheck is happy. sthen, if this looks good to you as well and you want to import this and its dependency libstrophe, ok tb Rafael, one question: there are two test suites bundled: unit tests and functional tests. We currently only run the unit tests. Have you looked into the functional tests? The functional tests have two additional dependencies that currently don't have ports, libstabber https://github.com/boothj5/stabber (which looks very much like WIP and would currently probably only be useful for this and libmicrohttpd https://www.gnu.org/software/libmicrohttpd/ (which might be useful otherwise). I do have a working port of libmicrohttpd ready, I can send it if there's any interest.
Re: UPDATE: net/profanity
On Thu Sep 29, 2016 at 11:56:02PM +0200, Theo Buehler wrote:
> On Thu, Sep 29, 2016 at 10:03:32PM +0200, Rafael Sadowski wrote:
> > Hi @ports,
> >
> > new profanity release. Tested without issues over days. All regressions
> > test are green on amd64. Head up, you need new the libstrophe version.
> >
> > Kind regards,
> >
> > Rafael
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/net/profanity/Makefile,v
> > retrieving revision 1.3
> > diff -u -p -u -p -r1.3 Makefile
> > --- Makefile26 Apr 2016 09:35:38 - 1.3
> > +++ Makefile29 Sep 2016 19:50:40 -
> > @@ -1,7 +1,7 @@
> > # $OpenBSD: Makefile,v 1.3 2016/04/26 09:35:38 sthen Exp $
> >
> > COMMENT = console based XMPP client
> > -DISTNAME = profanity-0.4.7
> > +DISTNAME = profanity-0.5.0
> > CATEGORIES = net
> >
> > HOMEPAGE = http://www.profanity.im/
> > @@ -12,19 +12,24 @@ PERMIT_PACKAGE_CDROM = Yes
> >
> > MASTER_SITES = http://www.profanity.im/
> >
> > -WANTLIB += assuan c curl ereadline glib-2.0 gpg-error gpgme intl ncursesw
> > -WANTLIB += otr strophe uuid
> > +WANTLIB += assuan c crypto curl ereadline expat ffi gcrypt gdk_pixbuf-2.0
> > +WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gpg-error
> > +WANTLIB += gpgme iconv idn intl m ncursesw nghttp2 notify otr
> > +WANTLIB += pcre png pthread ssl strophe z
>
> :(
New XEP's
>
>
> > BUILD_DEPENDS +=${MODGNU_AUTOCONF_DEPENDS} \
> > ${MODGNU_AUTOMAKE_DEPENDS}
> >
> > -LIB_DEPENDS += net/curl \
> > +LIB_DEPENDS += devel/glib2 \
> > + devel/libnotify \
> > devel/readline>=6.1p2 \
> > - devel/glib2 \
> > - net/libstrophe \
> > + graphics/gdk-pixbuf2 \
> > + net/curl \
> > + net/libstrophe>=0.9.1 \
> > security/gpgme \
> > security/libotr \
> > - sysutils/e2fsprogs
> > + sysutils/e2fsprogs \
>
> I get this:
>
> $ /usr/ports/infrastructure/bin/portcheck
> hardcoded paths detected in Makefile, consider using SUBST_VARS and
> TRUEPREFIX/LOCALBASE/LOCALSTATEDIR/VARBASE
> LIB_DEPENDS sysutils/e2fsprogs not needed for net/profanity ?
>
> I assume the former complaint is due to the sed command in post-patch.
> What about the latter?
>
New diff:
- without e2fsprogs and nghttp2 LIB_DEPENDS
-- port-lib-depends-check looks good
- replace /usr/local with $TRUEPREFIX
- portcheck is happy again
Index: Makefile
===
RCS file: /cvs/ports/net/profanity/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Makefile26 Apr 2016 09:35:38 - 1.3
+++ Makefile30 Sep 2016 05:52:42 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.3 2016/04/26 09:35:38 sthen Exp $
COMMENT = console based XMPP client
-DISTNAME = profanity-0.4.7
+DISTNAME = profanity-0.5.0
CATEGORIES = net
HOMEPAGE = http://www.profanity.im/
@@ -12,19 +12,22 @@ PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = http://www.profanity.im/
-WANTLIB += assuan c curl ereadline glib-2.0 gpg-error gpgme intl ncursesw
-WANTLIB += otr strophe uuid
+WANTLIB += assuan c crypto curl ereadline expat ffi gcrypt gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gpg-error
+WANTLIB += gpgme iconv idn intl m ncursesw nghttp2 notify otr
+WANTLIB += pcre png pthread ssl strophe z
BUILD_DEPENDS +=${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
-LIB_DEPENDS += net/curl \
+LIB_DEPENDS += devel/glib2 \
+ devel/libnotify \
devel/readline>=6.1p2 \
- devel/glib2 \
- net/libstrophe \
+ graphics/gdk-pixbuf2 \
+ net/curl \
+ net/libstrophe>=0.9.1 \
security/gpgme \
- security/libotr \
- sysutils/e2fsprogs
+ security/libotr
TEST_DEPENDS = devel/cmocka
@@ -33,8 +36,9 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
CONFIGURE_ARGS = --with-xscreensaver=no \
- --enable-notifications \
- --enable-otr
+ --enable-icons=no \
+ --enable-notifications=yes \
+ --enable-otr=yes
MAKE_FLAGS = CC="${CC}" CFLAGS="${CFLAGS}"
@@ -45,6 +49,6 @@ AUTOMAKE_VERSION =1.11
post-patch:
find ${WRKSRC} -type f -name "*.c" \
-exec sed -i '/stub\_ui.h/d' "{}" \;
- sed -i s,/usr/local,${LOCALBASE}, ${WRKSRC}/configure.ac
+ sed -i s,${TRUEPREFIX},${LOCALBASE}, ${WRKSRC}/configure.ac
.include
Index: distinfo
===
RCS file: /cvs/ports/net/profanity/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo
Re: UPDATE: net/profanity
On 2016/09/29 22:03, Rafael Sadowski wrote:
> -WANTLIB += assuan c curl ereadline glib-2.0 gpg-error gpgme intl ncursesw
> -WANTLIB += otr strophe uuid
> +WANTLIB += assuan c crypto curl ereadline expat ffi gcrypt gdk_pixbuf-2.0
> +WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gpg-error
> +WANTLIB += gpgme iconv idn intl m ncursesw nghttp2 notify otr
> +WANTLIB += pcre png pthread ssl strophe z
>
> BUILD_DEPENDS +=${MODGNU_AUTOCONF_DEPENDS} \
> ${MODGNU_AUTOMAKE_DEPENDS}
>
> -LIB_DEPENDS += net/curl \
> +LIB_DEPENDS += devel/glib2 \
> + devel/libnotify \
> devel/readline>=6.1p2 \
> - devel/glib2 \
> - net/libstrophe \
> + graphics/gdk-pixbuf2 \
> + net/curl \
> + net/libstrophe>=0.9.1 \
> security/gpgme \
> security/libotr \
> - sysutils/e2fsprogs
> + sysutils/e2fsprogs \
> + www/nghttp2
nghttp2 shouldn't be in LIB_DEPENDS here, it is only coming from curl
and is not used directly by profanity.
Re: UPDATE: net/profanity
On Thu, Sep 29, 2016 at 10:03:32PM +0200, Rafael Sadowski wrote:
> Hi @ports,
>
> new profanity release. Tested without issues over days. All regressions
> test are green on amd64. Head up, you need new the libstrophe version.
>
> Kind regards,
>
> Rafael
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/profanity/Makefile,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 Makefile
> --- Makefile 26 Apr 2016 09:35:38 - 1.3
> +++ Makefile 29 Sep 2016 19:50:40 -
> @@ -1,7 +1,7 @@
> # $OpenBSD: Makefile,v 1.3 2016/04/26 09:35:38 sthen Exp $
>
> COMMENT =console based XMPP client
> -DISTNAME = profanity-0.4.7
> +DISTNAME = profanity-0.5.0
> CATEGORIES = net
>
> HOMEPAGE = http://www.profanity.im/
> @@ -12,19 +12,24 @@ PERMIT_PACKAGE_CDROM =Yes
>
> MASTER_SITES = http://www.profanity.im/
>
> -WANTLIB += assuan c curl ereadline glib-2.0 gpg-error gpgme intl ncursesw
> -WANTLIB += otr strophe uuid
> +WANTLIB += assuan c crypto curl ereadline expat ffi gcrypt gdk_pixbuf-2.0
> +WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gpg-error
> +WANTLIB += gpgme iconv idn intl m ncursesw nghttp2 notify otr
> +WANTLIB += pcre png pthread ssl strophe z
:(
> BUILD_DEPENDS +=${MODGNU_AUTOCONF_DEPENDS} \
> ${MODGNU_AUTOMAKE_DEPENDS}
>
> -LIB_DEPENDS += net/curl \
> +LIB_DEPENDS += devel/glib2 \
> + devel/libnotify \
> devel/readline>=6.1p2 \
> - devel/glib2 \
> - net/libstrophe \
> + graphics/gdk-pixbuf2 \
> + net/curl \
> + net/libstrophe>=0.9.1 \
> security/gpgme \
> security/libotr \
> - sysutils/e2fsprogs
> + sysutils/e2fsprogs \
I get this:
$ /usr/ports/infrastructure/bin/portcheck
hardcoded paths detected in Makefile, consider using SUBST_VARS and
TRUEPREFIX/LOCALBASE/LOCALSTATEDIR/VARBASE
LIB_DEPENDS sysutils/e2fsprogs not needed for net/profanity ?
I assume the former complaint is due to the sed command in post-patch.
What about the latter?
> + www/nghttp2
>
> TEST_DEPENDS = devel/cmocka
>
> @@ -33,8 +38,9 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}
> LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
>
> CONFIGURE_ARGS = --with-xscreensaver=no \
> - --enable-notifications \
> - --enable-otr
> + --enable-icons=no \
> + --enable-notifications=yes \
> + --enable-otr=yes
>
> MAKE_FLAGS = CC="${CC}" CFLAGS="${CFLAGS}"
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/profanity/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 distinfo
> --- distinfo 25 Apr 2016 17:46:38 - 1.1.1.1
> +++ distinfo 29 Sep 2016 19:50:40 -
> @@ -1,2 +1,2 @@
> -SHA256 (profanity-0.4.7.tar.gz) =
> sCxOAp/oSUEFDMq2yM318V3yPeXROEtNHsZtpvruEd0=
> -SIZE (profanity-0.4.7.tar.gz) = 463291
> +SHA256 (profanity-0.5.0.tar.gz) =
> eDvoqm6rcZL8IR8ArawTayHlgOpS2cBxKDEqlgmTlmg=
> +SIZE (profanity-0.5.0.tar.gz) = 687169
> Index: patches/patch-configure_ac
> ===
> RCS file: /cvs/ports/net/profanity/patches/patch-configure_ac,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-configure_ac
> --- patches/patch-configure_ac25 Apr 2016 17:46:38 - 1.1.1.1
> +++ patches/patch-configure_ac29 Sep 2016 19:50:40 -
> @@ -1,7 +1,7 @@
> -$OpenBSD: patch-configure_ac,v 1.1.1.1 2016/04/25 17:46:38 tb Exp $
> configure.ac.origSun Sep 20 17:42:03 2015
> -+++ configure.ac Sun Oct 4 23:13:15 2015
> -@@ -19,6 +19,7 @@ AC_CANONICAL_HOST
> +$OpenBSD$
> +--- configure.ac.origWed Sep 14 22:52:04 2016
> configure.ac Sun Sep 25 21:17:03 2016
> +@@ -22,6 +22,7 @@ AC_CANONICAL_HOST
> PLATFORM="unknown"
> AS_CASE([$host_os],
> [freebsd*], [PLATFORM="freebsd"],
> @@ -9,24 +9,9 @@ $OpenBSD: patch-configure_ac,v 1.1.1.1 2
> [darwin*], [PLATFORM="osx"],
> [cygwin], [PLATFORM="cygwin"],
> [PLATFORM="nix"])
> -@@ -57,12 +58,12 @@ AC_ARG_WITH([themes],
> - # Use the CFLAGS and libs provided by libstrophe.pc if libstrophe has
> pkg-config support.
> - PKG_CHECK_MODULES([libstrophe], [libstrophe], [LIBS="$libstrophe_LIBS
> $LIBS"],
> - [
> -- if test "x$PLATFORM" != xfreebsd; then
> -+ if test "x$PLATFORM" != xfreebsd || test "x$PLATFORM" != xopenbsd; then
> - AC_CHECK_LIB([resolv], [res_query], [],
> - [AC_CHECK_LIB([resolv], [__res_query], [],
> - [AC_MSG_ERROR([libresolv not found; libresolv required
> for profanity])])])
> - else
> --AC_MSG_NOTICE([skipping libresolv checks for freebsd])
> -+
UPDATE: net/profanity
Hi @ports,
new profanity release. Tested without issues over days. All regressions
test are green on amd64. Head up, you need new the libstrophe version.
Kind regards,
Rafael
Index: Makefile
===
RCS file: /cvs/ports/net/profanity/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Makefile26 Apr 2016 09:35:38 - 1.3
+++ Makefile29 Sep 2016 19:50:40 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.3 2016/04/26 09:35:38 sthen Exp $
COMMENT = console based XMPP client
-DISTNAME = profanity-0.4.7
+DISTNAME = profanity-0.5.0
CATEGORIES = net
HOMEPAGE = http://www.profanity.im/
@@ -12,19 +12,24 @@ PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = http://www.profanity.im/
-WANTLIB += assuan c curl ereadline glib-2.0 gpg-error gpgme intl ncursesw
-WANTLIB += otr strophe uuid
+WANTLIB += assuan c crypto curl ereadline expat ffi gcrypt gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gpg-error
+WANTLIB += gpgme iconv idn intl m ncursesw nghttp2 notify otr
+WANTLIB += pcre png pthread ssl strophe z
BUILD_DEPENDS +=${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
-LIB_DEPENDS += net/curl \
+LIB_DEPENDS += devel/glib2 \
+ devel/libnotify \
devel/readline>=6.1p2 \
- devel/glib2 \
- net/libstrophe \
+ graphics/gdk-pixbuf2 \
+ net/curl \
+ net/libstrophe>=0.9.1 \
security/gpgme \
security/libotr \
- sysutils/e2fsprogs
+ sysutils/e2fsprogs \
+ www/nghttp2
TEST_DEPENDS = devel/cmocka
@@ -33,8 +38,9 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
CONFIGURE_ARGS = --with-xscreensaver=no \
- --enable-notifications \
- --enable-otr
+ --enable-icons=no \
+ --enable-notifications=yes \
+ --enable-otr=yes
MAKE_FLAGS = CC="${CC}" CFLAGS="${CFLAGS}"
Index: distinfo
===
RCS file: /cvs/ports/net/profanity/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo25 Apr 2016 17:46:38 - 1.1.1.1
+++ distinfo29 Sep 2016 19:50:40 -
@@ -1,2 +1,2 @@
-SHA256 (profanity-0.4.7.tar.gz) = sCxOAp/oSUEFDMq2yM318V3yPeXROEtNHsZtpvruEd0=
-SIZE (profanity-0.4.7.tar.gz) = 463291
+SHA256 (profanity-0.5.0.tar.gz) = eDvoqm6rcZL8IR8ArawTayHlgOpS2cBxKDEqlgmTlmg=
+SIZE (profanity-0.5.0.tar.gz) = 687169
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/net/profanity/patches/patch-configure_ac,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-configure_ac
--- patches/patch-configure_ac 25 Apr 2016 17:46:38 - 1.1.1.1
+++ patches/patch-configure_ac 29 Sep 2016 19:50:40 -
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure_ac,v 1.1.1.1 2016/04/25 17:46:38 tb Exp $
configure.ac.orig Sun Sep 20 17:42:03 2015
-+++ configure.ac Sun Oct 4 23:13:15 2015
-@@ -19,6 +19,7 @@ AC_CANONICAL_HOST
+$OpenBSD$
+--- configure.ac.orig Wed Sep 14 22:52:04 2016
configure.ac Sun Sep 25 21:17:03 2016
+@@ -22,6 +22,7 @@ AC_CANONICAL_HOST
PLATFORM="unknown"
AS_CASE([$host_os],
[freebsd*], [PLATFORM="freebsd"],
@@ -9,24 +9,9 @@ $OpenBSD: patch-configure_ac,v 1.1.1.1 2
[darwin*], [PLATFORM="osx"],
[cygwin], [PLATFORM="cygwin"],
[PLATFORM="nix"])
-@@ -57,12 +58,12 @@ AC_ARG_WITH([themes],
- # Use the CFLAGS and libs provided by libstrophe.pc if libstrophe has
pkg-config support.
- PKG_CHECK_MODULES([libstrophe], [libstrophe], [LIBS="$libstrophe_LIBS $LIBS"],
- [
-- if test "x$PLATFORM" != xfreebsd; then
-+ if test "x$PLATFORM" != xfreebsd || test "x$PLATFORM" != xopenbsd; then
- AC_CHECK_LIB([resolv], [res_query], [],
- [AC_CHECK_LIB([resolv], [__res_query], [],
- [AC_MSG_ERROR([libresolv not found; libresolv required
for profanity])])])
-else
-- AC_MSG_NOTICE([skipping libresolv checks for freebsd])
-+ AC_MSG_NOTICE([skipping libresolv checks for FreeBSD and
OpenBSD])
-fi
-
- ### Check for libstrophe dependencies
-@@ -141,17 +142,24 @@ PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.26], [],
- PKG_CHECK_MODULES([curl], [libcurl], [],
- [AC_MSG_ERROR([libcurl is required for profanity])])
+@@ -172,15 +173,22 @@ 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],
