[Forensics-changes] [guymager] 04/06: Drop debian/patches/ftbfs-gcc-4.7.diff - applied upstream

[Michael Prokop]

This is an automated email from the git hooks/post-receive script.

mika pushed a commit to branch debian
in repository guymager.

commit 6935fb31eb4d095f009cd747b1a5062b5242a3fc
Author: Michael Prokop <mika at debian.org>
Date:   Mon Feb 3 12:23:49 2014 +0100

    Drop debian/patches/ftbfs-gcc-4.7.diff - applied upstream
---
 debian/patches/ftbfs-gcc-4.7.diff | 44 ---------------------------------------
 debian/patches/series             |  1 -
 2 files changed, 45 deletions(-)

diff --git a/debian/patches/ftbfs-gcc-4.7.diff b/debian/patches/ftbfs-gcc-4.7.diff
deleted file mode 100644
index f75222b..0000000
--- a/debian/patches/ftbfs-gcc-4.7.diff
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/main.cpp
-+++ b/main.cpp
-@@ -33,6 +33,7 @@
- #include <signal.h>
- #include <locale.h>
- #include <pwd.h>
-+#include <unistd.h>
- 
- #include <QApplication>
- #include <QtGui>
---- a/aewf.cpp
-+++ b/aewf.cpp
-@@ -46,21 +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.
--
--#if (QT_VERSION < 0x040800)
--   template <typename T> T qbswap(T source);
--   template <> inline uchar qbswap<uchar>(uchar source)
--   {
--      return source;
--   }
--#endif
--
--// ------------------
- //  AEWF definitions
- // ------------------
- 
---- a/config.cpp
-+++ b/config.cpp
-@@ -29,6 +29,7 @@
- #include "common.h"
- 
- #include <limits.h>
-+#include <unistd.h>
- //#include "proc/sysinfo.h"  // Required in order to get smp_num_cpus for finding out the number of CPUs in the system
- 
- #include <qcolor.h>
diff --git a/debian/patches/series b/debian/patches/series
index e4398e6..05176c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 01_do-not-statically-compile-against-libs.diff
-ftbfs-gcc-4.7.diff
 reenable_libguytools_and_libewf.diff
 fix_sysconf_build_failure.diff
 adjust_compileinfo

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/guymager.git