Index: kbase/kb_about.cpp --- kbase/kb_about.cpp.orig 2005-09-30 19:37:17 +0200 +++ kbase/kb_about.cpp 2006-01-15 13:33:36 +0100 @@ -166,7 +166,7 @@ static cchar *aboutText = "" "

RekallQT: A QT database front end

" - "

Release %s

" + "

Release %1

" "

(C) 1999,2000,2001,2002,2003,2004,2005

" "" ; Index: kjs/kjs/date_object.cpp --- kjs/kjs/date_object.cpp.orig 2005-06-26 21:36:39 +0200 +++ kjs/kjs/date_object.cpp 2006-01-15 13:28:21 +0100 @@ -134,7 +134,7 @@ static double timeZoneOffset(const struct tm *t) { -#if defined BSD || defined(__linux__) || defined(__APPLE__) +#if defined(BSD) || defined(__FreeBSD__) || defined(__linux__) || defined(__APPLE__) return -(t->tm_gmtoff / 60); #else # if defined(__BORLANDC__) @@ -665,7 +665,7 @@ int utcOffset; if (utc) { time_t zero = 0; -#if defined BSD || defined(__linux__) || defined(__APPLE__) +#if defined(BSD) || defined(__FreeBSD__) || defined(__linux__) || defined(__APPLE__) struct tm t3; localtime_r(&zero, &t3); utcOffset = t3.tm_gmtoff; Index: libs/common/kb_locator_qt3.cpp --- libs/common/kb_locator_qt3.cpp.orig 2005-06-26 12:12:48 +0200 +++ libs/common/kb_locator_qt3.cpp 2006-01-15 13:28:21 +0100 @@ -26,8 +26,8 @@ static QString rootdir = ROOTDIR ; -#define DATAPATH "/share/apps/rekallqt/" -#define DOCPATH "/share/doc/HTML/en/rekallqt/" +#define DATAPATH "/share/rekall/" +#define DOCPATH "/share/rekall/doc" /* locateFile : Locate a file of specified type */ /* type : const char * : File type */ Index: parts/report/kb_reportviewer.h --- parts/report/kb_reportviewer.h.orig 2004-12-20 12:00:59 +0100 +++ parts/report/kb_reportviewer.h 2006-01-15 13:28:21 +0100 @@ -15,6 +15,7 @@ #include #include +#include #include "kb_classes.h" #include "kb_viewer.h" Index: scons/Makefile --- scons/Makefile.orig 2005-10-02 12:50:16 +0200 +++ scons/Makefile 2006-01-15 13:28:21 +0100 @@ -3,11 +3,9 @@ install: PYTHONPATH=scons/ scons -Q install - [ `id -u` = 0 ] && ldconfig inst: PYTHONPATH=scons/ scons -Q install - [ `id -u` = 0 ] && ldconfig clean: PYTHONPATH=scons/ scons -Q --clean Index: scons/rkBuilder.py --- scons/rkBuilder.py.orig 2005-10-02 23:16:34 +0200 +++ scons/rkBuilder.py 2006-01-15 13:44:57 +0100 @@ -49,10 +49,10 @@ if rkConfig.mode in [ 'qt3' ] : instDir = rkConfig.prefix binDir = destDir + os.path.join (instDir, 'bin') - libDir = destDir + os.path.join (instDir, 'lib') - pluginDir = destDir + os.path.join (instDir, 'lib') - appDir = destDir + os.path.join (instDir, 'share', 'apps', rkConfig.appName) - docDir = destDir + os.path.join (instDir, 'share', 'doc', 'HTML', 'en') + libDir = destDir + os.path.join (instDir, 'lib', rkConfig.appName) + pluginDir = destDir + os.path.join (instDir, 'lib', rkConfig.appName) + appDir = destDir + os.path.join (instDir, 'share', rkConfig.appName) + docDir = destDir + os.path.join (instDir, 'share', rkConfig.appName, 'doc') rekallServicesDir = os.path.join (appDir, 'services') rekallGUIDir = os.path.join (appDir, 'gui') @@ -302,10 +302,6 @@ if self.m_type == typeLoadedLib : self.setDefine ('__KB_INITNAME', 'init_' + self.target()) - if self.m_build not in [ buildMAC, buildWIN ] : - self.addLFlags ('-Wl,--no-undefined') - self.addCFlags ('-Wall') - if self.m_build in [ buildMAC ] : if self.m_type == typeSharedLib : self.addLFlags ('-Wl,-install_name,@executable_path/../Frameworks/%s.dylib' % (self.target())) @@ -336,6 +332,20 @@ if self.m_build in [ buildQT3, buildGTK, buildMAC ] : self.setDefine ('ROOTDIR', '"\\"%s"\\"' % (rkConfig.prefix)) + self.setDefine ('Q_OS_LINUX') + p = re.compile('-([lL])(.*)') + f = os.popen("pkg-config --libs qt") + o = f.readlines() + for l in o : + for flag in string.split (l, ' ') : + m = p.match(flag) + if m : + if m.group(1) == 'L' : + self.addLibPath(m.group(2)) + else : + self.addLib(m.group(2)) + f.close + self.addLib("pthread") if self.m_build in [ buildWIN ] : self.setDefine ('ROOTDIR', '"\\"%s"\\"' % (rkConfig.prefix)) @@ -539,7 +549,6 @@ self.addLib (rkConfig.pythonLib ) if rkConfig.mode not in [ 'win', 'mingw' ] : - self.addLib ('dl') self.addLib ('pthread') self.addLib ('util') @@ -555,11 +564,9 @@ if self.m_build in [ buildQT3 ] : self.addAll (os.path.join (rkConfig.topDir, 'ports', 'qt3'), '_kde') - self.addLib ('dl') if self.m_build in [ buildGTK ] : self.addAll (os.path.join (rkConfig.topDir, 'ports', 'gtk'), '_kde') - self.addLib ('dl') if self.m_build in [ buildWIN, buildMINGW, buildMAC ] : self.addAll (os.path.join (rkConfig.topDir, 'ports', 'qt3'), '_kde') Index: scons/rkScan_QT3.py --- scons/rkScan_QT3.py.orig 2005-09-30 00:03:08 +0200 +++ scons/rkScan_QT3.py 2006-01-15 13:28:21 +0100 @@ -75,7 +75,7 @@ binDir = rkLocator.locateFile ('moc', binList) if settings.lookup('mode') in [ 'kde', 'qt3', 'qte' ] : - libDir = rkLocator.locateFile ('libqt-mt.so', libList) + libDir = rkLocator.locateFile ('libqt-mt.a', libList) libLib = 'qt-mt' binDir = rkLocator.locateFile ('moc', binList) Index: wizards/wizSetup.wiz --- wizards/wizSetup.wiz.orig 2005-09-30 00:03:09 +0200 +++ wizards/wizSetup.wiz 2006-01-15 13:29:22 +0100 @@ -67,7 +67,7 @@ settings.

- If you with not to use either the toolbox or the wizards (which + If you wish not to use either the toolbox or the wizards (which did not exist in earlier versions of Rekall) then you can disable them here. They can be reenabled later via the View/Options menu. Index: db/mysql/rkScan_MySQL.py --- db/mysql/rkScan_MySQL.py.orig 2005-06-26 21:26:47 +0200 +++ db/mysql/rkScan_MySQL.py 2006-01-15 15:05:20 +0100 @@ -38,7 +38,7 @@ libLib = 'mysqlclient' if settings.mode() in [ 'kde', 'qt3' ] : - libFile = 'libmysqlclient.so' + libFile = 'libmysqlclient.a' libLib = 'mysqlclient' incDir = rkLocator.locateFile ('mysql.h', incList) Index: db/pgsql/rkScan_PgSQL.py --- db/pgsql/rkScan_PgSQL.py.orig 2005-09-30 18:25:11 +0200 +++ db/pgsql/rkScan_PgSQL.py 2006-01-15 15:05:07 +0100 @@ -31,7 +31,7 @@ libLib = 'libpq' if settings.mode() in [ 'kde', 'qt3' ] : - libFile = 'libpq.so' + libFile = 'libpq.a' libLib = 'pq' if settings.mode() in [ 'mac' ] : Index: db/pgsql/SConscript --- db/pgsql/SConscript.orig 2005-09-30 18:25:11 +0200 +++ db/pgsql/SConscript 2006-01-15 15:06:47 +0100 @@ -31,6 +31,8 @@ rb.setDefine ('WIN32', '1') if rkConfig.mode in [ 'kde', 'qt3' ] : + rb.addLib ('ssl') + rb.addLib ('crypto') rb.addLib ('crypt') if rkConfig.mode in [ 'mac' ] :