[pkgsrc/trunk]: pkgsrc/chat/psi remove no longer needed patches - part of psi...

[jdolecek <jdolecek%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1d1ef8e9f87d
branches:  trunk
changeset: 536696:1d1ef8e9f87d
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Thu Dec 20 20:15:25 2007 +0000

description:
remove no longer needed patches - part of psi update to 0.11

tested on NetBSD 4.0, I don't have other platforms ...

diffstat:

 chat/psi/distinfo         |  11 +----------
 chat/psi/patches/patch-aa |  14 --------------
 chat/psi/patches/patch-ac |  17 -----------------
 chat/psi/patches/patch-ad |  20 --------------------
 chat/psi/patches/patch-ae |  18 ------------------
 chat/psi/patches/patch-af |  13 -------------
 chat/psi/patches/patch-ag |  13 -------------
 chat/psi/patches/patch-ah |  25 -------------------------
 chat/psi/patches/patch-ai |  13 -------------
 chat/psi/patches/patch-aj |  12 ------------
 10 files changed, 1 insertions(+), 155 deletions(-)

diffs (200 lines):

diff -r b86353a03f1b -r 1d1ef8e9f87d chat/psi/distinfo
--- a/chat/psi/distinfo Thu Dec 20 18:51:18 2007 +0000
+++ b/chat/psi/distinfo Thu Dec 20 20:15:25 2007 +0000
@@ -1,14 +1,5 @@
-$NetBSD: distinfo,v 1.22 2007/12/19 13:19:38 jdolecek Exp $
+$NetBSD: distinfo,v 1.23 2007/12/20 20:15:25 jdolecek Exp $
 
 SHA1 (psi-0.11-20071115-1/psi-0.11.tar.bz2) = 834fac4b51d92e2502cb08d01d40f05ffcdce4a2
 RMD160 (psi-0.11-20071115-1/psi-0.11.tar.bz2) = 0e4ce707d7659e02d29b16d6d95a4c4c8ba9850a
 Size (psi-0.11-20071115-1/psi-0.11.tar.bz2) = 2000216 bytes
-SHA1 (patch-aa) = 1cc8ebcc9317f48e1a1548e6a3895f57899f6cb7
-SHA1 (patch-ac) = 011dfae070e171628ce03471c76360aa1f4a30d4
-SHA1 (patch-ad) = 01c71c5a00284570b919a5d244fe0e96d141138e
-SHA1 (patch-ae) = 93896bc73cb834a42d81e3eed1419940b75a49a0
-SHA1 (patch-af) = 3be7b02847bbc1c552a15334ae1ba158b030326b
-SHA1 (patch-ag) = ed53824947298272f5ac83af91bf59186d544b93
-SHA1 (patch-ah) = 97eba977a7519488b2d3bef0ed2cbc3e2636de9b
-SHA1 (patch-ai) = 06d0e9dc7aa67ca42462779acf4d2978904df66b
-SHA1 (patch-aj) = b7f7b3ccc5333f50fcde36bab3a3bc120900f37b
diff -r b86353a03f1b -r 1d1ef8e9f87d chat/psi/patches/patch-aa
--- a/chat/psi/patches/patch-aa Thu Dec 20 18:51:18 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2006/01/23 17:05:02 xtraeme Exp $
-
---- src/tools/openpgp/gpgproc/jprocess_unix.cpp.orig   2006-01-23 17:21:43.000000000 +0100
-+++ src/tools/openpgp/gpgproc/jprocess_unix.cpp        2006-01-23 17:22:01.000000000 +0100
-@@ -35,6 +35,9 @@
- **
- **********************************************************************/
- 
-+#define BSD_COMP
-+#include <sys/ioctl.h>
-+
- #include "qplatformdefs.h"
- 
- // Solaris redefines connect -> __xnet_connect with _XOPEN_SOURCE_EXTENDED.
diff -r b86353a03f1b -r 1d1ef8e9f87d chat/psi/patches/patch-ac
--- a/chat/psi/patches/patch-ac Thu Dec 20 18:51:18 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2006/01/23 17:05:02 xtraeme Exp $
-
---- src/psi_profiles.cpp.orig  2006-01-23 16:20:44.000000000 +0100
-+++ src/psi_profiles.cpp       2006-01-23 16:21:15.000000000 +0100
-@@ -441,7 +441,11 @@
-       prefs.rosterOpacity = 95;
-       prefs.outlineHeadings = false;
- 
--      prefs.player = "play";
-+#ifdef __NetBSD__
-+      prefs.player = "audioplay";
-+#else
-+      prefs.player = "player";
-+#endif
-       prefs.noAwaySound = FALSE;
- 
-       prefs.onevent[eMessage]    = g.pathBase + "/sound/chat2.wav";
diff -r b86353a03f1b -r 1d1ef8e9f87d chat/psi/patches/patch-ad
--- a/chat/psi/patches/patch-ad Thu Dec 20 18:51:18 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2006/01/23 17:05:02 xtraeme Exp $
-
---- src/tools/zip/minizip/unzip.h.orig 2006-01-23 16:41:21.000000000 +0100
-+++ src/tools/zip/minizip/unzip.h      2006-01-23 16:41:41.000000000 +0100
-@@ -49,6 +49,15 @@
- #include "zlib.h"
- #endif
- 
-+#ifndef OF
-+#  ifdef STDC
-+#    define OF(x)      x
-+#  else
-+#    define OF(x)
-+#  endif
-+#endif
-+
-+
- #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
- /* like the STRICT of WIN32, we define a pointer that cannot be converted
-     from (void*) without cast */
diff -r b86353a03f1b -r 1d1ef8e9f87d chat/psi/patches/patch-ae
--- a/chat/psi/patches/patch-ae Thu Dec 20 18:51:18 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/10/01 22:02:00 jdolecek Exp $
-
---- iris.pri.orig      2005-10-01 22:20:56.000000000 +0200
-+++ iris.pri   2005-10-01 22:22:05.000000000 +0200
-@@ -1,7 +1,10 @@
- # libidn
--LIBIDN_BASE = $$IRIS_BASE/libidn
--CONFIG += libidn
--include($$IRIS_BASE/libidn.pri)
-+#LIBIDN_BASE = $$IRIS_BASE/libidn
-+#CONFIG += libidn
-+#include($$IRIS_BASE/libidn.pri)
-+unix:{
-+      LIBS += -lidn
-+}
- 
- # qca
- #unix:{
diff -r b86353a03f1b -r 1d1ef8e9f87d chat/psi/patches/patch-af
--- a/chat/psi/patches/patch-af Thu Dec 20 18:51:18 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.3 2006/10/23 21:49:31 jdolecek Exp $
-
---- src/psiaccount.cpp.orig    2006-10-23 23:12:24.000000000 +0200
-+++ src/psiaccount.cpp
-@@ -83,7 +83,7 @@
- #include "psigrowlnotifier.h"
- #endif
- 
--#include"bsocket.h"
-+#include"network/bsocket.h"
- /*#ifdef Q_WS_WIN
- #include<windows.h>
- typedef int socklen_t;
diff -r b86353a03f1b -r 1d1ef8e9f87d chat/psi/patches/patch-ag
--- a/chat/psi/patches/patch-ag Thu Dec 20 18:51:18 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/10/23 21:49:31 jdolecek Exp $
-
---- iris/jabber/s5b.cpp.orig   2006-10-23 23:06:52.000000000 +0200
-+++ iris/jabber/s5b.cpp
-@@ -26,7 +26,7 @@
- #include<qca.h>
- #include"xmpp_xmlcommon.h"
- #include"hash.h"
--#include"socks.h"
-+#include"network/socks.h"
- #include"safedelete.h"
- 
- #ifdef Q_OS_WIN
diff -r b86353a03f1b -r 1d1ef8e9f87d chat/psi/patches/patch-ah
--- a/chat/psi/patches/patch-ah Thu Dec 20 18:51:18 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/10/23 21:49:31 jdolecek Exp $
-
---- iris/xmpp-core/connector.cpp.orig  2006-10-23 23:00:30.000000000 +0200
-+++ iris/xmpp-core/connector.cpp
-@@ -38,14 +38,14 @@
- #ifdef NO_NDNS
- #include<qdns.h>
- #else
--#include"ndns.h"
-+#include"network/ndns.h"
- #endif
- 
--#include"srvresolver.h"
--#include"bsocket.h"
--#include"httpconnect.h"
--#include"httppoll.h"
--#include"socks.h"
-+#include"network/srvresolver.h"
-+#include"network/bsocket.h"
-+#include"network/httpconnect.h"
-+#include"network/httppoll.h"
-+#include"network/socks.h"
- #include"hash.h"
- 
- //#define XMPP_DEBUG
diff -r b86353a03f1b -r 1d1ef8e9f87d chat/psi/patches/patch-ai
--- a/chat/psi/patches/patch-ai Thu Dec 20 18:51:18 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/10/23 21:49:31 jdolecek Exp $
-
---- psics.pri.orig     2006-10-23 22:53:43.000000000 +0200
-+++ psics.pri
-@@ -2,7 +2,7 @@ psics {
-       # iris
-       INCLUDEPATH += \
-               $$IRISCS_CPP/util \
--              $$IRISCS_CPP/network
-+              $$IRISCS_CPP
- 
-       HEADERS += \
-               $$IRISCS_CPP/util/base64.h \
diff -r b86353a03f1b -r 1d1ef8e9f87d chat/psi/patches/patch-aj
--- a/chat/psi/patches/patch-aj Thu Dec 20 18:51:18 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2006/12/04 22:06:40 jdolecek Exp $
-
---- configure.orig     2006-01-07 23:19:01.000000000 +0200
-+++ configure  2006-12-04 18:30:37.000000000 +0200
-@@ -1058,6 +1058,7 @@
-               if(!path.isEmpty())
-                       extra += QString("-L") + path + ' ';
-               extra += QString("-l") + name;
-+              extra += QString(" -pthread");
-               if(!doCompileAndLink(str, extra))
-                       return false;
-               return true;