[SCM] KDE Multimedia module packaging branch, kde4.8, updated. debian/4.7.4-3-15-gcdb41f7

[Pino Toscano]

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

The following commit has been merged in the kde4.8 branch:
commit cdb41f78c86fe297dd523a1b70af98b5cbb73237
Author: Pino Toscano <pino at debian.org>
Date:   Thu May 24 23:48:55 2012 +0200

    remove upstream_Fix-build-with-clang.patch
    
    it has been cherry-picked from upstream
---
 debian/changelog                                   |    3 ++
 debian/patches/series                              |    1 -
 debian/patches/upstream_Fix-build-with-clang.patch |   32 --------------------
 3 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 228f64b..c577d5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ kdemultimedia (4:4.8.3-0r0) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.9.3, no changes needed.
   * Bump kde-sc-dev-latest build dependency to version 4:4.8.3.
 
+  [ Pino Toscano ]
+  * Remove upstream_Fix-build-with-clang.patch, cherry-picked from upstream.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 09 Mar 2012 00:22:19 +0100
 
 kdemultimedia (4:4.7.4-3) unstable; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index 83ac8ca..b5e7d70 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 kmix_showeverywhere.diff
 fix_target_link_libraries.diff
 libav_compat.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
deleted file mode 100644
index 200e60f..0000000
--- a/debian/patches/upstream_Fix-build-with-clang.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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