[PR PATCH] OpenLP: update to 2.9.5.

[PR PATCH] OpenLP: update to 2.9.5.

[TinfoilSubmarine]

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

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

https://github.com/TinfoilSubmarine/void-packages update/OpenLP
https://github.com/void-linux/void-packages/pull/40057

OpenLP: update to 2.9.5.
- python3-QtAwesome: update to 1.2.0.
- OpenLP: update to 2.9.5.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/40057.patch is attached

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

From aa25133322e63b523ed66df98dde1b2606b4c3ab Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 20 Oct 2022 08:26:19 -0400
Subject: [PATCH 1/2] python3-QtAwesome: update to 1.2.0.

---
 srcpkgs/python3-QtAwesome/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-QtAwesome/template b/srcpkgs/python3-QtAwesome/template
index cd84ff6f74da..4e8c238d9712 100644
--- a/srcpkgs/python3-QtAwesome/template
+++ b/srcpkgs/python3-QtAwesome/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-QtAwesome'
 pkgname=python3-QtAwesome
-version=1.1.1
+version=1.2.0
 revision=1
 wrksrc="QtAwesome-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://github.com/spyder-ide/qtawesome"
 changelog="https://raw.githubusercontent.com/spyder-ide/qtawesome/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/Q/QtAwesome/QtAwesome-${version}.tar.gz"
-checksum=ec02e200231fa68a146a93845890aa0432a7edcba14bf811ff6975cf9acdab5d
+checksum=b431dfee46ccbe43aa5d40d5b187749e2bf052ca16b8fbdf98b7778a8beb1063
 
 post_install() {
 	vlicense LICENSE.txt

From 100774586c37e0580d258294fa4fa60a8e069d4a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 20 Oct 2022 08:13:56 -0400
Subject: [PATCH 2/2] OpenLP: update to 2.9.5.

---
 .../OpenLP/patches/py310_applocation.patch    | 67 -------------------
 srcpkgs/OpenLP/template                       | 16 ++---
 srcpkgs/OpenLP/update                         |  1 -
 3 files changed, 4 insertions(+), 80 deletions(-)
 delete mode 100644 srcpkgs/OpenLP/patches/py310_applocation.patch
 delete mode 100644 srcpkgs/OpenLP/update

diff --git a/srcpkgs/OpenLP/patches/py310_applocation.patch b/srcpkgs/OpenLP/patches/py310_applocation.patch
deleted file mode 100644
index 89dc3e8c8a84..000000000000
--- a/srcpkgs/OpenLP/patches/py310_applocation.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 54ad75426825cdd977f770b12a62ee92218b82d6 Mon Sep 17 00:00:00 2001
-From: Raoul Snyman <raoul@snyman.info>
-Date: Thu, 3 Feb 2022 11:26:24 -0700
-Subject: [PATCH] Make two versions of a test to work around a difference in
- Python 3.10
-
----
- tests/openlp_core/common/test_applocation.py | 29 +++++++++++++++++++-
- 1 file changed, 28 insertions(+), 1 deletion(-)
-
-diff --git a/tests/openlp_core/common/test_applocation.py b/tests/openlp_core/common/test_applocation.py
-index 2aebc5213..432773ec7 100644
---- a/tests/openlp_core/common/test_applocation.py
-+++ b/tests/openlp_core/common/test_applocation.py
-@@ -22,9 +22,12 @@
- Functional tests to test the AppLocation class and related methods.
- """
- import os
-+import sys
- from pathlib import Path
- from unittest.mock import patch
- 
-+import pytest
-+
- from openlp.core.common import get_frozen_path
- from openlp.core.common.applocation import AppLocation
- 
-@@ -141,11 +144,35 @@ def test_get_directory_for_app_dir(mocked_get_frozen_path):
-     assert directory == Path.cwd() / Path('app', 'dir'), 'Directory should be "app/dir"'
- 
- 
-+@pytest.mark.skipif(sys.version_info < (3, 10), reason="Python 3.10 version of this test")
-+@patch('openlp.core.common.applocation.get_frozen_path')
-+@patch('openlp.core.common.applocation.os.path.abspath')
-+@patch('openlp.core.common.applocation.os.path.split')
-+@patch('openlp.core.common.applocation.sys')
-+def test_get_directory_for_plugins_dir_py310(mocked_sys, mocked_split, mocked_abspath, mocked_get_frozen_path):
-+    """
-+    Test the AppLocation.get_directory() method for AppLocation.PluginsDir
-+    """
-+    # GIVEN: _get_frozen_path, abspath, split and sys are mocked out
-+    mocked_abspath.return_value = os.path.join('dir', 'plugins')
-+    mocked_split.return_value = ['openlp']
-+    mocked_get_frozen_path.return_value = Path('dir')
-+    mocked_sys.frozen = 1
-+    mocked_sys.argv = ['openlp']
-+
-+    # WHEN: We call AppLocation.get_directory
-+    directory = AppLocation.get_directory(AppLocation.PluginsDir)
-+
-+    # THEN: The correct directory should be returned
-+    assert directory == Path('dir', 'plugins'), 'Directory should be "dir/plugins"'
-+
-+
-+@pytest.mark.skipif(sys.version_info >= (3, 10), reason="Python 3.9 version of this test")
- @patch('openlp.core.common.applocation.get_frozen_path')
- @patch('openlp.core.common.applocation.os.path.abspath')
- @patch('openlp.core.common.applocation.os.path.split')
- @patch('openlp.core.common.applocation.sys')
--def test_get_directory_for_plugins_dir(mocked_sys, mocked_split, mocked_abspath, mocked_get_frozen_path):
-+def test_get_directory_for_plugins_dir_py39(mocked_sys, mocked_split, mocked_abspath, mocked_get_frozen_path):
-     """
-     Test the AppLocation.get_directory() method for AppLocation.PluginsDir
-     """
--- 
-GitLab
-
diff --git a/srcpkgs/OpenLP/template b/srcpkgs/OpenLP/template
index 023ffdbc38df..038e9cf4fe7e 100644
--- a/srcpkgs/OpenLP/template
+++ b/srcpkgs/OpenLP/template
@@ -1,13 +1,10 @@
 # Template file for 'OpenLP'
 pkgname=OpenLP
-version=2.9.4
+version=2.9.5
 revision=1
 wrksrc="OpenLP-${version}"
 create_wrksrc=yes
 build_style=python3-module
-# test always fails with AssertionError
-# see https://gitlab.com/openlp/openlp/-/issues/1024
-make_check_args="--deselect tests/openlp_core/ui/test_mainwindow.py::test_load_settings_position_invalid"
 hostmakedepends="python3-setuptools qt5-host-tools"
 depends="python3-alembic python3-appdirs python3-BeautifulSoup4 python3-chardet
  python3-dbus python3-distro python3-Flask python3-Flask-Cors python3-lxml
@@ -15,19 +12,14 @@ depends="python3-alembic python3-appdirs python3-BeautifulSoup4 python3-chardet
  python3-PyQt5-multimedia python3-PyQt5-webengine python3-vlc python3-qrcode
  python3-QtAwesome python3-requests python3-SQLAlchemy python3-waitress
  python3-WebOb python3-websockets python3-zeroconf"
-checkdepends="python3-pytest-qt ${depends}"
+checkdepends="python3-pytest-qt xvfb-run ${depends}"
 short_desc="Free Worship Presentation Software for your Church"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-3.0-or-later"
 homepage="https://openlp.org/"
 distfiles="https://get.openlp.org/${version}/OpenLP-${version}.tar.gz"
-checksum=24dcd14841b5a6a03e0ac12202628429f467264ac8605268c63b6634121dd73a
-
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	# test fails with XMLSyntaxError
-	# see https://gitlab.com/openlp/openlp/-/issues/1023
-	make_check_args+=" --deselect tests/openlp_plugins/songs/test_presentationmanagerimport.py::test_presenter_manager"
-fi
+checksum=4648e6869ffe2fb88a1e2b90705e1cf709dd6dd24abbfe2e17df13742e701c09
+make_check_pre="env -u QT_QPA_PLATFORM xvfb-run"
 
 post_install() {
 	vinstall resources/openlp.desktop 644 usr/share/applications
diff --git a/srcpkgs/OpenLP/update b/srcpkgs/OpenLP/update
deleted file mode 100644
index abb68da72a2d..000000000000
--- a/srcpkgs/OpenLP/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="2.9.*" # pre-release of 3

Re: [PR PATCH] [Updated] OpenLP: update to 2.9.5.

[TinfoilSubmarine]

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

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

https://github.com/TinfoilSubmarine/void-packages update/OpenLP
https://github.com/void-linux/void-packages/pull/40057

OpenLP: update to 2.9.5.
- python3-QtAwesome: update to 1.2.0.
- OpenLP: update to 2.9.5.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/40057.patch is attached

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

From aa25133322e63b523ed66df98dde1b2606b4c3ab Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 20 Oct 2022 08:26:19 -0400
Subject: [PATCH 1/2] python3-QtAwesome: update to 1.2.0.

---
 srcpkgs/python3-QtAwesome/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-QtAwesome/template b/srcpkgs/python3-QtAwesome/template
index cd84ff6f74da..4e8c238d9712 100644
--- a/srcpkgs/python3-QtAwesome/template
+++ b/srcpkgs/python3-QtAwesome/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-QtAwesome'
 pkgname=python3-QtAwesome
-version=1.1.1
+version=1.2.0
 revision=1
 wrksrc="QtAwesome-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://github.com/spyder-ide/qtawesome"
 changelog="https://raw.githubusercontent.com/spyder-ide/qtawesome/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/Q/QtAwesome/QtAwesome-${version}.tar.gz"
-checksum=ec02e200231fa68a146a93845890aa0432a7edcba14bf811ff6975cf9acdab5d
+checksum=b431dfee46ccbe43aa5d40d5b187749e2bf052ca16b8fbdf98b7778a8beb1063
 
 post_install() {
 	vlicense LICENSE.txt

From dca3031caf214d8d479dc1a657fd7869e9a60410 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 20 Oct 2022 08:13:56 -0400
Subject: [PATCH 2/2] OpenLP: update to 2.9.5.

---
 .../OpenLP/patches/py310_applocation.patch    | 67 -------------------
 srcpkgs/OpenLP/template                       | 17 ++---
 srcpkgs/OpenLP/update                         |  1 -
 3 files changed, 4 insertions(+), 81 deletions(-)
 delete mode 100644 srcpkgs/OpenLP/patches/py310_applocation.patch
 delete mode 100644 srcpkgs/OpenLP/update

diff --git a/srcpkgs/OpenLP/patches/py310_applocation.patch b/srcpkgs/OpenLP/patches/py310_applocation.patch
deleted file mode 100644
index 89dc3e8c8a84..000000000000
--- a/srcpkgs/OpenLP/patches/py310_applocation.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 54ad75426825cdd977f770b12a62ee92218b82d6 Mon Sep 17 00:00:00 2001
-From: Raoul Snyman <raoul@snyman.info>
-Date: Thu, 3 Feb 2022 11:26:24 -0700
-Subject: [PATCH] Make two versions of a test to work around a difference in
- Python 3.10
-
----
- tests/openlp_core/common/test_applocation.py | 29 +++++++++++++++++++-
- 1 file changed, 28 insertions(+), 1 deletion(-)
-
-diff --git a/tests/openlp_core/common/test_applocation.py b/tests/openlp_core/common/test_applocation.py
-index 2aebc5213..432773ec7 100644
---- a/tests/openlp_core/common/test_applocation.py
-+++ b/tests/openlp_core/common/test_applocation.py
-@@ -22,9 +22,12 @@
- Functional tests to test the AppLocation class and related methods.
- """
- import os
-+import sys
- from pathlib import Path
- from unittest.mock import patch
- 
-+import pytest
-+
- from openlp.core.common import get_frozen_path
- from openlp.core.common.applocation import AppLocation
- 
-@@ -141,11 +144,35 @@ def test_get_directory_for_app_dir(mocked_get_frozen_path):
-     assert directory == Path.cwd() / Path('app', 'dir'), 'Directory should be "app/dir"'
- 
- 
-+@pytest.mark.skipif(sys.version_info < (3, 10), reason="Python 3.10 version of this test")
-+@patch('openlp.core.common.applocation.get_frozen_path')
-+@patch('openlp.core.common.applocation.os.path.abspath')
-+@patch('openlp.core.common.applocation.os.path.split')
-+@patch('openlp.core.common.applocation.sys')
-+def test_get_directory_for_plugins_dir_py310(mocked_sys, mocked_split, mocked_abspath, mocked_get_frozen_path):
-+    """
-+    Test the AppLocation.get_directory() method for AppLocation.PluginsDir
-+    """
-+    # GIVEN: _get_frozen_path, abspath, split and sys are mocked out
-+    mocked_abspath.return_value = os.path.join('dir', 'plugins')
-+    mocked_split.return_value = ['openlp']
-+    mocked_get_frozen_path.return_value = Path('dir')
-+    mocked_sys.frozen = 1
-+    mocked_sys.argv = ['openlp']
-+
-+    # WHEN: We call AppLocation.get_directory
-+    directory = AppLocation.get_directory(AppLocation.PluginsDir)
-+
-+    # THEN: The correct directory should be returned
-+    assert directory == Path('dir', 'plugins'), 'Directory should be "dir/plugins"'
-+
-+
-+@pytest.mark.skipif(sys.version_info >= (3, 10), reason="Python 3.9 version of this test")
- @patch('openlp.core.common.applocation.get_frozen_path')
- @patch('openlp.core.common.applocation.os.path.abspath')
- @patch('openlp.core.common.applocation.os.path.split')
- @patch('openlp.core.common.applocation.sys')
--def test_get_directory_for_plugins_dir(mocked_sys, mocked_split, mocked_abspath, mocked_get_frozen_path):
-+def test_get_directory_for_plugins_dir_py39(mocked_sys, mocked_split, mocked_abspath, mocked_get_frozen_path):
-     """
-     Test the AppLocation.get_directory() method for AppLocation.PluginsDir
-     """
--- 
-GitLab
-
diff --git a/srcpkgs/OpenLP/template b/srcpkgs/OpenLP/template
index 023ffdbc38df..e8dd194f52b5 100644
--- a/srcpkgs/OpenLP/template
+++ b/srcpkgs/OpenLP/template
@@ -1,13 +1,9 @@
 # Template file for 'OpenLP'
 pkgname=OpenLP
-version=2.9.4
+version=2.9.5
 revision=1
-wrksrc="OpenLP-${version}"
 create_wrksrc=yes
 build_style=python3-module
-# test always fails with AssertionError
-# see https://gitlab.com/openlp/openlp/-/issues/1024
-make_check_args="--deselect tests/openlp_core/ui/test_mainwindow.py::test_load_settings_position_invalid"
 hostmakedepends="python3-setuptools qt5-host-tools"
 depends="python3-alembic python3-appdirs python3-BeautifulSoup4 python3-chardet
  python3-dbus python3-distro python3-Flask python3-Flask-Cors python3-lxml
@@ -15,19 +11,14 @@ depends="python3-alembic python3-appdirs python3-BeautifulSoup4 python3-chardet
  python3-PyQt5-multimedia python3-PyQt5-webengine python3-vlc python3-qrcode
  python3-QtAwesome python3-requests python3-SQLAlchemy python3-waitress
  python3-WebOb python3-websockets python3-zeroconf"
-checkdepends="python3-pytest-qt ${depends}"
+checkdepends="python3-pytest-qt xvfb-run ${depends}"
 short_desc="Free Worship Presentation Software for your Church"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-3.0-or-later"
 homepage="https://openlp.org/"
 distfiles="https://get.openlp.org/${version}/OpenLP-${version}.tar.gz"
-checksum=24dcd14841b5a6a03e0ac12202628429f467264ac8605268c63b6634121dd73a
-
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	# test fails with XMLSyntaxError
-	# see https://gitlab.com/openlp/openlp/-/issues/1023
-	make_check_args+=" --deselect tests/openlp_plugins/songs/test_presentationmanagerimport.py::test_presenter_manager"
-fi
+checksum=4648e6869ffe2fb88a1e2b90705e1cf709dd6dd24abbfe2e17df13742e701c09
+make_check_pre="env -u QT_QPA_PLATFORM xvfb-run"
 
 post_install() {
 	vinstall resources/openlp.desktop 644 usr/share/applications
diff --git a/srcpkgs/OpenLP/update b/srcpkgs/OpenLP/update
deleted file mode 100644
index abb68da72a2d..000000000000
--- a/srcpkgs/OpenLP/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="2.9.*" # pre-release of 3

Re: [PR PATCH] [Merged]: OpenLP: update to 2.9.5.

[classabbyamp]

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

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

OpenLP: update to 2.9.5.
https://github.com/void-linux/void-packages/pull/40057

Description:
- python3-QtAwesome: update to 1.2.0.
- OpenLP: update to 2.9.5.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->