Index: /diffs/psi_0.16.diff
===================================================================
--- /diffs/psi_0.16.diff	(revision 159)
+++ /diffs/psi_0.16.diff	(revision 160)
@@ -1,6 +1,22 @@
+diff -Naur -x Makefile -x '*.dll' -x 'conf*.pri' -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist -x conf.log vendor/current/build.txt trunk/build.txt
+--- vendor/current/build.txt	1970-01-01 01:00:00.000000000 +0100
++++ trunk/build.txt	2014-04-23 12:11:54.000000000 +0200
+@@ -0,0 +1 @@
++sh configure --enable-webkit --with-idn-inc=e:/trees/libidn/trunk/lib --with-idn-lib=e:/trees/libidn/trunk/lib/.libs --with-qca-inc=e:/trees/qca/include --with-qca-lib=e:/trees/qca/lib
 diff -Naur -x Makefile -x '*.dll' -x 'conf*.pri' -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist -x conf.log vendor/current/configure trunk/configure
---- vendor/current/configure	2013-12-03 18:34:22.000000000 +0100
-+++ trunk/configure	2013-12-05 13:55:18.000000000 +0100
-@@ -1000,12 +1000,12 @@
+--- vendor/current/configure	2014-04-17 19:28:52.000000000 +0200
++++ trunk/configure	2014-04-23 11:58:12.000000000 +0200
+@@ -959,8 +959,8 @@
+ 	QString shortname() const { return "qjdns"; }
+ 	bool exec()
+ 	{
+-#if defined Q_OS_WIN || defined Q_OS_MAC
+-		// HACK: on Windows and Mac OS X, always use psi's bundled qjdns
++#if defined Q_OS_WIN || defined Q_OS_MAC || defined Q_OS_OS2
++		// HACK: on Windows, OS/2 and Mac OS X, always use psi's bundled qjdns
+ 		conf->addExtra("CONFIG += iris-qjdns");
+ 		return true;
+ #else
+@@ -1071,13 +1071,13 @@
  	qc_qdbus(Conf *c) : ConfObj(c) {}
  	QString name() const { return "QDBUS"; }
@@ -13,17 +29,11 @@
  	{
 -#ifdef Q_OS_WIN
+-		// skip dbus support on windows
 +#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
- 		// skip dbus support on windows
++		// skip dbus support on windows and OS/2
  		return false;
  #else
-@@ -1358,6 +1358,7 @@
- };
- #line 1 "enchant.qcm"
- /*
-+
- -----BEGIN QCMOD-----
- name: enchant
- -----END QCMOD-----
-@@ -1884,18 +1885,36 @@
+ 		if (!conf->getenv("QC_DISABLE_qdbus").isEmpty())
+@@ -1958,18 +1958,36 @@
  	QString path = qc_getenv("PATH");
  	if(!path.isEmpty())
@@ -64,14 +74,16 @@
  {
  	QString out;
-@@ -1909,7 +1928,7 @@
+@@ -1983,8 +2001,8 @@
  			break;
  		}
  
 -#ifdef Q_OS_WIN
+-		// on windows, be sure to look for .exe
 +#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
- 		// on windows, be sure to look for .exe
++		// on windows and OS/2, be sure to look for .exe
  		if(prog.right(4).toLower() != ".exe")
  		{
-@@ -1927,7 +1946,7 @@
+ 			fi = QFileInfo(list[n] + '/' + prog + ".exe");
+@@ -2001,7 +2019,7 @@
  
  QString qc_findself(const QString &argv0)
@@ -82,5 +94,5 @@
  #else
  	if(argv0.contains('/'))
-@@ -2380,6 +2399,9 @@
+@@ -2454,6 +2472,9 @@
  	QStringList dirs;
  	dirs += "/usr/local/include";
@@ -92,5 +104,5 @@
  	{
  		if(checkHeader(*it, h))
-@@ -2422,6 +2444,18 @@
+@@ -2496,6 +2517,18 @@
  		*lib = "/usr/local/lib";
  		return true;
@@ -111,7 +123,35 @@
  }
  
+diff -Naur -x Makefile -x '*.dll' -x 'conf*.pri' -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist -x conf.log vendor/current/iris/configure trunk/iris/configure
+--- vendor/current/iris/configure	2014-04-17 19:29:12.000000000 +0200
++++ trunk/iris/configure	2014-04-23 10:36:10.000000000 +0200
+@@ -1018,8 +1018,8 @@
+ 	QString shortname() const { return "qjdns"; }
+ 	bool exec()
+ 	{
+-#if defined Q_OS_WIN || Q_OS_MAC
+-		// HACK: on Windows and Mac OS X, always use psi's bundled qjdns
++#if defined Q_OS_WIN || defined Q_OS_MAC || defined Q_OS_OS2
++		// HACK: on Windows, OS/2 and Mac OS X, always use psi's bundled qjdns
+ 		conf->addExtra("CONFIG += iris-qjdns");
+ 		return true;
+ #else
+diff -Naur -x Makefile -x '*.dll' -x 'conf*.pri' -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist -x conf.log vendor/current/iris/qcm/qjdns.qcm trunk/iris/qcm/qjdns.qcm
+--- vendor/current/iris/qcm/qjdns.qcm	2014-04-17 19:29:12.000000000 +0200
++++ trunk/iris/qcm/qjdns.qcm	2014-04-23 10:35:38.000000000 +0200
+@@ -17,8 +17,8 @@
+ 	QString shortname() const { return "qjdns"; }
+ 	bool exec()
+ 	{
+-#if defined Q_OS_WIN || defined Q_OS_MAC
+-		// HACK: on Windows and Mac OS X, always use psi's bundled qjdns
++#if defined Q_OS_WIN || defined Q_OS_MAC || defined Q_OS_OS2
++		// HACK: on Windows, OS/2 and Mac OS X, always use psi's bundled qjdns
+ 		conf->addExtra("CONFIG += iris-qjdns");
+ 		return true;
+ #else
 diff -Naur -x Makefile -x '*.dll' -x 'conf*.pri' -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist -x conf.log vendor/current/iris/src/irisnet/corelib/corelib.pri trunk/iris/src/irisnet/corelib/corelib.pri
---- vendor/current/iris/src/irisnet/corelib/corelib.pri	2013-08-22 16:54:12.000000000 +0200
-+++ trunk/iris/src/irisnet/corelib/corelib.pri	2013-08-22 17:19:58.000000000 +0200
+--- vendor/current/iris/src/irisnet/corelib/corelib.pri	2014-04-17 19:29:12.000000000 +0200
++++ trunk/iris/src/irisnet/corelib/corelib.pri	2014-04-23 10:37:56.000000000 +0200
 @@ -30,6 +30,11 @@
  		$$PWD/netinterface_unix.cpp
@@ -197,12 +237,12 @@
  namespace XMPP {
  
-diff -Naur -x Makefile -x '*.dll' -x 'conf*.pri' -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist -x conf.log vendor/current/iris/src/jdns/jdns_p.h trunk/iris/src/jdns/jdns_p.h
---- vendor/current/iris/src/jdns/jdns_p.h	2012-10-04 02:53:08.000000000 +0200
-+++ trunk/iris/src/jdns/jdns_p.h	2012-10-16 16:32:36.000000000 +0200
+diff -Naur -x Makefile -x '*.dll' -x 'conf*.pri' -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist -x conf.log vendor/current/iris/src/jdns/src/jdns/jdns_p.h trunk/iris/src/jdns/src/jdns/jdns_p.h
+--- vendor/current/iris/src/jdns/src/jdns/jdns_p.h	2014-04-17 19:29:14.000000000 +0200
++++ trunk/iris/src/jdns/src/jdns/jdns_p.h	2014-04-23 11:14:00.000000000 +0200
 @@ -32,6 +32,8 @@
  
  #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
  # define JDNS_OS_WIN
-+#elif (__OS2__) || (OS2) || (_OS2)
++#elif defined(__OS2__) || defined(OS2) || defined(_OS2)
 +# define JDNS_OS_OS2
  #else
@@ -218,7 +258,7 @@
  # include <netinet/in.h>
  #endif
-diff -Naur -x Makefile -x '*.dll' -x 'conf*.pri' -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist -x conf.log vendor/current/iris/src/jdns/jdns_sys.c trunk/iris/src/jdns/jdns_sys.c
---- vendor/current/iris/src/jdns/jdns_sys.c	2013-12-03 19:04:08.000000000 +0100
-+++ trunk/iris/src/jdns/jdns_sys.c	2013-12-05 13:57:44.000000000 +0100
+diff -Naur -x Makefile -x '*.dll' -x 'conf*.pri' -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist -x conf.log vendor/current/iris/src/jdns/src/jdns/jdns_sys.c trunk/iris/src/jdns/src/jdns/jdns_sys.c
+--- vendor/current/iris/src/jdns/src/jdns/jdns_sys.c	2014-04-17 19:29:14.000000000 +0200
++++ trunk/iris/src/jdns/src/jdns/jdns_sys.c	2014-04-23 11:18:56.000000000 +0200
 @@ -117,7 +117,7 @@
  # include <windows.h>
@@ -275,12 +315,12 @@
  #ifdef __GLIBC__
  	for(n = 0; n < MAXNS && n < RESVAR._u._ext.nscount6; ++n)
-@@ -780,6 +792,7 @@
+@@ -779,6 +791,7 @@
+ 		jdns_dnsparams_append_nameserver(params, addr, JDNS_UNICAST_PORT);
  		jdns_address_delete(addr);
  	}
- 
-+#endif
++#endif
+ 
  	// nameservers - ipv4
  	for(n = 0; n < MAXNS && n < RESVAR.nscount; ++n)
- 	{
 @@ -841,7 +854,13 @@
  		params = dnsparams_get_unixfiles();
@@ -297,7 +337,7 @@
  	return params;
  }
-diff -Naur -x Makefile -x '*.dll' -x 'conf*.pri' -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist -x conf.log vendor/current/iris/src/jdns/qjdns_sock.cpp trunk/iris/src/jdns/qjdns_sock.cpp
---- vendor/current/iris/src/jdns/qjdns_sock.cpp	2012-10-04 02:53:08.000000000 +0200
-+++ trunk/iris/src/jdns/qjdns_sock.cpp	2012-10-16 16:48:10.000000000 +0200
+diff -Naur -x Makefile -x '*.dll' -x 'conf*.pri' -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist -x conf.log vendor/current/iris/src/jdns/src/qjdns/qjdns_sock.cpp trunk/iris/src/jdns/src/qjdns/qjdns_sock.cpp
+--- vendor/current/iris/src/jdns/src/qjdns/qjdns_sock.cpp	2014-04-17 19:29:14.000000000 +0200
++++ trunk/iris/src/jdns/src/qjdns/qjdns_sock.cpp	2014-04-23 11:19:34.000000000 +0200
 @@ -33,7 +33,7 @@
  # include <ws2tcpip.h>
@@ -607,6 +647,6 @@
 diff -Naur -x Makefile -x '*.dll' -x 'conf*.pri' -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist -x conf.log vendor/current/os2/Readme.OS2 trunk/os2/Readme.OS2
 --- vendor/current/os2/Readme.OS2	1970-01-01 01:00:00.000000000 +0100
-+++ trunk/os2/Readme.OS2	2014-02-18 12:25:44.000000000 +0100
-@@ -0,0 +1,228 @@
++++ trunk/os2/Readme.OS2	2014-04-30 15:55:22.000000000 +0200
+@@ -0,0 +1,231 @@
 +Psi 0.16-dev for OS/2 and eComStation
 +-------------------------------------
@@ -648,8 +688,8 @@
 +  GCC4Core
 +  --------
-+    1. yum install libgcc
-+    2. yum install gcc-stack-protector
-+    3. yum install gcc-stdc++-shared-library
-+    4. yum install gcc-supc++-shared-library
++    1. yum install libgcc4*
++    2. yum install libssp
++    3. yum install libstdc++6 libstdc++
++    4. yum install libsupc++6 libsupc++
 +  
 +  Qt4 dll
@@ -680,5 +720,5 @@
 +  GCC4Core   
 +  --------
-+    1. Download GCC4Core 1.2.1 or better from ftp://ftp.netlabs.org/pub/gcc
++    1. Download GCC4Core 1.2.2 or better from ftp://ftp.netlabs.org/pub/gcc
 +    2. Install the files to your libpath eg. x:\ecs\dll
 +  
@@ -815,4 +855,7 @@
 +==========
 +
++  2014-04-23 (Happy birthday Jason)
++    * updated to latest 0.16-dev sources
++
 +  2014-02-18
 +    * updated to latest 0.16-dev sources
@@ -838,6 +881,6 @@
 +2012-10-29 Andreas Buchinger
 diff -Naur -x Makefile -x '*.dll' -x 'conf*.pri' -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist -x conf.log vendor/current/psi.pro trunk/psi.pro
---- vendor/current/psi.pro	2013-08-22 16:52:32.000000000 +0200
-+++ trunk/psi.pro	2013-08-22 18:15:36.000000000 +0200
+--- vendor/current/psi.pro	2014-04-17 19:28:52.000000000 +0200
++++ trunk/psi.pro	2014-04-23 11:24:28.000000000 +0200
 @@ -5,6 +5,7 @@
  # configure iris
@@ -848,4 +891,18 @@
  sub_iris.subdir = iris
  sub_src.subdir = src
+diff -Naur -x Makefile -x '*.dll' -x 'conf*.pri' -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist -x conf.log vendor/current/qcm/qjdns.qcm trunk/qcm/qjdns.qcm
+--- vendor/current/qcm/qjdns.qcm	2014-04-17 19:28:52.000000000 +0200
++++ trunk/qcm/qjdns.qcm	2014-04-23 11:26:10.000000000 +0200
+@@ -17,8 +17,8 @@
+ 	QString shortname() const { return "qjdns"; }
+ 	bool exec()
+ 	{
+-#if defined Q_OS_WIN || defined Q_OS_MAC
+-		// HACK: on Windows and Mac OS X, always use psi's bundled qjdns
++#if defined Q_OS_WIN || defined Q_OS_MAC || defined Q_OS_OS2
++		// HACK: on Windows, OS/2 and Mac OS X, always use psi's bundled qjdns
+ 		conf->addExtra("CONFIG += iris-qjdns");
+ 		return true;
+ #else
 diff -Naur -x Makefile -x '*.dll' -x 'conf*.pri' -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist -x conf.log vendor/current/src/aboutdlg.cpp trunk/src/aboutdlg.cpp
 --- vendor/current/src/aboutdlg.cpp	2012-10-04 02:53:02.000000000 +0200
@@ -903,9 +960,9 @@
 diff -Naur -x Makefile -x '*.dll' -x 'conf*.pri' -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist -x conf.log vendor/current/src/config.h trunk/src/config.h
 --- vendor/current/src/config.h	1970-01-01 01:00:00.000000000 +0100
-+++ trunk/src/config.h	2014-02-18 19:33:06.000000000 +0100
++++ trunk/src/config.h	2014-04-23 12:06:30.000000000 +0200
 @@ -0,0 +1,3 @@
 +#define PSI_LIBDIR "/usr/local/lib/psi"
 +#define PSI_DATADIR "/usr/local/share/psi"
-+#define PSI_VERSION "0.16-dev-20140218"
++#define PSI_VERSION "0.16-dev-20140423"
 diff -Naur -x Makefile -x '*.dll' -x 'conf*.pri' -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist -x conf.log vendor/current/src/homedirmigration.cpp trunk/src/homedirmigration.cpp
 --- vendor/current/src/homedirmigration.cpp	2013-08-22 16:52:32.000000000 +0200
