define Q_OS_LINUX always to get the Unix-specific code enabled; also fix a typo

rekall/rekall.patch

@@ -1,6 +1,53 @@
+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	=
+ 	"<qt>"
+ 	"<p><b>RekallQT</b>: A QT database front end</p>"
+-	"<p>Release %s</p>"
++	"<p>Release %1</p>"
+ 	"<p>(C) 1999,2000,2001,2002,2003,2004,2005</p>"
+ 	"</qt>"
+ 	;
+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-14 23:45:33 +0100
++++ parts/report/kb_reportviewer.h	2006-01-15 13:28:21 +0100
 @@ -15,6 +15,7 @@
  
  #include	<qscrollview.h>
@@ -11,7 +58,7 @@ Index: parts/report/kb_reportviewer.h
  #include	"kb_viewer.h"
 Index: scons/Makefile
 --- scons/Makefile.orig	2005-10-02 12:50:16 +0200
-+++ scons/Makefile	2006-01-14 23:45:33 +0100
++++ scons/Makefile	2006-01-15 13:28:21 +0100
 @@ -3,11 +3,9 @@
  
  install:
@@ -26,7 +73,7 @@ Index: scons/Makefile
  		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-14 23:46:57 +0100
++++ scons/rkBuilder.py	2006-01-15 13:44:57 +0100
 @@ -49,10 +49,10 @@
  if rkConfig.mode in [ 'qt3' ] :
      instDir		= rkConfig.prefix
@@ -53,10 +100,11 @@ Index: scons/rkBuilder.py
          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,19 @@
+@@ -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()
@@ -73,7 +121,7 @@ Index: scons/rkBuilder.py
  
          if self.m_build in [ buildWIN ] :
  	    self.setDefine ('ROOTDIR', '"\\"%s"\\"' % (rkConfig.prefix))
-@@ -539,7 +548,6 @@
+@@ -539,7 +549,6 @@
          self.addLib     (rkConfig.pythonLib   )
  
          if rkConfig.mode not in [ 'win', 'mingw' ] :
@@ -81,7 +129,7 @@ Index: scons/rkBuilder.py
              self.addLib	   ('pthread')
              self.addLib	   ('util')
  
-@@ -555,11 +563,9 @@
+@@ -555,11 +564,9 @@
  
          if self.m_build in [ buildQT3 ] :
              self.addAll (os.path.join (rkConfig.topDir, 'ports', 'qt3'), '_kde')
@@ -95,7 +143,7 @@ Index: scons/rkBuilder.py
              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-14 23:45:33 +0100
++++ scons/rkScan_QT3.py	2006-01-15 13:28:21 +0100
 @@ -75,7 +75,7 @@
          binDir = rkLocator.locateFile ('moc', binList)
  
@@ -105,38 +153,15 @@ Index: scons/rkScan_QT3.py
          libLib = 'qt-mt'
          binDir = rkLocator.locateFile ('moc', binList)
  
-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-14 23:54: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 00:31:34 +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: 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.
+       </p>
+       <p>
+-        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 <b>Rekall</b>) then you
+         can disable them here. They can be reenabled later via the
+         <i>View/Options</i> menu.