Changeset 160


Ignore:
Timestamp:
Apr 30, 2014, 2:11:48 PM (7 years ago)
Author:
Silvan Scherrer
Message:

updated psi to latest 0.16 dev

File:
1 edited

Legend:

Unmodified
Added
Removed
  • diffs/psi_0.16.diff

    r153 r160  
     1diff -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
     2--- vendor/current/build.txt    1970-01-01 01:00:00.000000000 +0100
     3+++ trunk/build.txt     2014-04-23 12:11:54.000000000 +0200
     4@@ -0,0 +1 @@
     5+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
    16diff -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
    2 --- vendor/current/configure    2013-12-03 18:34:22.000000000 +0100
    3 +++ trunk/configure     2013-12-05 13:55:18.000000000 +0100
    4 @@ -1000,12 +1000,12 @@
     7--- vendor/current/configure    2014-04-17 19:28:52.000000000 +0200
     8+++ trunk/configure     2014-04-23 11:58:12.000000000 +0200
     9@@ -959,8 +959,8 @@
     10        QString shortname() const { return "qjdns"; }
     11        bool exec()
     12        {
     13-#if defined Q_OS_WIN || defined Q_OS_MAC
     14-               // HACK: on Windows and Mac OS X, always use psi's bundled qjdns
     15+#if defined Q_OS_WIN || defined Q_OS_MAC || defined Q_OS_OS2
     16+               // HACK: on Windows, OS/2 and Mac OS X, always use psi's bundled qjdns
     17                conf->addExtra("CONFIG += iris-qjdns");
     18                return true;
     19 #else
     20@@ -1071,13 +1071,13 @@
    521        qc_qdbus(Conf *c) : ConfObj(c) {}
    622        QString name() const { return "QDBUS"; }
     
    1329        {
    1430-#ifdef Q_OS_WIN
     31-               // skip dbus support on windows
    1532+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
    16                 // skip dbus support on windows
     33+               // skip dbus support on windows and OS/2
    1734                return false;
    1835 #else
    19 @@ -1358,6 +1358,7 @@
    20  };
    21  #line 1 "enchant.qcm"
    22  /*
    23 +
    24  -----BEGIN QCMOD-----
    25  name: enchant
    26  -----END QCMOD-----
    27 @@ -1884,18 +1885,36 @@
     36                if (!conf->getenv("QC_DISABLE_qdbus").isEmpty())
     37@@ -1958,18 +1958,36 @@
    2838        QString path = qc_getenv("PATH");
    2939        if(!path.isEmpty())
     
    6474 {
    6575        QString out;
    66 @@ -1909,7 +1928,7 @@
     76@@ -1983,8 +2001,8 @@
    6777                        break;
    6878                }
    6979 
    7080-#ifdef Q_OS_WIN
     81-               // on windows, be sure to look for .exe
    7182+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
    72                 // on windows, be sure to look for .exe
     83+               // on windows and OS/2, be sure to look for .exe
    7384                if(prog.right(4).toLower() != ".exe")
    7485                {
    75 @@ -1927,7 +1946,7 @@
     86                        fi = QFileInfo(list[n] + '/' + prog + ".exe");
     87@@ -2001,7 +2019,7 @@
    7688 
    7789 QString qc_findself(const QString &argv0)
     
    8294 #else
    8395        if(argv0.contains('/'))
    84 @@ -2380,6 +2399,9 @@
     96@@ -2454,6 +2472,9 @@
    8597        QStringList dirs;
    8698        dirs += "/usr/local/include";
     
    92104        {
    93105                if(checkHeader(*it, h))
    94 @@ -2422,6 +2444,18 @@
     106@@ -2496,6 +2517,18 @@
    95107                *lib = "/usr/local/lib";
    96108                return true;
     
    111123 }
    112124 
     125diff -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
     126--- vendor/current/iris/configure       2014-04-17 19:29:12.000000000 +0200
     127+++ trunk/iris/configure        2014-04-23 10:36:10.000000000 +0200
     128@@ -1018,8 +1018,8 @@
     129        QString shortname() const { return "qjdns"; }
     130        bool exec()
     131        {
     132-#if defined Q_OS_WIN || Q_OS_MAC
     133-               // HACK: on Windows and Mac OS X, always use psi's bundled qjdns
     134+#if defined Q_OS_WIN || defined Q_OS_MAC || defined Q_OS_OS2
     135+               // HACK: on Windows, OS/2 and Mac OS X, always use psi's bundled qjdns
     136                conf->addExtra("CONFIG += iris-qjdns");
     137                return true;
     138 #else
     139diff -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
     140--- vendor/current/iris/qcm/qjdns.qcm   2014-04-17 19:29:12.000000000 +0200
     141+++ trunk/iris/qcm/qjdns.qcm    2014-04-23 10:35:38.000000000 +0200
     142@@ -17,8 +17,8 @@
     143        QString shortname() const { return "qjdns"; }
     144        bool exec()
     145        {
     146-#if defined Q_OS_WIN || defined Q_OS_MAC
     147-               // HACK: on Windows and Mac OS X, always use psi's bundled qjdns
     148+#if defined Q_OS_WIN || defined Q_OS_MAC || defined Q_OS_OS2
     149+               // HACK: on Windows, OS/2 and Mac OS X, always use psi's bundled qjdns
     150                conf->addExtra("CONFIG += iris-qjdns");
     151                return true;
     152 #else
    113153diff -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
    114 --- vendor/current/iris/src/irisnet/corelib/corelib.pri 2013-08-22 16:54:12.000000000 +0200
    115 +++ trunk/iris/src/irisnet/corelib/corelib.pri  2013-08-22 17:19:58.000000000 +0200
     154--- vendor/current/iris/src/irisnet/corelib/corelib.pri 2014-04-17 19:29:12.000000000 +0200
     155+++ trunk/iris/src/irisnet/corelib/corelib.pri  2014-04-23 10:37:56.000000000 +0200
    116156@@ -30,6 +30,11 @@
    117157                $$PWD/netinterface_unix.cpp
     
    197237 namespace XMPP {
    198238 
    199 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
    200 --- vendor/current/iris/src/jdns/jdns_p.h       2012-10-04 02:53:08.000000000 +0200
    201 +++ trunk/iris/src/jdns/jdns_p.h        2012-10-16 16:32:36.000000000 +0200
     239diff -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
     240--- vendor/current/iris/src/jdns/src/jdns/jdns_p.h      2014-04-17 19:29:14.000000000 +0200
     241+++ trunk/iris/src/jdns/src/jdns/jdns_p.h       2014-04-23 11:14:00.000000000 +0200
    202242@@ -32,6 +32,8 @@
    203243 
    204244 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
    205245 # define JDNS_OS_WIN
    206 +#elif (__OS2__) || (OS2) || (_OS2)
     246+#elif defined(__OS2__) || defined(OS2) || defined(_OS2)
    207247+# define JDNS_OS_OS2
    208248 #else
     
    218258 # include <netinet/in.h>
    219259 #endif
    220 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
    221 --- vendor/current/iris/src/jdns/jdns_sys.c     2013-12-03 19:04:08.000000000 +0100
    222 +++ trunk/iris/src/jdns/jdns_sys.c      2013-12-05 13:57:44.000000000 +0100
     260diff -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
     261--- vendor/current/iris/src/jdns/src/jdns/jdns_sys.c    2014-04-17 19:29:14.000000000 +0200
     262+++ trunk/iris/src/jdns/src/jdns/jdns_sys.c     2014-04-23 11:18:56.000000000 +0200
    223263@@ -117,7 +117,7 @@
    224264 # include <windows.h>
     
    275315 #ifdef __GLIBC__
    276316        for(n = 0; n < MAXNS && n < RESVAR._u._ext.nscount6; ++n)
    277 @@ -780,6 +792,7 @@
     317@@ -779,6 +791,7 @@
     318                jdns_dnsparams_append_nameserver(params, addr, JDNS_UNICAST_PORT);
    278319                jdns_address_delete(addr);
    279320        }
    280  
    281 +#endif
     321+#endif
     322 
    282323        // nameservers - ipv4
    283324        for(n = 0; n < MAXNS && n < RESVAR.nscount; ++n)
    284         {
    285325@@ -841,7 +854,13 @@
    286326                params = dnsparams_get_unixfiles();
     
    297337        return params;
    298338 }
    299 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
    300 --- vendor/current/iris/src/jdns/qjdns_sock.cpp 2012-10-04 02:53:08.000000000 +0200
    301 +++ trunk/iris/src/jdns/qjdns_sock.cpp  2012-10-16 16:48:10.000000000 +0200
     339diff -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
     340--- vendor/current/iris/src/jdns/src/qjdns/qjdns_sock.cpp       2014-04-17 19:29:14.000000000 +0200
     341+++ trunk/iris/src/jdns/src/qjdns/qjdns_sock.cpp        2014-04-23 11:19:34.000000000 +0200
    302342@@ -33,7 +33,7 @@
    303343 # include <ws2tcpip.h>
     
    607647diff -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
    608648--- vendor/current/os2/Readme.OS2       1970-01-01 01:00:00.000000000 +0100
    609 +++ trunk/os2/Readme.OS2        2014-02-18 12:25:44.000000000 +0100
    610 @@ -0,0 +1,228 @@
     649+++ trunk/os2/Readme.OS2        2014-04-30 15:55:22.000000000 +0200
     650@@ -0,0 +1,231 @@
    611651+Psi 0.16-dev for OS/2 and eComStation
    612652+-------------------------------------
     
    648688+  GCC4Core
    649689+  --------
    650 +    1. yum install libgcc
    651 +    2. yum install gcc-stack-protector
    652 +    3. yum install gcc-stdc++-shared-library
    653 +    4. yum install gcc-supc++-shared-library
     690+    1. yum install libgcc4*
     691+    2. yum install libssp
     692+    3. yum install libstdc++6 libstdc++
     693+    4. yum install libsupc++6 libsupc++
    654694
    655695+  Qt4 dll
     
    680720+  GCC4Core   
    681721+  --------
    682 +    1. Download GCC4Core 1.2.1 or better from ftp://ftp.netlabs.org/pub/gcc
     722+    1. Download GCC4Core 1.2.2 or better from ftp://ftp.netlabs.org/pub/gcc
    683723+    2. Install the files to your libpath eg. x:\ecs\dll
    684724
     
    815855+==========
    816856+
     857+  2014-04-23 (Happy birthday Jason)
     858+    * updated to latest 0.16-dev sources
     859+
    817860+  2014-02-18
    818861+    * updated to latest 0.16-dev sources
     
    838881+2012-10-29 Andreas Buchinger
    839882diff -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
    840 --- vendor/current/psi.pro      2013-08-22 16:52:32.000000000 +0200
    841 +++ trunk/psi.pro       2013-08-22 18:15:36.000000000 +0200
     883--- vendor/current/psi.pro      2014-04-17 19:28:52.000000000 +0200
     884+++ trunk/psi.pro       2014-04-23 11:24:28.000000000 +0200
    842885@@ -5,6 +5,7 @@
    843886 # configure iris
     
    848891 sub_iris.subdir = iris
    849892 sub_src.subdir = src
     893diff -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
     894--- vendor/current/qcm/qjdns.qcm        2014-04-17 19:28:52.000000000 +0200
     895+++ trunk/qcm/qjdns.qcm 2014-04-23 11:26:10.000000000 +0200
     896@@ -17,8 +17,8 @@
     897        QString shortname() const { return "qjdns"; }
     898        bool exec()
     899        {
     900-#if defined Q_OS_WIN || defined Q_OS_MAC
     901-               // HACK: on Windows and Mac OS X, always use psi's bundled qjdns
     902+#if defined Q_OS_WIN || defined Q_OS_MAC || defined Q_OS_OS2
     903+               // HACK: on Windows, OS/2 and Mac OS X, always use psi's bundled qjdns
     904                conf->addExtra("CONFIG += iris-qjdns");
     905                return true;
     906 #else
    850907diff -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
    851908--- vendor/current/src/aboutdlg.cpp     2012-10-04 02:53:02.000000000 +0200
     
    903960diff -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
    904961--- vendor/current/src/config.h 1970-01-01 01:00:00.000000000 +0100
    905 +++ trunk/src/config.h  2014-02-18 19:33:06.000000000 +0100
     962+++ trunk/src/config.h  2014-04-23 12:06:30.000000000 +0200
    906963@@ -0,0 +1,3 @@
    907964+#define PSI_LIBDIR "/usr/local/lib/psi"
    908965+#define PSI_DATADIR "/usr/local/share/psi"
    909 +#define PSI_VERSION "0.16-dev-20140218"
     966+#define PSI_VERSION "0.16-dev-20140423"
    910967diff -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
    911968--- vendor/current/src/homedirmigration.cpp     2013-08-22 16:52:32.000000000 +0200
Note: See TracChangeset for help on using the changeset viewer.