[Forensics-changes] [SCM] debian-forensics/guymager branch, debian, updated. debian/0.6.5-1-9-g9129a0b

[Michael Prokop]

The following commit has been merged in the debian branch:
commit 18221cc50cc678960ffe88945864aaebe8516de5
Author: Michael Prokop <mika at debian.org>
Date:   Fri May 4 15:04:02 2012 +0200

    Apply fix to address build failure with gcc-4.7.
    
    Closes: #667197
    
    Thanks: Matthias Klose <doko at debian.org>

diff --git a/debian/patches/ftbfs-gcc-4.7.diff b/debian/patches/ftbfs-gcc-4.7.diff
new file mode 100644
index 0000000..bfbb0ce
--- /dev/null
+++ b/debian/patches/ftbfs-gcc-4.7.diff
@@ -0,0 +1,72 @@
+Index: guymager-0.6.5/main.cpp
+===================================================================
+--- guymager-0.6.5.orig/main.cpp	2012-03-01 10:59:44.000000000 +0000
++++ guymager-0.6.5/main.cpp	2012-05-04 05:32:06.323619454 +0000
+@@ -33,6 +33,7 @@
+ #include <signal.h>
+ #include <locale.h>
+ #include <pwd.h>
++#include <unistd.h>
+ #include "proc/sysinfo.h"  // Required in order to get the amount of memory installed
+ 
+ #include <QApplication>
+Index: guymager-0.6.5/aewf.cpp
+===================================================================
+--- guymager-0.6.5.orig/aewf.cpp	2012-03-01 10:59:44.000000000 +0000
++++ guymager-0.6.5/aewf.cpp	2012-05-04 05:37:02.383630470 +0000
+@@ -46,19 +46,6 @@
+ 
+ 
+ // ------------------
+-//         Qt
+-// ------------------
+-
+-// Qt inconsistently defines its little/big endian functions, see QTBUG-21208 on bugreports.qt.nokia.com
+-// The following lines implement conversin for uchar and avoid the problems. 
+-
+-template <typename T> T qbswap(T source);
+-template <> inline uchar qbswap<uchar>(uchar source)
+-{
+-   return source;
+-}
+-
+-// ------------------
+ //  AEWF definitions
+ // ------------------
+ 
+Index: guymager-0.6.5/media.cpp
+===================================================================
+--- guymager-0.6.5.orig/media.cpp	2012-03-01 10:59:44.000000000 +0000
++++ guymager-0.6.5/media.cpp	2012-05-04 05:38:07.275632886 +0000
+@@ -12,6 +12,7 @@
+ // ****************************************************************************
+ 
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <sys/ioctl.h>
+Index: guymager-0.6.5/table.cpp
+===================================================================
+--- guymager-0.6.5.orig/table.cpp	2012-03-01 10:59:44.000000000 +0000
++++ guymager-0.6.5/table.cpp	2012-05-04 05:38:43.507634232 +0000
+@@ -26,6 +26,7 @@
+ // You should have received a copy of the GNU General Public License
+ // along with guymager. If not, see <http://www.gnu.org/licenses/>.
+ 
++#include <unistd.h>
+ #include <QtGui>
+ 
+ #include "toolconstants.h"
+Index: guymager-0.6.5/threadread.cpp
+===================================================================
+--- guymager-0.6.5.orig/threadread.cpp	2012-03-01 10:59:44.000000000 +0000
++++ guymager-0.6.5/threadread.cpp	2012-05-04 05:39:17.771635508 +0000
+@@ -27,6 +27,7 @@
+ // along with guymager. If not, see <http://www.gnu.org/licenses/>.
+ 
+ #include <errno.h>
++#include <unistd.h>
+ 
+ #include <QtCore>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 0fc4199..20a73e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_do-not-statically-compile-against-libs.diff
 02_adjust_ssl_flags.diff
+ftbfs-gcc-4.7.diff

-- 
debian-forensics/guymager