[rekall] fix compile with gcc 4.7.0

Tom Callaway spot at fedoraproject.org
Thu Jan 5 19:56:55 UTC 2012


commit af46924f0fec38fd9db1311db58ec22981b8704d
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Thu Jan 5 14:56:52 2012 -0500

    fix compile with gcc 4.7.0

 rekall-2.4.6-unistd.patch |   22 ++++++++++++++++++++++
 rekall.spec               |    8 +++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/rekall-2.4.6-unistd.patch b/rekall-2.4.6-unistd.patch
new file mode 100644
index 0000000..8106aff
--- /dev/null
+++ b/rekall-2.4.6-unistd.patch
@@ -0,0 +1,22 @@
+diff -up rekall-2.4.6/db/sqlite3/kb_sqlite3.cpp.gcc47 rekall-2.4.6/db/sqlite3/kb_sqlite3.cpp
+--- rekall-2.4.6/db/sqlite3/kb_sqlite3.cpp.gcc47	2012-01-05 14:35:55.505896586 -0500
++++ rekall-2.4.6/db/sqlite3/kb_sqlite3.cpp	2012-01-05 14:35:55.549896174 -0500
+@@ -21,6 +21,7 @@
+ #endif
+ 
+ #include	<cstdlib>
++#include	<unistd.h>
+ 
+ static	QIntDict<SQLite3TypeMap>	dIdentToType	;
+ static	QDict	<KBSQLite3Type>		typesDict	;
+diff -up rekall-2.4.6/kbase/kb_main_qt3.cpp.gcc47 rekall-2.4.6/kbase/kb_main_qt3.cpp
+--- rekall-2.4.6/kbase/kb_main_qt3.cpp.gcc47	2012-01-05 14:39:09.758083432 -0500
++++ rekall-2.4.6/kbase/kb_main_qt3.cpp	2012-01-05 14:37:52.084808434 -0500
+@@ -13,6 +13,7 @@
+ #include	<stdio.h>
+ #include	<stdlib.h>
+ #include	<time.h>
++#include	<unistd.h>
+ 
+ #include	"rk_application.h"
+ 
diff --git a/rekall.spec b/rekall.spec
index e4f2793..0dba903 100644
--- a/rekall.spec
+++ b/rekall.spec
@@ -3,7 +3,7 @@
 Name:		rekall
 Summary:	A KDE database front-end application
 Version:	2.4.6
-Release:	17%{?dist}
+Release:	18%{?dist}
 Group:		Development/Tools
 License:	GPLv2
 URL:		http://www.rekallrevealed.org/
@@ -21,6 +21,7 @@ Patch11:	rekall-2.4.6-xbsql.l.patch
 Patch12:	rekall-unixODBCfix.patch
 Patch13:	rekall-2.4.6-fix-desktop-icon.patch
 Patch14:	rekall-gcc45.patch
+Patch15:	rekall-2.4.6-unistd.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	python-devel, mysql-devel, postgresql-devel, unixODBC-devel
 BuildRequires:	kdelibs3-devel, desktop-file-utils, libacl-devel
@@ -132,6 +133,8 @@ SQLite components and scripts for Rekall.
 %patch13 -p1 -b .dicon
 # Fix rekall build against gcc45
 %patch14 -p1 -b .gcc45
+# Fix rekall build against gcc47
+%patch15 -p1 -b .gcc47
 
 rm -rf libs/el32/hash.cpp.orig libs/kbase/kb_parse.cpp.orig libs/kbase/kb_link.cpp.orig
 
@@ -345,6 +348,9 @@ fi
 %{_libdir}/librekallqt_driver_sqlite3.so*
 
 %changelog
+* Thu Jan  5 2012 Tom Callaway <spot at fedoraproject.org> - 2.4.6-18
+- Fix rekall build against gcc47
+
 * Wed Mar 23 2011 Dan HorĂ¡k <dan at danny.cz> - 2.4.6-17
 - rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
 


More information about the scm-commits mailing list