From d98eafeca15cf41bf45d7143a95c07d7deefcc24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 18 Dec 2020 17:09:39 +0100
Subject: [PATCH] rosegarden: upgrade 20.06 -> 20.12
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 recipes-musicians/rosegarden/rosegarden.bb    | 10 ++---
 .../0001-Fix-build-with-Qt-5.15.patch         | 43 -------------------
 2 files changed, 3 insertions(+), 50 deletions(-)
 delete mode 100644 recipes-musicians/rosegarden/rosegarden/0001-Fix-build-with-Qt-5.15.patch

diff --git a/recipes-musicians/rosegarden/rosegarden.bb b/recipes-musicians/rosegarden/rosegarden.bb
index c2d68e1..a36e0b1 100644
--- a/recipes-musicians/rosegarden/rosegarden.bb
+++ b/recipes-musicians/rosegarden/rosegarden.bb
@@ -18,13 +18,9 @@ inherit cmake_qt5 pkgconfig gtk-icon-cache features_check mime mime-xdg
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-PV = "20.06"
-SRC_URI = " \
-    ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.bz2 \
-    file://0001-Fix-build-with-Qt-5.15.patch \
-"
-SRC_URI[md5sum] = "16f0cbbb3104c9f58f644b18e4cbaf19"
-SRC_URI[sha256sum] = "d94c0eb0e28c51662d9056c7e50e5b394a8648442a17dacf99b9718e674e3dc5"
+PV = "20.12"
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.bz2"
+SRC_URI[sha256sum] = "886684afc5858a9578234d1f845188db130114f7fbf38208c4d5ecda15131c5b"
 
 FILES_${PN} += " \
     ${datadir}/mime \
diff --git a/recipes-musicians/rosegarden/rosegarden/0001-Fix-build-with-Qt-5.15.patch b/recipes-musicians/rosegarden/rosegarden/0001-Fix-build-with-Qt-5.15.patch
deleted file mode 100644
index 6eeb7a2..0000000
--- a/recipes-musicians/rosegarden/rosegarden/0001-Fix-build-with-Qt-5.15.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 2aa451137236f610b65bfa7e271b5918accde247 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sun, 7 Jun 2020 22:55:40 +0200
-Subject: [PATCH] Fix build with Qt 5.15
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- src/gui/widgets/Panner.cpp     | 1 +
- src/gui/general/ThornStyle.cpp | 1 +
- 2 file changed, 2 insertions(+)
-
-diff --git a/src/gui/widgets/Panner.cpp b/src/gui/widgets/Panner.cpp
-index ceba4ea..d4f9ae3 100644
---- a/src/gui/widgets/Panner.cpp
-+++ b/src/gui/widgets/Panner.cpp
-@@ -26,6 +26,7 @@
- 
- #include <QPolygon>
- #include <QMouseEvent>
-+#include <QPainterPath>
- 
- #include <iostream>
- 
-diff --git a/src/gui/general/ThornStyle.cpp b/src/gui/general/ThornStyle.cpp
-index 4374607..4c82c29 100644
---- a/src/gui/general/ThornStyle.cpp
-+++ b/src/gui/general/ThornStyle.cpp
-@@ -45,6 +45,7 @@
- #include <QSpinBox>
- #include <QScrollBar>
- #include <QAbstractScrollArea>
-+#include <QPainterPath>
- 
- using namespace Rosegarden;
- 
--- 
-2.26.2
-