psi: update patches

[Benny Siegert <bsiegert%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Benny Siegert <bsiegert%gmail.com@localhost>
Pushed By:	bsiegert
Date:		Sun Nov 18 11:54:53 2018 +0100
Changeset:	a4a098de5f176f2d134e5bb2c870092b1ec40af0

Modified Files:
	psi/distinfo
Added Files:
	psi/patches/patch-iris_src_jdns_src_jdns_jdns__sys.c
Removed Files:
	psi/patches/patch-ah
	psi/patches/patch-ak
	psi/patches/patch-al
	psi/patches/patch-configure
	psi/patches/patch-src_src.pro

Log Message:
psi: update patches

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

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

diffstat:
 psi/distinfo                                         |  6 +-----
 psi/patches/patch-ah                                 | 16 ----------------
 psi/patches/patch-ak                                 | 16 ----------------
 psi/patches/patch-al                                 | 16 ----------------
 psi/patches/patch-configure                          | 15 ---------------
 psi/patches/patch-iris_src_jdns_src_jdns_jdns__sys.c | 13 +++++++++++++
 psi/patches/patch-src_src.pro                        | 14 --------------
 7 files changed, 14 insertions(+), 82 deletions(-)

diffs:
diff --git a/psi/distinfo b/psi/distinfo
index 0b56fa5444..7e89007dba 100644
--- a/psi/distinfo
+++ b/psi/distinfo
@@ -5,8 +5,4 @@ RMD160 (psi-1.3/psi-1.3.tar.xz) = 699e9c0442efccbd54296978c1e6fc6ed641f40b
 SHA512 (psi-1.3/psi-1.3.tar.xz) = b1b0f8d0c8326d486cb908d7b7de8f48579a2775f4cad0721ebeb646abd35e890712df176dd8676bf6c6089db88e73cf1b0423bd7a0ea0054661bdcea89349fe
 Size (psi-1.3/psi-1.3.tar.xz) = 2143076 bytes
 SHA1 (patch-ad) = 3ee21a1cb17637ed650b6b58e5575c8fa246a4f0
-SHA1 (patch-ah) = 1c50b81daf5c4e9a4fcefc102ba5780ae90cf44e
-SHA1 (patch-ak) = f3870be31be769ac51a3f26a1fc6f6e14564e685
-SHA1 (patch-al) = 44d17e5ca70061c13164cadf69b8a5f84648c177
-SHA1 (patch-configure) = 3fb1061ec3f4b5c810348109bf397cfad6a6999d
-SHA1 (patch-src_src.pro) = d35d1f22b91b8ca14692c4b5bfb13d11f1d06c34
+SHA1 (patch-iris_src_jdns_src_jdns_jdns__sys.c) = bbbeceda6d4ec9005058da46185af471ca02f86d
diff --git a/psi/patches/patch-ah b/psi/patches/patch-ah
deleted file mode 100644
index efb6aa777a..0000000000
--- a/psi/patches/patch-ah
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2012/12/07 23:52:09 schnoebe Exp $
-
-pkgsrc places idna.h in a different directory than other package
-managers
-
---- iris/src/xmpp/xmpp-core/connector.cpp.orig	2012-10-04 00:53:09.000000000 +0000
-+++ iris/src/xmpp/xmpp-core/connector.cpp
-@@ -36,7 +36,7 @@
- #include <QUrl>
- #include <QTimer>
- #include <qca.h>
--#include <libidn/idna.h>
-+#include <idna.h>
- 
- #include "bsocket.h"
- #include "httpconnect.h"
diff --git a/psi/patches/patch-ak b/psi/patches/patch-ak
deleted file mode 100644
index 7674e052d2..0000000000
--- a/psi/patches/patch-ak
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2012/12/07 23:52:09 schnoebe Exp $
-
-pkgsrc places IDN's stringprep in a different directory than other
-package managers.
-
---- iris/src/xmpp/jid/jid.cpp.orig	2012-10-04 00:53:09.000000000 +0000
-+++ iris/src/xmpp/jid/jid.cpp
-@@ -24,7 +24,7 @@
- #include <QCoreApplication>
- #include <QByteArray>
- #include <QHash>
--#include <libidn/stringprep.h>
-+#include <stringprep.h>
- 
- #ifndef NO_IRISNET
- #include "irisnetglobal_p.h"
diff --git a/psi/patches/patch-al b/psi/patches/patch-al
deleted file mode 100644
index b6798d2b69..0000000000
--- a/psi/patches/patch-al
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-al,v 1.1 2011/01/02 23:53:13 schnoebe Exp $
-
-Add NetBSD to the list of resolvers that support threading, having a
-"modern" resolver API.
-
---- iris/src/jdns/jdns_sys.c.orig	2009-07-26 16:02:12.000000000 -0500
-+++ iris/src/jdns/jdns_sys.c
-@@ -679,7 +679,7 @@ static jdns_dnsparams_t *dnsparams_get_u
- 	return params;
- }
- 
--#if defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 3)))
-+#if defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 3))) || defined(JDNS_OS_NETBSD)
- # define JDNS_MODERN_RES_API
- #endif
- 
diff --git a/psi/patches/patch-configure b/psi/patches/patch-configure
deleted file mode 100644
index 8ad2a01063..0000000000
--- a/psi/patches/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Enchant 2 support.
-
---- configure.orig	2012-10-04 00:53:03.000000000 +0000
-+++ configure
-@@ -1262,7 +1262,7 @@ public:
- 
- 		QStringList incs;
- 		QString version, libs, other;
--		if(!conf->findPkgConfig("enchant", VersionMin, "1.3.0", &version, &incs, &libs, &other))
-+		if(!conf->findPkgConfig("enchant-2", VersionMin, "2.0.0", &version, &incs, &libs, &other))
-                         return false;
- 
- 		qc_enchant_defs += "HAVE_ENCHANT";
diff --git a/psi/patches/patch-iris_src_jdns_src_jdns_jdns__sys.c b/psi/patches/patch-iris_src_jdns_src_jdns_jdns__sys.c
new file mode 100644
index 0000000000..ae2dc31522
--- /dev/null
+++ b/psi/patches/patch-iris_src_jdns_src_jdns_jdns__sys.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- iris/src/jdns/src/jdns/jdns_sys.c.orig	2018-11-18 10:47:00.011865328 +0000
++++ iris/src/jdns/src/jdns/jdns_sys.c
+@@ -700,7 +700,7 @@ static jdns_dnsparams_t *dnsparams_get_u
+ 	return params;
+ }
+ 
+-#if defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 3)))
++#if defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 3))) || defined(JDNS_OS_NETBSD)
+ # define JDNS_MODERN_RES_API
+ #endif
+ 
diff --git a/psi/patches/patch-src_src.pro b/psi/patches/patch-src_src.pro
deleted file mode 100644
index 5477479ba1..0000000000
--- a/psi/patches/patch-src_src.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_src.pro,v 1.1 2012/12/07 23:52:09 schnoebe Exp $
-
-Remove unneeded DESTDIR statement, it broke the install target.
-
---- src/src.pro.orig	2012-10-04 00:53:03.000000000 +0000
-+++ src/src.pro
-@@ -6,7 +6,6 @@
- TEMPLATE = app
- TARGET   = psi
- CONFIG  += qt thread x11
--DESTDIR  = $$PWD/..
- 
- #CONFIG += use_crash
- CONFIG += pep