[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.7.4-4-3-ga16986e

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit a16986e9057f3f883a3f389d097efe2c86d3d92c
Author: Pino Toscano <pino at debian.org>
Date:   Sat May 12 17:02:56 2012 +0200

    fix building with GCC 4.7
    
    backport the upstream commit 01b0c1a8051f372e400d213ac125311c398e4b17
---
 debian/changelog                                  |    2 +
 debian/patches/series                             |    1 +
 debian/patches/upstream_Add-missing-include.patch |   28 +++++++++++++++++++++
 3 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a0bb45a..706a693 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ kde4libs (4:4.7.4-5) UNRELEASED; urgency=low
   [ Pino Toscano ]
   * Make kdelibs5-dbg strictly depend on libkdecore5, to avoid a mismatch
     between the kdelibs debug symbols and at least one of the libraries.
+  * Backport the upstream commit 01b0c1a8051f372e400d213ac125311c398e4b17 to fix
+    the build with GCC 4.7; patch upstream_Add-missing-include.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 18 Mar 2012 09:22:26 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index eed5b71..8bbb0aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,4 @@ ktar_header_checksum_fix.diff
 ktar_longlink_length_in_bytes.diff
 glibc_filesystem.diff
 upstream_better-check-for-return-values-of-m_protocols.value.patch
+upstream_Add-missing-include.patch
diff --git a/debian/patches/upstream_Add-missing-include.patch b/debian/patches/upstream_Add-missing-include.patch
new file mode 100644
index 0000000..1b714dc
--- /dev/null
+++ b/debian/patches/upstream_Add-missing-include.patch
@@ -0,0 +1,28 @@
+From 01b0c1a8051f372e400d213ac125311c398e4b17 Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <rakuco at FreeBSD.org>
+Date: Fri, 30 Dec 2011 23:27:31 -0200
+Subject: [PATCH] Add missing include.
+
+RefPtr::release() needs PassRefPtr.h for adoptRef(). The include is also
+present in WebKit's wtf.
+
+This should fix another build failure with clang.
+---
+ kjs/wtf/RefPtr.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/kjs/wtf/RefPtr.h b/kjs/wtf/RefPtr.h
+index c16397e..493ab05 100644
+--- a/kjs/wtf/RefPtr.h
++++ b/kjs/wtf/RefPtr.h
+@@ -24,6 +24,7 @@
+ 
+ #include <algorithm>
+ #include "AlwaysInline.h"
++#include "PassRefPtr.h"
+ 
+ namespace WTF {
+ 
+-- 
+1.7.10
+

-- 
KDE Development Platform Libraries module packaging