Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: GoldenCheetah-3.5
@ 2020-07-26  2:55 gt7-void
  2020-07-26  3:12 ` [PR REVIEW] " ericonr
                   ` (9 more replies)
  0 siblings, 10 replies; 11+ messages in thread
From: gt7-void @ 2020-07-26  2:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 618 bytes --]

There is a new pull request by gt7-void against master on the void-packages repository

https://github.com/gt7-void/void-packages GoldenCheetah
https://github.com/void-linux/void-packages/pull/23839

New package: GoldenCheetah-3.5
Performance Software for Cyclists, Runners and Triathletes

http://www.goldencheetah.org/

Free alternative to garmin connect.

NOTE: qwt is included in the source, it is a /different/ branch of qwt than the stable one void ships. I did try to compile using the qwt from void but it fails.

A patch file from https://github.com/void-linux/void-packages/pull/23839.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-GoldenCheetah-23839.patch --]
[-- Type: text/x-diff, Size: 3397 bytes --]

From 9814cd118047c49920c8545a919f3954392ed512 Mon Sep 17 00:00:00 2001
From: gt7-void <gt7@mail.com>
Date: Sat, 25 Jul 2020 22:30:21 -0300
Subject: [PATCH] New package: GoldenCheetah-3.5

---
 .../GoldenCheetah/patches/qt5-5.15.0.patch    | 58 +++++++++++++++++++
 srcpkgs/GoldenCheetah/template                | 26 +++++++++
 2 files changed, 84 insertions(+)
 create mode 100644 srcpkgs/GoldenCheetah/patches/qt5-5.15.0.patch
 create mode 100644 srcpkgs/GoldenCheetah/template

diff --git a/srcpkgs/GoldenCheetah/patches/qt5-5.15.0.patch b/srcpkgs/GoldenCheetah/patches/qt5-5.15.0.patch
new file mode 100644
index 00000000000..5b124dd1756
--- /dev/null
+++ b/srcpkgs/GoldenCheetah/patches/qt5-5.15.0.patch
@@ -0,0 +1,58 @@
+Source: @pullmoll
+Upstream: no
+Reason: qt5-5.15.0 requires explicit include for QPainterPath
+
+--- qwt/src/qwt_painter.h	2019-01-02 17:21:30.232435482 +0100
++++ qwt/src/qwt_painter.h	2020-07-14 16:47:54.577577031 +0200
+@@ -17,6 +17,7 @@
+ #include <qpen.h>
+ #include <qline.h>
+ #include <qpalette.h>
++#include <qpainterpath.h>
+ 
+ class QPainter;
+ class QBrush;
+@@ -31,7 +32,6 @@
+ class QwtInterval;
+ 
+ class QTextDocument;
+-class QPainterPath;
+ 
+ /*!
+   \brief A collection of QPainter workarounds
+--- qwt/src/qwt_null_paintdevice.cpp	2019-01-02 17:21:31.296461212 +0100
++++ qwt/src/qwt_null_paintdevice.cpp	2020-07-14 16:49:13.479579545 +0200
+@@ -9,6 +9,7 @@
+ 
+ #include "qwt_null_paintdevice.h"
+ #include <qpaintengine.h>
++#include <qpainterpath.h>
+ #include <qpixmap.h>
+ 
+ class QwtNullPaintDevice::PrivateData
+--- qwt/src/qwt_painter_command.h	2019-01-02 17:21:30.320437610 +0100
++++ qwt/src/qwt_painter_command.h	2020-07-14 16:50:38.501582253 +0200
+@@ -12,12 +12,11 @@
+ 
+ #include "qwt_global.h"
+ #include <qpaintengine.h>
++#include <qpainterpath.h>
+ #include <qpixmap.h>
+ #include <qimage.h>
+ #include <qpolygon.h>
+ 
+-class QPainterPath;
+-
+ /*!
+   QwtPainterCommand represents the attributes of a paint operation
+   how it is used between QPainter and QPaintDevice
+--- qwt/src/qwt_plot_glcanvas.h	2019-01-02 17:21:30.204434804 +0100
++++ qwt/src/qwt_plot_glcanvas.h	2020-07-14 16:52:54.074586572 +0200
+@@ -13,6 +13,7 @@
+ #include "qwt_global.h"
+ #include <qframe.h>
+ #include <qgl.h>
++#include <qpainterpath.h>
+ 
+ class QwtPlot;
+ 
diff --git a/srcpkgs/GoldenCheetah/template b/srcpkgs/GoldenCheetah/template
new file mode 100644
index 00000000000..6163bf95159
--- /dev/null
+++ b/srcpkgs/GoldenCheetah/template
@@ -0,0 +1,26 @@
+# Template file for 'GoldenCheetah'
+pkgname=GoldenCheetah
+version=3.5
+revision=1
+build_style=qmake
+hostmakedepends="qt5-qmake qt5-host-tools bison flex"
+makedepends="qt5-devel qt5-charts-devel qt5-connectivity-devel
+	qt5-multimedia-devel qt5-serialport-devel qt5-svg-devel
+	qt5-webkit-devel zlib-devel"
+short_desc="Performance Software for Cyclists, Runners and Triathletes"
+maintainer="gt7-void <gt7@mail.com>"
+license="GPL-2.0-or-later"
+homepage="http://www.goldencheetah.org/"
+distfiles="https://github.com/GoldenCheetah/GoldenCheetah/archive/V$version.tar.gz"
+checksum=d5a12a71b9bd49ec8224aca51807155cddc8863b69abc1c48e54084014115020
+
+pre_configure() {
+	cp "qwt/qwtconfig.pri.in" "qwt/qwtconfig.pri"
+
+	echo "QMAKE_LRELEASE = /usr/bin/lrelease" > src/gcconfig.pri
+	echo "LIBZ_LIBS = -lz" >> src/gcconfig.pri
+}
+
+do_install() {
+	vbin "src/GoldenCheetah"
+}

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR REVIEW] New package: GoldenCheetah-3.5
  2020-07-26  2:55 [PR PATCH] New package: GoldenCheetah-3.5 gt7-void
@ 2020-07-26  3:12 ` ericonr
  2020-07-26  3:15 ` ericonr
                   ` (8 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2020-07-26  3:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 175 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23839#discussion_r460471622

Comment:
These tabs should be spaces.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: New package: GoldenCheetah-3.5
  2020-07-26  2:55 [PR PATCH] New package: GoldenCheetah-3.5 gt7-void
  2020-07-26  3:12 ` [PR REVIEW] " ericonr
@ 2020-07-26  3:15 ` ericonr
  2020-07-26 15:13 ` [PR PATCH] [Updated] " gt7-void
                   ` (7 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2020-07-26  3:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 181 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23839#issuecomment-663930221

Comment:
How did it fail when using the Void qwt?

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] New package: GoldenCheetah-3.5
  2020-07-26  2:55 [PR PATCH] New package: GoldenCheetah-3.5 gt7-void
  2020-07-26  3:12 ` [PR REVIEW] " ericonr
  2020-07-26  3:15 ` ericonr
@ 2020-07-26 15:13 ` gt7-void
  2020-07-26 15:23 ` [PR REVIEW] " gt7-void
                   ` (6 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: gt7-void @ 2020-07-26 15:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 623 bytes --]

There is an updated pull request by gt7-void against master on the void-packages repository

https://github.com/gt7-void/void-packages GoldenCheetah
https://github.com/void-linux/void-packages/pull/23839

New package: GoldenCheetah-3.5
Performance Software for Cyclists, Runners and Triathletes

http://www.goldencheetah.org/

Free alternative to garmin connect.

NOTE: qwt is included in the source, it is a /different/ branch of qwt than the stable one void ships. I did try to compile using the qwt from void but it fails.

A patch file from https://github.com/void-linux/void-packages/pull/23839.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-GoldenCheetah-23839.patch --]
[-- Type: text/x-diff, Size: 3397 bytes --]

From 6173e1ae2b890f21741a905c8d9f3b920c0617c2 Mon Sep 17 00:00:00 2001
From: gt7-void <gt7@mail.com>
Date: Sat, 25 Jul 2020 22:30:21 -0300
Subject: [PATCH] New package: GoldenCheetah-3.5

---
 .../GoldenCheetah/patches/qt5-5.15.0.patch    | 58 +++++++++++++++++++
 srcpkgs/GoldenCheetah/template                | 26 +++++++++
 2 files changed, 84 insertions(+)
 create mode 100644 srcpkgs/GoldenCheetah/patches/qt5-5.15.0.patch
 create mode 100644 srcpkgs/GoldenCheetah/template

diff --git a/srcpkgs/GoldenCheetah/patches/qt5-5.15.0.patch b/srcpkgs/GoldenCheetah/patches/qt5-5.15.0.patch
new file mode 100644
index 00000000000..5b124dd1756
--- /dev/null
+++ b/srcpkgs/GoldenCheetah/patches/qt5-5.15.0.patch
@@ -0,0 +1,58 @@
+Source: @pullmoll
+Upstream: no
+Reason: qt5-5.15.0 requires explicit include for QPainterPath
+
+--- qwt/src/qwt_painter.h	2019-01-02 17:21:30.232435482 +0100
++++ qwt/src/qwt_painter.h	2020-07-14 16:47:54.577577031 +0200
+@@ -17,6 +17,7 @@
+ #include <qpen.h>
+ #include <qline.h>
+ #include <qpalette.h>
++#include <qpainterpath.h>
+ 
+ class QPainter;
+ class QBrush;
+@@ -31,7 +32,6 @@
+ class QwtInterval;
+ 
+ class QTextDocument;
+-class QPainterPath;
+ 
+ /*!
+   \brief A collection of QPainter workarounds
+--- qwt/src/qwt_null_paintdevice.cpp	2019-01-02 17:21:31.296461212 +0100
++++ qwt/src/qwt_null_paintdevice.cpp	2020-07-14 16:49:13.479579545 +0200
+@@ -9,6 +9,7 @@
+ 
+ #include "qwt_null_paintdevice.h"
+ #include <qpaintengine.h>
++#include <qpainterpath.h>
+ #include <qpixmap.h>
+ 
+ class QwtNullPaintDevice::PrivateData
+--- qwt/src/qwt_painter_command.h	2019-01-02 17:21:30.320437610 +0100
++++ qwt/src/qwt_painter_command.h	2020-07-14 16:50:38.501582253 +0200
+@@ -12,12 +12,11 @@
+ 
+ #include "qwt_global.h"
+ #include <qpaintengine.h>
++#include <qpainterpath.h>
+ #include <qpixmap.h>
+ #include <qimage.h>
+ #include <qpolygon.h>
+ 
+-class QPainterPath;
+-
+ /*!
+   QwtPainterCommand represents the attributes of a paint operation
+   how it is used between QPainter and QPaintDevice
+--- qwt/src/qwt_plot_glcanvas.h	2019-01-02 17:21:30.204434804 +0100
++++ qwt/src/qwt_plot_glcanvas.h	2020-07-14 16:52:54.074586572 +0200
+@@ -13,6 +13,7 @@
+ #include "qwt_global.h"
+ #include <qframe.h>
+ #include <qgl.h>
++#include <qpainterpath.h>
+ 
+ class QwtPlot;
+ 
diff --git a/srcpkgs/GoldenCheetah/template b/srcpkgs/GoldenCheetah/template
new file mode 100644
index 00000000000..81eb32eb9fa
--- /dev/null
+++ b/srcpkgs/GoldenCheetah/template
@@ -0,0 +1,26 @@
+# Template file for 'GoldenCheetah'
+pkgname=GoldenCheetah
+version=3.5
+revision=1
+build_style=qmake
+hostmakedepends="qt5-qmake qt5-host-tools bison flex"
+makedepends="qt5-devel qt5-charts-devel qt5-connectivity-devel
+ qt5-multimedia-devel qt5-serialport-devel qt5-svg-devel
+ qt5-webkit-devel zlib-devel"
+short_desc="Performance Software for Cyclists, Runners and Triathletes"
+maintainer="gt7-void <gt7@mail.com>"
+license="GPL-2.0-or-later"
+homepage="http://www.goldencheetah.org/"
+distfiles="https://github.com/GoldenCheetah/GoldenCheetah/archive/V$version.tar.gz"
+checksum=d5a12a71b9bd49ec8224aca51807155cddc8863b69abc1c48e54084014115020
+
+pre_configure() {
+	cp "qwt/qwtconfig.pri.in" "qwt/qwtconfig.pri"
+
+	echo "QMAKE_LRELEASE = /usr/bin/lrelease" > src/gcconfig.pri
+	echo "LIBZ_LIBS = -lz" >> src/gcconfig.pri
+}
+
+do_install() {
+	vbin "src/GoldenCheetah"
+}

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR REVIEW] New package: GoldenCheetah-3.5
  2020-07-26  2:55 [PR PATCH] New package: GoldenCheetah-3.5 gt7-void
                   ` (2 preceding siblings ...)
  2020-07-26 15:13 ` [PR PATCH] [Updated] " gt7-void
@ 2020-07-26 15:23 ` gt7-void
  2020-07-26 15:30 ` gt7-void
                   ` (5 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: gt7-void @ 2020-07-26 15:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 153 bytes --]

New review comment by gt7-void on void-packages repository

https://github.com/void-linux/void-packages/pull/23839#discussion_r460540185

Comment:
fixed

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: New package: GoldenCheetah-3.5
  2020-07-26  2:55 [PR PATCH] New package: GoldenCheetah-3.5 gt7-void
                   ` (3 preceding siblings ...)
  2020-07-26 15:23 ` [PR REVIEW] " gt7-void
@ 2020-07-26 15:30 ` gt7-void
  2020-07-26 15:31 ` gt7-void
                   ` (4 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: gt7-void @ 2020-07-26 15:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 753 bytes --]

New comment by gt7-void on void-packages repository

https://github.com/void-linux/void-packages/pull/23839#issuecomment-664002452

Comment:
> How did it fail when using the Void qwt?

```
In file included from Charts/AllPlot.cpp:20:
Charts/AllPlot.h:26:10: fatal error: qwt_axis_id.h: No such file or directory
   26 | #include <qwt_axis_id.h>
      |          ^~~~~~~~~~~~~~~
compilation terminated.
```
If I remove this `#include` I get stuff like
```
Charts/AllPlot.h:66:7: note: forward declaration of 'class QwtAxisId'
   66 | class QwtAxisId;
```
so it seems to be really necessary.

If you want to have a look, I've pushed gt7-void:GoldenCheetah-qwt with my attempt. Maybe I'm overlooking something.

Thanks for your comments.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: New package: GoldenCheetah-3.5
  2020-07-26  2:55 [PR PATCH] New package: GoldenCheetah-3.5 gt7-void
                   ` (4 preceding siblings ...)
  2020-07-26 15:30 ` gt7-void
@ 2020-07-26 15:31 ` gt7-void
  2020-07-27  2:14 ` [PR PATCH] [Updated] " gt7-void
                   ` (3 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: gt7-void @ 2020-07-26 15:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1031 bytes --]

New comment by gt7-void on void-packages repository

https://github.com/void-linux/void-packages/pull/23839#issuecomment-664002452

Comment:
> How did it fail when using the Void qwt?

```
In file included from Charts/AllPlot.cpp:20:
Charts/AllPlot.h:26:10: fatal error: qwt_axis_id.h: No such file or directory
   26 | #include <qwt_axis_id.h>
      |          ^~~~~~~~~~~~~~~
compilation terminated.
```
If I remove this `#include` I get warnings like
```
Charts/AllPlot.h:66:7: note: forward declaration of 'class QwtAxisId'
   66 | class QwtAxisId;
```
and errors like
```
  524 |         while(from != to) --to, delete reinterpret_cast<T*>(to->v);
/usr/include/qt5/QtCore/qlist.h:526:61: error: invalid use of incomplete type 'class QwtAxisId'
  526 |         while (from != to) --to, reinterpret_cast<T*>(to)->~T();
```
so it seems to be really necessary.

If you want to have a look, I've pushed gt7-void:GoldenCheetah-qwt with my attempt. Maybe I'm overlooking something.

Thanks for your comments.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] New package: GoldenCheetah-3.5
  2020-07-26  2:55 [PR PATCH] New package: GoldenCheetah-3.5 gt7-void
                   ` (5 preceding siblings ...)
  2020-07-26 15:31 ` gt7-void
@ 2020-07-27  2:14 ` gt7-void
  2020-07-27  3:21 ` gt7-void
                   ` (2 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: gt7-void @ 2020-07-27  2:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 623 bytes --]

There is an updated pull request by gt7-void against master on the void-packages repository

https://github.com/gt7-void/void-packages GoldenCheetah
https://github.com/void-linux/void-packages/pull/23839

New package: GoldenCheetah-3.5
Performance Software for Cyclists, Runners and Triathletes

http://www.goldencheetah.org/

Free alternative to garmin connect.

NOTE: qwt is included in the source, it is a /different/ branch of qwt than the stable one void ships. I did try to compile using the qwt from void but it fails.

A patch file from https://github.com/void-linux/void-packages/pull/23839.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-GoldenCheetah-23839.patch --]
[-- Type: text/x-diff, Size: 3411 bytes --]

From a71feb308b31afc96f6055317b391e04a3b2f252 Mon Sep 17 00:00:00 2001
From: gt7-void <gt7@mail.com>
Date: Sat, 25 Jul 2020 22:30:21 -0300
Subject: [PATCH] New package: GoldenCheetah-3.5

---
 .../GoldenCheetah/patches/qt5-5.15.0.patch    | 58 +++++++++++++++++++
 srcpkgs/GoldenCheetah/template                | 26 +++++++++
 2 files changed, 84 insertions(+)
 create mode 100644 srcpkgs/GoldenCheetah/patches/qt5-5.15.0.patch
 create mode 100644 srcpkgs/GoldenCheetah/template

diff --git a/srcpkgs/GoldenCheetah/patches/qt5-5.15.0.patch b/srcpkgs/GoldenCheetah/patches/qt5-5.15.0.patch
new file mode 100644
index 00000000000..5b124dd1756
--- /dev/null
+++ b/srcpkgs/GoldenCheetah/patches/qt5-5.15.0.patch
@@ -0,0 +1,58 @@
+Source: @pullmoll
+Upstream: no
+Reason: qt5-5.15.0 requires explicit include for QPainterPath
+
+--- qwt/src/qwt_painter.h	2019-01-02 17:21:30.232435482 +0100
++++ qwt/src/qwt_painter.h	2020-07-14 16:47:54.577577031 +0200
+@@ -17,6 +17,7 @@
+ #include <qpen.h>
+ #include <qline.h>
+ #include <qpalette.h>
++#include <qpainterpath.h>
+ 
+ class QPainter;
+ class QBrush;
+@@ -31,7 +32,6 @@
+ class QwtInterval;
+ 
+ class QTextDocument;
+-class QPainterPath;
+ 
+ /*!
+   \brief A collection of QPainter workarounds
+--- qwt/src/qwt_null_paintdevice.cpp	2019-01-02 17:21:31.296461212 +0100
++++ qwt/src/qwt_null_paintdevice.cpp	2020-07-14 16:49:13.479579545 +0200
+@@ -9,6 +9,7 @@
+ 
+ #include "qwt_null_paintdevice.h"
+ #include <qpaintengine.h>
++#include <qpainterpath.h>
+ #include <qpixmap.h>
+ 
+ class QwtNullPaintDevice::PrivateData
+--- qwt/src/qwt_painter_command.h	2019-01-02 17:21:30.320437610 +0100
++++ qwt/src/qwt_painter_command.h	2020-07-14 16:50:38.501582253 +0200
+@@ -12,12 +12,11 @@
+ 
+ #include "qwt_global.h"
+ #include <qpaintengine.h>
++#include <qpainterpath.h>
+ #include <qpixmap.h>
+ #include <qimage.h>
+ #include <qpolygon.h>
+ 
+-class QPainterPath;
+-
+ /*!
+   QwtPainterCommand represents the attributes of a paint operation
+   how it is used between QPainter and QPaintDevice
+--- qwt/src/qwt_plot_glcanvas.h	2019-01-02 17:21:30.204434804 +0100
++++ qwt/src/qwt_plot_glcanvas.h	2020-07-14 16:52:54.074586572 +0200
+@@ -13,6 +13,7 @@
+ #include "qwt_global.h"
+ #include <qframe.h>
+ #include <qgl.h>
++#include <qpainterpath.h>
+ 
+ class QwtPlot;
+ 
diff --git a/srcpkgs/GoldenCheetah/template b/srcpkgs/GoldenCheetah/template
new file mode 100644
index 00000000000..90216bfad57
--- /dev/null
+++ b/srcpkgs/GoldenCheetah/template
@@ -0,0 +1,26 @@
+# Template file for 'GoldenCheetah'
+pkgname=GoldenCheetah
+version=3.5
+revision=1
+build_style=qmake
+hostmakedepends="qt5-qmake qt5-host-tools qt5-svg-devel bison flex"
+makedepends="qt5-devel qt5-charts-devel qt5-connectivity-devel
+ qt5-multimedia-devel qt5-serialport-devel qt5-svg-devel
+ qt5-webkit-devel zlib-devel"
+short_desc="Performance Software for Cyclists, Runners and Triathletes"
+maintainer="gt7-void <gt7@mail.com>"
+license="GPL-2.0-or-later"
+homepage="http://www.goldencheetah.org/"
+distfiles="https://github.com/GoldenCheetah/GoldenCheetah/archive/V$version.tar.gz"
+checksum=d5a12a71b9bd49ec8224aca51807155cddc8863b69abc1c48e54084014115020
+
+pre_configure() {
+	cp "qwt/qwtconfig.pri.in" "qwt/qwtconfig.pri"
+
+	echo "QMAKE_LRELEASE = /usr/bin/lrelease" > src/gcconfig.pri
+	echo "LIBZ_LIBS = -lz" >> src/gcconfig.pri
+}
+
+do_install() {
+	vbin "src/GoldenCheetah"
+}

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] New package: GoldenCheetah-3.5
  2020-07-26  2:55 [PR PATCH] New package: GoldenCheetah-3.5 gt7-void
                   ` (6 preceding siblings ...)
  2020-07-27  2:14 ` [PR PATCH] [Updated] " gt7-void
@ 2020-07-27  3:21 ` gt7-void
  2022-04-18  2:11 ` github-actions
  2022-05-02  2:15 ` [PR PATCH] [Closed]: " github-actions
  9 siblings, 0 replies; 11+ messages in thread
From: gt7-void @ 2020-07-27  3:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 623 bytes --]

There is an updated pull request by gt7-void against master on the void-packages repository

https://github.com/gt7-void/void-packages GoldenCheetah
https://github.com/void-linux/void-packages/pull/23839

New package: GoldenCheetah-3.5
Performance Software for Cyclists, Runners and Triathletes

http://www.goldencheetah.org/

Free alternative to garmin connect.

NOTE: qwt is included in the source, it is a /different/ branch of qwt than the stable one void ships. I did try to compile using the qwt from void but it fails.

A patch file from https://github.com/void-linux/void-packages/pull/23839.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-GoldenCheetah-23839.patch --]
[-- Type: text/x-diff, Size: 3514 bytes --]

From 00b4cbc74f50a5d02d05023880807da384b51ebf Mon Sep 17 00:00:00 2001
From: gt7-void <gt7@mail.com>
Date: Sat, 25 Jul 2020 22:30:21 -0300
Subject: [PATCH] New package: GoldenCheetah-3.5

---
 .../GoldenCheetah/patches/qt5-5.15.0.patch    | 58 +++++++++++++++++++
 srcpkgs/GoldenCheetah/template                | 28 +++++++++
 2 files changed, 86 insertions(+)
 create mode 100644 srcpkgs/GoldenCheetah/patches/qt5-5.15.0.patch
 create mode 100644 srcpkgs/GoldenCheetah/template

diff --git a/srcpkgs/GoldenCheetah/patches/qt5-5.15.0.patch b/srcpkgs/GoldenCheetah/patches/qt5-5.15.0.patch
new file mode 100644
index 00000000000..5b124dd1756
--- /dev/null
+++ b/srcpkgs/GoldenCheetah/patches/qt5-5.15.0.patch
@@ -0,0 +1,58 @@
+Source: @pullmoll
+Upstream: no
+Reason: qt5-5.15.0 requires explicit include for QPainterPath
+
+--- qwt/src/qwt_painter.h	2019-01-02 17:21:30.232435482 +0100
++++ qwt/src/qwt_painter.h	2020-07-14 16:47:54.577577031 +0200
+@@ -17,6 +17,7 @@
+ #include <qpen.h>
+ #include <qline.h>
+ #include <qpalette.h>
++#include <qpainterpath.h>
+ 
+ class QPainter;
+ class QBrush;
+@@ -31,7 +32,6 @@
+ class QwtInterval;
+ 
+ class QTextDocument;
+-class QPainterPath;
+ 
+ /*!
+   \brief A collection of QPainter workarounds
+--- qwt/src/qwt_null_paintdevice.cpp	2019-01-02 17:21:31.296461212 +0100
++++ qwt/src/qwt_null_paintdevice.cpp	2020-07-14 16:49:13.479579545 +0200
+@@ -9,6 +9,7 @@
+ 
+ #include "qwt_null_paintdevice.h"
+ #include <qpaintengine.h>
++#include <qpainterpath.h>
+ #include <qpixmap.h>
+ 
+ class QwtNullPaintDevice::PrivateData
+--- qwt/src/qwt_painter_command.h	2019-01-02 17:21:30.320437610 +0100
++++ qwt/src/qwt_painter_command.h	2020-07-14 16:50:38.501582253 +0200
+@@ -12,12 +12,11 @@
+ 
+ #include "qwt_global.h"
+ #include <qpaintengine.h>
++#include <qpainterpath.h>
+ #include <qpixmap.h>
+ #include <qimage.h>
+ #include <qpolygon.h>
+ 
+-class QPainterPath;
+-
+ /*!
+   QwtPainterCommand represents the attributes of a paint operation
+   how it is used between QPainter and QPaintDevice
+--- qwt/src/qwt_plot_glcanvas.h	2019-01-02 17:21:30.204434804 +0100
++++ qwt/src/qwt_plot_glcanvas.h	2020-07-14 16:52:54.074586572 +0200
+@@ -13,6 +13,7 @@
+ #include "qwt_global.h"
+ #include <qframe.h>
+ #include <qgl.h>
++#include <qpainterpath.h>
+ 
+ class QwtPlot;
+ 
diff --git a/srcpkgs/GoldenCheetah/template b/srcpkgs/GoldenCheetah/template
new file mode 100644
index 00000000000..714052fbb05
--- /dev/null
+++ b/srcpkgs/GoldenCheetah/template
@@ -0,0 +1,28 @@
+# Template file for 'GoldenCheetah'
+pkgname=GoldenCheetah
+version=3.5
+revision=1
+build_style=qmake
+hostmakedepends="qt5-qmake qt5-host-tools qt5-charts-devel
+ qt5-connectivity-devel qt5-multimedia-devel qt5-serialport-devel
+ qt5-svg-devel qt5-webkit-devel bison flex"
+makedepends="qt5-devel qt5-charts-devel qt5-connectivity-devel
+ qt5-multimedia-devel qt5-serialport-devel qt5-svg-devel
+ qt5-webkit-devel zlib-devel"
+short_desc="Performance Software for Cyclists, Runners and Triathletes"
+maintainer="gt7-void <gt7@mail.com>"
+license="GPL-2.0-or-later"
+homepage="http://www.goldencheetah.org/"
+distfiles="https://github.com/GoldenCheetah/GoldenCheetah/archive/V$version.tar.gz"
+checksum=d5a12a71b9bd49ec8224aca51807155cddc8863b69abc1c48e54084014115020
+
+pre_configure() {
+	cp "qwt/qwtconfig.pri.in" "qwt/qwtconfig.pri"
+
+	echo "QMAKE_LRELEASE = /usr/bin/lrelease" > src/gcconfig.pri
+	echo "LIBZ_LIBS = -lz" >> src/gcconfig.pri
+}
+
+do_install() {
+	vbin "src/GoldenCheetah"
+}

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: New package: GoldenCheetah-3.5
  2020-07-26  2:55 [PR PATCH] New package: GoldenCheetah-3.5 gt7-void
                   ` (7 preceding siblings ...)
  2020-07-27  3:21 ` gt7-void
@ 2022-04-18  2:11 ` github-actions
  2022-05-02  2:15 ` [PR PATCH] [Closed]: " github-actions
  9 siblings, 0 replies; 11+ messages in thread
From: github-actions @ 2022-04-18  2:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/23839#issuecomment-1101026273

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Closed]: New package: GoldenCheetah-3.5
  2020-07-26  2:55 [PR PATCH] New package: GoldenCheetah-3.5 gt7-void
                   ` (8 preceding siblings ...)
  2022-04-18  2:11 ` github-actions
@ 2022-05-02  2:15 ` github-actions
  9 siblings, 0 replies; 11+ messages in thread
From: github-actions @ 2022-05-02  2:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 459 bytes --]

There's a closed pull request on the void-packages repository

New package: GoldenCheetah-3.5
https://github.com/void-linux/void-packages/pull/23839

Description:
Performance Software for Cyclists, Runners and Triathletes

http://www.goldencheetah.org/

Free alternative to garmin connect.

NOTE: qwt is included in the source, it is a /different/ branch of qwt than the stable one void ships. I did try to compile using the qwt from void but it fails.

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2022-05-02  2:15 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-26  2:55 [PR PATCH] New package: GoldenCheetah-3.5 gt7-void
2020-07-26  3:12 ` [PR REVIEW] " ericonr
2020-07-26  3:15 ` ericonr
2020-07-26 15:13 ` [PR PATCH] [Updated] " gt7-void
2020-07-26 15:23 ` [PR REVIEW] " gt7-void
2020-07-26 15:30 ` gt7-void
2020-07-26 15:31 ` gt7-void
2020-07-27  2:14 ` [PR PATCH] [Updated] " gt7-void
2020-07-27  3:21 ` gt7-void
2022-04-18  2:11 ` github-actions
2022-05-02  2:15 ` [PR PATCH] [Closed]: " github-actions

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).