[PR PATCH] rosegarden: update to 21.06

[PR PATCH] rosegarden: update to 21.06

[newbluemoon]

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

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

https://github.com/newbluemoon/void-packages rosegarden
https://github.com/void-linux/void-packages/pull/31341

rosegarden: update to 21.06
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 170f78ad9181e5c030e9af127007974a2643da3d Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Mon, 7 Jun 2021 09:04:24 +0200
Subject: [PATCH] rosegarden: update to 21.06

---
 srcpkgs/rosegarden/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rosegarden/template b/srcpkgs/rosegarden/template
index 04640a9362e6..f3103e938af8 100644
--- a/srcpkgs/rosegarden/template
+++ b/srcpkgs/rosegarden/template
@@ -1,6 +1,6 @@
 # Template file for 'rosegarden'
 pkgname=rosegarden
-version=20.12
+version=21.06
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config shared-mime-info"
@@ -12,7 +12,10 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="http://rosegardenmusic.com/"
 distfiles="${SOURCEFORGE_SITE}/rosegarden/rosegarden/${version/*.*.*/${version%.*}}/rosegarden-${version}.tar.bz2"
-checksum=886684afc5858a9578234d1f845188db130114f7fbf38208c4d5ecda15131c5b
+checksum=cde4fde48d01024a03bd7a96f63f9c6e7324728214183ceb605018f89faf0b66
+# check requires a display:
+# qt.qpa.xcb: could not connect to display
+make_check=no
 
 if [ -n "${CROSS_BUILD}" ]; then
 	hostmakedepends+=" qt5-devel qt5-host-tools"

Re: [PR REVIEW] rosegarden: update to 21.06

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31341#discussion_r646616106

Comment:
Try adding a `pre_check` like `kparts` does.

Re: [PR PATCH] [Updated] rosegarden: update to 21.06

[newbluemoon]

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

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

https://github.com/newbluemoon/void-packages rosegarden
https://github.com/void-linux/void-packages/pull/31341

rosegarden: update to 21.06
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From be5b066d7332f8fee629b4800143301ba51e8ff0 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Mon, 7 Jun 2021 09:04:24 +0200
Subject: [PATCH] rosegarden: update to 21.06

---
 srcpkgs/rosegarden/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rosegarden/template b/srcpkgs/rosegarden/template
index 04640a9362e6..dab95b35b3ad 100644
--- a/srcpkgs/rosegarden/template
+++ b/srcpkgs/rosegarden/template
@@ -1,6 +1,6 @@
 # Template file for 'rosegarden'
 pkgname=rosegarden
-version=20.12
+version=21.06
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config shared-mime-info"
@@ -12,7 +12,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="http://rosegardenmusic.com/"
 distfiles="${SOURCEFORGE_SITE}/rosegarden/rosegarden/${version/*.*.*/${version%.*}}/rosegarden-${version}.tar.bz2"
-checksum=886684afc5858a9578234d1f845188db130114f7fbf38208c4d5ecda15131c5b
+checksum=cde4fde48d01024a03bd7a96f63f9c6e7324728214183ceb605018f89faf0b66
 
 if [ -n "${CROSS_BUILD}" ]; then
 	hostmakedepends+=" qt5-devel qt5-host-tools"
@@ -21,3 +21,10 @@ fi
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'
 }
+
+pre_check() {
+	mkdir  -p ${wrksrc}/check_xdg_runtime_dir
+	chmod 700 ${wrksrc}/check_xdg_runtime_dir
+	export XDG_RUNTIME_DIR=${wrksrc}/check_xdg_runtime_dir
+	export QT_QPA_PLATFORM=offscreen
+}

Re: [PR REVIEW] rosegarden: update to 21.06

[newbluemoon]

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

New review comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/31341#discussion_r646899048

Comment:
Yes, that did the trick, thanks. However, one test requires `XDG_RUNTIME_DIR` to be set. So I added it, too, but maybe there is a more elegant solution I just don’t see?

Re: [PR REVIEW] rosegarden: update to 21.06

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31341#discussion_r646939342

Comment:
We could have it exported by `xbps-src` by default, but I'm not sure that's ideal. Your current fix looks good to me.

Re: [PR PATCH] [Merged]: rosegarden: update to 21.06

[ericonr]

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

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

rosegarden: update to 21.06
https://github.com/void-linux/void-packages/pull/31341

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->