[SCM] KDE PIM module packaging branch, master, updated. debian/4.4.11.1+l10n-1-6-gca37121

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit ca37121e982c0505b3d1636ddb66c4e0049af05c
Author: Pino Toscano <pino at debian.org>
Date:   Wed May 23 12:59:16 2012 +0200

    fix building with GCC 4.7
    
    backport upstream commit 4aa4059b40aed27ae76201baa48f419d1ba09576
---
 debian/changelog                               |    2 +
 debian/patches/series                          |    1 +
 debian/patches/upstream_Build-with-clang.patch |   25 ++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 22d58a3..c82a3e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ kdepim (4:4.4.11.1+l10n-2) UNRELEASED; urgency=low
     KAlarm crashes with Qt 4.8.x; patch
     upstream_Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch.
     (Closes: #671619)
+  * Backport upstream commit 4aa4059b40aed27ae76201baa48f419d1ba09576 to fix
+    building with GCC 4.7; patch upstream_Build-with-clang.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 17 Apr 2012 14:21:49 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 95bba96..fa2c3b9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ kdepim_l10n.diff
 displaying_only_unread_issue.diff
 debian_set_library_version.diff
 upstream_Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch
+upstream_Build-with-clang.patch
diff --git a/debian/patches/upstream_Build-with-clang.patch b/debian/patches/upstream_Build-with-clang.patch
new file mode 100644
index 0000000..9c80502
--- /dev/null
+++ b/debian/patches/upstream_Build-with-clang.patch
@@ -0,0 +1,25 @@
+From 4aa4059b40aed27ae76201baa48f419d1ba09576 Mon Sep 17 00:00:00 2001
+From: Till Adam <till at kdab.com>
+Date: Tue, 6 Sep 2011 09:35:06 +0200
+Subject: [PATCH] Build with clang.
+
+---
+ libkleo/backends/qgpgme/threadedjobmixin.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libkleo/backends/qgpgme/threadedjobmixin.h b/libkleo/backends/qgpgme/threadedjobmixin.h
+index 6d915e7..a1f85cc 100644
+--- a/libkleo/backends/qgpgme/threadedjobmixin.h
++++ b/libkleo/backends/qgpgme/threadedjobmixin.h
+@@ -143,7 +143,7 @@ namespace _detail {
+ 
+     void lateInitialization() {
+       assert( m_ctx );
+-      connect( &m_thread, SIGNAL(finished()), this, SLOT(slotFinished()) );
++      QObject::connect( &m_thread, SIGNAL(finished()), this, SLOT(slotFinished()) );
+       m_ctx->setProgressProvider( this );
+     }
+ 
+-- 
+1.7.10
+

-- 
KDE PIM module packaging