On Fri Jul 03, 2020 at 04:25:50PM +0200, Landry Breuil wrote:
> On Fri, Jul 03, 2020 at 04:16:49PM +0200, Rafael Sadowski wrote:
> > Hi All
> >
> > My goal is to remove QCA and PSI is the last consumer, so I would like
> > to remove PSI(Qt4) and QCA(Qt4) I have tried to update net/psi several
> > times but I can't get a connection to xmpp server.
> >
> > I don't think it makes sense to have an old XMPP client in the tree.
> > There are plenty of alternatives.
>
> Sure there are, but psi is still alive (last release nov 2018), so at
> least commit what you have if it builds against qt5, mark it BROKEN, and
> then remove, qca ?
>
> Landry
>
Sound like a plan. Here is a update diff to the latest stable version.
Broken at runtime. Every TLS connection fails with "Connection Error:
Unable to connect to server".
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/psi/Makefile,v
retrieving revision 1.33
diff -u -p -u -p -r1.33 Makefile
--- Makefile 12 Jul 2019 20:48:44 -0000 1.33
+++ Makefile 3 Jul 2020 17:11:04 -0000
@@ -1,77 +1,50 @@
# $OpenBSD: Makefile,v 1.33 2019/07/12 20:48:44 sthen Exp $
+BROKEN = Connection Error: Unable to connect to server
+
COMMENT= multiplatform Jabber client
-DISTNAME= psi-0.15
-REVISION= 11
+DISTNAME= psi-1.4
CATEGORIES= net
HOMEPAGE= https://psi-im.org/
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=psi/}
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=psi/Psi/1.4/}
+EXTRACT_SUFX= .tar.xz
# GPLv2
PERMIT_PACKAGE= Yes
-WANTLIB += ICE QtDBus QtGui QtNetwork QtXml SM X11 Xext Xi Xinerama
-WANTLIB += Xrender Xss c enchant fontconfig freetype glib-2.0
-WANTLIB += gmodule-2.0 iconv intl m pthread qca ${COMPILER_LIBCXX} z
-
-COMPILER = base-clang ports-gcc base-gcc
-
-MODULES= x11/qt4
+WANTLIB += ${COMPILER_LIBCXX} ICE Qt5Concurrent Qt5Core Qt5DBus
+WANTLIB += Qt5Gui Qt5Multimedia Qt5Network Qt5Positioning Qt5PrintSupport
+WANTLIB += Qt5Qml Qt5Quick Qt5Svg Qt5WebChannel Qt5WebEngine Qt5WebEngineCore
+WANTLIB += Qt5WebEngineWidgets Qt5Widgets Qt5X11Extras Qt5Xml
+WANTLIB += SM X11 Xext c hunspell-1.6 idn m qca-qt5 xcb z
+
+MODULES= devel/cmake \
+ x11/qt5
+
+LIB_DEPENDS= devel/libidn \
+ security/qca-qt5 \
+ textproc/hunspell \
+ x11/qt5/qtmultimedia \
+ x11/qt5/qtsvg \
+ x11/qt5/qtwebengine \
+ x11/qt5/qtx11extras
-USE_GMAKE= Yes
-
-LIB_DEPENDS= security/qca \
- textproc/enchant
RUN_DEPENDS= devel/desktop-file-utils \
- security/qca,-gnupg \
- security/qca,-ossl \
x11/gtk+3,-guic
-CONFIGURE_STYLE= simple
-
-CONFIGURE_ARGS+= --prefix=${LOCALBASE} \
- --qtdir=${MODQT4_QTDIR} \
- --disable-growl
+CONFIGURE_ARGS= -DUSE_CCACHE=OFF
# For QSettings to write its setup
PORTHOME= ${WRKDIST}
NO_TEST= Yes
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/psi ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/psi
- ${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/psi
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/psi
- cp -R ${WRKSRC}/iconsets ${PREFIX}/share/psi
- cp -R ${WRKSRC}/sound ${PREFIX}/share/psi
- cp -R ${WRKSRC}/certs ${PREFIX}/share/psi
-
- ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
- ${INSTALL_DATA} ${WRKSRC}/psi.desktop ${PREFIX}/share/applications/
-
- ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/16x16/apps
- ${INSTALL_DATA} ${WRKSRC}/iconsets/system/default/logo_16.png \
- ${PREFIX}/share/icons/hicolor/16x16/apps/psi.png
-
- ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/32x32/apps
- ${INSTALL_DATA} ${WRKSRC}/iconsets/system/default/logo_32.png \
- ${PREFIX}/share/icons/hicolor/32x32/apps/psi.png
-
- ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/48x48/apps
- ${INSTALL_DATA} ${WRKSRC}/iconsets/system/default/logo_48.png \
- ${PREFIX}/share/icons/hicolor/48x48/apps/psi.png
-
- ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/64x64/apps
- ${INSTALL_DATA} ${WRKSRC}/iconsets/system/default/logo_64.png \
- ${PREFIX}/share/icons/hicolor/64x64/apps/psi.png
-
- ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/128x128/apps
- ${INSTALL_DATA} ${WRKSRC}/iconsets/system/default/logo_128.png \
- ${PREFIX}/share/icons/hicolor/128x128/apps/psi.png
+post-patch:
+ # Avoid conflict with C++20 <version> by adding .txt suffix
+ mv ${WRKSRC}/version ${WRKSRC}/version.txt
+ sed -i 's,SOURCE_DIR}/version,&.txt,' ${WRKSRC}/CMakeLists.txt
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/psi/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- distinfo 21 Apr 2013 13:56:27 -0000 1.7
+++ distinfo 3 Jul 2020 17:11:04 -0000
@@ -1,2 +1,2 @@
-SHA256 (psi-0.15.tar.bz2) = WTtd3Xk0r2nCRa+w5ykAR/197c/YdluspaOgJMVpx+Y=
-SIZE (psi-0.15.tar.bz2) = 1984777
+SHA256 (psi-1.4.tar.xz) = dhk0wcYtr2khXwhbok1/nNTbBe8K1zU4PWj7A9IVca0=
+SIZE (psi-1.4.tar.xz) = 2119840
Index: patches/patch-iris_iris_pri
===================================================================
RCS file: patches/patch-iris_iris_pri
diff -N patches/patch-iris_iris_pri
--- patches/patch-iris_iris_pri 21 Apr 2013 13:56:27 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-iris_iris_pri,v 1.1 2013/04/21 13:56:27 shadchin Exp $
---- iris/iris.pri.orig Mon Aug 1 18:06:20 2011
-+++ iris/iris.pri Mon Aug 1 18:06:29 2011
-@@ -1,7 +1,7 @@
- IRIS_BASE = $$PWD
- include(common.pri)
-
--CONFIG *= depend_prl
-+#CONFIG *= depend_prl
-
- INCLUDEPATH += $$IRIS_BASE/include $$IRIS_BASE/include/iris $$IRIS_BASE/src
-
Index: patches/patch-iris_src_jdns_jdns_p_h
===================================================================
RCS file: patches/patch-iris_src_jdns_jdns_p_h
diff -N patches/patch-iris_src_jdns_jdns_p_h
--- patches/patch-iris_src_jdns_jdns_p_h 21 Apr 2013 13:56:27 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-iris_src_jdns_jdns_p_h,v 1.1 2013/04/21 13:56:27 shadchin Exp $
---- iris/src/jdns/jdns_p.h.orig Mon Aug 1 02:19:45 2011
-+++ iris/src/jdns/jdns_p.h Mon Aug 1 02:20:09 2011
-@@ -40,6 +40,8 @@
- # define JDNS_OS_FREEBSD
- #elif defined(__NetBSD__)
- # define JDNS_OS_NETBSD
-+#elif defined(__OpenBSD__)
-+# define JDNS_OS_OPENBSD
- #elif defined(sun) || defined(__sun)
- # define JDNS_OS_SOLARIS
- #elif defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__))
Index: patches/patch-iris_src_jdns_jdns_sys_c
===================================================================
RCS file: patches/patch-iris_src_jdns_jdns_sys_c
diff -N patches/patch-iris_src_jdns_jdns_sys_c
--- patches/patch-iris_src_jdns_jdns_sys_c 9 Oct 2013 16:52:24 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,37 +0,0 @@
-$OpenBSD: patch-iris_src_jdns_jdns_sys_c,v 1.2 2013/10/09 16:52:24 shadchin Exp $
---- iris/src/jdns/jdns_sys.c.orig Thu Oct 4 06:53:09 2012
-+++ iris/src/jdns/jdns_sys.c Sun Jul 14 21:45:39 2013
-@@ -752,6 +752,7 @@ static jdns_dnsparams_t *dnsparams_get_unixsys()
- if(n == -1)
- return params;
-
-+#ifndef JDNS_OS_OPENBSD
- // nameservers - ipv6
- for(n = 0; n < MAXNS && n < RESVAR._u._ext.nscount; ++n)
- {
-@@ -775,6 +776,7 @@ static jdns_dnsparams_t *dnsparams_get_unixsys()
- jdns_dnsparams_append_nameserver(params, addr, JDNS_UNICAST_PORT);
- jdns_address_delete(addr);
- }
-+
No comments:
Post a Comment