[rekall] * Sat Jul 31 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 2.4.6-15 - Fix build for gcc45
Toshio くらとみ
toshio at fedoraproject.org
Sat Jul 31 20:31:04 UTC 2010
commit e90179a05ab20118b56683d2caf3d710229d7676
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date: Sat Jul 31 16:30:55 2010 -0400
* Sat Jul 31 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 2.4.6-15
- Fix build for gcc45
rekall-gcc45.patch | 13 +++++++++++++
rekall.spec | 11 +++++++++--
2 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/rekall-gcc45.patch b/rekall-gcc45.patch
new file mode 100644
index 0000000..10cded2
--- /dev/null
+++ b/rekall-gcc45.patch
@@ -0,0 +1,13 @@
+Index: rekall-2.4.6/ports/rkdcop/rk_dcoplib.cpp
+===================================================================
+--- rekall-2.4.6.orig/ports/rkdcop/rk_dcoplib.cpp
++++ rekall-2.4.6/ports/rkdcop/rk_dcoplib.cpp
+@@ -232,7 +232,7 @@ QString LIBRKCOP_API
+ {
+ int rv ;
+ result >> rv ;
+- resv = QVariant::QVariant((bool)rv, 0) ;
++ resv = QVariant((bool)rv, 0) ;
+ return QString::null ;
+ }
+
diff --git a/rekall.spec b/rekall.spec
index 198d62e..3d507f6 100644
--- a/rekall.spec
+++ b/rekall.spec
@@ -1,9 +1,9 @@
-%{!?python_includedir: %define python_includedir %(%{__python} -c "from distutils.sysconfig import get_python_inc; print get_python_inc()")}
+%{!?python_includedir: %global python_includedir %(%{__python} -c "from distutils.sysconfig import get_python_inc; print get_python_inc()")}
Name: rekall
Summary: A KDE database front-end application
Version: 2.4.6
-Release: 14%{?dist}
+Release: 15%{?dist}
Group: Development/Tools
License: GPLv2
URL: http://www.rekallrevealed.org/
@@ -20,6 +20,7 @@ Patch10: rekall-2.4.6-fixflags.patch
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
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
@@ -128,6 +129,9 @@ SQLite components and scripts for Rekall.
%patch11 -p1 -b .fix
# Fix rekall to build against the latest unixODBC
%patch12 -p1 -b .unixODBC
+%patch13 -p1 -b .dicon
+# Fix rekall build against gcc45
+%patch14 -p1 -b .gcc45
rm -rf libs/el32/hash.cpp.orig libs/kbase/kb_parse.cpp.orig libs/kbase/kb_link.cpp.orig
@@ -341,6 +345,9 @@ fi
%{_libdir}/librekallqt_driver_sqlite3.so*
%changelog
+* Sat Jul 31 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 2.4.6-15
+- Fix build for gcc45
+
* Thu Jul 22 2010 David Malcolm <dmalcolm at redhat.com> - 2.4.6-14
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
More information about the scm-commits
mailing list