[SCM] cantor packaging branch, master, updated. debian/4.7.4-2-3-ga0a3f1d

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit f250762c9abe7d9d935267b08f9ac93ac695ea13
Author: Pino Toscano <pino at debian.org>
Date:   Tue May 22 11:11:47 2012 +0200

    fix building with GCC 4.7 (#667127)
    
    backport the upstream commit 56040ac851dc9180ae51c0e5041984abef54e7f2
---
 debian/changelog                                   |    4 +++
 debian/patches/series                              |    1 +
 ...eam_Qualify-which-setupUi-is-being-called.patch |   29 ++++++++++++++++++++
 3 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b7e83d5..b522fcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 cantor (4:4.7.4-3) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Backport upstream commit 56040ac851dc9180ae51c0e5041984abef54e7f2 to fix
+    building with GCC 4.7; patch
+    upstream_Qualify-which-setupUi-is-being-called.patch. (Closes: #667127)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 07 Mar 2012 18:48:42 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 0fe063c..1bfea8b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 no_install_rpath_use_link_path.diff
+upstream_Qualify-which-setupUi-is-being-called.patch
diff --git a/debian/patches/upstream_Qualify-which-setupUi-is-being-called.patch b/debian/patches/upstream_Qualify-which-setupUi-is-being-called.patch
new file mode 100644
index 0000000..e0a4c75
--- /dev/null
+++ b/debian/patches/upstream_Qualify-which-setupUi-is-being-called.patch
@@ -0,0 +1,29 @@
+From 56040ac851dc9180ae51c0e5041984abef54e7f2 Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <kubo at profusion.mobi>
+Date: Mon, 2 Jan 2012 11:15:54 -0200
+Subject: [PATCH] Qualify which setupUi() is being called.
+
+DirectiveControl inherits from both UI and DirectiveProducer, and both
+provide setupUi(), which breaks the build with clang.
+
+Be explicit and call UI::setupUi().
+---
+ src/lib/extension.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/extension.h b/src/lib/extension.h
+index 2fec771..bfd859d 100644
+--- a/src/lib/extension.h
++++ b/src/lib/extension.h
+@@ -249,7 +249,7 @@ class CANTOR_EXPORT AdvancedPlotExtension : public Extension
+     template <class UI> class DirectiveControl : protected UI, public DirectiveProducer
+     {
+         public:
+-            DirectiveControl(QWidget* parent) : DirectiveProducer(parent) { setupUi(this); }
++            DirectiveControl(QWidget* parent) : DirectiveProducer(parent) { UI::setupUi(this); }
+         protected:
+             typedef DirectiveControl<UI> AbstractParent;
+     };
+-- 
+1.7.10
+

-- 
cantor packaging