[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#667127: cantor: ftbfs with GCC-4.7



tag 667127 patch
thanks

Matthias Klose <doko@debian.org> (03/04/2012):
> Package: cantor
> Version: 4:4.7.4-2
> Severity: important
> Tags: sid wheezy
> User: debian-gcc@lists.debian.org
> Usertags: ftbfs-gcc-4.7

Here's a patch for this FTBFS. No intent to NMU.

Mraw,
KiBi.
diff -Nru cantor-4.7.4/debian/changelog cantor-4.7.4/debian/changelog
--- cantor-4.7.4/debian/changelog	2012-03-07 17:48:53.000000000 +0000
+++ cantor-4.7.4/debian/changelog	2012-04-04 23:33:16.000000000 +0000
@@ -1,3 +1,10 @@
+cantor (4:4.7.4-2.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS with gcc 4.7 by adding “this->” when needed (Closes: #667127).
+
+ -- Cyril Brulebois <kibi@debian.org>  Wed, 04 Apr 2012 23:32:50 +0000
+
 cantor (4:4.7.4-2) unstable; urgency=low
 
   * Team upload. Upload to unstable.
diff -Nru cantor-4.7.4/debian/patches/fix-ftbfs-with-gcc-4.7 cantor-4.7.4/debian/patches/fix-ftbfs-with-gcc-4.7
--- cantor-4.7.4/debian/patches/fix-ftbfs-with-gcc-4.7	1970-01-01 00:00:00.000000000 +0000
+++ cantor-4.7.4/debian/patches/fix-ftbfs-with-gcc-4.7	2012-04-04 23:33:48.000000000 +0000
@@ -0,0 +1,15 @@
+Description: Fix FTBFS with gcc 4.7 by adding “this->” when needed.
+Author: Cyril Brulebois <kibi@debian.org>
+Bug-Debian: http://bugs.debian.org/667127
+
+--- cantor-4.7.4.orig/src/lib/extension.h
++++ cantor-4.7.4/src/lib/extension.h
+@@ -249,7 +249,7 @@ class CANTOR_EXPORT AdvancedPlotExtensio
+     template <class UI> class DirectiveControl : protected UI, public DirectiveProducer
+     {
+         public:
+-            DirectiveControl(QWidget* parent) : DirectiveProducer(parent) { setupUi(this); }
++            DirectiveControl(QWidget* parent) : DirectiveProducer(parent) { this->setupUi(this); }
+         protected:
+             typedef DirectiveControl<UI> AbstractParent;
+     };
diff -Nru cantor-4.7.4/debian/patches/series cantor-4.7.4/debian/patches/series
--- cantor-4.7.4/debian/patches/series	2011-12-08 11:31:46.000000000 +0000
+++ cantor-4.7.4/debian/patches/series	2012-04-04 23:33:33.000000000 +0000
@@ -1 +1,2 @@
 no_install_rpath_use_link_path.diff
+fix-ftbfs-with-gcc-4.7

Attachment: signature.asc
Description: Digital signature


Reply to: