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

[Pino Toscano]

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

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

    fix building with GCC 4.7 (#672016)
    
    backport upstream commit 35e6e47c332e12b7f5e6963fee7b32fe6a25e6ba
---
 debian/changelog                                   |    4 ++
 debian/patches/series                              |    1 +
 debian/patches/upstream_Fix-build-with-clang.patch |   32 ++++++++++++++++++++
 3 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 78abaa8..f8b62a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 kdemultimedia (4:4.7.4-3) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Backport upstream commit 35e6e47c332e12b7f5e6963fee7b32fe6a25e6ba to fix
+    building with GCC 4.7; patch upstream_Fix-build-with-clang.patch.
+    (Closes: #672016)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 06 Mar 2012 20:17:47 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index e008dce..44da981 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ kmix_showeverywhere.diff
 fix_target_link_libraries.diff
 libav_compat.diff
 kscd_dont_crash_if_device_is_emtpy.diff
+upstream_Fix-build-with-clang.patch
diff --git a/debian/patches/upstream_Fix-build-with-clang.patch b/debian/patches/upstream_Fix-build-with-clang.patch
new file mode 100644
index 0000000..200e60f
--- /dev/null
+++ b/debian/patches/upstream_Fix-build-with-clang.patch
@@ -0,0 +1,32 @@
+From 35e6e47c332e12b7f5e6963fee7b32fe6a25e6ba Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <rakuco at FreeBSD.org>
+Date: Tue, 3 Jan 2012 16:09:04 +0000
+Subject: [PATCH] Fix build with clang.
+
+The call to QSet::contains() failed due to [1].
+
+CCMAIL: mpyne at kde.org
+
+[1] http://clang.llvm.org/compatibility.html#dep_lookup_bases
+
+svn path=/trunk/KDE/kdemultimedia/juk/; revision=1271272
+---
+ stringhash.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/juk/stringhash.h b/juk/stringhash.h
+index ff1f193..7d55fb4 100644
+--- a/juk/stringhash.h
++++ b/juk/stringhash.h
+@@ -33,7 +33,7 @@ public:
+      */
+     inline bool insert(const T &value)
+     {
+-        if(contains(value))
++        if(this->contains(value))
+             return true;
+         QSet<T>::insert(value);
+         return false;
+-- 
+1.7.10
+

-- 
KDE Multimedia module packaging