Control: tags 966704 + patch Dear maintainer,
I've prepared an NMU for goldencheetah (versioned as 1:3.5-1.1). The diff is attached to this message. cu Adrian
diff -Nru goldencheetah-3.5/debian/changelog goldencheetah-3.5/debian/changelog --- goldencheetah-3.5/debian/changelog 2020-07-25 03:03:49.000000000 +0300 +++ goldencheetah-3.5/debian/changelog 2021-02-07 14:29:13.000000000 +0200 @@ -1,3 +1,11 @@ +goldencheetah (1:3.5-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add upstream fix for FTBFS with bison 3.7. (Closes: #966704) + * Add fix for FTBFS with Qt 5.15. + + -- Adrian Bunk <[email protected]> Sun, 07 Feb 2021 14:29:13 +0200 + goldencheetah (1:3.5-1) unstable; urgency=medium * New upstream release. diff -Nru goldencheetah-3.5/debian/patches/0001-Fix-building-with-bison-3.7.patch goldencheetah-3.5/debian/patches/0001-Fix-building-with-bison-3.7.patch --- goldencheetah-3.5/debian/patches/0001-Fix-building-with-bison-3.7.patch 1970-01-01 02:00:00.000000000 +0200 +++ goldencheetah-3.5/debian/patches/0001-Fix-building-with-bison-3.7.patch 2021-02-07 14:22:18.000000000 +0200 @@ -0,0 +1,63 @@ +From 3d6b36a9a1bdb422a27826b97ffbae3fcd312029 Mon Sep 17 00:00:00 2001 +From: Poncho <[email protected]> +Date: Mon, 7 Sep 2020 09:39:49 +0200 +Subject: Fix building with bison 3.7 + +Bison 3.7 changes how header files are included [1][2], in that instead of +copying and inserting the contents of a file, the file itself is included +(by default as '"basename.h"'). + +[1] https://lists.gnu.org/archive/html/info-gnu/2020-07/msg00006.html +[2] https://www.gnu.org/software/bison/manual/html_node/_0025define-Summary.html + +Close: https://github.com/GoldenCheetah/GoldenCheetah/issues/3586 +--- + src/Core/DataFilter.y | 3 +++ + src/Core/RideDB.y | 2 ++ + src/FileIO/JsonRideFile.y | 3 +++ + 3 files changed, 8 insertions(+) + +diff --git a/src/Core/DataFilter.y b/src/Core/DataFilter.y +index c532c06ee..3d4e914ee 100644 +--- a/src/Core/DataFilter.y ++++ b/src/Core/DataFilter.y +@@ -49,6 +49,9 @@ extern Leaf *DataFilterroot; // root node for parsed statement + + %} + ++// generated by the scanner ++%define api.header.include {"DataFilter_yacc.h"} ++ + // Symbol can be meta or metric name + %token <leaf> SYMBOL PYTHON + +diff --git a/src/Core/RideDB.y b/src/Core/RideDB.y +index d6da086bd..f2001e23c 100644 +--- a/src/Core/RideDB.y ++++ b/src/Core/RideDB.y +@@ -40,6 +40,8 @@ void RideDBerror(void*jc, const char *error) // used by parser aka yyerror() + #define scanner jc->scanner + + %} ++// generated by the scanner ++%define api.header.include {"RideDB_yacc.h"} + + %pure-parser + %lex-param { void *scanner } +diff --git a/src/FileIO/JsonRideFile.y b/src/FileIO/JsonRideFile.y +index 2cbbef9fc..d5c77a779 100644 +--- a/src/FileIO/JsonRideFile.y ++++ b/src/FileIO/JsonRideFile.y +@@ -106,6 +106,9 @@ static QString protect(const QString string) + + %} + ++// generated by the scanner ++%define api.header.include {"JsonRideFile_yacc.h"} ++ + %pure-parser + %lex-param { void *scanner } + %parse-param { struct JsonContext *jc } +-- +2.20.1 + diff -Nru goldencheetah-3.5/debian/patches/0001-Fix-Qwt-incompatibilities-with-Qt-5.15.0.patch goldencheetah-3.5/debian/patches/0001-Fix-Qwt-incompatibilities-with-Qt-5.15.0.patch --- goldencheetah-3.5/debian/patches/0001-Fix-Qwt-incompatibilities-with-Qt-5.15.0.patch 1970-01-01 02:00:00.000000000 +0200 +++ goldencheetah-3.5/debian/patches/0001-Fix-Qwt-incompatibilities-with-Qt-5.15.0.patch 2021-02-07 14:22:13.000000000 +0200 @@ -0,0 +1,128 @@ +From e1f9005cf5ebafbed6be4b0cae4bee59112ea780 Mon Sep 17 00:00:00 2001 +From: Ale Martinez <[email protected]> +Date: Thu, 11 Jun 2020 11:36:54 -0300 +Subject: Fix Qwt incompatibilities with Qt 5.15.0 + +--- + qwt/src/qwt_compass_rose.cpp | 1 + + qwt/src/qwt_dial_needle.cpp | 1 + + qwt/src/qwt_null_paintdevice.cpp | 1 + + qwt/src/qwt_painter.cpp | 1 + + qwt/src/qwt_painter_command.h | 1 + + qwt/src/qwt_plot_glcanvas.h | 1 + + qwt/src/qwt_plot_panner.cpp | 1 + + qwt/src/qwt_plot_renderer.cpp | 1 + + qwt/src/qwt_widget_overlay.cpp | 1 + + 9 files changed, 9 insertions(+) + +diff --git a/qwt/src/qwt_compass_rose.cpp b/qwt/src/qwt_compass_rose.cpp +index 21a35f244..d67175940 100644 +--- a/qwt/src/qwt_compass_rose.cpp ++++ b/qwt/src/qwt_compass_rose.cpp +@@ -11,6 +11,7 @@ + #include "qwt_point_polar.h" + #include "qwt_painter.h" + #include <qpainter.h> ++#include <qpainterpath.h> + + static QPointF qwtIntersection( + QPointF p11, QPointF p12, QPointF p21, QPointF p22 ) +diff --git a/qwt/src/qwt_dial_needle.cpp b/qwt/src/qwt_dial_needle.cpp +index 1b53a3d5b..694f7f2bb 100644 +--- a/qwt/src/qwt_dial_needle.cpp ++++ b/qwt/src/qwt_dial_needle.cpp +@@ -13,6 +13,7 @@ + #include "qwt_painter.h" + #include <qapplication.h> + #include <qpainter.h> ++#include <qpainterpath.h> + + #if QT_VERSION < 0x040601 + #define qFastSin(x) qSin(x) +diff --git a/qwt/src/qwt_null_paintdevice.cpp b/qwt/src/qwt_null_paintdevice.cpp +index db1611da2..b9b5dafb6 100644 +--- a/qwt/src/qwt_null_paintdevice.cpp ++++ b/qwt/src/qwt_null_paintdevice.cpp +@@ -9,6 +9,7 @@ + + #include "qwt_null_paintdevice.h" + #include <qpaintengine.h> ++#include <qpainterpath.h> + #include <qpixmap.h> + + class QwtNullPaintDevice::PrivateData +diff --git a/qwt/src/qwt_painter.cpp b/qwt/src/qwt_painter.cpp +index 0bbf258c5..07b217033 100644 +--- a/qwt/src/qwt_painter.cpp ++++ b/qwt/src/qwt_painter.cpp +@@ -19,6 +19,7 @@ + #include <qpainter.h> + #include <qpalette.h> + #include <qpaintdevice.h> ++#include <qpainterpath.h> + #include <qpixmap.h> + #include <qstyle.h> + #include <qtextdocument.h> +diff --git a/qwt/src/qwt_painter_command.h b/qwt/src/qwt_painter_command.h +index 2da597a7f..4fafd555c 100644 +--- a/qwt/src/qwt_painter_command.h ++++ b/qwt/src/qwt_painter_command.h +@@ -15,6 +15,7 @@ + #include <qpixmap.h> + #include <qimage.h> + #include <qpolygon.h> ++#include <qpainterpath.h> + + class QPainterPath; + +diff --git a/qwt/src/qwt_plot_glcanvas.h b/qwt/src/qwt_plot_glcanvas.h +index 2ff1cf2e3..89462bba9 100644 +--- a/qwt/src/qwt_plot_glcanvas.h ++++ b/qwt/src/qwt_plot_glcanvas.h +@@ -13,6 +13,7 @@ + #include "qwt_global.h" + #include <qframe.h> + #include <qgl.h> ++#include <qpainterpath.h> + + class QwtPlot; + +diff --git a/qwt/src/qwt_plot_panner.cpp b/qwt/src/qwt_plot_panner.cpp +index 8ed3dbee9..44de4cbef 100644 +--- a/qwt/src/qwt_plot_panner.cpp ++++ b/qwt/src/qwt_plot_panner.cpp +@@ -15,6 +15,7 @@ + #include <qbitmap.h> + #include <qstyle.h> + #include <qstyleoption.h> ++#include <qpainterpath.h> + + static QBitmap qwtBorderMask( const QWidget *canvas, const QSize &size ) + { +diff --git a/qwt/src/qwt_plot_renderer.cpp b/qwt/src/qwt_plot_renderer.cpp +index 3cdcd8c0e..09a5c0a10 100644 +--- a/qwt/src/qwt_plot_renderer.cpp ++++ b/qwt/src/qwt_plot_renderer.cpp +@@ -19,6 +19,7 @@ + #include "qwt_math.h" + #include <qpainter.h> + #include <qpaintengine.h> ++#include <qpainterpath.h> + #include <qtransform.h> + #include <qprinter.h> + #include <qprintdialog.h> +diff --git a/qwt/src/qwt_widget_overlay.cpp b/qwt/src/qwt_widget_overlay.cpp +index 07c6272e1..9a458277b 100644 +--- a/qwt/src/qwt_widget_overlay.cpp ++++ b/qwt/src/qwt_widget_overlay.cpp +@@ -11,6 +11,7 @@ + #include "qwt_painter.h" + #include <qpainter.h> + #include <qpaintengine.h> ++#include <qpainterpath.h> + #include <qimage.h> + #include <qevent.h> + +-- +2.20.1 + diff -Nru goldencheetah-3.5/debian/patches/series goldencheetah-3.5/debian/patches/series --- goldencheetah-3.5/debian/patches/series 2020-04-14 06:30:39.000000000 +0300 +++ goldencheetah-3.5/debian/patches/series 2021-02-07 14:29:07.000000000 +0200 @@ -1,3 +1,5 @@ kfreebsd-ttycom append-uncompressed-jquery avoid-link-google-logo +0001-Fix-building-with-bison-3.7.patch +0001-Fix-Qwt-incompatibilities-with-Qt-5.15.0.patch
