summaryrefslogtreecommitdiffstats
path: root/misc/goldencheetah/patches
diff options
context:
space:
mode:
Diffstat (limited to 'misc/goldencheetah/patches')
-rw-r--r--misc/goldencheetah/patches/0001-Fix-Qwt-incompatibilities-with-Qt-5.15.0.patch114
-rw-r--r--misc/goldencheetah/patches/0001-SEGV-on-Overview-Chart.patch22
-rw-r--r--misc/goldencheetah/patches/0002-View-on-Strava.patch50
-rw-r--r--misc/goldencheetah/patches/0003-Compatible-with-Strava.patchbin4931 -> 0 bytes
-rw-r--r--misc/goldencheetah/patches/0004-Connect-with-Strava.patchbin8081 -> 0 bytes
-rw-r--r--misc/goldencheetah/patches/0005-3.5-BUILD-INCREMENT.patch29
6 files changed, 0 insertions, 215 deletions
diff --git a/misc/goldencheetah/patches/0001-Fix-Qwt-incompatibilities-with-Qt-5.15.0.patch b/misc/goldencheetah/patches/0001-Fix-Qwt-incompatibilities-with-Qt-5.15.0.patch
deleted file mode 100644
index d6cbec6e41..0000000000
--- a/misc/goldencheetah/patches/0001-Fix-Qwt-incompatibilities-with-Qt-5.15.0.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From e1f9005cf5ebafbed6be4b0cae4bee59112ea780 Mon Sep 17 00:00:00 2001
-From: Ale Martinez <amtriathlon@gmail.com>
-Date: Thu, 11 Jun 2020 11:36:54 -0300
-Subject: Fix Qwt incompatibilities with Qt 5.15.0
-
-
-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>
-
diff --git a/misc/goldencheetah/patches/0001-SEGV-on-Overview-Chart.patch b/misc/goldencheetah/patches/0001-SEGV-on-Overview-Chart.patch
deleted file mode 100644
index da451e86c4..0000000000
--- a/misc/goldencheetah/patches/0001-SEGV-on-Overview-Chart.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 372dd5c14415885c8808c4ad4729cb39ae717db0 Mon Sep 17 00:00:00 2001
-From: Mark Liversedge <liversedge@gmail.com>
-Date: Mon, 13 Jan 2020 20:21:00 +0000
-Subject: SEGV on Overview Chart
-
-.. when no rides available on new user.
-
-Fixes #3295
-
-diff --git a/src/Charts/OverviewWindow.cpp b/src/Charts/OverviewWindow.cpp
-index bfbd31432..7aa0792df 100644
---- a/src/Charts/OverviewWindow.cpp
-+++ b/src/Charts/OverviewWindow.cpp
-@@ -558,6 +558,8 @@ static const QStringList timeInZonesWBAL = QStringList()
- void
- Card::setData(RideItem *item)
- {
-+ if (item == NULL || item->ride() == NULL) return;
-+
- // use ride colors in painting?
- ridecolor = item->color;
-
diff --git a/misc/goldencheetah/patches/0002-View-on-Strava.patch b/misc/goldencheetah/patches/0002-View-on-Strava.patch
deleted file mode 100644
index 454b44865d..0000000000
--- a/misc/goldencheetah/patches/0002-View-on-Strava.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From cc91520e76079555bee24360d42610b7cbc246b3 Mon Sep 17 00:00:00 2001
-From: Mark Liversedge <liversedge@gmail.com>
-Date: Fri, 17 Jan 2020 12:30:29 +0000
-Subject: View on Strava
-
-.. when data is downloaded from strava we now set the metadata
- tag "StravaID" to the id of the activity on Strava.
-
-.. On RideSummary a link is added at the bottom to view the activity
- on Strava if the "StravaID" is set.
-
-.. if the user clicks on the link the summary is replaced with the
- strava page for the ride:
- e.g. https://www.strava.com/activities/962515512
-
-.. this is part of a couple of updates to comply with the Strava
- guidelines for consumption of the Strava v3 API, see:
- https://developers.strava.com/guidelines/
-
-diff --git a/src/Charts/RideSummaryWindow.cpp b/src/Charts/RideSummaryWindow.cpp
-index 1906ef1f3..37de8244d 100644
---- a/src/Charts/RideSummaryWindow.cpp
-+++ b/src/Charts/RideSummaryWindow.cpp
-@@ -1517,6 +1517,12 @@ RideSummaryWindow::htmlSummary()
- summary += " <li>" + i.next();
- summary += "</ul>";
- }
-+
-+ // add link to view on Strava if was downloaded from there (StravaID will be set)
-+ if (ridesummary && rideItem && rideItem->ride() && rideItem->ride()->getTag("StravaID","") != "") {
-+ summary += "<a href=\"https://www.strava.com/activities/" + rideItem->ride()->getTag("StravaID","") + "\">View on Strava</a>";
-+ }
-+
- summary += "<br></center>";
-
- return summary;
-diff --git a/src/Cloud/Strava.cpp b/src/Cloud/Strava.cpp
-index 0b339ac98..fe03e9eba 100644
---- a/src/Cloud/Strava.cpp
-+++ b/src/Cloud/Strava.cpp
-@@ -859,6 +859,9 @@ Strava::prepareResponse(QByteArray* data)
- // 1s samples with start time
- RideFile *ride = new RideFile(starttime.toUTC(), 1.0f);
-
-+ // set strava id in metadata (to show where we got it from - to add View on Strava link in Summary view
-+ if (!each["id"].isNull()) ride->setTag("StravaID", QString("%1").arg(each["id"].toVariant().toULongLong()));
-+
- // what sport?
- if (!each["type"].isNull()) {
- QString stype = each["type"].toString();
diff --git a/misc/goldencheetah/patches/0003-Compatible-with-Strava.patch b/misc/goldencheetah/patches/0003-Compatible-with-Strava.patch
deleted file mode 100644
index 6b7eadad71..0000000000
--- a/misc/goldencheetah/patches/0003-Compatible-with-Strava.patch
+++ /dev/null
Binary files differ
diff --git a/misc/goldencheetah/patches/0004-Connect-with-Strava.patch b/misc/goldencheetah/patches/0004-Connect-with-Strava.patch
deleted file mode 100644
index a52aa748dc..0000000000
--- a/misc/goldencheetah/patches/0004-Connect-with-Strava.patch
+++ /dev/null
Binary files differ
diff --git a/misc/goldencheetah/patches/0005-3.5-BUILD-INCREMENT.patch b/misc/goldencheetah/patches/0005-3.5-BUILD-INCREMENT.patch
deleted file mode 100644
index eb8565ad13..0000000000
--- a/misc/goldencheetah/patches/0005-3.5-BUILD-INCREMENT.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 525fcb0a660f99a21250919fd1d8de78fe8cb90d Mon Sep 17 00:00:00 2001
-From: Mark Liversedge <liversedge@gmail.com>
-Date: Fri, 17 Jan 2020 20:15:28 +0000
-Subject: 3.5 BUILD INCREMENT
-
-.. re-issue of 3.5 binaries with Strava API guideline compliance, as
- part of the 'rate limit' requirements.
-
-diff --git a/src/Core/GcUpgrade.h b/src/Core/GcUpgrade.h
-index b6db40b07..8266c7cb4 100644
---- a/src/Core/GcUpgrade.h
-+++ b/src/Core/GcUpgrade.h
-@@ -98,6 +98,7 @@
- // 3981 - V3.5 RC2
- // 3982 - V3.5 RC2X
- // 3990 - V3.5 RELEASE (January 2020)
-+// 3991 - V3.5 RELEASE RE-ISSUE STRAVA RATE LIMIT (January 2020)
-
-
- #define VERSION3_BUILD 3010 // released
-@@ -114,7 +115,7 @@
- #define VERSION31_BUILD VERSION31_UPG
-
- // the next two will with each build/release
--#define VERSION_LATEST 3990
-+#define VERSION_LATEST 3991
- #define VERSION_STRING "V3.5"
-
- // default config for this release cycle