[SCM] KDE PIM Libraries module packaging branch, master, updated. debian/4.7.4-2-3-g408f3a4

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit e7c962e7ae425c93f3897a2f9f36630dc5e1c02d
Author: Pino Toscano <pino at debian.org>
Date:   Fri May 11 14:24:24 2012 +0200

    fix build with GCC 4.7 (#667220)
    
    backport upstream commit b886894bd1afc515947c24883169d0a5107a86d5
---
 debian/changelog                                   |    5 +++
 debian/patches/series                              |    1 +
 ...uations-necessary-for-building-with-clang.patch |   39 ++++++++++++++++++++
 3 files changed, 45 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f6bbea6..267c06b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 kdepimlibs (4:4.7.4-3) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Backport upstream commit b886894bd1afc515947c24883169d0a5107a86d5 to fix
+    building with GCC 4.7; patch
+    upstream_Disambiguations-necessary-for-building-with-clang.patch.
+    (Closes: #667220)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 11 May 2012 14:18:54 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 30f6e5e..e4742c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 03_hide_akonadi_progressbar.diff
 kio_imap_append.diff
+upstream_Disambiguations-necessary-for-building-with-clang.patch
diff --git a/debian/patches/upstream_Disambiguations-necessary-for-building-with-clang.patch b/debian/patches/upstream_Disambiguations-necessary-for-building-with-clang.patch
new file mode 100644
index 0000000..3de980f
--- /dev/null
+++ b/debian/patches/upstream_Disambiguations-necessary-for-building-with-clang.patch
@@ -0,0 +1,39 @@
+From b886894bd1afc515947c24883169d0a5107a86d5 Mon Sep 17 00:00:00 2001
+From: Till Adam <till at kdab.com>
+Date: Fri, 9 Sep 2011 20:29:39 +0200
+Subject: [PATCH] Disambiguations necessary for building with clang.
+
+---
+ kcal/listbase.h         |    2 +-
+ kmime/kautodeletehash.h |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/kcal/listbase.h b/kcal/listbase.h
+index c246cc0..80acc23 100644
+--- a/kcal/listbase.h
++++ b/kcal/listbase.h
+@@ -115,7 +115,7 @@ class ListBase : public QList<T *>
+     */
+     bool removeRef( T *t )
+     {
+-      if ( !contains( t ) ) {
++      if ( !this->contains( t ) ) {
+         return false;
+       } else {
+         if ( mAutoDelete ) {
+diff --git a/kmime/kautodeletehash.h b/kmime/kautodeletehash.h
+index 2e24c3a..67cb1dd 100644
+--- a/kmime/kautodeletehash.h
++++ b/kmime/kautodeletehash.h
+@@ -64,7 +64,7 @@ public:
+    */
+   ~KAutoDeleteHash() { while ( ! QHash<Key, T *>::isEmpty() ) {
+                          T *value = *QHash<Key, T *>::begin();
+-                         erase( QHash<Key, T *>::begin() );
++                         this->erase( QHash<Key, T *>::begin() );
+                          delete value;
+                        }
+                      }
+-- 
+1.7.10
+

-- 
KDE PIM Libraries module packaging