Changeset 172

Timestamp:

Feb 19, 2015, 5:01:12 PM (10 years ago)

Author:

Silvan Scherrer

Message:

psi: latest diff

File:

• diffs/psi_0.16.diff (modified) (46 diffs)

diffs/psi_0.16.diff

@@ -1 @@
-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    2014-04-17 19:28:52.000000000 +0200
-+++ trunk/configure     2014-04-23 11:58:12.000000000 +0200
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/configure trunk/configure
+--- vendor/current/configure    2014-09-18 16:18:04.000000000 +0200
++++ trunk/configure     2014-09-18 16:18:18.000000000 +0200
 @@ -959,8 +959,8 @@
         QString shortname() const { return "qjdns"; }
@@ -35 +30 @@
  #else
                 if (!conf->getenv("QC_DISABLE_qdbus").isEmpty())
-@@ -1958,18 +1958,36 @@
+@@ -1959,18 +1959,36 @@
         QString path = qc_getenv("PATH");
         if(!path.isEmpty())
@@ -74 +69 @@
  {
         QString out;
-@@ -1983,8 +2001,8 @@
+@@ -1984,8 +2002,8 @@
                         break;
                 }
@@ -85 +80 @@
                 {
                         fi = QFileInfo(list[n] + '/' + prog + ".exe");
-@@ -2001,7 +2019,7 @@
+@@ -2002,7 +2020,7 @@
  
  QString qc_findself(const QString &argv0)
@@ -94 +89 @@
  #else
         if(argv0.contains('/'))
-@@ -2454,6 +2472,9 @@
+@@ -2455,6 +2473,9 @@
         QStringList dirs;
         dirs += "/usr/local/include";
@@ -104 +99 @@
         {
                 if(checkHeader(*it, h))
-@@ -2496,6 +2517,18 @@
+@@ -2497,6 +2518,18 @@
                 *lib = "/usr/local/lib";
                 return true;
@@ -123 +118 @@
  }
  
-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
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' 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
@@ -137 +132 @@
                 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
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' 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
@@ -151 +146 @@
                 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
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/iris/src/irisnet/corelib/corelib.pri trunk/iris/src/irisnet/corelib/corelib.pri
 --- 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
@@ -166 +161 @@
         SOURCES += \
                 $$PWD/netinterface_win.cpp
-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/irisnetglobal.cpp trunk/iris/src/irisnet/corelib/irisnetglobal.cpp
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/iris/src/irisnet/corelib/irisnetglobal.cpp trunk/iris/src/irisnet/corelib/irisnetglobal.cpp
 --- vendor/current/iris/src/irisnet/corelib/irisnetglobal.cpp   2012-10-04 02:53:08.000000000 +0200
 +++ trunk/iris/src/irisnet/corelib/irisnetglobal.cpp    2012-10-16 17:42:50.000000000 +0200
@@ -187 +182 @@
  #endif
                         addBuiltIn(irisnet_createJDnsProvider());
-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/netinterface_unix.cpp trunk/iris/src/irisnet/corelib/netinterface_unix.cpp
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/iris/src/irisnet/corelib/netinterface_unix.cpp trunk/iris/src/irisnet/corelib/netinterface_unix.cpp
 --- vendor/current/iris/src/irisnet/corelib/netinterface_unix.cpp       2012-10-04 02:53:08.000000000 +0200
 +++ trunk/iris/src/irisnet/corelib/netinterface_unix.cpp        2012-10-18 15:13:40.000000000 +0200
@@ -201 +196 @@
                         sockaddr_len = sizeof(struct sockaddr);
                 }
-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/noncore/cutestuff/socks.cpp trunk/iris/src/irisnet/noncore/cutestuff/socks.cpp
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/iris/src/irisnet/noncore/cutestuff/socks.cpp trunk/iris/src/irisnet/noncore/cutestuff/socks.cpp
 --- vendor/current/iris/src/irisnet/noncore/cutestuff/socks.cpp 2013-08-22 16:54:12.000000000 +0200
 +++ trunk/iris/src/irisnet/noncore/cutestuff/socks.cpp  2013-08-22 17:30:26.000000000 +0200
@@ -222 +217 @@
  #include <fcntl.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/irisnet/noncore/turnclient.cpp trunk/iris/src/irisnet/noncore/turnclient.cpp
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/iris/src/irisnet/noncore/turnclient.cpp trunk/iris/src/irisnet/noncore/turnclient.cpp
 --- vendor/current/iris/src/irisnet/noncore/turnclient.cpp      2013-08-22 16:54:12.000000000 +0200
 +++ trunk/iris/src/irisnet/noncore/turnclient.cpp       2013-08-22 17:49:06.000000000 +0200
@@ -237 +232 @@
  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/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
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' 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-09-18 16:20:48.000000000 +0200
++++ trunk/iris/src/jdns/src/jdns/jdns_p.h       2014-09-18 16:20:20.000000000 +0200
 @@ -32,6 +32,8 @@
  
@@ -249 +244 @@
  # define JDNS_OS_UNIX
  #endif
-@@ -50,7 +52,7 @@
+@@ -52,7 +54,7 @@
  # include <windows.h>
  #endif
@@ -258 +253 @@
  # 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/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
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' 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-09-18 16:29:12.000000000 +0200
++++ trunk/iris/src/jdns/src/jdns/jdns_sys.c     2014-09-18 16:29:34.000000000 +0200
 @@ -117,7 +117,7 @@
  # include <windows.h>
@@ -307 +302 @@
  #endif
  
-@@ -752,6 +763,7 @@
-        if(n == -1)
-                return params;
- 
+@@ -771,6 +782,7 @@
+                jdns_address_delete(addr);
+        }
+ #else
 +#ifndef JDNS_OS_OS2 //no ipv6 on os2
         // nameservers - ipv6
  #ifdef __GLIBC__
         for(n = 0; n < MAXNS && n < RESVAR._u._ext.nscount6; ++n)
-@@ -779,6 +791,7 @@
+@@ -798,6 +810,7 @@
                 jdns_dnsparams_append_nameserver(params, addr, JDNS_UNICAST_PORT);
                 jdns_address_delete(addr);
@@ -323 +318 @@
         // nameservers - ipv4
         for(n = 0; n < MAXNS && n < RESVAR.nscount; ++n)
-@@ -841,7 +854,13 @@
+@@ -861,7 +874,13 @@
                 params = dnsparams_get_unixfiles();
         }
@@ -337 +332 @@
         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/src/qjdns/qjdns_sock.cpp trunk/iris/src/jdns/src/qjdns/qjdns_sock.cpp
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' 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
@@ -349 +344 @@
  # include <sys/types.h>
  # include <sys/socket.h>
-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/xmpp/xmpp-core/connector.cpp trunk/iris/src/xmpp/xmpp-core/connector.cpp
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/iris/src/xmpp/xmpp-core/connector.cpp trunk/iris/src/xmpp/xmpp-core/connector.cpp
 --- vendor/current/iris/src/xmpp/xmpp-core/connector.cpp        2013-08-22 16:54:12.000000000 +0200
 +++ trunk/iris/src/xmpp/xmpp-core/connector.cpp 2013-08-22 18:01:58.000000000 +0200
@@ -364 +359 @@
  //#define XMPP_DEBUG
  
-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/xmpp/xmpp-im/s5b.cpp trunk/iris/src/xmpp/xmpp-im/s5b.cpp
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/iris/src/xmpp/xmpp-im/s5b.cpp trunk/iris/src/xmpp/xmpp-im/s5b.cpp
 --- vendor/current/iris/src/xmpp/xmpp-im/s5b.cpp        2013-08-22 16:54:12.000000000 +0200
 +++ trunk/iris/src/xmpp/xmpp-im/s5b.cpp 2013-08-22 18:06:04.000000000 +0200
@@ -379 +374 @@
  
  #ifdef Q_OS_WIN
-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/app.ico trunk/os2/app.ico
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/os2/app.ico trunk/os2/app.ico
 --- vendor/current/os2/app.ico  1970-01-01 01:00:00.000000000 +0100
 +++ trunk/os2/app.ico   2012-10-18 21:15:20.000000000 +0200
@@ -640 +635 @@
 œ
 \ No newline at end of file
-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/psi_os2.rc trunk/os2/psi_os2.rc
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/os2/psi_os2.rc trunk/os2/psi_os2.rc
 --- vendor/current/os2/psi_os2.rc       1970-01-01 01:00:00.000000000 +0100
 +++ trunk/os2/psi_os2.rc        2012-10-18 21:26:14.000000000 +0200
 @@ -0,0 +1 @@
 +ICON 1 DISCARDABLE "../os2/app.ico"
-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
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' 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-04-30 15:55:22.000000000 +0200
-@@ -0,0 +1,231 @@
++++ trunk/os2/Readme.OS2        2015-02-16 21:44:52.000000000 +0100
+@@ -0,0 +1,257 @@
 +Psi 0.16-dev for OS/2 and eComStation
 +-------------------------------------
@@ -688 +683 @@
 +  GCC4Core
 +  --------
-+    1. yum install libgcc4*
++    1. yum install libgcc1
 +    2. yum install libssp
 +    3. yum install libstdc++6 libstdc++
 +    4. yum install libsupc++6 libsupc++
++    5. yum install libgcc-fwd
 +  
 +  Qt4 dll
@@ -709 +705 @@
 +    1. yum install pthread
 +
++  aspell
++  ------
++    1. yum install aspell (this also installs the english dictionary)
++
++  aspell languages
++  ----------------
++    1. yum install aspell-xx were xx is your language (not all are available)
++
 +
 +  ZIP Installation:
@@ -714 +718 @@
 +  klibc    
 +  -----
-+    1. Download klibc 0.6.5 or better (see http://svn.netlabs.org/libc for 
++    1. Download klibc 0.6.6 or better (see http://svn.netlabs.org/libc for 
 +        more information)
 +    2. Install the files to your libpath eg x:\ecs\dll
@@ -743 +747 @@
 +    1. Download pthread from f.i. http://rpm.netlabs.org/release/00/zip
 +    2. Unpack and install the dll to your libpath eg. x:\ecs\dll
++
++  aspell
++  ------
++    1. Download aspell from f.i. http://rpm.netlabs.org/release/00/zip
++    2. Unpack and install the dll to your libpath eg. x:\ecs\dll
++
++  aspell languages
++  ----------------
++    1. Download aspell-xx from f.i. http://rpm.netlabs.org/release/00/zip
++    2. unpack the files to x:\psi_application_dir\aspell
++       (not all languages are available)
 +
 +  Extended System Tray
@@ -855 +870 @@
 +==========
 +
++  2015-02-16
++    * enabled spellchecker
++
++  2014-09-18
++    * updated to latest 0.16-dev sources
++
 +  2014-04-23 (Happy birthday Jason)
 +    * updated to latest 0.16-dev sources
@@ -880 +901 @@
 +
 +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      2014-04-17 19:28:52.000000000 +0200
-+++ trunk/psi.pro       2014-04-23 11:24:28.000000000 +0200
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/psi.pro trunk/psi.pro
+--- vendor/current/psi.pro      2014-11-19 10:52:16.000000000 +0100
++++ trunk/psi.pro       2014-11-19 17:28:42.000000000 +0100
 @@ -5,6 +5,7 @@
  # configure iris
- unix:system("echo \"include(../src/conf_iris.pri)\" > iris/conf.pri")
- windows:system("echo include(../src/conf_iris.pri) > iris\\conf.pri")
-+os2:system("echo include(../src/conf_iris.pri) > iris/conf.pri")
+ unix:system("echo \"include($$top_srcdir/src/conf_iris.pri)\" > $$top_builddir/iris/conf.pri")
+ windows:system("echo include($$top_srcdir/src/conf_iris.pri) > $$top_builddir\\iris\\conf.pri")
++os2:system("echo include($$top_srcdir/src/conf_iris.pri) > $$top_builddir/iris/conf.pri")
  
  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
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' 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
@@ -905 +926 @@
                 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
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/aboutdlg.cpp trunk/src/aboutdlg.cpp
 --- vendor/current/src/aboutdlg.cpp     2012-10-04 02:53:02.000000000 +0200
-+++ trunk/src/aboutdlg.cpp      2013-12-05 14:28:04.000000000 +0100
-@@ -24,6 +24,7 @@
++++ trunk/src/aboutdlg.cpp      2014-11-19 17:45:00.000000000 +0100
+@@ -24,6 +24,9 @@
  
  #include "applicationinfo.h"
  #include "aboutdlg.h"
++#ifdef Q_OS_OS2
 +#include "systeminfo.h"
++#endif
  
  AboutDlg::AboutDlg(QWidget* parent)
         : QDialog(parent)
-@@ -33,7 +34,7 @@
+@@ -33,7 +36,11 @@
  
         setModal(false);
  
--       ui_.lb_name->setText ( QString("<h3><b>%1 v%2</b></h3>").arg(ApplicationInfo::name()).arg(ApplicationInfo::version()) );
++#ifdef Q_OS_OS2
 +       ui_.lb_name->setText ( QString("<h3><b>%1 v%2 on %3</b></h3>").arg(ApplicationInfo::name()).arg(ApplicationInfo::version()).arg(SystemInfo::instance()->os()) );
++#else
+        ui_.lb_name->setText ( QString("<h3><b>%1 v%2</b></h3>").arg(ApplicationInfo::name()).arg(ApplicationInfo::version()) );
++#endif
  
         ui_.te_license->setText ( loadText(":/COPYING") );
  
-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/applicationinfo.cpp trunk/src/applicationinfo.cpp
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/applicationinfo.cpp trunk/src/applicationinfo.cpp
 --- vendor/current/src/applicationinfo.cpp      2013-12-03 18:34:22.000000000 +0100
 +++ trunk/src/applicationinfo.cpp       2013-12-05 14:03:02.000000000 +0100
@@ -946 +972 @@
                         QString XdgDataHome = QString::fromLocal8Bit(getenv("XDG_DATA_HOME"));
                         QString XdgCacheHome = QString::fromLocal8Bit(getenv("XDG_CACHE_HOME"));
-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/common.cpp trunk/src/common.cpp
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/common.cpp trunk/src/common.cpp
 --- vendor/current/src/common.cpp       2013-12-03 18:34:22.000000000 +0100
 +++ trunk/src/common.cpp        2013-12-05 13:34:34.000000000 +0100
@@ -958 +984 @@
  #else
         QString player = PsiOptions::instance()->getOption("options.ui.notifications.sounds.unix-sound-player").toString();
-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
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' 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-04-23 12:06:30.000000000 +0200
++++ trunk/src/config.h  2015-02-13 13:17:26.000000000 +0100
 @@ -0,0 +1,3 @@
 +#define PSI_LIBDIR "/usr/local/lib/psi"
 +#define PSI_DATADIR "/usr/local/share/psi"
-+#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
++#define PSI_VERSION "0.16-dev-20150213"
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/homedirmigration.cpp trunk/src/homedirmigration.cpp
 --- vendor/current/src/homedirmigration.cpp     2013-08-22 16:52:32.000000000 +0200
 +++ trunk/src/homedirmigration.cpp      2013-08-23 10:14:42.000000000 +0200
@@ -987 +1013 @@
         return oldHomeDir_.exists();
  }
-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/libpsi/tools/globalshortcut/globalshortcut.pri trunk/src/libpsi/tools/globalshortcut/globalshortcut.pri
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/libpsi/tools/globalshortcut/globalshortcut.pri trunk/src/libpsi/tools/globalshortcut/globalshortcut.pri
 --- vendor/current/src/libpsi/tools/globalshortcut/globalshortcut.pri   2013-12-03 19:04:12.000000000 +0100
 +++ trunk/src/libpsi/tools/globalshortcut/globalshortcut.pri    2013-12-05 14:05:14.000000000 +0100
@@ -997 +1023 @@
 +       SOURCES += $$PWD/globalshortcutmanager_pm.cpp
 +}
-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/libpsi/tools/globalshortcut/globalshortcutmanager_pm.cpp trunk/src/libpsi/tools/globalshortcut/globalshortcutmanager_pm.cpp
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/libpsi/tools/globalshortcut/globalshortcutmanager_pm.cpp trunk/src/libpsi/tools/globalshortcut/globalshortcutmanager_pm.cpp
 --- vendor/current/src/libpsi/tools/globalshortcut/globalshortcutmanager_pm.cpp 1970-01-01 01:00:00.000000000 +0100
 +++ trunk/src/libpsi/tools/globalshortcut/globalshortcutmanager_pm.cpp  2012-10-18 15:08:06.000000000 +0200
@@ -1064 +1090 @@
 +       d = 0;
 +}
-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/libpsi/tools/idle/idle.pri trunk/src/libpsi/tools/idle/idle.pri
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/libpsi/tools/idle/idle.pri trunk/src/libpsi/tools/idle/idle.pri
 --- vendor/current/src/libpsi/tools/idle/idle.pri       2012-10-04 02:53:12.000000000 +0200
 +++ trunk/src/libpsi/tools/idle/idle.pri        2012-10-18 14:31:18.000000000 +0200
@@ -1074 +1100 @@
 +       SOURCES += $$PWD/idle_x11.cpp
 +}
-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/libpsi/tools/simplecli/simplecli.cpp trunk/src/libpsi/tools/simplecli/simplecli.cpp
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/libpsi/tools/simplecli/simplecli.cpp trunk/src/libpsi/tools/simplecli/simplecli.cpp
 --- vendor/current/src/libpsi/tools/simplecli/simplecli.cpp     2013-08-22 16:54:16.000000000 +0200
 +++ trunk/src/libpsi/tools/simplecli/simplecli.cpp      2013-12-05 14:24:28.000000000 +0100
@@ -1086 +1112 @@
  #else
         const bool winmode = false;
-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/libpsi/tools/spellchecker/aspellchecker.cpp trunk/src/libpsi/tools/spellchecker/aspellchecker.cpp
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/libpsi/tools/spellchecker/aspellchecker.cpp trunk/src/libpsi/tools/spellchecker/aspellchecker.cpp
 --- vendor/current/src/libpsi/tools/spellchecker/aspellchecker.cpp      2013-08-22 16:54:16.000000000 +0200
-+++ trunk/src/libpsi/tools/spellchecker/aspellchecker.cpp       2013-12-05 14:25:08.000000000 +0100
-@@ -38,7 +38,7 @@
++++ trunk/src/libpsi/tools/spellchecker/aspellchecker.cpp       2015-02-16 21:36:06.000000000 +0100
+@@ -38,10 +38,19 @@
         speller_ = NULL;
         config_ = new_aspell_config();
@@ -1095 +1121 @@
 -#ifdef Q_OS_WIN
 +#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
++#if defined(Q_OS_OS2)
++       // on os/2 we overwrite the directory only if not in an rpm installed system
++       if (!getenv("UNIXROOT"))
++       {
++#endif
         aspell_config_replace(config_, "conf-dir", QDir::homePath().toLocal8Bit().data());
         aspell_config_replace(config_, "data-dir", QString("%1/aspell").arg(QCoreApplication::applicationDirPath()).toLocal8Bit().data());
         aspell_config_replace(config_, "dict-dir", QString("%1/aspell").arg(QCoreApplication::applicationDirPath()).toLocal8Bit().data());
-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/libpsi/tools/systemwatch/systemwatch.pri trunk/src/libpsi/tools/systemwatch/systemwatch.pri
++#if defined(Q_OS_OS2)
++       }
++#endif
++
+ #endif
+        AspellCanHaveError* ret = new_aspell_speller(config_);
+        if (aspell_error_number(ret) == 0) {
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/libpsi/tools/systemwatch/systemwatch.pri trunk/src/libpsi/tools/systemwatch/systemwatch.pri
 --- vendor/current/src/libpsi/tools/systemwatch/systemwatch.pri 2012-10-04 02:53:12.000000000 +0200
 +++ trunk/src/libpsi/tools/systemwatch/systemwatch.pri  2013-08-23 10:33:04.000000000 +0200
@@ -1109 +1147 @@
 +       SOURCES += $$PWD/systemwatch_unix.cpp
 +}
-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/main.cpp trunk/src/main.cpp
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/main.cpp trunk/src/main.cpp
 --- vendor/current/src/main.cpp 2013-08-22 16:52:32.000000000 +0200
 +++ trunk/src/main.cpp  2013-08-23 10:46:06.000000000 +0200
@@ -1121 +1159 @@
  #else
                 QLatin1Char pathSep(':');
-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/options/opt_sound.cpp trunk/src/options/opt_sound.cpp
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/options/opt_sound.cpp trunk/src/options/opt_sound.cpp
 --- vendor/current/src/options/opt_sound.cpp    2013-08-22 16:52:32.000000000 +0200
 +++ trunk/src/options/opt_sound.cpp     2013-08-23 11:01:08.000000000 +0200
@@ -1133 +1171 @@
         d->le_player->setText( PsiOptions::instance()->getOption("options.ui.notifications.sounds.unix-sound-player").toString() );
  #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/src/src.pri trunk/src/src.pri
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/src.pri trunk/src/src.pri
 --- vendor/current/src/src.pri  2013-12-03 18:34:22.000000000 +0100
 +++ trunk/src/src.pri   2013-12-05 14:09:30.000000000 +0100
@@ -1147 +1185 @@
         HEADERS +=      $$PWD/chatview_webkit.h \
                         $$PWD/networkaccessmanager.h \
-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/src.pro trunk/src/src.pro
---- vendor/current/src/src.pro  2013-08-22 16:52:34.000000000 +0200
-+++ trunk/src/src.pro   2013-08-23 11:41:48.000000000 +0200
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/src.pro trunk/src/src.pro
+--- vendor/current/src/src.pro  2014-09-18 16:37:50.000000000 +0200
++++ trunk/src/src.pro   2014-11-19 17:29:04.000000000 +0100
 @@ -151,6 +151,9 @@
         # buggy MSVC workaround
@@ -1160 +1198 @@
         # Universal binaries
         qc_universal:contains(QT_CONFIG,x86):contains(QT_CONFIG,x86_64) {
-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/systeminfo.cpp trunk/src/systeminfo.cpp
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/systeminfo.cpp trunk/src/systeminfo.cpp
 --- vendor/current/src/systeminfo.cpp   2013-12-03 18:34:22.000000000 +0100
 +++ trunk/src/systeminfo.cpp    2013-12-06 14:53:42.000000000 +0100
@@ -1248 +1286 @@
  
  #if defined(Q_OS_WIN)
-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/textutil.cpp trunk/src/textutil.cpp
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/textutil.cpp trunk/src/textutil.cpp
 --- vendor/current/src/textutil.cpp     2014-02-18 11:42:48.000000000 +0100
 +++ trunk/src/textutil.cpp      2014-02-18 12:22:34.000000000 +0100
@@ -1260 +1298 @@
                         ++i;    // Qt/Win sees \r\n as two new line chars
  #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/src/webview.cpp trunk/src/webview.cpp
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/webview.cpp trunk/src/webview.cpp
 --- vendor/current/src/webview.cpp      2013-12-03 18:34:22.000000000 +0100
 +++ trunk/src/webview.cpp       2014-02-19 16:26:34.000000000 +0100
@@ -1311 +1349 @@
  {
         return TextUtil::rich2plain(TextUtil::img2title(selectedHtml()));
-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/webview.h trunk/src/webview.h
+diff -Naur -x Makefile -x Makefile.initvars -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 -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/webview.h trunk/src/webview.h
 --- vendor/current/src/webview.h        2013-12-03 18:34:22.000000000 +0100
 +++ trunk/src/webview.h 2013-12-06 17:12:04.000000000 +0100