[PR PATCH] [WIP] OpenLP: update to 3.1.0rc1.

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] [WIP] OpenLP: update to 3.1.0rc1.
@ 2023-09-14 15:32 TinfoilSubmarine
  2023-09-14 16:41 ` [PR PATCH] [Updated] " TinfoilSubmarine
                   ` (10 more replies)
  0 siblings, 11 replies; 12+ messages in thread
From: TinfoilSubmarine @ 2023-09-14 15:32 UTC (permalink / raw)
  To: ml

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

[WIP] OpenLP: update to 3.1.0rc1.
Pretty big set of things needing to be updated, 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: 11484 bytes --]

From 4d84e83818b9677d6212399db58a9fac558eb391 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 09:20:29 -0400
Subject: [PATCH 1/7] python3-SQLAlchemy: update to 1.4.49.

---
 srcpkgs/python3-SQLAlchemy/template | 12 ++++++------
 srcpkgs/python3-SQLAlchemy/update   |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/python3-SQLAlchemy/update

diff --git a/srcpkgs/python3-SQLAlchemy/template b/srcpkgs/python3-SQLAlchemy/template
index 11d3b30242c06..3ae353590fd65 100644
--- a/srcpkgs/python3-SQLAlchemy/template
+++ b/srcpkgs/python3-SQLAlchemy/template
@@ -1,19 +1,19 @@
 # Template file for 'python3-SQLAlchemy'
 pkgname=python3-SQLAlchemy
-version=1.3.18
-revision=5
+version=1.4.49
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="python3"
-checkdepends="python3-pytest-xdist"
+depends="python3-greenlet"
+checkdepends="python3-pytest-xdist python3-mock"
 short_desc="SQL Toolkit and Object Relational Mapper for Python3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.sqlalchemy.org"
+changelog="https://docs.sqlalchemy.org/en/14/changelog/"
 distfiles="${PYPI_SITE}/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz"
-checksum=da2fb75f64792c1fc64c82313a00c728a7c301efe6a60b7a9fe35b16b4368ce7
-make_check=no # FIXME
+checksum=06ff25cbae30c396c4b7737464f2a7fc37a67b7da409993b182b024cec80aed9
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-SQLAlchemy/update b/srcpkgs/python3-SQLAlchemy/update
new file mode 100644
index 0000000000000..0f73cbc6432e9
--- /dev/null
+++ b/srcpkgs/python3-SQLAlchemy/update
@@ -0,0 +1 @@
+ignore="2.* *b*"

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

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

diff --git a/srcpkgs/python3-vlc/template b/srcpkgs/python3-vlc/template
index 58dcdf2afb087..d77f678555d04 100644
--- a/srcpkgs/python3-vlc/template
+++ b/srcpkgs/python3-vlc/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-vlc'
 pkgname=python3-vlc
-version=3.0.18121
+version=3.0.18122
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -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=1039bde287853b4b7b61ba22d83761832434f78506da762dfb060291bf32897d

From f05f8abd759fe464016ef214e170ae6acdfb56b8 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 09:25:45 -0400
Subject: [PATCH 3/7] python3-Flask-Cors: update to 4.0.0.

---
 srcpkgs/python3-Flask-Cors/template | 12 ++++++------
 srcpkgs/python3-Flask-Cors/update   |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/python3-Flask-Cors/update

diff --git a/srcpkgs/python3-Flask-Cors/template b/srcpkgs/python3-Flask-Cors/template
index ffe646b7ce20b..816bd42bc453f 100644
--- a/srcpkgs/python3-Flask-Cors/template
+++ b/srcpkgs/python3-Flask-Cors/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-Flask-Cors'
 pkgname=python3-Flask-Cors
-version=3.0.10
-revision=2
+version=4.0.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-Flask python3-six"
-checkdepends="python3-pytest ${depends}"
+depends="python3-Flask"
+checkdepends="python3-pytest python3-packaging ${depends}"
 short_desc="Flask extension adding a decorator for CORS support"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="MIT"
 homepage="https://github.com/corydolphin/flask-cors"
-changelog="https://raw.githubusercontent.com/corydolphin/flask-cors/master/CHANGELOG.md"
+changelog="https://raw.githubusercontent.com/corydolphin/flask-cors/main/CHANGELOG.md"
 distfiles="${PYPI_SITE}/F/Flask-Cors/Flask-Cors-${version}.tar.gz"
-checksum=b60839393f3b84a0f3746f6cdca56c1ad7426aa738b70d6c61375857823181de
+checksum=f268522fcb2f73e2ecdde1ef45e2fd5c71cc48fe03cffb4b441c6d1b40684eb0
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-Flask-Cors/update b/srcpkgs/python3-Flask-Cors/update
new file mode 100644
index 0000000000000..2c857beffb293
--- /dev/null
+++ b/srcpkgs/python3-Flask-Cors/update
@@ -0,0 +1 @@
+ignore="*a*"

From 62c04da2486807622541706a0ca25b263a4bf371 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 09:28:17 -0400
Subject: [PATCH 4/7] 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 234dda2d83c5f..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=2
+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 3d1ea97c40dca35dea5b69bde4f75c0def058e5e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 11:00:56 -0400
Subject: [PATCH 5/7] 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 533296494a21cc878e9e3010fda7fa353fd6c5ea Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 11:03:10 -0400
Subject: [PATCH 6/7] python3-qrcode: update to 7.4.2.

---
 srcpkgs/python3-qrcode/files/README.voidlinux |  2 +-
 srcpkgs/python3-qrcode/template               | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

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/template b/srcpkgs/python3-qrcode/template
index d8c1713c4992f..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=6
+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 f62d5d830e383b34932f8cd5bb8e5fa5fdd4cfc0 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 11:30:52 -0400
Subject: [PATCH 7/7] OpenLP: update to 3.1.0rc1.

---
 srcpkgs/OpenLP/patches/no_pytest_runner.patch |  4 ++--
 srcpkgs/OpenLP/template                       | 13 ++++++-------
 2 files changed, 8 insertions(+), 9 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 ff1f5b2cb5670..8440635459479 100644
--- a/srcpkgs/OpenLP/template
+++ b/srcpkgs/OpenLP/template
@@ -1,23 +1,22 @@
 # Template file for 'OpenLP'
 pkgname=OpenLP
-version=3.0.2
+version=3.1.0rc1
 revision=1
-create_wrksrc=yes
 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
+checksum=1f8535a5cdfaf0a0aea5a934719293b98a67eae8fa860789eb6e290c2d00c53b
 make_check_pre="env -u QT_QPA_PLATFORM xvfb-run"
 
 post_install() {

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] OpenLP: update to 3.1.0rc1.
  2023-09-14 15:32 [PR PATCH] [WIP] OpenLP: update to 3.1.0rc1 TinfoilSubmarine
@ 2023-09-14 16:41 ` TinfoilSubmarine
  2023-09-14 17:20 ` TinfoilSubmarine
                   ` (9 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: TinfoilSubmarine @ 2023-09-14 16:41 UTC (permalink / raw)
  To: ml

[-- 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.0rc1.
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: 12070 bytes --]

From 4d84e83818b9677d6212399db58a9fac558eb391 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 09:20:29 -0400
Subject: [PATCH 1/7] python3-SQLAlchemy: update to 1.4.49.

---
 srcpkgs/python3-SQLAlchemy/template | 12 ++++++------
 srcpkgs/python3-SQLAlchemy/update   |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/python3-SQLAlchemy/update

diff --git a/srcpkgs/python3-SQLAlchemy/template b/srcpkgs/python3-SQLAlchemy/template
index 11d3b30242c06..3ae353590fd65 100644
--- a/srcpkgs/python3-SQLAlchemy/template
+++ b/srcpkgs/python3-SQLAlchemy/template
@@ -1,19 +1,19 @@
 # Template file for 'python3-SQLAlchemy'
 pkgname=python3-SQLAlchemy
-version=1.3.18
-revision=5
+version=1.4.49
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="python3"
-checkdepends="python3-pytest-xdist"
+depends="python3-greenlet"
+checkdepends="python3-pytest-xdist python3-mock"
 short_desc="SQL Toolkit and Object Relational Mapper for Python3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.sqlalchemy.org"
+changelog="https://docs.sqlalchemy.org/en/14/changelog/"
 distfiles="${PYPI_SITE}/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz"
-checksum=da2fb75f64792c1fc64c82313a00c728a7c301efe6a60b7a9fe35b16b4368ce7
-make_check=no # FIXME
+checksum=06ff25cbae30c396c4b7737464f2a7fc37a67b7da409993b182b024cec80aed9
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-SQLAlchemy/update b/srcpkgs/python3-SQLAlchemy/update
new file mode 100644
index 0000000000000..0f73cbc6432e9
--- /dev/null
+++ b/srcpkgs/python3-SQLAlchemy/update
@@ -0,0 +1 @@
+ignore="2.* *b*"

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

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

diff --git a/srcpkgs/python3-vlc/template b/srcpkgs/python3-vlc/template
index 58dcdf2afb087..d77f678555d04 100644
--- a/srcpkgs/python3-vlc/template
+++ b/srcpkgs/python3-vlc/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-vlc'
 pkgname=python3-vlc
-version=3.0.18121
+version=3.0.18122
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -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=1039bde287853b4b7b61ba22d83761832434f78506da762dfb060291bf32897d

From f05f8abd759fe464016ef214e170ae6acdfb56b8 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 09:25:45 -0400
Subject: [PATCH 3/7] python3-Flask-Cors: update to 4.0.0.

---
 srcpkgs/python3-Flask-Cors/template | 12 ++++++------
 srcpkgs/python3-Flask-Cors/update   |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/python3-Flask-Cors/update

diff --git a/srcpkgs/python3-Flask-Cors/template b/srcpkgs/python3-Flask-Cors/template
index ffe646b7ce20b..816bd42bc453f 100644
--- a/srcpkgs/python3-Flask-Cors/template
+++ b/srcpkgs/python3-Flask-Cors/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-Flask-Cors'
 pkgname=python3-Flask-Cors
-version=3.0.10
-revision=2
+version=4.0.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-Flask python3-six"
-checkdepends="python3-pytest ${depends}"
+depends="python3-Flask"
+checkdepends="python3-pytest python3-packaging ${depends}"
 short_desc="Flask extension adding a decorator for CORS support"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="MIT"
 homepage="https://github.com/corydolphin/flask-cors"
-changelog="https://raw.githubusercontent.com/corydolphin/flask-cors/master/CHANGELOG.md"
+changelog="https://raw.githubusercontent.com/corydolphin/flask-cors/main/CHANGELOG.md"
 distfiles="${PYPI_SITE}/F/Flask-Cors/Flask-Cors-${version}.tar.gz"
-checksum=b60839393f3b84a0f3746f6cdca56c1ad7426aa738b70d6c61375857823181de
+checksum=f268522fcb2f73e2ecdde1ef45e2fd5c71cc48fe03cffb4b441c6d1b40684eb0
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-Flask-Cors/update b/srcpkgs/python3-Flask-Cors/update
new file mode 100644
index 0000000000000..2c857beffb293
--- /dev/null
+++ b/srcpkgs/python3-Flask-Cors/update
@@ -0,0 +1 @@
+ignore="*a*"

From 62c04da2486807622541706a0ca25b263a4bf371 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 09:28:17 -0400
Subject: [PATCH 4/7] 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 234dda2d83c5f..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=2
+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 3d1ea97c40dca35dea5b69bde4f75c0def058e5e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 11:00:56 -0400
Subject: [PATCH 5/7] 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 533296494a21cc878e9e3010fda7fa353fd6c5ea Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 11:03:10 -0400
Subject: [PATCH 6/7] python3-qrcode: update to 7.4.2.

---
 srcpkgs/python3-qrcode/files/README.voidlinux |  2 +-
 srcpkgs/python3-qrcode/template               | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

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/template b/srcpkgs/python3-qrcode/template
index d8c1713c4992f..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=6
+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 fc08b054a341625064a0dccd2d57194c94bd2880 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 11:30:52 -0400
Subject: [PATCH 7/7] OpenLP: update to 3.1.0rc1.

---
 srcpkgs/OpenLP/patches/no_pytest_runner.patch |  4 +--
 srcpkgs/OpenLP/template                       | 27 +++++++++++++------
 2 files changed, 21 insertions(+), 10 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 ff1f5b2cb5670..60397d038c2d4 100644
--- a/srcpkgs/OpenLP/template
+++ b/srcpkgs/OpenLP/template
@@ -1,30 +1,41 @@
+#!/bin/bash
 # Template file for 'OpenLP'
 pkgname=OpenLP
-version=3.0.2
+version=3.1.0rc1
 revision=1
-create_wrksrc=yes
 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
+checksum=1f8535a5cdfaf0a0aea5a934719293b98a67eae8fa860789eb6e290c2d00c53b
 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
 }

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] OpenLP: update to 3.1.0rc1.
  2023-09-14 15:32 [PR PATCH] [WIP] OpenLP: update to 3.1.0rc1 TinfoilSubmarine
  2023-09-14 16:41 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2023-09-14 17:20 ` TinfoilSubmarine
  2023-09-15 12:41 ` TinfoilSubmarine
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: TinfoilSubmarine @ 2023-09-14 17:20 UTC (permalink / raw)
  To: ml

[-- 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.0rc1.
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: 12057 bytes --]

From 4d84e83818b9677d6212399db58a9fac558eb391 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 09:20:29 -0400
Subject: [PATCH 1/7] python3-SQLAlchemy: update to 1.4.49.

---
 srcpkgs/python3-SQLAlchemy/template | 12 ++++++------
 srcpkgs/python3-SQLAlchemy/update   |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/python3-SQLAlchemy/update

diff --git a/srcpkgs/python3-SQLAlchemy/template b/srcpkgs/python3-SQLAlchemy/template
index 11d3b30242c06..3ae353590fd65 100644
--- a/srcpkgs/python3-SQLAlchemy/template
+++ b/srcpkgs/python3-SQLAlchemy/template
@@ -1,19 +1,19 @@
 # Template file for 'python3-SQLAlchemy'
 pkgname=python3-SQLAlchemy
-version=1.3.18
-revision=5
+version=1.4.49
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="python3"
-checkdepends="python3-pytest-xdist"
+depends="python3-greenlet"
+checkdepends="python3-pytest-xdist python3-mock"
 short_desc="SQL Toolkit and Object Relational Mapper for Python3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.sqlalchemy.org"
+changelog="https://docs.sqlalchemy.org/en/14/changelog/"
 distfiles="${PYPI_SITE}/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz"
-checksum=da2fb75f64792c1fc64c82313a00c728a7c301efe6a60b7a9fe35b16b4368ce7
-make_check=no # FIXME
+checksum=06ff25cbae30c396c4b7737464f2a7fc37a67b7da409993b182b024cec80aed9
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-SQLAlchemy/update b/srcpkgs/python3-SQLAlchemy/update
new file mode 100644
index 0000000000000..0f73cbc6432e9
--- /dev/null
+++ b/srcpkgs/python3-SQLAlchemy/update
@@ -0,0 +1 @@
+ignore="2.* *b*"

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

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

diff --git a/srcpkgs/python3-vlc/template b/srcpkgs/python3-vlc/template
index 58dcdf2afb087..d77f678555d04 100644
--- a/srcpkgs/python3-vlc/template
+++ b/srcpkgs/python3-vlc/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-vlc'
 pkgname=python3-vlc
-version=3.0.18121
+version=3.0.18122
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -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=1039bde287853b4b7b61ba22d83761832434f78506da762dfb060291bf32897d

From f05f8abd759fe464016ef214e170ae6acdfb56b8 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 09:25:45 -0400
Subject: [PATCH 3/7] python3-Flask-Cors: update to 4.0.0.

---
 srcpkgs/python3-Flask-Cors/template | 12 ++++++------
 srcpkgs/python3-Flask-Cors/update   |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/python3-Flask-Cors/update

diff --git a/srcpkgs/python3-Flask-Cors/template b/srcpkgs/python3-Flask-Cors/template
index ffe646b7ce20b..816bd42bc453f 100644
--- a/srcpkgs/python3-Flask-Cors/template
+++ b/srcpkgs/python3-Flask-Cors/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-Flask-Cors'
 pkgname=python3-Flask-Cors
-version=3.0.10
-revision=2
+version=4.0.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-Flask python3-six"
-checkdepends="python3-pytest ${depends}"
+depends="python3-Flask"
+checkdepends="python3-pytest python3-packaging ${depends}"
 short_desc="Flask extension adding a decorator for CORS support"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="MIT"
 homepage="https://github.com/corydolphin/flask-cors"
-changelog="https://raw.githubusercontent.com/corydolphin/flask-cors/master/CHANGELOG.md"
+changelog="https://raw.githubusercontent.com/corydolphin/flask-cors/main/CHANGELOG.md"
 distfiles="${PYPI_SITE}/F/Flask-Cors/Flask-Cors-${version}.tar.gz"
-checksum=b60839393f3b84a0f3746f6cdca56c1ad7426aa738b70d6c61375857823181de
+checksum=f268522fcb2f73e2ecdde1ef45e2fd5c71cc48fe03cffb4b441c6d1b40684eb0
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-Flask-Cors/update b/srcpkgs/python3-Flask-Cors/update
new file mode 100644
index 0000000000000..2c857beffb293
--- /dev/null
+++ b/srcpkgs/python3-Flask-Cors/update
@@ -0,0 +1 @@
+ignore="*a*"

From 62c04da2486807622541706a0ca25b263a4bf371 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 09:28:17 -0400
Subject: [PATCH 4/7] 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 234dda2d83c5f..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=2
+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 3d1ea97c40dca35dea5b69bde4f75c0def058e5e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 11:00:56 -0400
Subject: [PATCH 5/7] 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 533296494a21cc878e9e3010fda7fa353fd6c5ea Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 11:03:10 -0400
Subject: [PATCH 6/7] python3-qrcode: update to 7.4.2.

---
 srcpkgs/python3-qrcode/files/README.voidlinux |  2 +-
 srcpkgs/python3-qrcode/template               | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

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/template b/srcpkgs/python3-qrcode/template
index d8c1713c4992f..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=6
+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 6ead8f3046fb5a8031329ae9546527f766295fa0 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 11:30:52 -0400
Subject: [PATCH 7/7] OpenLP: update to 3.1.0rc1.

---
 srcpkgs/OpenLP/patches/no_pytest_runner.patch |  4 +--
 srcpkgs/OpenLP/template                       | 26 +++++++++++++------
 2 files changed, 20 insertions(+), 10 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 ff1f5b2cb5670..78d8a1fce924c 100644
--- a/srcpkgs/OpenLP/template
+++ b/srcpkgs/OpenLP/template
@@ -1,30 +1,40 @@
 # Template file for 'OpenLP'
 pkgname=OpenLP
-version=3.0.2
+version=3.1.0rc1
 revision=1
-create_wrksrc=yes
 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
+checksum=1f8535a5cdfaf0a0aea5a934719293b98a67eae8fa860789eb6e290c2d00c53b
 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
 }

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] OpenLP: update to 3.1.0rc1.
  2023-09-14 15:32 [PR PATCH] [WIP] OpenLP: update to 3.1.0rc1 TinfoilSubmarine
  2023-09-14 16:41 ` [PR PATCH] [Updated] " TinfoilSubmarine
  2023-09-14 17:20 ` TinfoilSubmarine
@ 2023-09-15 12:41 ` TinfoilSubmarine
  2023-12-15  1:47 ` [WIP] OpenLP: update to 3.1.0rc2 github-actions
                   ` (7 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: TinfoilSubmarine @ 2023-09-15 12:41 UTC (permalink / raw)
  To: ml

[-- 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.0rc1.
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: 12057 bytes --]

From eecad976ac16d59c9034e54a7c4f10f224d94c0c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 09:20:29 -0400
Subject: [PATCH 1/7] python3-SQLAlchemy: update to 1.4.49.

---
 srcpkgs/python3-SQLAlchemy/template | 12 ++++++------
 srcpkgs/python3-SQLAlchemy/update   |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/python3-SQLAlchemy/update

diff --git a/srcpkgs/python3-SQLAlchemy/template b/srcpkgs/python3-SQLAlchemy/template
index 11d3b30242c06..3ae353590fd65 100644
--- a/srcpkgs/python3-SQLAlchemy/template
+++ b/srcpkgs/python3-SQLAlchemy/template
@@ -1,19 +1,19 @@
 # Template file for 'python3-SQLAlchemy'
 pkgname=python3-SQLAlchemy
-version=1.3.18
-revision=5
+version=1.4.49
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="python3"
-checkdepends="python3-pytest-xdist"
+depends="python3-greenlet"
+checkdepends="python3-pytest-xdist python3-mock"
 short_desc="SQL Toolkit and Object Relational Mapper for Python3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.sqlalchemy.org"
+changelog="https://docs.sqlalchemy.org/en/14/changelog/"
 distfiles="${PYPI_SITE}/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz"
-checksum=da2fb75f64792c1fc64c82313a00c728a7c301efe6a60b7a9fe35b16b4368ce7
-make_check=no # FIXME
+checksum=06ff25cbae30c396c4b7737464f2a7fc37a67b7da409993b182b024cec80aed9
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-SQLAlchemy/update b/srcpkgs/python3-SQLAlchemy/update
new file mode 100644
index 0000000000000..0f73cbc6432e9
--- /dev/null
+++ b/srcpkgs/python3-SQLAlchemy/update
@@ -0,0 +1 @@
+ignore="2.* *b*"

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

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

diff --git a/srcpkgs/python3-vlc/template b/srcpkgs/python3-vlc/template
index 58dcdf2afb087..d77f678555d04 100644
--- a/srcpkgs/python3-vlc/template
+++ b/srcpkgs/python3-vlc/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-vlc'
 pkgname=python3-vlc
-version=3.0.18121
+version=3.0.18122
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -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=1039bde287853b4b7b61ba22d83761832434f78506da762dfb060291bf32897d

From 790a37eb495d9270e444a9181b7a81a48915f8fe Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 09:25:45 -0400
Subject: [PATCH 3/7] python3-Flask-Cors: update to 4.0.0.

---
 srcpkgs/python3-Flask-Cors/template | 12 ++++++------
 srcpkgs/python3-Flask-Cors/update   |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/python3-Flask-Cors/update

diff --git a/srcpkgs/python3-Flask-Cors/template b/srcpkgs/python3-Flask-Cors/template
index ffe646b7ce20b..816bd42bc453f 100644
--- a/srcpkgs/python3-Flask-Cors/template
+++ b/srcpkgs/python3-Flask-Cors/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-Flask-Cors'
 pkgname=python3-Flask-Cors
-version=3.0.10
-revision=2
+version=4.0.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-Flask python3-six"
-checkdepends="python3-pytest ${depends}"
+depends="python3-Flask"
+checkdepends="python3-pytest python3-packaging ${depends}"
 short_desc="Flask extension adding a decorator for CORS support"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="MIT"
 homepage="https://github.com/corydolphin/flask-cors"
-changelog="https://raw.githubusercontent.com/corydolphin/flask-cors/master/CHANGELOG.md"
+changelog="https://raw.githubusercontent.com/corydolphin/flask-cors/main/CHANGELOG.md"
 distfiles="${PYPI_SITE}/F/Flask-Cors/Flask-Cors-${version}.tar.gz"
-checksum=b60839393f3b84a0f3746f6cdca56c1ad7426aa738b70d6c61375857823181de
+checksum=f268522fcb2f73e2ecdde1ef45e2fd5c71cc48fe03cffb4b441c6d1b40684eb0
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-Flask-Cors/update b/srcpkgs/python3-Flask-Cors/update
new file mode 100644
index 0000000000000..2c857beffb293
--- /dev/null
+++ b/srcpkgs/python3-Flask-Cors/update
@@ -0,0 +1 @@
+ignore="*a*"

From 072d51a3caea5cb27f284432aef628d554098fff Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 09:28:17 -0400
Subject: [PATCH 4/7] 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 234dda2d83c5f..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=2
+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 8501deb93f112f411cd6d8eef82709290f77b4a6 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 11:00:56 -0400
Subject: [PATCH 5/7] 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 e9981cb082174353cfb33a3a3f31ca654b5dafd5 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 11:03:10 -0400
Subject: [PATCH 6/7] python3-qrcode: update to 7.4.2.

---
 srcpkgs/python3-qrcode/files/README.voidlinux |  2 +-
 srcpkgs/python3-qrcode/template               | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

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/template b/srcpkgs/python3-qrcode/template
index d8c1713c4992f..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=6
+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 4e81a638ab8de44364fdea8a1c8d3b186254c457 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 11:30:52 -0400
Subject: [PATCH 7/7] OpenLP: update to 3.1.0rc1.

---
 srcpkgs/OpenLP/patches/no_pytest_runner.patch |  4 +--
 srcpkgs/OpenLP/template                       | 26 +++++++++++++------
 2 files changed, 20 insertions(+), 10 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 ff1f5b2cb5670..45dd561d713c9 100644
--- a/srcpkgs/OpenLP/template
+++ b/srcpkgs/OpenLP/template
@@ -1,30 +1,40 @@
 # Template file for 'OpenLP'
 pkgname=OpenLP
-version=3.0.2
+version=3.1.0rc2
 revision=1
-create_wrksrc=yes
 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
+checksum=401bf133ae0038bbf4778be8ed43b6e2ef512a614ff044c2c147a778e95ce86e
 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
 }

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [WIP] OpenLP: update to 3.1.0rc2.
  2023-09-14 15:32 [PR PATCH] [WIP] OpenLP: update to 3.1.0rc1 TinfoilSubmarine
                   ` (2 preceding siblings ...)
  2023-09-15 12:41 ` TinfoilSubmarine
@ 2023-12-15  1:47 ` github-actions
  2024-02-01 21:02 ` [PR PATCH] [Updated] " TinfoilSubmarine
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: github-actions @ 2023-12-15  1:47 UTC (permalink / raw)
  To: ml

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/46058#issuecomment-1857140444

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] OpenLP: update to 3.1.0rc2.
  2023-09-14 15:32 [PR PATCH] [WIP] OpenLP: update to 3.1.0rc1 TinfoilSubmarine
                   ` (3 preceding siblings ...)
  2023-12-15  1:47 ` [WIP] OpenLP: update to 3.1.0rc2 github-actions
@ 2024-02-01 21:02 ` TinfoilSubmarine
  2024-02-01 21:04 ` [PR PATCH] [Updated] [WIP] OpenLP: update to 3.1.0rc4 TinfoilSubmarine
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: TinfoilSubmarine @ 2024-02-01 21:02 UTC (permalink / raw)
  To: ml

[-- 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.0rc2.
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: 10834 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/6] 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/6] 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/6] 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/6] 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 5420162c7e331889a21a6045f16684393e9d0631 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/6] OpenLP: update to 3.1.0rc3.

---
 srcpkgs/OpenLP/patches/no_pytest_runner.patch |  4 +--
 srcpkgs/OpenLP/template                       | 28 +++++++++++++------
 2 files changed, 21 insertions(+), 11 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..f1693d12513d7 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.0rc3
+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
+checksum=7f36537911763743a37e5c3d90f461af66f31cc8a2a242224305775291480211
 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
 }

From 9cbef5604c230f65e2c22b8b918f778e1a244792 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 21 Dec 2023 13:16:56 -0500
Subject: [PATCH 6/6] OpenLP: update to 3.1.0rc4.

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

diff --git a/srcpkgs/OpenLP/template b/srcpkgs/OpenLP/template
index f1693d12513d7..ae6ce54591b2a 100644
--- a/srcpkgs/OpenLP/template
+++ b/srcpkgs/OpenLP/template
@@ -1,6 +1,6 @@
 # Template file for 'OpenLP'
 pkgname=OpenLP
-version=3.1.0rc3
+version=3.1.0rc4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools qt5-host-tools"
@@ -15,8 +15,8 @@ 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=7f36537911763743a37e5c3d90f461af66f31cc8a2a242224305775291480211
+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() {

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] OpenLP: update to 3.1.0rc4.
  2023-09-14 15:32 [PR PATCH] [WIP] OpenLP: update to 3.1.0rc1 TinfoilSubmarine
                   ` (4 preceding siblings ...)
  2024-02-01 21:02 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2024-02-01 21:04 ` TinfoilSubmarine
  2024-02-01 21:24 ` TinfoilSubmarine
                   ` (4 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: TinfoilSubmarine @ 2024-02-01 21:04 UTC (permalink / raw)
  To: ml

[-- 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: 9613 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 cb11f7d38587b55ef40b2819a43ab9fb6b779e51 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                       | 28 +++++++++++++------
 2 files changed, 21 insertions(+), 11 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..c3421d8b93c68 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
+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
 }

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] OpenLP: update to 3.1.0rc4.
  2023-09-14 15:32 [PR PATCH] [WIP] OpenLP: update to 3.1.0rc1 TinfoilSubmarine
                   ` (5 preceding siblings ...)
  2024-02-01 21:04 ` [PR PATCH] [Updated] [WIP] OpenLP: update to 3.1.0rc4 TinfoilSubmarine
@ 2024-02-01 21:24 ` TinfoilSubmarine
  2024-02-28  2:10 ` TinfoilSubmarine
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: TinfoilSubmarine @ 2024-02-01 21:24 UTC (permalink / raw)
  To: ml

[-- 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
 }

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] OpenLP: update to 3.1.0rc4.
  2023-09-14 15:32 [PR PATCH] [WIP] OpenLP: update to 3.1.0rc1 TinfoilSubmarine
                   ` (6 preceding siblings ...)
  2024-02-01 21:24 ` TinfoilSubmarine
@ 2024-02-28  2:10 ` TinfoilSubmarine
  2024-03-07 20:58 ` [PR PATCH] [Updated] OpenLP: update to 3.1.0 TinfoilSubmarine
                   ` (2 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: TinfoilSubmarine @ 2024-02-28  2:10 UTC (permalink / raw)
  To: ml

[-- 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: 9763 bytes --]

From 348bac04359a1240bcf31e40ff237fcc13aa6ce7 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 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-vlc/template b/srcpkgs/python3-vlc/template
index 9e655cf15f73f4..b12377fa580084 100644
--- a/srcpkgs/python3-vlc/template
+++ b/srcpkgs/python3-vlc/template
@@ -1,13 +1,13 @@
 # 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"
+depends="python3 libvlc"
 short_desc="VLC bindings for python"
 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 38733300c1016bb7ae3c2412c37a8c3136c3d701 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.3.0.

---
 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 0dea5df2ec6134..75096cf9808718 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.3.0
+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=104ed030e2c2237606898a621e8b2dc3f0a64c753a54d7bd6fa0015345fb1ad2
 
 post_install() {
 	vlicense LICENSE.txt

From 656a2dfc24510325b5090409f00dc5db31609955 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 00000000000000..6ef365893c1982
--- /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 1e210436fdc022510a78f44c07789a8e835f0eb8 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 09539ea5d62801..0ffee4d08f76d6 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 00000000000000..d8efa19885c864
--- /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 ae33cf832fef25..ebe91ed2e61191 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 bba1e2c721c1f316cf0216cd61cf1c15d6c2856b 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.0.

---
 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 e829c59dad61d9..49eac46285d998 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 f3d76b360e8fa5..a479b60914c7c5 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.0
+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
+depends="python3-alembic python3-platformdirs python3-BeautifulSoup4
+ python3-chardet python3-dbus python3-distro python3-Flask python3-Flask-Cors
+ python3-lxml 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"
+ 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=d40baf9698d84fbcaf1cc3624aca3c157de6e25dbf8b09f54037cd98632ec939
 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
 }

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] OpenLP: update to 3.1.0.
  2023-09-14 15:32 [PR PATCH] [WIP] OpenLP: update to 3.1.0rc1 TinfoilSubmarine
                   ` (7 preceding siblings ...)
  2024-02-28  2:10 ` TinfoilSubmarine
@ 2024-03-07 20:58 ` TinfoilSubmarine
  2024-03-10 22:44 ` TinfoilSubmarine
  2024-03-18 19:50 ` [PR PATCH] [Merged]: OpenLP: update to 3.1.1 cinerea0
  10 siblings, 0 replies; 12+ messages in thread
From: TinfoilSubmarine @ 2024-03-07 20:58 UTC (permalink / raw)
  To: ml

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

OpenLP: update to 3.1.0.
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: **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/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: 8637 bytes --]

From 9c222cc86f61c8a7de4a2a3d882b3f414252f9d5 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 09:28:17 -0400
Subject: [PATCH 1/4] python3-QtAwesome: update to 1.3.0.

---
 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 0dea5df2ec6134..75096cf9808718 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.3.0
+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=104ed030e2c2237606898a621e8b2dc3f0a64c753a54d7bd6fa0015345fb1ad2
 
 post_install() {
 	vlicense LICENSE.txt

From da46fb04ecc959822442a2d3fc8a8db36d0920eb Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 11:00:56 -0400
Subject: [PATCH 2/4] 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 00000000000000..6ef365893c1982
--- /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 36ceb1649badb4a44a748bbb7cb7a283ea70d5c1 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 11:03:10 -0400
Subject: [PATCH 3/4] 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 09539ea5d62801..0ffee4d08f76d6 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 00000000000000..d8efa19885c864
--- /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 ae33cf832fef25..ebe91ed2e61191 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 ec9e27c36b0a39f56f37c9ba2c8c09cbca5c57c2 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 11:30:52 -0400
Subject: [PATCH 4/4] OpenLP: update to 3.1.0.

---
 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 e829c59dad61d9..49eac46285d998 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 f3d76b360e8fa5..a479b60914c7c5 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.0
+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
+depends="python3-alembic python3-platformdirs python3-BeautifulSoup4
+ python3-chardet python3-dbus python3-distro python3-Flask python3-Flask-Cors
+ python3-lxml 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"
+ 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=d40baf9698d84fbcaf1cc3624aca3c157de6e25dbf8b09f54037cd98632ec939
 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
 }

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] OpenLP: update to 3.1.0.
  2023-09-14 15:32 [PR PATCH] [WIP] OpenLP: update to 3.1.0rc1 TinfoilSubmarine
                   ` (8 preceding siblings ...)
  2024-03-07 20:58 ` [PR PATCH] [Updated] OpenLP: update to 3.1.0 TinfoilSubmarine
@ 2024-03-10 22:44 ` TinfoilSubmarine
  2024-03-18 19:50 ` [PR PATCH] [Merged]: OpenLP: update to 3.1.1 cinerea0
  10 siblings, 0 replies; 12+ messages in thread
From: TinfoilSubmarine @ 2024-03-10 22:44 UTC (permalink / raw)
  To: ml

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

OpenLP: update to 3.1.0.
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: **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/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: 8637 bytes --]

From 653ffa33b024b0e31939006afa9f2360cede120f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 09:28:17 -0400
Subject: [PATCH 1/4] python3-QtAwesome: update to 1.3.0.

---
 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 0dea5df2ec6134..75096cf9808718 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.3.0
+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=104ed030e2c2237606898a621e8b2dc3f0a64c753a54d7bd6fa0015345fb1ad2
 
 post_install() {
 	vlicense LICENSE.txt

From 4c9997fff19cfa81538a3c1e2f18de8628240ff4 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 11:00:56 -0400
Subject: [PATCH 2/4] 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 00000000000000..6ef365893c1982
--- /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 ec0b26afb1075e1524bc26b42d8d5792c068c8e5 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 11:03:10 -0400
Subject: [PATCH 3/4] 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 09539ea5d62801..0ffee4d08f76d6 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 00000000000000..d8efa19885c864
--- /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 ae33cf832fef25..ebe91ed2e61191 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 8c1b0f1718d3e86cd5c35f3f0e61f04d8d42769b Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Sep 2023 11:30:52 -0400
Subject: [PATCH 4/4] OpenLP: update to 3.1.1.

---
 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 e829c59dad61d9..49eac46285d998 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 f3d76b360e8fa5..889ea8e8466e4d 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.1
+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
+depends="python3-alembic python3-platformdirs python3-BeautifulSoup4
+ python3-chardet python3-dbus python3-distro python3-Flask python3-Flask-Cors
+ python3-lxml 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"
+ 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=c464669a3661b3b23e917cb1508c1bfc8e8c8308ee24c86e7dde94789ea1797c
 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
 }

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Merged]: OpenLP: update to 3.1.1.
  2023-09-14 15:32 [PR PATCH] [WIP] OpenLP: update to 3.1.0rc1 TinfoilSubmarine
                   ` (9 preceding siblings ...)
  2024-03-10 22:44 ` TinfoilSubmarine
@ 2024-03-18 19:50 ` cinerea0
  10 siblings, 0 replies; 12+ messages in thread
From: cinerea0 @ 2024-03-18 19:50 UTC (permalink / raw)
  To: ml

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

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

OpenLP: update to 3.1.1.
https://github.com/void-linux/void-packages/pull/46058

Description:
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: **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
-->


^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2024-03-18 19:50 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-14 15:32 [PR PATCH] [WIP] OpenLP: update to 3.1.0rc1 TinfoilSubmarine
2023-09-14 16:41 ` [PR PATCH] [Updated] " TinfoilSubmarine
2023-09-14 17:20 ` TinfoilSubmarine
2023-09-15 12:41 ` TinfoilSubmarine
2023-12-15  1:47 ` [WIP] OpenLP: update to 3.1.0rc2 github-actions
2024-02-01 21:02 ` [PR PATCH] [Updated] " TinfoilSubmarine
2024-02-01 21:04 ` [PR PATCH] [Updated] [WIP] OpenLP: update to 3.1.0rc4 TinfoilSubmarine
2024-02-01 21:24 ` TinfoilSubmarine
2024-02-28  2:10 ` TinfoilSubmarine
2024-03-07 20:58 ` [PR PATCH] [Updated] OpenLP: update to 3.1.0 TinfoilSubmarine
2024-03-10 22:44 ` TinfoilSubmarine
2024-03-18 19:50 ` [PR PATCH] [Merged]: OpenLP: update to 3.1.1 cinerea0

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).