tag 667410 patch thanks Matthias Klose <[email protected]> (03/04/2012): > Package: vite > Version: 1.2-3 > Severity: important > Tags: sid wheezy > User: [email protected] > Usertags: ftbfs-gcc-4.7
Hi, here's a patch. I don't intend to NMU. Mraw, KiBi.
diff -Nru vite-1.2/debian/changelog vite-1.2/debian/changelog --- vite-1.2/debian/changelog 2011-02-20 17:25:22.000000000 +0000 +++ vite-1.2/debian/changelog 2012-04-04 16:59:09.000000000 +0000 @@ -1,3 +1,11 @@ +vite (1.2-3.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Fix FTBFS with gcc 4.7 by fixing missing <unistd.h> include and by adding + some “this->” where needed (Closes: #667410). + + -- Cyril Brulebois <[email protected]> Wed, 04 Apr 2012 16:58:26 +0000 + vite (1.2-3) unstable; urgency=low * rules: Replace rules with mere dh. diff -Nru vite-1.2/debian/patches/fix-ftbfs-with-gcc-4.7 vite-1.2/debian/patches/fix-ftbfs-with-gcc-4.7 --- vite-1.2/debian/patches/fix-ftbfs-with-gcc-4.7 1970-01-01 00:00:00.000000000 +0000 +++ vite-1.2/debian/patches/fix-ftbfs-with-gcc-4.7 2012-04-04 16:59:51.000000000 +0000 @@ -0,0 +1,58 @@ +Description: Fix FTBFS with gcc 4.7 by fixing missing <unistd.h> includes and by adding some “this->” where needed. +Author: Cyril Brulebois <[email protected]> +Bug-Debian: http://bugs.debian.org/667410 + +--- vite-1.2.orig/src/core/Core.cpp ++++ vite-1.2/src/core/Core.cpp +@@ -56,6 +56,7 @@ + #include <vector> + #include <stack> + #include <cmath> ++#include <unistd.h> + /* -- */ + #include <QObject> + //#include <QtUiTools>/* for the run-time loading .ui file */ +--- vite-1.2.orig/src/statistics/DrawCounter.hpp ++++ vite-1.2/src/statistics/DrawCounter.hpp +@@ -124,7 +124,7 @@ public: + + draw_object->set_total_height((_nb_variables_already_print-1)*this->_size_for_one_variable); + +- end_draw(draw_object); ++ this->end_draw(draw_object); + } + + /*! +--- vite-1.2.orig/src/statistics/DrawHDiagram.hpp ++++ vite-1.2/src/statistics/DrawHDiagram.hpp +@@ -147,7 +147,7 @@ public: + draw_legend(draw_object, + _POS_X_LEGEND_DEFAULT + _startx, + _POS_Y_LEGEND_DEFAULT + _starty - (nbcont+3)*_WIDTH_HISTOGRAM_DEFAULT); +- end_draw(draw_object); ++ this->end_draw(draw_object); + } + + /*! +@@ -268,7 +268,7 @@ public: + } + + this->_max_width = pos_x + w + _POS_X_LEGEND_DEFAULT; +- set_geometrical_informations_object(draw_object); ++ this->set_geometrical_informations_object(draw_object); + + } + }; +--- vite-1.2.orig/src/statistics/DrawVDiagram.hpp ++++ vite-1.2/src/statistics/DrawVDiagram.hpp +@@ -95,8 +95,8 @@ public: + + draw_legend(draw_object, i); + } +- set_geometrical_informations_object(draw_object); +- end_draw(draw_object); ++ this->set_geometrical_informations_object(draw_object); ++ this->end_draw(draw_object); + } + + /*! diff -Nru vite-1.2/debian/patches/series vite-1.2/debian/patches/series --- vite-1.2/debian/patches/series 2011-02-24 03:46:40.000000000 +0000 +++ vite-1.2/debian/patches/series 2012-04-04 16:59:33.000000000 +0000 @@ -1 +1,2 @@ gold-fix.diff +fix-ftbfs-with-gcc-4.7
signature.asc
Description: Digital signature
