Date: Wednesday, December 9, 2020 @ 19:20:48 Author: dvzrv Revision: 772921
upgpkg: rosegarden 20.12-1: Upgrade to 20.12. Remove now included patch. Add changelog. Modified: rosegarden/trunk/PKGBUILD Deleted: rosegarden/trunk/0001-Audit-includes.patch ---------------------------+ 0001-Audit-includes.patch | 170 -------------------------------------------- PKGBUILD | 18 +--- 2 files changed, 5 insertions(+), 183 deletions(-) Deleted: 0001-Audit-includes.patch =================================================================== --- 0001-Audit-includes.patch 2020-12-09 19:12:32 UTC (rev 772920) +++ 0001-Audit-includes.patch 2020-12-09 19:20:48 UTC (rev 772921) @@ -1,170 +0,0 @@ -From 9648884f7bf904f1401ff695ac0eea8463efbc49 Mon Sep 17 00:00:00 2001 -From: Ted Felix <[email protected]> -Date: Thu, 4 Jun 2020 20:29:40 -0400 -Subject: [PATCH] Audit #includes - -Fix build issues with Qt 5.15. Bug #1585. ---- - src/gui/general/ThornStyle.cpp | 25 +++++++++++++------------ - src/gui/general/ThornStyle.h | 12 +++++++++++- - src/gui/widgets/Panner.cpp | 18 ++++++++++++++---- - src/gui/widgets/Panner.h | 15 ++++++++++++++- - 4 files changed, 52 insertions(+), 18 deletions(-) - -diff --git a/src/gui/general/ThornStyle.cpp b/src/gui/general/ThornStyle.cpp -index b4586cb0..387e19e7 100644 ---- a/src/gui/general/ThornStyle.cpp -+++ b/src/gui/general/ThornStyle.cpp -@@ -19,32 +19,33 @@ - - #include "ThornStyle.h" - --#include "ResourceFinder.h" - #include "gui/general/IconLoader.h" - #include "misc/Debug.h" - --#include <QApplication> -+#include <QApplication> // qApp - #include <QAbstractItemView> -+#include <QAbstractSpinBox> - #include <QCheckBox> -+#include <QColor> -+#include <QComboBox> - #include <QDebug> --#include <qdrawutil.h> -+#include <QDialogButtonBox> - #include <QEvent> --#include <QFile> - #include <QFileDialog> - #include <QLabel> --#include <QLayout> -+#include <QLinearGradient> -+#include <QObject> - #include <QPainter> -+#include <QPainterPath> -+#include <QPen> -+#include <QPoint> -+#include <QPushButton> - #include <QRadioButton> -+#include <QRect> - #include <QStyleFactory> --#include <QStyleOption> -+#include <QStyleOption> // QStyleOption* classes - #include <QToolBar> - #include <QWidget> --#include <QDialogButtonBox> --#include <QPushButton> --#include <QComboBox> --#include <QSpinBox> --#include <QScrollBar> --#include <QAbstractScrollArea> - - using namespace Rosegarden; - -diff --git a/src/gui/general/ThornStyle.h b/src/gui/general/ThornStyle.h -index f56e2086..e5385724 100644 ---- a/src/gui/general/ThornStyle.h -+++ b/src/gui/general/ThornStyle.h -@@ -18,8 +18,18 @@ - #ifndef RG_THORN_STYLE_H - #define RG_THORN_STYLE_H - --#include <QProxyStyle> - #include <QIcon> -+#include <QPalette> -+#include <QPixmap> -+#include <QProxyStyle> -+#include <QSize> -+#include <QStyle> -+ -+class QPainter; -+class QStyleOption; -+class QStyleOptionComplex; -+class QWidget; -+ - #include <rosegardenprivate_export.h> - - namespace Rosegarden -diff --git a/src/gui/widgets/Panner.cpp b/src/gui/widgets/Panner.cpp -index ceba4eae..e3ee2479 100644 ---- a/src/gui/widgets/Panner.cpp -+++ b/src/gui/widgets/Panner.cpp -@@ -24,14 +24,23 @@ - #include "misc/Debug.h" - #include "base/Profiler.h" - --#include <QPolygon> -+#include <QColor> -+#include <QGraphicsScene> - #include <QMouseEvent> -+#include <QPainter> -+#include <QPainterPath> -+#include <QPaintEvent> -+#include <QPen> -+#include <QPoint> -+#include <QPolygon> -+#include <QTransform> -+#include <QWheelEvent> - --#include <iostream> - - namespace Rosegarden - { - -+ - class PannerScene : public QGraphicsScene - { - public: -@@ -39,6 +48,7 @@ public: - }; - - Panner::Panner() : -+ m_pointerHeight(0), - m_pointerVisible(false), - m_clicked(false) - { -@@ -284,6 +294,6 @@ Panner::moveTo(QPoint p) - emit pannedRectChanged(m_pannedRect); - viewport()->update(); - } -- --} - -+ -+} -diff --git a/src/gui/widgets/Panner.h b/src/gui/widgets/Panner.h -index d5f6ec5a..07bfaeb4 100644 ---- a/src/gui/widgets/Panner.h -+++ b/src/gui/widgets/Panner.h -@@ -19,6 +19,19 @@ - #define RG_PANNER_H - - #include <QGraphicsView> -+#include <QRectF> -+#include <QPixmap> -+#include <QPointF> -+ -+class QGraphicsItem; -+class QGraphicsScene; -+class QMouseEvent; -+class QPainter; -+class QPaintEvent; -+class QResizeEvent; -+class QStyleOptionGraphicsItem; -+class QWheelEvent; -+ - - namespace Rosegarden - { -@@ -87,7 +100,7 @@ protected: - QPixmap m_cache; - }; - -+ - } - - #endif -- --- -2.17.1 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-12-09 19:12:32 UTC (rev 772920) +++ PKGBUILD 2020-12-09 19:20:48 UTC (rev 772921) @@ -5,7 +5,7 @@ # Contributor: Robert Emil Berge <[email protected]> pkgname=rosegarden -pkgver=20.06 +pkgver=20.12 pkgrel=1 pkgdesc="MIDI/audio sequencer and notation editor" arch=('x86_64') @@ -25,18 +25,10 @@ 'flac: FLAC support' 'wavpack: Lossless audio codec support') provides=('dssi-host' 'ladspa-host') -source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"; - "0001-Audit-includes.patch") -sha512sums=('7f3892697b99344d47e2bf398f6fe82de9867a093f3396d571730a30f3442a923f16a5472a74bda865205696ff3834c0a188ceefae17e56b137d8df1a56e03f7' - 'b754dc23e3333317f16c891c30297087868b75cfb6ec440abc54994db7d9b07d02f6b68154994f09c640c6b7e1c998a841f543f76bc3c507e73215e8e64756e4') +source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2";) +sha512sums=('a2901d35ef7dac9358350fa47e47b9314698790bb2e2a95c6cc444135f49a92e3fb6d6cbf8710194bca6e57e1c82218991ae3db4aa7b6acea311cb3b627d3dc2') +b2sums=('f03862a8523dd43cc7e2b146446bb943229cfa1c598bc36601695465566d1037d360b15ac78802dbcc51c601e605abc9199f3006b3072e5e0ad2b49da9e15c28') -prepare() { - cd "${pkgname}-${pkgver}" - # fix build for qt5 >= 5.15.0 - # https://sourceforge.net/p/rosegarden/bugs/1585/ - patch -Np1 -i "../0001-Audit-includes.patch" -} - build() { cd "${pkgname}-${pkgver}" cmake -DCMAKE_INSTALL_PREFIX=/usr \ @@ -60,7 +52,7 @@ 'libsamplerate.so' 'libsndfile.so') cd "${pkgname}-${pkgver}" make DESTDIR="$pkgdir" install -C build - install -vDm 644 {AUTHORS,README} \ + install -vDm 644 {AUTHORS,CHANGELOG,README} \ -t "${pkgdir}/usr/share/doc/${pkgname}" } # vim:set ts=2 sw=2 et:
