Re: [PR PATCH] [Updated] [WIP] OpenLP: update to 3.1.0rc4.

[TinfoilSubmarine <TinfoilSubmarine@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1492 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/46058

[WIP] OpenLP: update to 3.1.0rc4.
Pretty big set of things needing to be updated so I figured I'd open this one up early to make sure I get everything.

I still need to go through and see what additional dependents these changes might affect.

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

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

<!--
#### 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/46058.patch is attached

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

From 1d969d51961b193889a4a30937ed2c4c90dfef45 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 09:25:40 -0400
Subject: [PATCH 1/5] python3-vlc: update to 3.0.20123.

---
 srcpkgs/python3-vlc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-vlc/template b/srcpkgs/python3-vlc/template
index 9e655cf15f73f..521f83038fe2b 100644
--- a/srcpkgs/python3-vlc/template
+++ b/srcpkgs/python3-vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-vlc'
 pkgname=python3-vlc
-version=3.0.18121
-revision=2
+version=3.0.20123
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
@@ -10,4 +10,4 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.videolan.org/Python_bindings"
 distfiles="${PYPI_SITE}/p/python-vlc/python-vlc-${version}.tar.gz"
-checksum=24550314a3e6ed55fd347b009491c98b865f9dfa05a92e889d7b0a2210e7485b
+checksum=244fbb9e392a0326841fca926d6d12a2a36c546982191f493f148fa19e66b1d4

From 5297b41f3330d6838aa4fdf866563e9ecb5f5dfd Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 09:28:17 -0400
Subject: [PATCH 2/5] python3-QtAwesome: update to 1.2.3.

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

diff --git a/srcpkgs/python3-QtAwesome/template b/srcpkgs/python3-QtAwesome/template
index 0dea5df2ec613..288046a9d5065 100644
--- a/srcpkgs/python3-QtAwesome/template
+++ b/srcpkgs/python3-QtAwesome/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-QtAwesome'
 pkgname=python3-QtAwesome
-version=1.2.0
-revision=3
+version=1.2.3
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-QtPy"
@@ -12,7 +12,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=b431dfee46ccbe43aa5d40d5b187749e2bf052ca16b8fbdf98b7778a8beb1063
+checksum=0db96484f3ac7a53c88279736b39b6f881a3f6bbd2163d4f0d043b74b1ef9131
 
 post_install() {
 	vlicense LICENSE.txt

From 290e2a4b277e6f17345f3e43334727be8159934f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 11:00:56 -0400
Subject: [PATCH 3/5] New package: python3-pypng-0.20220715.0

---
 srcpkgs/python3-pypng/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-pypng/template

diff --git a/srcpkgs/python3-pypng/template b/srcpkgs/python3-pypng/template
new file mode 100644
index 0000000000000..6ef365893c198
--- /dev/null
+++ b/srcpkgs/python3-pypng/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pypng'
+pkgname=python3-pypng
+version=0.20220715.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Pure Python library for saving and loading PNG images"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://gitlab.com/drj11/pypng"
+distfiles="${PYPI_SITE}/p/pypng/pypng-${version}.tar.gz"
+checksum=739c433ba96f078315de54c0db975aee537cbc3e1d0ae4ed9aab0ca1e427e2c1
+make_check_pre="env PYTHONPATH=code"
+
+post_install() {
+	vlicense LICENCE
+}

From f99899fe36ba170e4a5d789c1f7607617cb78818 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 11:03:10 -0400
Subject: [PATCH 4/5] python3-qrcode: update to 7.4.2.

---
 srcpkgs/python3-qrcode/files/README.voidlinux   |  2 +-
 .../patches/qrcode_assert-has-calls.patch       |  9 +++++++++
 srcpkgs/python3-qrcode/template                 | 17 +++++++----------
 3 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/python3-qrcode/patches/qrcode_assert-has-calls.patch

diff --git a/srcpkgs/python3-qrcode/files/README.voidlinux b/srcpkgs/python3-qrcode/files/README.voidlinux
index 09539ea5d6280..0ffee4d08f76d 100644
--- a/srcpkgs/python3-qrcode/files/README.voidlinux
+++ b/srcpkgs/python3-qrcode/files/README.voidlinux
@@ -1,4 +1,4 @@
 Some optional packages must be installed for additional functionality:
 
- - python-Pillow: Image generation support
+ - python-Pillow: More image generation support
 
diff --git a/srcpkgs/python3-qrcode/patches/qrcode_assert-has-calls.patch b/srcpkgs/python3-qrcode/patches/qrcode_assert-has-calls.patch
new file mode 100644
index 0000000000000..d8efa19885c86
--- /dev/null
+++ b/srcpkgs/python3-qrcode/patches/qrcode_assert-has-calls.patch
@@ -0,0 +1,9 @@
+diff -rupN --no-dereference qrcode-7.4.2/qrcode/tests/test_release.py qrcode-7.4.2-new/qrcode/tests/test_release.py
+--- qrcode-7.4.2/qrcode/tests/test_release.py	2023-02-05 23:11:38.000000000 +0100
++++ qrcode-7.4.2-new/qrcode/tests/test_release.py	2023-05-12 13:59:22.069372313 +0200
+@@ -37,4 +37,4 @@ class UpdateManpageTests(unittest.TestCa
+             .replace("version", "3.11")
+             .replace("date", datetime.datetime.now().strftime("%-d %b %Y"))
+         )
+-        mock_file().write.has_calls([mock.call(line) for line in expected])
++        mock_file().write.assert_has_calls([mock.call(line) for line in expected if line])
diff --git a/srcpkgs/python3-qrcode/template b/srcpkgs/python3-qrcode/template
index ae33cf832fef2..ebe91ed2e6119 100644
--- a/srcpkgs/python3-qrcode/template
+++ b/srcpkgs/python3-qrcode/template
@@ -1,21 +1,18 @@
 # Template file for 'python3-qrcode'
 pkgname=python3-qrcode
-version=6.1
-revision=7
+version=7.4.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-six"
-checkdepends="python3-six"
-short_desc="QR Code image generator (Python3)"
+depends="python3-pypng python3-typing_extensions"
+checkdepends="python3-pytest ${depends}"
+short_desc="QR Code image generator"
 maintainer="Charles E. Lehner <cel@celehner.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/lincolnloop/python-qrcode"
+changelog="https://raw.githubusercontent.com/lincolnloop/python-qrcode/main/CHANGES.rst"
 distfiles="${PYPI_SITE}/q/qrcode/qrcode-${version}.tar.gz"
-checksum=505253854f607f2abf4d16092c61d4e9d511a3b4392e60bff957a68592b04369
-
-do_check() {
-	python3 setup.py test
-}
+checksum=9dd969454827e127dbd93696b20747239e6d540e082937c90f14ac95b30f5845
 
 post_install() {
 	vlicense LICENSE

From 6e5172335b313e10df6b21ebca580d70d5b140e9 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 11:30:52 -0400
Subject: [PATCH 5/5] OpenLP: update to 3.1.0rc4.

---
 srcpkgs/OpenLP/patches/no_pytest_runner.patch |  4 +--
 srcpkgs/OpenLP/template                       | 30 ++++++++++++-------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/OpenLP/patches/no_pytest_runner.patch b/srcpkgs/OpenLP/patches/no_pytest_runner.patch
index e829c59dad61d..49eac46285d99 100644
--- a/srcpkgs/OpenLP/patches/no_pytest_runner.patch
+++ b/srcpkgs/OpenLP/patches/no_pytest_runner.patch
@@ -1,8 +1,8 @@
 diff --git a/setup.py b/setup.py
-index 1476585..4fc3ab0 100644
+index 5491eab..dfd1e5b 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -141,6 +141,5 @@ using a computer and a data projector.""",
+@@ -139,6 +139,5 @@ using a computer and a display/projector.""",
              'flake8',
          ]
      },
diff --git a/srcpkgs/OpenLP/template b/srcpkgs/OpenLP/template
index f3d76b360e8fa..ae6ce54591b2a 100644
--- a/srcpkgs/OpenLP/template
+++ b/srcpkgs/OpenLP/template
@@ -1,30 +1,40 @@
 # Template file for 'OpenLP'
 pkgname=OpenLP
-version=3.0.2
-revision=2
-create_wrksrc=yes
+version=3.1.0rc4
+revision=1
 build_style=python3-module
 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
- python3-Mako python3-Pillow python3-pymediainfo python3-PyQt5
- python3-PyQt5-multimedia python3-PyQt5-webengine python3-vlc python3-qrcode
- python3-QtAwesome python3-requests python3-SQLAlchemy python3-waitress
- python3-WebOb python3-websockets python3-zeroconf python3-PyICU"
+ python3-Mako python3-pymediainfo python3-PyQt5 python3-PyQt5-multimedia
+ python3-PyQt5-webengine python3-vlc python3-qrcode python3-QtAwesome
+ python3-requests python3-SQLAlchemy python3-waitress python3-WebOb
+ python3-websockets python3-zeroconf python3-PyICU"
 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=edf03061e9e1c494835657bd4924c07d862aea1997832d2c9e56e3286fce1d2b
+distfiles="https://gitlab.com/openlp/openlp/-/archive/${version}/openlp-${version}.tar.gz"
+checksum=63cc3f49944b8e5d5e0576105813938dee87355cb672318acb6c78df2e33522d
 make_check_pre="env -u QT_QPA_PLATFORM xvfb-run"
 
 post_install() {
-	vinstall resources/openlp.desktop 644 usr/share/applications
 	vmkdir usr/share/openlp/i18n
 	cd resources/i18n
 	for i in *.ts; do
 		lconvert -i "${i}" -o "${DESTDIR}/usr/share/openlp/i18n/${i%ts}qm"
 	done
+
+	cd ../images
+	for size in 16 32 48 64 128 256; do
+		vinstall openlp-logo-${size}x${size}.png 644 \
+			usr/share/icons/hicolor/${size}x${size}/apps openlp.png
+	done
+		vinstall openlp.svg 644 usr/share/icons/hicolor/scalable/apps
+
+	cd ..
+
+	vinstall openlp.desktop 644 usr/share/applications
+	vinstall openlp.xml 644 usr/share/mime/packages
 }