[SCM] KDE Games module packaging branch, master, updated. debian/4.7.4-2-3-g0c41663

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdegames.git;a=commitdiff;h=fbdd78d

The following commit has been merged in the master branch:
commit fbdd78d8dc9ea0780dd1323968f945dd5d6438ee
Author: Pino Toscano <pino at debian.org>
Date:   Tue May 22 12:11:38 2012 +0200

    fix building with GCC 4.7 (#672674)
    
    backport upstream r1286738
---
 debian/changelog                      |    2 ++
 debian/patches/series                 |    1 +
 debian/patches/upstream_r1286738.diff |   29 +++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4393a09..663904a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 kdegames (4:4.7.4-3) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Backport upstream r1286738 to fix building with GCC 4.7. (Closes: #672674)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 06 Mar 2012 20:30:05 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..45cf043
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_r1286738.diff
diff --git a/debian/patches/upstream_r1286738.diff b/debian/patches/upstream_r1286738.diff
new file mode 100644
index 0000000..60defeb
--- /dev/null
+++ b/debian/patches/upstream_r1286738.diff
@@ -0,0 +1,29 @@
+Author: Christoph Feck <christoph at maxiom.de>
+Description: Compile with gcc 4.7
+Applied-Upstream: commit:1286738
+
+Index: kdegames/kblocks/KBlocksPlayNetwork.cpp
+===================================================================
+--- kdegames/kblocks/KBlocksPlayNetwork.cpp	(revision 1286737)
++++ kdegames/kblocks/KBlocksPlayNetwork.cpp	(revision 1286738)
+@@ -11,6 +11,8 @@
+ 
+ #ifdef Q_OS_WIN
+ #include <windows.h>
++#else
++#include <unistd.h>
+ #endif
+ 
+ KBlocksPlayNetwork::KBlocksPlayNetwork(int capacity, const string& serverIP, int localPort)
+Index: kdegames/kpat/patsolve/memory.h
+===================================================================
+--- kdegames/kpat/patsolve/memory.h	(revision 1286737)
++++ kdegames/kpat/patsolve/memory.h	(revision 1286738)
+@@ -19,6 +19,7 @@
+ #ifndef MEMORY_H
+ #define MEMORY_H
+ 
++#include <stdlib.h>
+ #include <sys/types.h>
+ 
+ struct TREE;

-- 
KDE Games module packaging