Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: frescobaldi-3.1.3
@ 2021-10-03  1:16 chili-b
  2021-10-03  5:18 ` chili-b
                   ` (84 more replies)
  0 siblings, 85 replies; 86+ messages in thread
From: chili-b @ 2021-10-03  1:16 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new package, `python-ly-0.9.7`, which is a dependency for frescobaldi.


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

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

From a048cbdb0d2f7390343b0f3b3b80580abe3abfc0 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/2] New package: python-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python-ly/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/python-ly/template

diff --git a/srcpkgs/python-ly/template b/srcpkgs/python-ly/template
new file mode 100644
index 000000000000..18a44dc78fb4
--- /dev/null
+++ b/srcpkgs/python-ly/template
@@ -0,0 +1,12 @@
+# Template file for 'python-ly'
+pkgname=python-ly
+version=0.9.7
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 287218fc357034128e754fc800f1fca611a58fe0 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:10:41 -0400
Subject: [PATCH 2/2] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..a71c09f23ce8
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,13 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi python3-cups python-ly lilypond"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+distfiles="https://github.com/frescobaldi/frescobaldi/releases/download/v${version}/frescobaldi-${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

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

* Re: New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
@ 2021-10-03  5:18 ` chili-b
  2021-10-03  7:24 ` [PR PATCH] [Updated] " chili-b
                   ` (83 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-03  5:18 UTC (permalink / raw)
  To: ml

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

New comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#issuecomment-932865380

Comment:
I realized there are some python bindings to poppler-qt5 I have to package as well. Please don't merge this until I've done that.

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
  2021-10-03  5:18 ` chili-b
@ 2021-10-03  7:24 ` chili-b
  2021-10-03  7:29 ` chili-b
                   ` (82 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-03  7:24 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new package, `python-ly-0.9.7`, which is a dependency for frescobaldi.


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

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

From a048cbdb0d2f7390343b0f3b3b80580abe3abfc0 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python-ly/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/python-ly/template

diff --git a/srcpkgs/python-ly/template b/srcpkgs/python-ly/template
new file mode 100644
index 000000000000..18a44dc78fb4
--- /dev/null
+++ b/srcpkgs/python-ly/template
@@ -0,0 +1,12 @@
+# Template file for 'python-ly'
+pkgname=python-ly
+version=0.9.7
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 287218fc357034128e754fc800f1fca611a58fe0 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:10:41 -0400
Subject: [PATCH 2/3] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..a71c09f23ce8
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,13 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi python3-cups python-ly lilypond"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+distfiles="https://github.com/frescobaldi/frescobaldi/releases/download/v${version}/frescobaldi-${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

From a7a12bf7c17a60aac4847e5441a78128c9fded85 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 3 Oct 2021 03:24:29 -0400
Subject: [PATCH 3/3] Add python-poppler-qt5 dependency

---
 srcpkgs/frescobaldi/template        |  3 ++-
 srcpkgs/python-poppler-qt5/template | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/python-poppler-qt5/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
index a71c09f23ce8..acb49db0294f 100644
--- a/srcpkgs/frescobaldi/template
+++ b/srcpkgs/frescobaldi/template
@@ -4,7 +4,8 @@ version=3.1.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi python3-cups python-ly lilypond"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi
+ python3-cups python-poppler-qt5 python-ly lilypond"
 short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
 maintainer="chili-b <dexter.gaonshatford@gmail.com>"
 license="GPL-2.0-or-later"
diff --git a/srcpkgs/python-poppler-qt5/template b/srcpkgs/python-poppler-qt5/template
new file mode 100644
index 000000000000..80f002ea91b7
--- /dev/null
+++ b/srcpkgs/python-poppler-qt5/template
@@ -0,0 +1,19 @@
+# Template file for 'python-poppler-qt5'
+pkgname=python-poppler-qt5
+version=0.75.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-sip-devel pkg-config qt5-qmake python3-PyQt5-devel poppler-qt5-devel python3-devel qt5-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="A Python binding for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+    site_package_dir=$(python -c 'import site; print(site.getsitepackages()[0])')
+    python setup.py build_ext --pyqt-sip-dir=$site_package_dir/PyQt5/bindings
+}

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

* Re: New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
  2021-10-03  5:18 ` chili-b
  2021-10-03  7:24 ` [PR PATCH] [Updated] " chili-b
@ 2021-10-03  7:29 ` chili-b
  2021-10-03  7:30 ` chili-b
                   ` (81 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-03  7:29 UTC (permalink / raw)
  To: ml

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

New comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#issuecomment-932880536

Comment:
Okay, I managed to get it working. The latest release of python-poppler-qt5 (21.1.0) fails to build due to an error that is addressed by [this commit](https://github.com/frescobaldi/python-poppler-qt5/commit/92e5962ec3751ab051d0b655fd61afc7a1cf709e) in master. I was able to build the previous release (0.75.0), but there's an ugly kludge applied during the do_install step to address the issue described [here](https://github.com/frescobaldi/python-poppler-qt5/issues/34). This works, but please tell me if there's a better way to do this.

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

* Re: New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (2 preceding siblings ...)
  2021-10-03  7:29 ` chili-b
@ 2021-10-03  7:30 ` chili-b
  2021-10-03 17:45 ` [PR PATCH] [Updated] " chili-b
                   ` (80 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-03  7:30 UTC (permalink / raw)
  To: ml

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

New comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#issuecomment-932880536

Comment:
Okay, I managed to get it working. The latest release of python-poppler-qt5 (21.1.0) fails to build due to an error that is addressed by [this commit](https://github.com/frescobaldi/python-poppler-qt5/commit/92e5962ec3751ab051d0b655fd61afc7a1cf709e) in master. I was able to build the previous release (0.75.0), but there's an ugly kludge applied during the do_build step to address the issue described [here](https://github.com/frescobaldi/python-poppler-qt5/issues/34). This works, but please tell me if there's a better way to do this.

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (3 preceding siblings ...)
  2021-10-03  7:30 ` chili-b
@ 2021-10-03 17:45 ` chili-b
  2021-10-03 17:50 ` chili-b
                   ` (79 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-03 17:45 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new package, `python-ly-0.9.7`, which is a dependency for frescobaldi.


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

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

From a048cbdb0d2f7390343b0f3b3b80580abe3abfc0 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/4] New package: python-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python-ly/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/python-ly/template

diff --git a/srcpkgs/python-ly/template b/srcpkgs/python-ly/template
new file mode 100644
index 000000000000..18a44dc78fb4
--- /dev/null
+++ b/srcpkgs/python-ly/template
@@ -0,0 +1,12 @@
+# Template file for 'python-ly'
+pkgname=python-ly
+version=0.9.7
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 287218fc357034128e754fc800f1fca611a58fe0 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:10:41 -0400
Subject: [PATCH 2/4] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..a71c09f23ce8
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,13 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi python3-cups python-ly lilypond"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+distfiles="https://github.com/frescobaldi/frescobaldi/releases/download/v${version}/frescobaldi-${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

From a7a12bf7c17a60aac4847e5441a78128c9fded85 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 3 Oct 2021 03:24:29 -0400
Subject: [PATCH 3/4] Add python-poppler-qt5 dependency

---
 srcpkgs/frescobaldi/template        |  3 ++-
 srcpkgs/python-poppler-qt5/template | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/python-poppler-qt5/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
index a71c09f23ce8..acb49db0294f 100644
--- a/srcpkgs/frescobaldi/template
+++ b/srcpkgs/frescobaldi/template
@@ -4,7 +4,8 @@ version=3.1.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi python3-cups python-ly lilypond"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi
+ python3-cups python-poppler-qt5 python-ly lilypond"
 short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
 maintainer="chili-b <dexter.gaonshatford@gmail.com>"
 license="GPL-2.0-or-later"
diff --git a/srcpkgs/python-poppler-qt5/template b/srcpkgs/python-poppler-qt5/template
new file mode 100644
index 000000000000..80f002ea91b7
--- /dev/null
+++ b/srcpkgs/python-poppler-qt5/template
@@ -0,0 +1,19 @@
+# Template file for 'python-poppler-qt5'
+pkgname=python-poppler-qt5
+version=0.75.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-sip-devel pkg-config qt5-qmake python3-PyQt5-devel poppler-qt5-devel python3-devel qt5-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="A Python binding for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+    site_package_dir=$(python -c 'import site; print(site.getsitepackages()[0])')
+    python setup.py build_ext --pyqt-sip-dir=$site_package_dir/PyQt5/bindings
+}

From 1835d86ffae8f5e3cbe187654ca61ce959b706e2 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 3 Oct 2021 13:45:15 -0400
Subject: [PATCH 4/4] Fix python-poppler-qt5 according to xlint

---
 srcpkgs/python-poppler-qt5/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python-poppler-qt5/template b/srcpkgs/python-poppler-qt5/template
index 80f002ea91b7..e215477d6ad9 100644
--- a/srcpkgs/python-poppler-qt5/template
+++ b/srcpkgs/python-poppler-qt5/template
@@ -3,10 +3,10 @@ pkgname=python-poppler-qt5
 version=0.75.0
 revision=1
 build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-sip-devel pkg-config qt5-qmake python3-PyQt5-devel poppler-qt5-devel python3-devel qt5-devel"
+makedepends="python3-sip-devel pkg-config qt5-qmake poppler-qt5-devel
+ python3-PyQt5-devel python3-devel qt5-devel"
 depends="poppler-qt5 python3-PyQt5"
-short_desc="A Python binding for libpoppler-qt5"
+short_desc="Python bindings for libpoppler-qt5"
 maintainer="chili-b <dexter.gaonshatford@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/frescobaldi/python-poppler-qt5"
@@ -14,6 +14,6 @@ distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.g
 checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
 
 do_build() {
-    site_package_dir=$(python -c 'import site; print(site.getsitepackages()[0])')
-    python setup.py build_ext --pyqt-sip-dir=$site_package_dir/PyQt5/bindings
+	site_package_dir=$(python -c 'import site; print(site.getsitepackages()[0])')
+	python setup.py build_ext --pyqt-sip-dir=$site_package_dir/PyQt5/bindings
 }

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (4 preceding siblings ...)
  2021-10-03 17:45 ` [PR PATCH] [Updated] " chili-b
@ 2021-10-03 17:50 ` chili-b
  2021-10-03 17:57 ` chili-b
                   ` (78 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-03 17:50 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new package, `python-ly-0.9.7`, which is a dependency for frescobaldi.


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

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

From a048cbdb0d2f7390343b0f3b3b80580abe3abfc0 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/6] New package: python-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python-ly/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/python-ly/template

diff --git a/srcpkgs/python-ly/template b/srcpkgs/python-ly/template
new file mode 100644
index 000000000000..18a44dc78fb4
--- /dev/null
+++ b/srcpkgs/python-ly/template
@@ -0,0 +1,12 @@
+# Template file for 'python-ly'
+pkgname=python-ly
+version=0.9.7
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 287218fc357034128e754fc800f1fca611a58fe0 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:10:41 -0400
Subject: [PATCH 2/6] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..a71c09f23ce8
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,13 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi python3-cups python-ly lilypond"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+distfiles="https://github.com/frescobaldi/frescobaldi/releases/download/v${version}/frescobaldi-${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

From a7a12bf7c17a60aac4847e5441a78128c9fded85 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 3 Oct 2021 03:24:29 -0400
Subject: [PATCH 3/6] Add python-poppler-qt5 dependency

---
 srcpkgs/frescobaldi/template        |  3 ++-
 srcpkgs/python-poppler-qt5/template | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/python-poppler-qt5/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
index a71c09f23ce8..acb49db0294f 100644
--- a/srcpkgs/frescobaldi/template
+++ b/srcpkgs/frescobaldi/template
@@ -4,7 +4,8 @@ version=3.1.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi python3-cups python-ly lilypond"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi
+ python3-cups python-poppler-qt5 python-ly lilypond"
 short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
 maintainer="chili-b <dexter.gaonshatford@gmail.com>"
 license="GPL-2.0-or-later"
diff --git a/srcpkgs/python-poppler-qt5/template b/srcpkgs/python-poppler-qt5/template
new file mode 100644
index 000000000000..80f002ea91b7
--- /dev/null
+++ b/srcpkgs/python-poppler-qt5/template
@@ -0,0 +1,19 @@
+# Template file for 'python-poppler-qt5'
+pkgname=python-poppler-qt5
+version=0.75.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-sip-devel pkg-config qt5-qmake python3-PyQt5-devel poppler-qt5-devel python3-devel qt5-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="A Python binding for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+    site_package_dir=$(python -c 'import site; print(site.getsitepackages()[0])')
+    python setup.py build_ext --pyqt-sip-dir=$site_package_dir/PyQt5/bindings
+}

From 1835d86ffae8f5e3cbe187654ca61ce959b706e2 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 3 Oct 2021 13:45:15 -0400
Subject: [PATCH 4/6] Fix python-poppler-qt5 according to xlint

---
 srcpkgs/python-poppler-qt5/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python-poppler-qt5/template b/srcpkgs/python-poppler-qt5/template
index 80f002ea91b7..e215477d6ad9 100644
--- a/srcpkgs/python-poppler-qt5/template
+++ b/srcpkgs/python-poppler-qt5/template
@@ -3,10 +3,10 @@ pkgname=python-poppler-qt5
 version=0.75.0
 revision=1
 build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-sip-devel pkg-config qt5-qmake python3-PyQt5-devel poppler-qt5-devel python3-devel qt5-devel"
+makedepends="python3-sip-devel pkg-config qt5-qmake poppler-qt5-devel
+ python3-PyQt5-devel python3-devel qt5-devel"
 depends="poppler-qt5 python3-PyQt5"
-short_desc="A Python binding for libpoppler-qt5"
+short_desc="Python bindings for libpoppler-qt5"
 maintainer="chili-b <dexter.gaonshatford@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/frescobaldi/python-poppler-qt5"
@@ -14,6 +14,6 @@ distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.g
 checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
 
 do_build() {
-    site_package_dir=$(python -c 'import site; print(site.getsitepackages()[0])')
-    python setup.py build_ext --pyqt-sip-dir=$site_package_dir/PyQt5/bindings
+	site_package_dir=$(python -c 'import site; print(site.getsitepackages()[0])')
+	python setup.py build_ext --pyqt-sip-dir=$site_package_dir/PyQt5/bindings
 }

From a13afc4b4ce79e0aff716f4efb15f576bb290d79 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 3 Oct 2021 03:24:29 -0400
Subject: [PATCH 5/6] New package: python-poppler-qt5-0.75.0

Dependency for frescobaldi
---
 srcpkgs/frescobaldi/template        |  3 ++-
 srcpkgs/python-poppler-qt5/template | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/python-poppler-qt5/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
index a71c09f23ce8..acb49db0294f 100644
--- a/srcpkgs/frescobaldi/template
+++ b/srcpkgs/frescobaldi/template
@@ -4,7 +4,8 @@ version=3.1.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi python3-cups python-ly lilypond"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi
+ python3-cups python-poppler-qt5 python-ly lilypond"
 short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
 maintainer="chili-b <dexter.gaonshatford@gmail.com>"
 license="GPL-2.0-or-later"
diff --git a/srcpkgs/python-poppler-qt5/template b/srcpkgs/python-poppler-qt5/template
new file mode 100644
index 000000000000..80f002ea91b7
--- /dev/null
+++ b/srcpkgs/python-poppler-qt5/template
@@ -0,0 +1,19 @@
+# Template file for 'python-poppler-qt5'
+pkgname=python-poppler-qt5
+version=0.75.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-sip-devel pkg-config qt5-qmake python3-PyQt5-devel poppler-qt5-devel python3-devel qt5-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="A Python binding for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+    site_package_dir=$(python -c 'import site; print(site.getsitepackages()[0])')
+    python setup.py build_ext --pyqt-sip-dir=$site_package_dir/PyQt5/bindings
+}

From fc3a2930818022cad96adbc89d26f31cf72478ae Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 3 Oct 2021 13:45:15 -0400
Subject: [PATCH 6/6] Fix python-poppler-qt5 according to xlint

---
 srcpkgs/python-poppler-qt5/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python-poppler-qt5/template b/srcpkgs/python-poppler-qt5/template
index 80f002ea91b7..e215477d6ad9 100644
--- a/srcpkgs/python-poppler-qt5/template
+++ b/srcpkgs/python-poppler-qt5/template
@@ -3,10 +3,10 @@ pkgname=python-poppler-qt5
 version=0.75.0
 revision=1
 build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-sip-devel pkg-config qt5-qmake python3-PyQt5-devel poppler-qt5-devel python3-devel qt5-devel"
+makedepends="python3-sip-devel pkg-config qt5-qmake poppler-qt5-devel
+ python3-PyQt5-devel python3-devel qt5-devel"
 depends="poppler-qt5 python3-PyQt5"
-short_desc="A Python binding for libpoppler-qt5"
+short_desc="Python bindings for libpoppler-qt5"
 maintainer="chili-b <dexter.gaonshatford@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/frescobaldi/python-poppler-qt5"
@@ -14,6 +14,6 @@ distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.g
 checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
 
 do_build() {
-    site_package_dir=$(python -c 'import site; print(site.getsitepackages()[0])')
-    python setup.py build_ext --pyqt-sip-dir=$site_package_dir/PyQt5/bindings
+	site_package_dir=$(python -c 'import site; print(site.getsitepackages()[0])')
+	python setup.py build_ext --pyqt-sip-dir=$site_package_dir/PyQt5/bindings
 }

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (5 preceding siblings ...)
  2021-10-03 17:50 ` chili-b
@ 2021-10-03 17:57 ` chili-b
  2021-10-03 18:02 ` chili-b
                   ` (77 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-03 17:57 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new package, `python-ly-0.9.7`, which is a dependency for frescobaldi.


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

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

From a048cbdb0d2f7390343b0f3b3b80580abe3abfc0 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 01/73] New package: python-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python-ly/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/python-ly/template

diff --git a/srcpkgs/python-ly/template b/srcpkgs/python-ly/template
new file mode 100644
index 000000000000..18a44dc78fb4
--- /dev/null
+++ b/srcpkgs/python-ly/template
@@ -0,0 +1,12 @@
+# Template file for 'python-ly'
+pkgname=python-ly
+version=0.9.7
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 287218fc357034128e754fc800f1fca611a58fe0 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:10:41 -0400
Subject: [PATCH 02/73] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..a71c09f23ce8
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,13 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi python3-cups python-ly lilypond"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+distfiles="https://github.com/frescobaldi/frescobaldi/releases/download/v${version}/frescobaldi-${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

From cf8876f75dc3daf70ce0593de78dd392591e954d Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sat, 2 Oct 2021 16:58:59 -0400
Subject: [PATCH 03/73] hexchat: update to 2.16.0 and change maintainer

- Remove obsolete [host]makedep 'libxml2-devel'
    as hexchat does not use libxml2
- Add makedep 'python3-cffi'
- Add hostmakedep 'python3-cffi' for crossbuilds
- Update configure args for dbus and tls (upstream renamed them)
- Remove configure args for building the text interface
    (now disabled by default by upstream)
- Add configure arg for libcanbera
- Remove patch for cross compile (introduced in 32a4badf)
    The file it applies to is now unrecognisable,
    and the patch *seems* unneeded

- Change the maintainer from Orphan

- Remove obsolete 'update' file (project has moved to github releases)
---
 srcpkgs/hexchat/patches/perl-link.patch | 20 --------------------
 srcpkgs/hexchat/template                | 20 ++++++++++----------
 srcpkgs/hexchat/update                  |  2 --
 3 files changed, 10 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/hexchat/patches/perl-link.patch
 delete mode 100644 srcpkgs/hexchat/update

diff --git a/srcpkgs/hexchat/patches/perl-link.patch b/srcpkgs/hexchat/patches/perl-link.patch
deleted file mode 100644
index 66390dedd5f4..000000000000
--- a/srcpkgs/hexchat/patches/perl-link.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/plugins/perl/meson.build	2018-08-15 13:30:17.108881970 +0200
-+++ b/plugins/perl/meson.build	2018-08-15 13:30:36.682882751 +0200
-@@ -39,7 +39,7 @@
- perl_ldflags = []
- perl_rpath = ''
- foreach flag : ret.stdout().strip().split(' ')
--  if flag.startswith('-L') or flag.startswith('-l')
-+  if flag.startswith('-l')
-     perl_ldflags += flag
-   endif
-   if flag.startswith('-Wl,-rpath,')
-@@ -52,6 +52,8 @@
-   endif
- endforeach
- 
-+perl_ldflags += '-L${XBPS_CROSS_BASE}/usr/lib/perl5/core_perl/CORE'
-+
- perl_cflags += [
-   # Perl has its own 'config.h' that we must override
-   # TODO: Just rename ours to something more unique.
diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index 8bd4b443f7d9..f2e356f54736 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,23 +1,23 @@
 # Template file for 'hexchat'
 pkgname=hexchat
-version=2.14.3
-revision=6
+version=2.16.0
+revision=1
 build_style=meson
-configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
+configure_args="-Ddbus=enabled -Dtls=enabled -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
- -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
+ -Dwith-lua=$(vopt_if LuaJIT luajit lua) -Dlibcanberra=enabled"
 hostmakedepends="gettext pkg-config glib-devel"
 makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
- libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
- iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
+ libcanberra-devel pciutils-devel libproxy-devel iso-codes
+ python3-devel python3-cffi $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
 depends="desktop-file-utils enchant2"
 short_desc="GTK+ based IRC client successor of Xchat"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="0x5c <dev@0x5c.io>"
 license="GPL-2.0-or-later"
 homepage="https://hexchat.github.io/"
 changelog="https://hexchat.readthedocs.org/en/latest/changelog.html"
-distfiles="https://dl.hexchat.net/hexchat/${pkgname}-${version}.tar.xz"
-checksum=901a9d13db5a4da69b827f6093306bbd16863dc49016f7668bd3e4506512e882
+distfiles="https://github.com/hexchat/hexchat/archive/v${version}.tar.gz"
+checksum=5c7f35317bb3bc437fc5fb57392ddc13ba11c173718cdfe4de89d69c30a40b06
 build_options="LuaJIT"
 lib32disabled=yes
 
@@ -27,7 +27,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" dbus-glib-devel libxml2-devel gdk-pixbuf perl
+	hostmakedepends+=" dbus-glib-devel python3-cffi gdk-pixbuf perl
 	 shared-mime-info"
 fi
 
diff --git a/srcpkgs/hexchat/update b/srcpkgs/hexchat/update
deleted file mode 100644
index c2af9761bb72..000000000000
--- a/srcpkgs/hexchat/update
+++ /dev/null
@@ -1,2 +0,0 @@
-pkgname=HexChat
-site=https://dl.hexchat.net/hexchat/

From d61349ade1295c605d912583be5c2c230e145f86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 3 Oct 2021 00:57:48 -0300
Subject: [PATCH 04/73] void-docs: update to 2021.10.03.

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

diff --git a/srcpkgs/void-docs/template b/srcpkgs/void-docs/template
index 3ffb0c2c5649..badef326e55a 100644
--- a/srcpkgs/void-docs/template
+++ b/srcpkgs/void-docs/template
@@ -1,6 +1,6 @@
 # Template file for 'void-docs'
 pkgname=void-docs
-version=2021.05.09
+version=2021.10.03
 revision=1
 hostmakedepends="mdBook lowdown texlive perl perl-JSON librsvg-utils"
 short_desc="Documentation for Void Linux"
@@ -8,7 +8,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="CC-BY-SA-4.0"
 homepage="https://github.com/void-linux/void-docs"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=96f6676bfbff213a9862c245227641da1723b4ca2d775582cb3a08a518ff4df9
+checksum=fb54f2a7fc7fc7176b4a305a18b1af8122fafd19ef036b8c902826c1f268963d
 
 do_build() {
 	PREFIX=/usr res/build.sh

From 78e97a08f68f4ce1795269918f5475718d75fbbb Mon Sep 17 00:00:00 2001
From: Manfred Usselmann <mu@usselmann.it>
Date: Sat, 2 Oct 2021 22:08:30 +0200
Subject: [PATCH 05/73] gnucash: update to 4.8

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

diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 4309553e29cc..a27deb2b931e 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
-version=4.6
-revision=2
+version=4.8
+revision=1
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check
@@ -16,7 +16,7 @@ maintainer="ManfredU <mu@usselmann.it>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnucash.org"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=251b01dfb9f9c679db26926f934ca4d13c7092a485be04f60e2031d85a445733
+checksum=15b8e4ff8336168eba88ef2faade377e5c5ff08e48b4660da1a33a8a407feb12
 
 pycompile_dirs="usr/share/gnucash/python"
 conf_files="/etc/gnucash/environment"

From 91dd1f8ca7a20e976b6861d7d5c240817db2f930 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 2 Oct 2021 17:43:11 -0300
Subject: [PATCH 06/73] flintlib: update to 2.8.1.

Also: build without ntl when cross-compiling, since ntl is nocross.
---
 srcpkgs/flintlib/template | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/flintlib/template b/srcpkgs/flintlib/template
index 078ed5316427..831602166916 100644
--- a/srcpkgs/flintlib/template
+++ b/srcpkgs/flintlib/template
@@ -1,17 +1,24 @@
 # Template file for 'flintlib'
 pkgname=flintlib
-version=2.8.0
+version=2.8.1
 revision=1
 wrksrc="flint-${version}"
 build_style=configure
-configure_args="--prefix=/usr --with-gmp=/usr --with-mpfr=/usr --with-ntl=/usr"
-makedepends="mpfr-devel ntl-devel"
+configure_args="--prefix=/usr --with-gmp=/usr --with-mpfr=/usr $(vopt_if ntl --with-ntl=/usr)"
+makedepends="mpfr-devel $(vopt_if ntl ntl-devel)"
 short_desc="Fast Library for Number Theory"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="LGPL-2.1-or-later"
 homepage="https://flintlib.org"
 distfiles="https://flintlib.org/flint-${version}.tar.gz"
-checksum=584235cdc39d779d9920eaef16fe084f3c26ffeeea003a3fff64a20a0f33449e
+checksum=edfdda7a7cb847db4e55e050349259cbc9778589686007fb45602d36ecfb427e
+
+build_options="ntl"
+desc_option_ntl="enable NTL support"
+
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" ntl"
+fi
 
 CFLAGS="-D_GNU_SOURCE" # needed for cpu_set_t
 

From a24a527f01d1a2a5c9cb9252ab6ef6ad0a557c24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 3 Oct 2021 00:08:26 -0300
Subject: [PATCH 07/73] fftw: update to 3.3.10.

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

diff --git a/srcpkgs/fftw/template b/srcpkgs/fftw/template
index 4a73c38ee361..1eb5c61554fd 100644
--- a/srcpkgs/fftw/template
+++ b/srcpkgs/fftw/template
@@ -1,6 +1,6 @@
 # Template file for 'fftw'
 pkgname=fftw
-version=3.3.9
+version=3.3.10
 revision=1
 hostmakedepends="libtool automake"
 makedepends="libgomp-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.fftw.org/"
 distfiles="${homepage}/fftw-${version}.tar.gz"
-checksum=bf2c7ce40b04ae811af714deb512510cc2c17b9ab9d6ddcf49fe4487eea7af3d
+checksum=56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467
 
 pre_configure() {
 	vsed -i configure.ac -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g'

From 670108f40e1d67eb064776bf0cb80d0aada51d2b Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Sat, 2 Oct 2021 22:34:04 +0700
Subject: [PATCH 08/73] vivaldi: update to 4.2.2406.54

---
 srcpkgs/vivaldi/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 69f15e66024f..15a71847a9ce 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=4.2.2406.48
+version=4.2.2406.54
 revision=1
 _release=1
 archs="x86_64"
@@ -12,14 +12,13 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 # Privacy Policy: https://vivaldi.com/privacy/browser/
 license="custom:Proprietary"
 homepage="https://vivaldi.com"
+distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_amd64.deb"
+_licenseUrl="https://vivaldi.com/privacy/vivaldi-end-user-license-agreement/"
+checksum=02c3a2a28b0e53bed563a94f3e504ec72dd206cd83cbaa141319b427dcf23c79
 repository=nonfree
 restricted=yes
 nostrip=yes
 
-distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_amd64.deb"
-_licenseUrl="https://vivaldi.com/privacy/vivaldi-end-user-license-agreement/"
-checksum=97841156fac3b34a17692e9724aa34e3fb90658a6504c6eb5303d61ecff06867
-
 do_extract() {
 	ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/vivaldi-stable_${version}-${_release}_amd64.deb
 	bsdtar xf data.tar.xz --exclude={./etc,./opt/vivaldi/cron}

From a7a12bf7c17a60aac4847e5441a78128c9fded85 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 3 Oct 2021 03:24:29 -0400
Subject: [PATCH 09/73] Add python-poppler-qt5 dependency

---
 srcpkgs/frescobaldi/template        |  3 ++-
 srcpkgs/python-poppler-qt5/template | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/python-poppler-qt5/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
index a71c09f23ce8..acb49db0294f 100644
--- a/srcpkgs/frescobaldi/template
+++ b/srcpkgs/frescobaldi/template
@@ -4,7 +4,8 @@ version=3.1.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi python3-cups python-ly lilypond"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi
+ python3-cups python-poppler-qt5 python-ly lilypond"
 short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
 maintainer="chili-b <dexter.gaonshatford@gmail.com>"
 license="GPL-2.0-or-later"
diff --git a/srcpkgs/python-poppler-qt5/template b/srcpkgs/python-poppler-qt5/template
new file mode 100644
index 000000000000..80f002ea91b7
--- /dev/null
+++ b/srcpkgs/python-poppler-qt5/template
@@ -0,0 +1,19 @@
+# Template file for 'python-poppler-qt5'
+pkgname=python-poppler-qt5
+version=0.75.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-sip-devel pkg-config qt5-qmake python3-PyQt5-devel poppler-qt5-devel python3-devel qt5-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="A Python binding for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+    site_package_dir=$(python -c 'import site; print(site.getsitepackages()[0])')
+    python setup.py build_ext --pyqt-sip-dir=$site_package_dir/PyQt5/bindings
+}

From b67aa1de9ee4a032f2f9c0e5b7f7112ae59b7ddd Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 1 May 2021 05:21:55 +1100
Subject: [PATCH 10/73] guile: devel needs dependency on libatomic_ops-devel on
 some targets

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

diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index f9ce43c06709..f0f917b1c4ee 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -1,13 +1,13 @@
 # Template file for 'guile'
 pkgname=guile
 version=2.2.7
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --disable-error-on-warning"
 hostmakedepends="pkg-config texinfo"
 makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
  libunistring-devel readline-devel"
-short_desc="A portable, embeddable Scheme implementation written in C"
+short_desc="Portable, embeddable Scheme implementation written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="http://www.gnu.org/software/guile"
@@ -40,7 +40,7 @@ libguile_package() {
 
 guile-devel_package() {
 	short_desc+=" - development files"
-	depends="gmp-devel gc-devel guile>=${version}_${revision}"
+	depends="gmp-devel gc-devel guile>=${version}_${revision} libatomic_ops-devel"
 	pkg_install() {
 		vmove usr/bin/guile-config
 		vmove usr/include

From 496e3305cb0f23e0b3bf7a6ddb1d6080e4640c76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 13 Sep 2021 11:50:02 -0300
Subject: [PATCH 11/73] gdb: update to 11.1 and clean up.

Also added build option for Guile.

gnulib now detects musl correctly, so we don't need the overrides.

Co-authored-by: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
---
 srcpkgs/gdb-common                           |  1 +
 srcpkgs/gdb/patches/gdb-mips-linux-nat.patch | 11 +++
 srcpkgs/gdb/template                         | 70 +++++++++-----------
 3 files changed, 45 insertions(+), 37 deletions(-)
 create mode 120000 srcpkgs/gdb-common
 create mode 100644 srcpkgs/gdb/patches/gdb-mips-linux-nat.patch

diff --git a/srcpkgs/gdb-common b/srcpkgs/gdb-common
new file mode 120000
index 000000000000..f3e03e3f1a44
--- /dev/null
+++ b/srcpkgs/gdb-common
@@ -0,0 +1 @@
+gdb
\ No newline at end of file
diff --git a/srcpkgs/gdb/patches/gdb-mips-linux-nat.patch b/srcpkgs/gdb/patches/gdb-mips-linux-nat.patch
new file mode 100644
index 000000000000..ec4e9c2666f5
--- /dev/null
+++ b/srcpkgs/gdb/patches/gdb-mips-linux-nat.patch
@@ -0,0 +1,11 @@
+--- a/gdb/mips-linux-nat.c
++++ b/gdb/mips-linux-nat.c
+@@ -31,7 +31,7 @@
+ #include "gdb_proc_service.h"
+ #include "gregset.h"
+ 
+-#include <sgidefs.h>
++#include <asm/sgidefs.h>
+ #include "nat/gdb_ptrace.h"
+ #include <asm/ptrace.h>
+ #include "inf-ptrace.h"
diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index 56c0e01630b5..2b62dd8f2947 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,6 +1,6 @@
 # Template file for 'gdb'
 pkgname=gdb
-version=10.2
+version=11.1
 revision=1
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
@@ -8,56 +8,52 @@ configure_args="--disable-werror --disable-nls --with-system-readline
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib
  $(vopt_enable gdbserver) $(vopt_if multiarch --enable-targets=all)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
- $(vopt_if python --with-python=/usr/bin/python3)
+ $(vopt_with guile) $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
-hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
-makedepends="ncurses-devel zlib-devel readline-devel expat-devel
- $(vopt_if python 'python3-devel gettext-devel')
- $(vopt_if debuginfod elfutils-devel)"
+hostmakedepends="pkg-config texinfo $(vopt_if python python3-devel) $(vopt_if guile guile)"
+makedepends="expat-devel ncurses-devel readline-devel zlib-devel gmp-devel
+ $(vopt_if debuginfod elfutils-devel) $(vopt_if guile guile-devel)
+ $(vopt_if python 'gettext-devel python3-devel')"
+depends="gdb-common>=${version}_${revision}"
+checkdepends="dejagnu"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
-homepage="https://www.gnu.org/software/gdb/"
-distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=aaa1223d534c9b700a8bec952d9748ee1977513f178727e1bee520ee000b4f29
+homepage="https://www.gnu.org/software/gdb"
+distfiles="${GNU_SITE}/gdb/gdb-${version}.tar.xz"
+checksum=cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94
+make_check=extended  # Tests take too long, not all of them pass.
 python_version=3
+patch_args="-Np1"
+ignore_elf_files="
+ /usr/share/gdb/guile/gdb/support.go
+ /usr/share/gdb/guile/gdb/experimental.go
+ /usr/share/gdb/guile/gdb/iterator.go
+ /usr/share/gdb/guile/gdb/types.go
+ /usr/share/gdb/guile/gdb/printing.go
+ /usr/share/gdb/guile/gdb.go"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
-	CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
-	CXXFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
+	CPPFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
 fi
 
-build_options="gdbserver multiarch static python debuginfod"
+build_options="debuginfod gdbserver guile multiarch python static"
+desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 desc_option_multiarch="Enable support for all architectures"
-desc_option_gdbserver="Enable support for building GDB server"
-build_options_default="gdbserver python debuginfod"
+build_options_default="debuginfod gdbserver python"
 vopt_conflict gdbserver static
 vopt_conflict debuginfod static
 
-post_extract() {
-	vsed -i 's,sgidefs.h,asm/sgidefs.h,' gdb/mips-linux-nat.c
-	mkdir -p build
-}
-do_configure() {
-	cd build
-	../configure ${configure_args/with-sysroot/with-build-sysroot} \
-		CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD} -fcommon"
-	export gl_cv_func_gettimeofday_clobber=no
-	export gl_cv_func_working_strerror=yes
-	export gl_cv_func_strerror_0_works=yes
-}
-do_build() {
-	cd build
-	make ${makejobs} all
-}
-do_install() {
-	cd build
-	make DESTDIR=${DESTDIR} ${makejobs} install
+post_install() {
 	# resolve conflicts with binutils
-	rm -rf ${DESTDIR}/usr/{include,lib,lib64}
-	for f in bfd configure standards; do
-		rm -f ${DESTDIR}/usr/share/info/${f}.info*
-	done
+	rm -r ${DESTDIR}/usr/{include,lib,share/info/bfd.info*}
+}
+
+gdb-common_package() {
+	short_desc+=" - common files"
+	pkg_install() {
+		vmove usr/share
+	}
 }

From c2934f34bffc7c9003deace0627ba30bd72a08af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 13 Sep 2021 11:50:31 -0300
Subject: [PATCH 12/73] avr-gdb: update to 11.1 and clean up.

Also added build option for Guile.

Co-authored-by: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
---
 .../avr-gdb/patches/gdb-mips-linux-nat.patch  | 11 +++
 srcpkgs/avr-gdb/template                      | 79 +++++--------------
 2 files changed, 29 insertions(+), 61 deletions(-)
 create mode 100644 srcpkgs/avr-gdb/patches/gdb-mips-linux-nat.patch

diff --git a/srcpkgs/avr-gdb/patches/gdb-mips-linux-nat.patch b/srcpkgs/avr-gdb/patches/gdb-mips-linux-nat.patch
new file mode 100644
index 000000000000..ec4e9c2666f5
--- /dev/null
+++ b/srcpkgs/avr-gdb/patches/gdb-mips-linux-nat.patch
@@ -0,0 +1,11 @@
+--- a/gdb/mips-linux-nat.c
++++ b/gdb/mips-linux-nat.c
+@@ -31,7 +31,7 @@
+ #include "gdb_proc_service.h"
+ #include "gregset.h"
+ 
+-#include <sgidefs.h>
++#include <asm/sgidefs.h>
+ #include "nat/gdb_ptrace.h"
+ #include <asm/ptrace.h>
+ #include "inf-ptrace.h"
diff --git a/srcpkgs/avr-gdb/template b/srcpkgs/avr-gdb/template
index 73d9f9ac7456..03a8e59405cf 100644
--- a/srcpkgs/avr-gdb/template
+++ b/srcpkgs/avr-gdb/template
@@ -1,79 +1,36 @@
 # Template file for 'avr-gdb'
 pkgname=avr-gdb
-version=10.1
+version=11.1
 revision=1
 wrksrc=gdb-${version}
 build_style=gnu-configure
-pycompile_dirs="/usr/share/gdb/python"
-configure_args="\
-	--target=avr \
-	--program-prefix=avr- \
-	--disable-werror \
-	--disable-nls \
-	--with-system-readline \
-	--with-system-gdbinit=/etc/gdb/gdbinit \
-	--with-system-zlib $(vopt_enable gdbserver) \
-	$(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static') \
-	$(vopt_if python --with-python=/usr/bin/python3)"
-hostmakedepends="texinfo perl $(vopt_if python python3-devel)"
-makedepends="ncurses-devel zlib-devel readline-devel expat-devel
- $(vopt_if python 'python3-devel gettext-devel')"
-depends=gdb
+configure_args="--target=avr --disable-werror --disable-nls --with-system-readline
+ --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib
+ $(vopt_with guile) $(vopt_if python --with-python=/usr/bin/python3)"
+hostmakedepends="pkg-config texinfo $(vopt_if python python3-devel) $(vopt_if guile guile)"
+makedepends="expat-devel ncurses-devel readline-devel zlib-devel gmp-devel
+ $(vopt_if guile guile-devel) $(vopt_if python 'gettext-devel python3-devel')"
+depends="gdb-common"
 short_desc="GNU Debugger for AVR"
 maintainer="Artur Sinila <opensource@logarithmus.dev>"
 license="GPL-3.0-or-later"
-homepage="https://www.gnu.org/software/gdb/"
+homepage="https://www.gnu.org/software/gdb"
 distfiles="${GNU_SITE}/gdb/gdb-${version}.tar.xz"
-checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
-python_version=3
+checksum=cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94
+make_check=no  # See gdb/template.
 replaces="cross-avr-gdb>=0"
+patch_args="-Np1"
 
 if [ "${CROSS_BUILD}" ]; then
 	# Make python3.x detection work in cross builds
-	CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
-	CXXFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
+	CPPFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
 fi
-CFLAGS+=" -fcommon"
-CXXFLAGS+=" -fcommon"
-# Package build options
-build_options="gdbserver static python"
-desc_option_gdbserver="Enable support for building GDB server"
-# By default, don't enable any of build options
-#build_options_default="gdbserver"
-# Both options cannot be enabled at the same time
-vopt_conflict gdbserver static
-
-post_extract() {
-	vsed -i 's,sgidefs.h,asm/sgidefs.h,' gdb/mips-linux-nat.c
-	mkdir -p build
-}
-
-do_configure() {
-	cd build
-	../configure ${configure_args/with-sysroot/with-build-sysroot} \
-		CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD} -fcommon"
-	export gl_cv_func_gettimeofday_clobber=no
-	export gl_cv_func_working_strerror=yes
-	export gl_cv_func_strerror_0_works=yes
-}
 
-do_build() {
-	cd build
-	make ${makejobs} all
-}
-
-do_install() {
-	cd build
-	make DESTDIR=${DESTDIR} ${makejobs} install
-	# resolve conflicts with binutils
-	rm -rf ${DESTDIR}/usr/include ${DESTDIR}/usr/lib
-	rm -rf ${DESTDIR}/usr/lib64
-	for f in bfd configure standards; do
-		rm -f ${DESTDIR}/usr/share/info/${f}.info*
-	done
-}
+# Package build options
+build_options="guile python"
+build_options_default="python"
 
 post_install() {
-	# resolve conflicts with binutils and native gdb
-	rm -fr usr/{share/{locale,gdb,info},include}
+	# resolve conflicts with gdb-common
+	rm -r ${DESTDIR}/usr/{share/{gdb,info},include}
 }

From beb3d4585fa4d7624548d44290034483ad6f368a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 13 Sep 2021 11:51:30 -0300
Subject: [PATCH 13/73] cross-arm-none-eabi-gdb: update to 11.1 and clean up.

Co-authored-by: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
---
 .../patches/gdb-mips-linux-nat.patch          | 11 +++
 srcpkgs/cross-arm-none-eabi-gdb/template      | 70 ++++++++-----------
 2 files changed, 41 insertions(+), 40 deletions(-)
 create mode 100644 srcpkgs/cross-arm-none-eabi-gdb/patches/gdb-mips-linux-nat.patch

diff --git a/srcpkgs/cross-arm-none-eabi-gdb/patches/gdb-mips-linux-nat.patch b/srcpkgs/cross-arm-none-eabi-gdb/patches/gdb-mips-linux-nat.patch
new file mode 100644
index 000000000000..ec4e9c2666f5
--- /dev/null
+++ b/srcpkgs/cross-arm-none-eabi-gdb/patches/gdb-mips-linux-nat.patch
@@ -0,0 +1,11 @@
+--- a/gdb/mips-linux-nat.c
++++ b/gdb/mips-linux-nat.c
+@@ -31,7 +31,7 @@
+ #include "gdb_proc_service.h"
+ #include "gregset.h"
+ 
+-#include <sgidefs.h>
++#include <asm/sgidefs.h>
+ #include "nat/gdb_ptrace.h"
+ #include <asm/ptrace.h>
+ #include "inf-ptrace.h"
diff --git a/srcpkgs/cross-arm-none-eabi-gdb/template b/srcpkgs/cross-arm-none-eabi-gdb/template
index ac8e6837d72c..8d9085a5ed6d 100644
--- a/srcpkgs/cross-arm-none-eabi-gdb/template
+++ b/srcpkgs/cross-arm-none-eabi-gdb/template
@@ -1,48 +1,38 @@
-# Template file for 'cross-${_triplet}-${_pkgname}'
-_triplet=arm-none-eabi
-_pkgname=gdb
-pkgname=cross-${_triplet}-${_pkgname}
-version=8.3
+# Template file for 'cross-arm-none-eabi-gdb'
+pkgname=cross-arm-none-eabi-gdb
+version=11.1
 revision=1
-wrksrc="${_pkgname}-${version}"
+wrksrc=gdb-${version}
 build_style=gnu-configure
-pycompile_dirs="/usr/share/${_pkgname}"
-configure_args="
- --disable-gdbserver
- --disable-nls
- --disable-werror
- --host=${XBPS_CROSS_TRIPLE}
- --prefix=/usr
- --target=${_triplet}
- --with-babeltrace
- --with-expat
- --with-mpfr
- --with-system-readline
- --with-system-zlib
- --without-isl
- $(vopt_with guile)
- $(vopt_with python)
-"
-hostmakedepends="autoconf automake bison flex pkg-config texinfo"
-makedepends="babeltrace-devel expat-devel mpfr-devel ncurses-devel
- readline-devel zlib-devel $(vopt_if guile guile-devel)
- $(vopt_if python 'python3-devel gettext-devel')"
-short_desc="GNU Debugger"
+configure_args="--target=arm-none-eabi --disable-werror --disable-nls --with-system-readline
+ --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib --without-isl
+ $(vopt_with guile) $(vopt_if python --with-python=/usr/bin/python3)"
+hostmakedepends="pkg-config texinfo $(vopt_if python python3-devel) $(vopt_if guile guile)"
+# mpfr is necessary to emulate target floating point behavior
+# babeltrace is necessary for Common Trace Format support
+makedepends="expat-devel ncurses-devel readline-devel zlib-devel gmp-devel
+ babeltrace-devel mpfr-devel
+ $(vopt_if guile guile-devel) $(vopt_if python 'gettext-devel python3-devel')"
+depends="gdb-common"
+short_desc="GNU Debugger for ARM"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="GPL-3.0-or-later"
-homepage="https://www.gnu.org/software/${_pkgname}"
-distfiles="${GNU_SITE}/${_pkgname}/${_pkgname}-${version}.tar.xz"
-checksum=802f7ee309dcc547d65a68d61ebd6526762d26c3051f52caebe2189ac1ffd72e
-python_version=2 #unverified
-build_options="guile python"
-# don't enable guile and python interfaces until they are moved into
-# platform independent packages
-build_options_default=" "
-nocross=yes
+homepage="https://www.gnu.org/software/gdb"
+distfiles="${GNU_SITE}/gdb/gdb-${version}.tar.xz"
+checksum=cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94
+make_check=no  # See gdb/template.
+patch_args="-Np1"
+
+if [ "${CROSS_BUILD}" ]; then
+	# Make python3.x detection work in cross builds
+	CPPFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
+fi
 
-CFLAGS="-fcommon"
+# Package build options
+build_options="guile python"
+build_options_default="python"
 
 post_install() {
-	# resolve conflicts with binutils and native gdb
-	rm -fr ${DESTDIR}/usr/{share/{locale,gdb,info},include}
+	# resolve conflicts with gdb-common
+	rm -r ${DESTDIR}/usr/{share/{gdb,info},include}
 }

From 207164315a9116c33b7eaac3b358f087caa3c7cd Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 17 Sep 2021 20:14:10 +0300
Subject: [PATCH 14/73] dnsmasq: update to 2.86.

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

diff --git a/srcpkgs/dnsmasq/template b/srcpkgs/dnsmasq/template
index afa763bd1ab6..731594e8a9de 100644
--- a/srcpkgs/dnsmasq/template
+++ b/srcpkgs/dnsmasq/template
@@ -1,6 +1,6 @@
 # Template file for 'dnsmasq'
 pkgname=dnsmasq
-version=2.85
+version=2.86
 revision=1
 conf_files="/etc/dnsmasq.conf"
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.thekelleys.org.uk/dnsmasq/doc.html"
 changelog="http://www.thekelleys.org.uk/dnsmasq/CHANGELOG"
 distfiles="http://www.thekelleys.org.uk/dnsmasq/dnsmasq-${version}.tar.gz"
-checksum=f36b93ecac9397c15f461de9b1689ee5a2ed6b5135db0085916233053ff3f886
+checksum=ef15f608a83ee2b1d1d2c1f11d089a7e0ac401ffb0991de73fc01ce5f290e512
 system_accounts="dnsmasq"
 dnsmasq_homedir="/var/chroot"
 

From a6586e34fe8c25f1a1358e376301a3cb664e9dce Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:22:38 +0200
Subject: [PATCH 15/73] ocaml: update to 4.13.1.

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

diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template
index 4bc8658c84da..6c4a9cf44161 100644
--- a/srcpkgs/ocaml/template
+++ b/srcpkgs/ocaml/template
@@ -1,6 +1,6 @@
 # Template file for 'ocaml'
 pkgname=ocaml
-version=4.12.0
+version=4.13.1
 revision=1
 build_style="gnu-configure"
 configure_args="--with-pic"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="QPL-1.0, LGPL-2.1-only"
 homepage="http://ocaml.org/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=adc07a3995362403f3cb11085a86354de08e5a7f9eb3c09be7bbcc38a3a26744
+checksum=194c7988cc1fd1c64f53f32f2f7551e5309e44d914d6efc7e2e4d002296aeac4
 nocross=yes
 
 export ASPP="cc -c"

From a55a975252215f623667e2c0a427f38a7656bc3e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:22:54 +0200
Subject: [PATCH 16/73] ocaml-findlib: rebuild for ocaml-4.13.1.

---
 srcpkgs/ocaml-findlib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template
index 050445e19224..ee4c78918e78 100644
--- a/srcpkgs/ocaml-findlib/template
+++ b/srcpkgs/ocaml-findlib/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-findlib'
 pkgname=ocaml-findlib
 version=1.9.1
-revision=1
+revision=2
 wrksrc="findlib-${version}"
 build_style=configure
 configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"

From 97e49bec9c39981b8fa79bb86df830064d08b32d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:23:34 +0200
Subject: [PATCH 17/73] ocaml-num: rebuild for ocaml-4.13.1.

---
 srcpkgs/ocaml-num/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ocaml-num/template b/srcpkgs/ocaml-num/template
index faa7b02c15c5..bfce4e7baf91 100644
--- a/srcpkgs/ocaml-num/template
+++ b/srcpkgs/ocaml-num/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-num'
 pkgname=ocaml-num
 version=1.4
-revision=2
+revision=3
 wrksrc="num-${version}"
 build_style=gnu-makefile
 make_install_target="findlib-install"

From 215d7a0d0f870ce15a3de86ec582da39ecf5f572 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:23:49 +0200
Subject: [PATCH 18/73] ocaml-zarith: rebuild for ocaml-4.13.1.

---
 srcpkgs/ocaml-zarith/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ocaml-zarith/template b/srcpkgs/ocaml-zarith/template
index 4c14a4143b18..e3bb17fa7e5f 100644
--- a/srcpkgs/ocaml-zarith/template
+++ b/srcpkgs/ocaml-zarith/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-zarith'
 pkgname=ocaml-zarith
 version=1.12
-revision=1
+revision=2
 wrksrc="Zarith-release-${version}"
 build_style=configure
 make_check_target="tests"

From 32324eaad3f17b5387ae298aa670206c39d371ad Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:23:57 +0200
Subject: [PATCH 19/73] ocamlbuild: rebuild for ocaml-4.13.1.

---
 srcpkgs/ocamlbuild/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ocamlbuild/template b/srcpkgs/ocamlbuild/template
index 9be2cd0dbda0..e5bca0ed33d6 100644
--- a/srcpkgs/ocamlbuild/template
+++ b/srcpkgs/ocamlbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'ocamlbuild'
 pkgname=ocamlbuild
 version=0.14.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_build_args="PREFIX=/usr"
 make_install_args="PREFIX=/usr"

From 357bd85e27f1558ead31dadda7fd123024b4e4c9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:27:30 +0200
Subject: [PATCH 20/73] ocaml-stdcompat: rebuild for ocaml-4.13.1.

---
 srcpkgs/ocaml-stdcompat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ocaml-stdcompat/template b/srcpkgs/ocaml-stdcompat/template
index c719f4cc674d..2035a9a2c4fa 100644
--- a/srcpkgs/ocaml-stdcompat/template
+++ b/srcpkgs/ocaml-stdcompat/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-stdcompat'
 pkgname=ocaml-stdcompat
 version=16
-revision=1
+revision=2
 wrksrc="stdcompat-${version}"
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib/ocaml"

From bf402950935816bc3f602f1fda4e9b3802c98c99 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:30:21 +0200
Subject: [PATCH 21/73] hivex: rebuild for ocaml-4.13.1.

---
 srcpkgs/hivex/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 5fcb79e3e351..3ac29c532c64 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
 version=1.3.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"

From 3451d3817e333a77d17a46a35247d3bcdfc19ec1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:31:04 +0200
Subject: [PATCH 22/73] opam: rebuild for ocaml-4.13.1.

---
 srcpkgs/opam/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index 7547a3281f08..6305e8019c11 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
 version=2.1.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"

From f06162a99db6ff1b1d6a46f6509596c2eaac1c68 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:32:10 +0200
Subject: [PATCH 23/73] ocaml-lablgtk2: rebuild for ocaml-4.13.1.

---
 srcpkgs/ocaml-lablgtk2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ocaml-lablgtk2/template b/srcpkgs/ocaml-lablgtk2/template
index 952b4b9c3dc2..c835e6b19d5d 100644
--- a/srcpkgs/ocaml-lablgtk2/template
+++ b/srcpkgs/ocaml-lablgtk2/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-lablgtk2'
 pkgname=ocaml-lablgtk2
 version=2.18.10
-revision=3
+revision=4
 wrksrc="lablgtk-${version}"
 build_style=gnu-configure
 configure_args="--without-glade --without-gnomeui --without-gtksourceview"

From 2c62b5c23d616ed742313e47377b3c6baf5cd18d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:32:54 +0200
Subject: [PATCH 24/73] pdfsandwich: rebuild for ocaml-4.13.1.

---
 srcpkgs/pdfsandwich/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pdfsandwich/template b/srcpkgs/pdfsandwich/template
index 07052abf413f..f3603e064c90 100644
--- a/srcpkgs/pdfsandwich/template
+++ b/srcpkgs/pdfsandwich/template
@@ -1,7 +1,7 @@
 # Template file for 'pdfsandwich'
 pkgname=pdfsandwich
 version=0.1.7
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="ocaml perl"
 makedepends="ocaml"

From f85f300641a2da8b1cf1fa33a7b8556ca68b69e3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:33:06 +0200
Subject: [PATCH 25/73] supermin: rebuild for ocaml-4.13.1.

---
 srcpkgs/supermin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template
index c088cb9a438c..09b45ddd429f 100644
--- a/srcpkgs/supermin/template
+++ b/srcpkgs/supermin/template
@@ -1,7 +1,7 @@
 # Template file for 'supermin'
 pkgname=supermin
 version=5.2.1
-revision=2
+revision=3
 _release_series=5.2-stable
 build_style=gnu-configure
 hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl"

From 7f0bbd57d91e326a13c9afd8b3b8aa8abc221d49 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:33:28 +0200
Subject: [PATCH 26/73] z3: rebuild for ocaml-4.13.1.

---
 srcpkgs/z3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index 6b4e3a46ccc0..43fca894b542 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,7 +1,7 @@
 # Template file for 'z3'
 pkgname=z3
 version=4.8.12
-revision=2
+revision=3
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
 configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"

From 7e7e483cc5c761a5fc7c22faec704dc312a4598e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:34:20 +0200
Subject: [PATCH 27/73] zeroinstall: rebuild for ocaml-4.13.1.

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index fe2835b1a9ef..eb8e1ea24280 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -1,7 +1,7 @@
 # Template file for 'zeroinstall'
 pkgname=zeroinstall
 version=2.17
-revision=4
+revision=5
 wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"

From 15130ce9ca2af3e494ca4148181b1dbde9868beb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:35:50 +0200
Subject: [PATCH 28/73] coccinelle: rebuild for ocaml-4.13.1.

---
 srcpkgs/coccinelle/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coccinelle/template b/srcpkgs/coccinelle/template
index f3f708b584f4..211c9bdb4394 100644
--- a/srcpkgs/coccinelle/template
+++ b/srcpkgs/coccinelle/template
@@ -1,7 +1,7 @@
 # Template file for 'coccinelle'
 pkgname=coccinelle
 version=1.1.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--without-pdflatex --enable-release --enable-opt
  --with-python=/usr/bin/python3"

From 7446b94bcaf7dd5322292604950b4c09f25a815f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 18:40:12 +0200
Subject: [PATCH 29/73] libguestfs: rebuild for ocaml-4.13.1.

---
 srcpkgs/libguestfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 15682eff7d51..4ee141709df0 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,7 +1,7 @@
 # Template file for 'libguestfs'
 pkgname=libguestfs
 version=1.46.0
-revision=1
+revision=2
 _version_short=${version%.*}
 build_style=gnu-configure
 make_install_args="INSTALLDIRS=vendor"

From 5f6da4e68416e04b42ea41fe6d90a752ae2fba9b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 22:04:17 +0200
Subject: [PATCH 30/73] unison: rebuild for ocaml-4.13.1.

---
 srcpkgs/unison/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template
index 14d558107859..67c424a3b8af 100644
--- a/srcpkgs/unison/template
+++ b/srcpkgs/unison/template
@@ -1,7 +1,7 @@
 # Template file for 'unison'
 pkgname=unison
 version=2.51.4
-revision=1
+revision=2
 hostmakedepends="ocaml"
 short_desc="File-synchronization tool"
 maintainer="allan <mail@may.mooo.com>"

From abd3a42fcd772c11bc593021158cd2b35c726fd9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 22:04:36 +0200
Subject: [PATCH 31/73] xen: rebuild for ocaml-4.13.1.

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index c8ad8ec65563..3565845e9dc3 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,7 +1,7 @@
 # Template file for 'xen'
 pkgname=xen
 version=4.14.1
-revision=3
+revision=4
 # grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
 _git_tag_ipxe=4bd064de239dab2426b31c9789a1f4d78087dc63
 # TODO: arm / aarch64

From 12df9c3ef57112c2cadda821ea5fdaa48c237732 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 22:12:02 +0200
Subject: [PATCH 32/73] camlp5: update to 8.00.02.

---
 srcpkgs/camlp5/template | 10 +++++-----
 srcpkgs/camlp5/update   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template
index 696d3a4093e3..712317edd85f 100644
--- a/srcpkgs/camlp5/template
+++ b/srcpkgs/camlp5/template
@@ -1,8 +1,8 @@
 # Template file for 'camlp5'
 pkgname=camlp5
-version=7.14
-revision=2
-wrksrc="camlp5-rel${version//./}"
+version=8.00.02
+revision=1
+wrksrc="camlp5-rel${version}"
 build_style=configure
 configure_args="-mandir /usr/share/man"
 hostmakedepends="ocaml perl"
@@ -10,8 +10,8 @@ short_desc="OCaml preprocessor and pretty-printer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://camlp5.github.io/"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/rel${version//./}.tar.gz"
-checksum=6e84b9bc04e03b05bd1ec15500f0b8f4ef4ea81576a1aa7037ef01c84cf76da5
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/rel${version}.tar.gz"
+checksum=3c8c5c574b739cd9e4f0fd4881625ec4c67b456b64fc04ed2882e89a724577fd
 nocross=yes
 nopie=yes
 
diff --git a/srcpkgs/camlp5/update b/srcpkgs/camlp5/update
index 052b24ccd151..d3695ee92307 100644
--- a/srcpkgs/camlp5/update
+++ b/srcpkgs/camlp5/update
@@ -1,2 +1,2 @@
-pattern='/archive/(v?|\Q'"$pkgname"'\E-|rel)?\K[\d\.]+(?=\.tar\.gz")'
-version="${version//./}"
+pattern='rel\K[\d\.]+(?=\.tar\.gz")'
+ignore='71?'

From 35a94304ed290fea7be7d2e748beb531f5578417 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 22:12:08 +0200
Subject: [PATCH 33/73] coq: rebuild for ocaml-4.13.1.

---
 srcpkgs/coq/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index c6066d1ef994..503d994b5ff5 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,7 +1,7 @@
 # Template file for 'coq'
 pkgname=coq
 version=8.13.2
-revision=2
+revision=3
 hostmakedepends="camlp5 ocaml ocaml-findlib ocaml-num ocaml-zarith"
 short_desc="Proof assistant written in OCaml"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From d3c58efc4b152d2967522ef10a22590be06ba9ad Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 1 Oct 2021 22:29:06 +0200
Subject: [PATCH 34/73] mathcomp: rebuild for coq-8.13.2_3.

---
 srcpkgs/mathcomp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index 17976c9e1ed2..f2a424aacb92 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -1,7 +1,7 @@
 # Template file for 'mathcomp'
 pkgname=mathcomp
 version=1.12.0
-revision=4
+revision=5
 wrksrc="math-comp-mathcomp-${version}"
 build_wrksrc="mathcomp"
 build_style=gnu-makefile

From 5bae8df2931cbb92ba97f9e848c8c4f4c99aacfd Mon Sep 17 00:00:00 2001
From: AluminumTank <joel@beckmeyer.us>
Date: Wed, 8 Sep 2021 08:41:55 -0400
Subject: [PATCH 35/73] synapse: update to 1.43.0.

---
 srcpkgs/synapse/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index f6fc935ba8ef..ba57f1f409d5 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,17 +1,16 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.41.0
+version=1.43.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-jsonschema python3-frozendict python3-canonicaljson
  python3-signedjson python3-pynacl python3-service_identity python3-Twisted
  python3-openssl python3-yaml python3-pyasn1 python3-pyasn1-modules
- python3-daemonize python3-bcrypt python3-Pillow python3-psutil
- python3-msgpack python3-phonenumbers python3-prometheus_client
- python3-attrs python3-netaddr python3-setuptools python3-bleach
- python3-Jinja2 python3-psycopg2 python3-lxml python3-saml2 python3-treq
- python3-txacme python3-macaroons python3-sortedcontainers
+ python3-bcrypt python3-Pillow python3-psutil python3-msgpack
+ python3-phonenumbers python3-prometheus_client python3-attrs python3-netaddr
+ python3-setuptools python3-bleach python3-Jinja2 python3-psycopg2 python3-lxml
+ python3-saml2 python3-treq python3-macaroons python3-sortedcontainers
  python3-typing_extensions python3-ijson"
 short_desc="Matrix reference homeserver"
 maintainer="Pete <pete@port22.co.uk>"
@@ -19,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=dcf1144c1818246f49e3ec7e487abde3f1e31fbbab700e8ee5e8ca73a883d5d7
+checksum=165c84be4f40b2bcde132a7fd4cb3706983f638617a38316404745ae72e56817
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From ff010d98c48c44f862b3a6f6c506d9c7124d1fb4 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Thu, 23 Sep 2021 05:06:27 -0400
Subject: [PATCH 36/73] ffsend: update to 0.2.73.

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

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index 9cabf92da220..41a623200e5c 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,6 +1,6 @@
 # Template file for 'ffsend'
 pkgname=ffsend
-version=0.2.72
+version=0.2.73
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/timvisee/ffsend"
 distfiles="https://github.com/timvisee/ffsend/archive/v${version}.tar.gz"
-checksum=288f988cb0ea77e05571152a7d72f0d2a7e13de86bcaf2ceacb29ea6d51341ef
+checksum=76032cfeaf5e8a84592cb501859816f09240c8f6438d1cd96ff63c134cfddc80
 
 post_extract() {
 	# avoid ring dependency

From c3b70c5515d5ee567c38c0cac21486c3ce6d87e3 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 3 Oct 2021 13:40:51 +0200
Subject: [PATCH 37/73] cargo-edit: broken on non-x86/arm because of ring

---
 srcpkgs/cargo-edit/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 65789afa6e52..f8221ebccdc6 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -2,6 +2,7 @@
 pkgname=cargo-edit
 version=0.8.0
 revision=1
+archs="x86_64* i686* aarch64* arm*" # uses ring
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="openssl-devel"

From 01ca544b862f9ea31abafbc8339d64ca25b2d7aa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 3 Oct 2021 13:09:41 +0200
Subject: [PATCH 38/73] stress: update to 1.0.5.

---
 srcpkgs/stress/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stress/template b/srcpkgs/stress/template
index 3718b3e1352d..f15e1c7a8fe7 100644
--- a/srcpkgs/stress/template
+++ b/srcpkgs/stress/template
@@ -1,11 +1,16 @@
 # Template file for 'stress'
 pkgname=stress
-version=1.0.4
-revision=2
+version=1.0.5
+revision=1
 build_style=gnu-configure
+hostmakedepends="automake"
 short_desc="Deliberately simple workload generator for POSIX systems"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://packages.debian.org/sid/stress"
 distfiles="${DEBIAN_SITE}/main/s/stress/stress_${version}.orig.tar.gz"
-checksum=057e4fc2a7706411e1014bf172e4f94b63a12f18412378fca8684ca92408825b
+checksum=1798e49ca365d928fb194ba1b8e8d1e09963b49e9edb0a78bcbba15750bb5027
+
+pre_configure() {
+	autoreconf -fi
+}

From 6c3fc5bc42a2bc9a561a15978223d8154f753c3c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 3 Oct 2021 13:10:36 +0200
Subject: [PATCH 39/73] kubefwd: update to 1.21.0.

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

diff --git a/srcpkgs/kubefwd/template b/srcpkgs/kubefwd/template
index 7804b4707052..98545253c85e 100644
--- a/srcpkgs/kubefwd/template
+++ b/srcpkgs/kubefwd/template
@@ -1,6 +1,6 @@
 # Template file for 'kubefwd'
 pkgname=kubefwd
-version=1.20.0
+version=1.21.0
 revision=1
 build_style=go
 go_import_path="github.com/txn2/kubefwd/cmd/kubefwd"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/txn2/kubefwd"
 distfiles="https://github.com/txn2/kubefwd/archive/${version}.tar.gz"
-checksum=3ddfd0ef5ce82efd75cdf2da3aa8ea2c95e434511404a4f7aca184148e0c0811
+checksum=cc7d8724d758c599946eb459379b1cffc2e72411489dc951788d687269a84778
 
 post_install() {
 	vlicense NOTICE

From f272ca1753ab5ddc2a314cb14c70a5c50c3128a8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 3 Oct 2021 13:10:39 +0200
Subject: [PATCH 40/73] mcelog: update to 179.

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

diff --git a/srcpkgs/mcelog/template b/srcpkgs/mcelog/template
index 3bb6c5d1d89e..c22cd4cb966a 100644
--- a/srcpkgs/mcelog/template
+++ b/srcpkgs/mcelog/template
@@ -1,6 +1,6 @@
 # Template file for 'mcelog'
 pkgname=mcelog
-version=178
+version=179
 revision=1
 archs="i686* x86_64*"
 conf_files="/etc/mcelog/mcelog.conf"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://www.mcelog.org/"
 distfiles="https://github.com/andikleen/${pkgname}/archive/v${version}.tar.gz"
-checksum=d19f745252a02e776b39ac510bc01418404fb608fb3463f2934c87281f95c3a9
+checksum=35b8c7686c1064c7f382b58d9992869b7434030cd994a2bbe1c5e846ec8b5ec7
 
 do_build() {
 	make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" ${makejobs}

From 0bd6ceff505d1767fde25124043bdcb08353af03 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 3 Oct 2021 13:11:05 +0200
Subject: [PATCH 41/73] skaffold: update to 1.32.0.

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

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 6b793064c74c..c8d001479675 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.31.0
+version=1.32.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=93e1600f7efae450e6b5632a9d190fdbf28e0c0fb74a3513e3591688a82d20e7
+checksum=ea33655b42aa6da98ad614042c1368bab802e2b1cc1b3c6b19b5abf41c341bf9

From fd4334dc9fa8cb48228faa933b161292b3c1f199 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 3 Oct 2021 13:11:47 +0200
Subject: [PATCH 42/73] perl-Mozilla-CA: update to 20211001.

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

diff --git a/srcpkgs/perl-Mozilla-CA/template b/srcpkgs/perl-Mozilla-CA/template
index 908e334065c6..b3b7d9a8b201 100644
--- a/srcpkgs/perl-Mozilla-CA/template
+++ b/srcpkgs/perl-Mozilla-CA/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Mozilla-CA'
 pkgname=perl-Mozilla-CA
-version=20200520
-revision=2
+version=20211001
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MPL-2.0"
 homepage="https://metacpan.org/release/Mozilla-CA"
 distfiles="${CPAN_SITE}/Mozilla/${pkgname/perl-/}-$version.tar.gz"
-checksum=b3ca0002310bf24a16c0d5920bdea97a2f46e77e7be3e7377e850d033387c726
+checksum=122c8900000a9d388aa8e44f911cab6c118fe8497417917a84a8ec183971b449

From e1178e2215090b9b2f4bd332f2db8f1139cf3cf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 1 Oct 2021 23:48:38 -0300
Subject: [PATCH 43/73] iperf: update to 2.1.4.

---
 .../patches/reorder-includes-for-musl.patch   | 28 +++++++++++++++++++
 .../skip-ip6-tests-if-not-available.patch     | 26 +++++++++++++++++
 srcpkgs/iperf/template                        |  4 +--
 3 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/iperf/patches/reorder-includes-for-musl.patch
 create mode 100644 srcpkgs/iperf/patches/skip-ip6-tests-if-not-available.patch

diff --git a/srcpkgs/iperf/patches/reorder-includes-for-musl.patch b/srcpkgs/iperf/patches/reorder-includes-for-musl.patch
new file mode 100644
index 000000000000..066620c8666c
--- /dev/null
+++ b/srcpkgs/iperf/patches/reorder-includes-for-musl.patch
@@ -0,0 +1,28 @@
+Change order of includes to fix compilation with musl libc
+
+--- a/include/headers.h	2021-08-16 14:27:51.000000000 -0300
++++ b/include/headers.h	2021-10-01 23:42:09.471528972 -0300
+@@ -106,11 +106,6 @@
+ #include <net/if.h>
+ #endif
+ 
+-#if ((HAVE_TUNTAP_TAP) || (HAVE_TUNTAP_TUN))
+-#include <linux/if_tun.h>
+-#include <sys/ioctl.h>
+-#endif
+-
+ 
+ // AF_PACKET HEADERS
+ #if defined(HAVE_LINUX_FILTER_H) && defined(HAVE_AF_PACKET)
+@@ -146,6 +141,11 @@
+ #define  IPV6HDRLEN 40
+ #endif // HAVE_AF_PACKET
+ 
++#if ((HAVE_TUNTAP_TAP) || (HAVE_TUNTAP_TUN))
++#include <linux/if_tun.h>
++#include <sys/ioctl.h>
++#endif
++
+ #ifdef WIN32
+ 
+ /* Windows config file */
diff --git a/srcpkgs/iperf/patches/skip-ip6-tests-if-not-available.patch b/srcpkgs/iperf/patches/skip-ip6-tests-if-not-available.patch
new file mode 100644
index 000000000000..b098195bd6d9
--- /dev/null
+++ b/srcpkgs/iperf/patches/skip-ip6-tests-if-not-available.patch
@@ -0,0 +1,26 @@
+Skip ip6 tests when ip6 is not available
+
+--- a/t/t2_tcp6.sh	2021-08-09 14:15:27.000000000 -0300
++++ b/t/t2_tcp6.sh	2021-10-02 23:13:59.832306995 -0300
+@@ -1,6 +1,9 @@
+ #!/bin/bash -e
+ . $(dirname $0)/base.sh
+ 
++# SKIP if ip6 not available
++(< /dev/udp/$ip6/$port) 2> /dev/null || exit 77
++
+ # usage:
+ # run_iperf -s server args   -c client args
+ #
+--- a/t/t4_udp6.sh	2021-08-09 14:15:27.000000000 -0300
++++ b/t/t4_udp6.sh	2021-10-02 23:13:57.274282598 -0300
+@@ -1,6 +1,9 @@
+ #!/bin/bash -e
+ . $(dirname $0)/base.sh
+ 
++# SKIP if ip6 not available
++(< /dev/udp/$ip6/$port) 2> /dev/null || exit 77
++
+ # usage:
+ # run_iperf -s server args   -c client args
+ #
diff --git a/srcpkgs/iperf/template b/srcpkgs/iperf/template
index d992f0d3d67b..ba754db0d608 100644
--- a/srcpkgs/iperf/template
+++ b/srcpkgs/iperf/template
@@ -1,6 +1,6 @@
 # Template file for 'iperf'
 pkgname=iperf
-version=2.0.13
+version=2.1.4
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-multicast --enable-threads
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="NCSA"
 homepage="https://iperf.fr/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}2/${pkgname}-${version}.tar.gz"
-checksum=c88adec966096a81136dda91b4bd19c27aae06df4d45a7f547a8e50d723778ad
+checksum=062b392e87b8e227aca74fef0a99b04fe0382d4518957041b508a56885b4d4f9
 
 post_install() {
 	vlicense COPYING LICENSE

From ed1c8a333b12361429bff9945d1fd0b7363f6618 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 24 Jun 2021 20:58:32 +0200
Subject: [PATCH 44/73] qt6-3d: update to 6.2.0.

---
 srcpkgs/qt6-3d/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
index dec8bdebf98f..3946df557887 100644
--- a/srcpkgs/qt6-3d/template
+++ b/srcpkgs/qt6-3d/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-3d'
 pkgname=qt6-3d
-version=6.1.1
+version=6.2.0
 revision=1
 wrksrc="qt3d-everywhere-src-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt3d-everywhere-src-${version}.tar.xz"
-checksum=66e25fcf0bd965374f9814ef8fb960ff7c0414ec9480dcdc57caad17f23ede08
+checksum=304352ae74fc8e7fe50a822413d69094efb25f15a2323e083a2a53dc5a43a6c6
 
 qt6-3d-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From b145fa9992a483d1bc44b8ab71a3f220f9f8ab2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 24 Jun 2021 20:58:41 +0200
Subject: [PATCH 45/73] qt6-base: update to 6.2.0.

---
 .../qt6-base/patches/musl-usr-path-hack.patch | 25 ++++++++++++++++
 srcpkgs/qt6-base/template                     | 30 ++++++++++++++++---
 srcpkgs/qt6-plugin-networkinformation         |  1 +
 srcpkgs/qt6-plugin-tls-openssl                |  1 +
 srcpkgs/qt6-plugin-tls-qcertonly              |  1 +
 5 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/qt6-base/patches/musl-usr-path-hack.patch
 create mode 120000 srcpkgs/qt6-plugin-networkinformation
 create mode 120000 srcpkgs/qt6-plugin-tls-openssl
 create mode 120000 srcpkgs/qt6-plugin-tls-qcertonly

diff --git a/srcpkgs/qt6-base/patches/musl-usr-path-hack.patch b/srcpkgs/qt6-base/patches/musl-usr-path-hack.patch
new file mode 100644
index 000000000000..a2ec7550e7bb
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/musl-usr-path-hack.patch
@@ -0,0 +1,25 @@
+Source: @Johnnynator
+Upsteam: No
+Subject: Musl always returns /lib/libQt6Core.so.6 for Dl_info.dli_fname. 
+This also happens sometimes with qtwebengine on glibc.
+This breaks qt6-webengine's search path for translations.
+Using realpath instead would probably be a more correct solution.
+
+---
+diff --git qtbasesrc/corelib/global/qlibraryinfo.cpp qtbasesrc/corelib/global/qlibraryinfo.cpp
+index 8bcf67e73d..28d7355310 100644
+--- a/src/corelib/global/qlibraryinfo.cpp
++++ b/src/corelib/global/qlibraryinfo.cpp
+@@ -558,6 +558,12 @@ static QString getRelocatablePrefix()
+     int result = dladdr(reinterpret_cast<void *>(&QLibraryInfo::isDebugBuild), &info);
+     if (result > 0 && info.dli_fname)
+         prefixPath = prefixFromQtCoreLibraryHelper(QString::fromLocal8Bit(info.dli_fname));
++#if 1
++    QDir preDir(prefixPath);
++    if (preDir.isRoot()) {
++        prefixPath = QStringLiteral("/usr");
++    }
++#endif
+ #elif defined(Q_OS_WIN)
+     HMODULE hModule = getWindowsModuleHandle();
+     const int kBufferSize = 4096;
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 0b3dd492fb1f..3c7ba930d920 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.1.1
-revision=2
+version=6.2.0
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -22,13 +22,14 @@ makedepends="zlib-devel libzstd-devel dbus-devel
  libpng-devel tslib-devel libinput-devel gtk+3-devel
  libmariadbclient-devel postgresql-libs-devel libatomic-devel
  unixodbc-devel cups-devel libproxy-devel brotli-devel
- sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader libb2-devel"
+ sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader libb2-devel
+ libXevie-devel libXcursor-devel"
 short_desc="Cross-platform application and UI framework (QT6)"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only WITH Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://www.qt.io"
 distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtbase-everywhere-src-${version}.tar.xz"
-checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
+checksum=fdfff0716d093bcb6bcd53746ce1d3c9701a6bf3326d47813866d43949b47769
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
@@ -207,6 +208,27 @@ qt6-plugin-sqlite_package() {
 	}
 }
 
+qt6-plugin-tls-openssl_package() {
+	short_desc+=" - TLS plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/tls/libqopensslbackend.so
+	}
+}
+
+qt6-plugin-tls-qcertonly_package() {
+	short_desc+=" - TLS plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/tls/libqcertonlybackend.so
+	}
+}
+
+qt6-plugin-networkinformation() {
+	short_desc+=" - Networkinformation plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/networkinformation/libqnetworkmanager.so
+	}
+}
+
 qt6-base-devel_package() {
 	short_desc+=" - Development files"
 	depends="qt6-base>=${version}_${revision}
diff --git a/srcpkgs/qt6-plugin-networkinformation b/srcpkgs/qt6-plugin-networkinformation
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-networkinformation
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-tls-openssl b/srcpkgs/qt6-plugin-tls-openssl
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-tls-openssl
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-tls-qcertonly b/srcpkgs/qt6-plugin-tls-qcertonly
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-tls-qcertonly
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file

From a187192c1edd8b936e7ae1ce0a8ad39778e16eef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 24 Jun 2021 20:58:45 +0200
Subject: [PATCH 46/73] qt6-charts: update to 6.2.0.

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

diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index 1645fe5b4507..88764df95f41 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-charts'
 pkgname=qt6-charts
-version=6.1.1
+version=6.2.0
 revision=1
 wrksrc="qtcharts-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtcharts-everywhere-src-${version}.tar.xz"
-checksum=a245b8e1b3edd22c5319d8cf0ee18f95901cfc39e4f94b34b59befffc17af60a
+checksum=9114d4e05e63f5b9d5f07d53d72bf2fbfb22ffae283cc98d3371d73f04b6f4fc
 
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 61df6af05fe8f4585ad19cc474d3fc2e0a0077a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 24 Jun 2021 20:58:51 +0200
Subject: [PATCH 47/73] qt6-declarative: update to 6.2.0.

---
 common/shlibs                       |  8 ++++----
 srcpkgs/qt6-declarative/template    | 26 ++++++++++++++++++--------
 srcpkgs/qt6-quickcontrols2-devel    |  1 -
 srcpkgs/qt6-quickcontrols2/template | 27 ---------------------------
 srcpkgs/qt6-quickcontrols2/update   |  1 -
 5 files changed, 22 insertions(+), 41 deletions(-)
 delete mode 120000 srcpkgs/qt6-quickcontrols2-devel
 delete mode 100644 srcpkgs/qt6-quickcontrols2/template
 delete mode 100644 srcpkgs/qt6-quickcontrols2/update

diff --git a/common/shlibs b/common/shlibs
index c5e88324a924..44d61909c7b3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2010,7 +2010,7 @@ libQt6LabsSharedImage.so.6 qt6-declarative-6.1.0_1
 libQt6LabsWavefrontMesh.so.6 qt6-declarative-6.1.0_1
 libQt6QmlLocalStorage.so.6 qt6-declarative-6.1.0_1
 libQt6QmlWorkerScript.so.6 qt6-declarative-6.0.0_1
-libQt6QuickTest.so.6 qt6-declarative-6.0.0_1
+libQt6QuickTest.so.6 qt6-declarative-devel-6.2.0beta4_1
 libQt6QuickShapes.so.6 qt6-declarative-6.0.0_1
 libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
 libQt6Quick.so.6 qt6-declarative-6.0.0_1
@@ -2024,9 +2024,9 @@ libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
 libQt6Quick3DParticles.so.6 qt6-quick3d-6.1.0_1
-libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
-libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
-libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickControls2Impl.so.6 qt6-declarative-6.0.0_1
+libQt6QuickControls2.so.6 qt6-declarative-6.0.0_1
+libQt6QuickTemplates2.so.6 qt6-declarative-6.0.0_1
 libQt6NetworkAuth.so.6 qt6-networkauth-6.1.0rc2_1
 libQt6ScxmlQml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index a61861576499..40a3d9607a1e 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,20 +1,25 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.1.1
+version=6.2.0
 revision=1
 wrksrc="qtdeclarative-everywhere-src-${version}"
 build_style=cmake
-configure_args=" -DQT_HOST_PATH=/usr
- -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+configure_args=" -DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
- qt6-declarative-devel"
+ qt6-shadertools-devel"
 makedepends="qt6-base-devel Vulkan-Headers"
 short_desc="Cross-platform application and UI framework - Declarative"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://www.qt.io"
 distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtdeclarative-everywhere-src-${version}.tar.xz"
-checksum=805394307479ebca9899996af8357037c4f1ff8b783162ade0c5a05cea7ee2d2
+checksum=46737feceb9e54d63ad0c87a08d33f08ca58f4b8920ccefad8f1ebd64f0d1270
+replaces="qt6-quickcontrols2>=0"
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	hostmakedepends+=" qt6-declarative-devel"
+fi
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -34,9 +39,10 @@ qt6-declarative-tools_package() {
 	short_desc+=" - tools"
 	pkg_install() {
 		vmove usr/lib/qt6/plugins/qmltooling
-		for bin in qmlcachegen qmleasing qmlformat qmlimportscanner \
-			qmllint qmlplugindump qmlpreview qmlprofiler qmlscene \
-			qmltestrunner qmltime qmltyperegistrar; do
+		for bin in qmlcachegen qmlimportscanner qmltyperegistrar; do
+			vmove usr/lib/qt6/libexec/$bin
+		done
+		for bin in qmlformat qmllint qmlpreview qmlprofiler; do
 			vmove usr/lib/qt6/bin/$bin
 		done
 	}
@@ -46,10 +52,14 @@ qt6-declarative-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
 	 qt6-declarative-tools>=${version}_${revision}"
 	short_desc+=" - development files"
+	replaces="qt6-quickcontrols2-devel>=0"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/libQt6QuickTest.so.*"
+		vmove usr/lib/qt6/qml/QtTest
+		vmove usr/lib/qt6/bin/qmltestrunner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
 	}
diff --git a/srcpkgs/qt6-quickcontrols2-devel b/srcpkgs/qt6-quickcontrols2-devel
deleted file mode 120000
index 280bc162057d..000000000000
--- a/srcpkgs/qt6-quickcontrols2-devel
+++ /dev/null
@@ -1 +0,0 @@
-qt6-quickcontrols2
\ No newline at end of file
diff --git a/srcpkgs/qt6-quickcontrols2/template b/srcpkgs/qt6-quickcontrols2/template
deleted file mode 100644
index ab57102a19cf..000000000000
--- a/srcpkgs/qt6-quickcontrols2/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'qt6-quickcontrols2'
-pkgname=qt6-quickcontrols2
-version=6.1.1
-revision=1
-wrksrc="qtquickcontrols2-everywhere-src-${version}"
-build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
-hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
-makedepends="qt6-base-devel qt6-declarative-devel"
-short_desc="Cross-platform application and UI framework - quickcontrols2"
-maintainer="John <me@johnnynator.dev>"
-license="GPL-2.0-or-later, LGPL-3.0-or-later"
-homepage="https://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquickcontrols2-everywhere-src-${version}.tar.xz"
-checksum=7ebc99724bedd97a2c6a606ba2726feb66bb76eb9f30262ae13cd246f5665ea4
-
-qt6-quickcontrols2-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/qt6/mkspecs
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/*.prl"
-	}
-}
diff --git a/srcpkgs/qt6-quickcontrols2/update b/srcpkgs/qt6-quickcontrols2/update
deleted file mode 100644
index 844552465222..000000000000
--- a/srcpkgs/qt6-quickcontrols2/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="${pkgname/6-/}-everywhere-src"

From c12e9e0188181755f4c0eb5dd759733ac0640880 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 24 Jun 2021 20:58:53 +0200
Subject: [PATCH 48/73] qt6-imageformats: update to 6.2.0.

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

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
index 45c34a253e53..fe5400ba7287 100644
--- a/srcpkgs/qt6-imageformats/template
+++ b/srcpkgs/qt6-imageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-imageformats'
 pkgname=qt6-imageformats
-version=6.1.1
+version=6.2.0
 revision=1
 wrksrc="qtimageformats-everywhere-src-${version}"
 build_style=cmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtimageformats-everywhere-src-${version}.tar.xz"
-checksum=d7ee9d96ed6958241acde2b5d505f89d7dcfd710d0944b100ac6de203b0e107d
+checksum=fdaa35536c3d0f8f5f313d0d52dedfbf6d8fcd81a82d6a56f473253f135072ad

From 6f13eff613ccfd4bdf71b95ba919ac584d396c44 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 24 Jun 2021 20:58:56 +0200
Subject: [PATCH 49/73] qt6-lottie: update to 6.2.0.

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

diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
index 775396bcac64..be9c41bf120c 100644
--- a/srcpkgs/qt6-lottie/template
+++ b/srcpkgs/qt6-lottie/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-lottie'
 pkgname=qt6-lottie
-version=6.1.1
+version=6.2.0
 revision=1
 wrksrc="qtlottie-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtlottie-everywhere-src-${version}.tar.xz"
-checksum=df8ee26ea3aa4524f82703f602449d990724ca232cb98498746e8f49e23037ed
+checksum=aa129261d409b5d935221acd6e38f56d68eac5e467a1990c96c654e81a2522ff
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 99d11de2555009b2744186283c6f9a9989e44d83 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 24 Jun 2021 20:58:58 +0200
Subject: [PATCH 50/73] qt6-networkauth: update to 6.2.0.

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

diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
index 8ffb44cad94a..bb3bc0fae104 100644
--- a/srcpkgs/qt6-networkauth/template
+++ b/srcpkgs/qt6-networkauth/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-networkauth'
 pkgname=qt6-networkauth
-version=6.1.1
+version=6.2.0
 revision=1
 wrksrc="qtnetworkauth-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtnetworkauth-everywhere-src-${version}.tar.xz"
-checksum=4e1b7f6584fe21e8a04ee6d9c5761e5858587e8bab01a522ee53f82dfd1efdd7
+checksum=e71504c8d6ae4cf4d573f1d91ff756f90f441e22b0af12eae2424f7e0c01d450
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 019d16986613cdee26f05df6d034d015119867a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 24 Jun 2021 20:59:02 +0200
Subject: [PATCH 51/73] qt6-qt5compat: update to 6.2.0.

---
 srcpkgs/qt6-qt5compat/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 06837849b3f1..fd3b0d42bc7e 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,18 +1,18 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
-version=6.1.1
-revision=2
+version=6.2.0
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
-hostmakedepends="qt6-base-devel perl"
-makedepends="qt6-base-devel"
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="qt6-base-devel qt6-declarative-devel perl pkg-config"
+makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz"
-checksum=7d08f1044cb09f8b3ee31af0de25771bae72936a6f9a699134d9b8d29dfaa5a7
+checksum=c2e2f058ecee36a96c1b15937badeda9b7b03eb5278fa01af4ff386c4f1854fb
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From df20a928c14cea33ac35aa254cefbcd72da48b36 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 24 Jun 2021 20:59:12 +0200
Subject: [PATCH 52/73] qt6-quick3d: update to 6.2.0.

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

diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
index d75bd8c086ca..1ef03c32b1cf 100644
--- a/srcpkgs/qt6-quick3d/template
+++ b/srcpkgs/qt6-quick3d/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-quick3d'
 pkgname=qt6-quick3d
-version=6.1.1
+version=6.2.0
 revision=1
 wrksrc="qtquick3d-everywhere-src-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz"
-checksum=94b45ae9d08495d701cfb586f1f85b12a1a10f8c29865de0d427a2366ae4507c
+checksum=e8f8163237468e158ace7737d60a0a722209ffda444c57c786fc53db1af851e1
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	# possibly a qt6-shadertools bug, actually

From 68976897873892bf77f159b837e2f4383501bd02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 24 Jun 2021 20:59:18 +0200
Subject: [PATCH 53/73] qt6-quicktimeline: update to 6.2.0.

---
 srcpkgs/qt6-quicktimeline/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
index e9c02e2440c2..4c0912d93347 100644
--- a/srcpkgs/qt6-quicktimeline/template
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -1,8 +1,8 @@
 # Template file for 'qt6-quicktimeline'
 pkgname=qt6-quicktimeline
-version=6.1.1
+version=6.2.0
 revision=1
-wrksrc="qtquicktimeline-everywhere-src-${version}"
+wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
@@ -11,8 +11,8 @@ short_desc="Cross-platform application and UI framework - quicktimeline"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquicktimeline-everywhere-src-${version}.tar.xz"
-checksum=40fb664eadf295001d2c49c333032406b6f45f14acddee7e72b8d6c5ea26a6a2
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtquicktimeline-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=67d644ad12df94e937bac3a1cb8a81a96213ec0102759a86c59ba7834ac90c8c
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 8cda74463ee4523757c9d5c901d4ef118bd5ac1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 24 Jun 2021 20:59:21 +0200
Subject: [PATCH 54/73] qt6-scxml: update to 6.2.0.

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

diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
index e3a594de99e3..36bc0fc689b2 100644
--- a/srcpkgs/qt6-scxml/template
+++ b/srcpkgs/qt6-scxml/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-scxml'
 pkgname=qt6-scxml
-version=6.1.1
+version=6.2.0
 revision=1
 wrksrc="qtscxml-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtscxml-everywhere-src-${version}.tar.xz"
-checksum=ffeb650458bb60bb076ac3460588f77f7c841b4f4b1de706960b9b34984dc528
+checksum=90d4af011a17f04a003cbd453c7e0720787e6cdacb8dfce7167179c2cd7dc839
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 46b2756d64b1f001d24f95136c9425913542f77e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 24 Jun 2021 20:59:23 +0200
Subject: [PATCH 55/73] qt6-shadertools: update to 6.2.0.

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

diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
index 9b55463602b7..9fc700d72927 100644
--- a/srcpkgs/qt6-shadertools/template
+++ b/srcpkgs/qt6-shadertools/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-shadertools'
 pkgname=qt6-shadertools
-version=6.1.1
+version=6.2.0
 revision=1
 wrksrc="qtshadertools-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz"
-checksum=324a9f6f87d4e82c0b5f80e6301c7dbc47617dbe752f3e3726c141bd85855512
+checksum=5f66d43610a3a6739fc360d836a2c045135107c0ecd40eb3ed18ce5f3dd79c42
 
 qt6-shadertools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"

From ba8202c3babd764a60e18ad43a5ec9cc7a2164e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 24 Jun 2021 20:59:26 +0200
Subject: [PATCH 56/73] qt6-svg: update to 6.2.0.

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

diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
index 9042cc483ff9..81a0c5ad25c0 100644
--- a/srcpkgs/qt6-svg/template
+++ b/srcpkgs/qt6-svg/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-svg'
 pkgname=qt6-svg
-version=6.1.1
+version=6.2.0
 revision=1
 wrksrc="qtsvg-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
-checksum=e2f62385c940de76dea480a2615c9b11dd2bf0cec2cc778096c0bebfa1ef15ec
+checksum=af9eabefbb0dcb772f18fae4d2c39bcc23579a5dfff569c35ea7e497591db3d4
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 41f1941948a966b0abc8f15c5aa586a5c68945c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 24 Jun 2021 20:59:30 +0200
Subject: [PATCH 57/73] qt6-tools: update to 6.2.0.

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

diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index 16b20c72d05a..576a7aef7449 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-tools'
 pkgname=qt6-tools
-version=6.1.1
+version=6.2.0
 revision=1
 wrksrc="qttools-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
-checksum=cba8d9a836e83b7a5e6d068239635b261f7ca4a059992b2b66cd546380091273
+checksum=a903d005f8ab39545aed88a13b04f13ddbbe073da7007203a91fb8b42b890057
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 7c6c37dee006775f3e05b9c24c813f4eaab564c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 24 Jun 2021 20:59:32 +0200
Subject: [PATCH 58/73] qt6-translations: update to 6.2.0.

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

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
index 088d21f4bdc8..19d44548bc8f 100644
--- a/srcpkgs/qt6-translations/template
+++ b/srcpkgs/qt6-translations/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-translations'
 pkgname=qt6-translations
-version=6.1.1
+version=6.2.0
 revision=1
 wrksrc="qttranslations-everywhere-src-${version}"
 build_style=cmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttranslations-everywhere-src-${version}.tar.xz"
-checksum=6cf3d191335a6b3a64864e7ba41819e7be461d1d2861d643babe836f81d4c393
+checksum=5b4ecb1ee35363444f03b1eb10637d79af1d19be5a5cc53657dc0925a78b2240

From e122509fc139e9b4fa4bffcb67a2c0fae4f52f1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 24 Jun 2021 20:59:35 +0200
Subject: [PATCH 59/73] qt6-virtualkeyboard: update to 6.2.0.

---
 srcpkgs/qt6-virtualkeyboard/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
index 07c4a4475f2e..f5188228e6bd 100644
--- a/srcpkgs/qt6-virtualkeyboard/template
+++ b/srcpkgs/qt6-virtualkeyboard/template
@@ -1,20 +1,18 @@
 # Template file for 'qt6-virtualkeyboard'
 pkgname=qt6-virtualkeyboard
-version=6.1.1
+version=6.2.0
 revision=1
 wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl pkg-config qt6-declarative-devel"
-makedepends="qt6-declarative-devel qt6-quickcontrols2-devel
- qt6-svg-devel hunspell-devel"
-depends="qt6-quickcontrols2"
+makedepends="qt6-declarative-devel qt6-svg-devel hunspell-devel"
 short_desc="Cross-platform application and UI framework - virtualkeyboard"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtvirtualkeyboard-everywhere-src-${version}.tar.xz"
-checksum=246d1acdcd953819b09b1da22bd359335d145d8a3550d9e827dc1fd27b6bd3ff
+checksum=1055e7fe1dfaecbfd4b69f40ec1135fda1980e6e21adbe757a8a4affbfb9bcee
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 133134cf59bf30438e26b2b2e30d0935375affe1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 24 Jun 2021 20:59:37 +0200
Subject: [PATCH 60/73] qt6-wayland: update to 6.2.0.

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

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index fff2a9b1e8e4..06b2cbbaa08c 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-wayland'
 pkgname=qt6-wayland
-version=6.1.1
+version=6.2.0
 revision=1
 wrksrc="qtwayland-everywhere-src-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://www.qt.io"
 distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwayland-everywhere-src-${version}.tar.xz"
-checksum=2cfb2b5403eb2037670549dd2d3968eaa30a9ce523dd08314c5bc677fdf27db6
+checksum=d6787fce74bde1a3386bcbe43c078c712471bab09f1946c40fc2327232d27d4c
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -33,7 +33,7 @@ qt6-wayland-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove usr/lib/qt6/mkspecs
-		vmove usr/lib/qt6/bin/qtwaylandscanner
+		vmove usr/lib/qt6/libexec/qtwaylandscanner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
 	}

From af034988191b753f1c558672304bf716e1ef64cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 2 Oct 2021 18:59:44 +0200
Subject: [PATCH 61/73] double-conversion: update to 3.1.5.

---
 common/shlibs                      |  2 +-
 srcpkgs/double-conversion/template | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 44d61909c7b3..7e5289f58f66 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2980,7 +2980,7 @@ libnss_libvirt_guest.so.2 libvirt-3.1.0_1
 libvirt-admin.so.0 libvirt-3.1.0_1
 libnss_libvirt.so.2 libvirt-3.1.0_1
 libassimp.so.5 libassimp-5.0.0_1
-libdouble-conversion.so.1 double-conversion-2.0.1_1
+libdouble-conversion.so.3 double-conversion-3.1.5_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
diff --git a/srcpkgs/double-conversion/template b/srcpkgs/double-conversion/template
index e67aa3b7d01a..fa03b83c3a81 100644
--- a/srcpkgs/double-conversion/template
+++ b/srcpkgs/double-conversion/template
@@ -1,15 +1,16 @@
 # Template file for 'double-conversion'
 pkgname=double-conversion
-version=3.1.1
+version=3.1.5
 revision=1
-build_style=scons
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=ON"
 short_desc="Efficient binary-decimal and decimal-binary routines for IEEE doubles"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/google/double-conversion"
 changelog="https://raw.githubusercontent.com/google/double-conversion/master/Changelog"
 distfiles="https://github.com/google/double-conversion/archive/v${version}.tar.gz"
-checksum=c49a6b3fa9c917f827b156c8e0799ece88ae50440487a99fc2f284cfd357a5b9
+checksum=a63ecb93182134ba4293fd5f22d6e08ca417caafa244afaa751cbfddf6415b13
 
 post_install() {
 	vlicense LICENSE
@@ -19,9 +20,8 @@ double-conversion-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
-		vmkdir usr/include/double-conversion
-		vcopy double-conversion/*.h usr/include/double-conversion/
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
 	}
 }

From 64686d04cbcc03e6f70241a9261508fec01c9df5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 2 Oct 2021 19:10:49 +0200
Subject: [PATCH 62/73] qt5: update to 5.15.3+20211001.

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

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 790ccc808d9e..c1d822ef021d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'qt5'
 pkgname=qt5
-version=5.15.3+20210924
+version=5.15.3+20211001
 # commit fcca82ca40a5d8a02a4ddd90846d070f2c58cfad
 # base repo: https://invent.kde.org/qt/qt/qt5
 revision=1
@@ -27,7 +27,7 @@ homepage="https://qt.io/"
 # to keep the size smaller qtwebengine, qtwebview, qtdocgallery, qtactiveqt and qtpim
 # can be marked with the export-ignore attribute
 distfiles="https://void.johnnynator.dev/distfiles/qt5-${version}.tar.gz"
-checksum=251dad114f9506bfb98fd96825ac8065a90a6932e9c847ddb9ce0887f19e7304
+checksum=6bff56434b4c2413ec0c9e57ffdcfed1f0966754d1ccf34dafe31840f4006c5a
 python_version=2 #unverified
 replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"

From 8bc2de5ba6370aeb4a3e595a20e820533e80d66a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 2 Oct 2021 19:10:49 +0200
Subject: [PATCH 63/73] vtk: rebuild against double-conversion-3.1.5

---
 srcpkgs/vtk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 4c1710087f83..8811247ae7e5 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
 # Template file for 'vtk'
 pkgname=vtk
 version=9.0.1
-revision=5
+revision=6
 wrksrc=VTK-${version}
 build_style=cmake
 # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"

From 0cc256fa961bf7f816edccdf5918242a1e436b1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 2 Oct 2021 19:10:49 +0200
Subject: [PATCH 64/73] inkscape: rebuild against double-conversion-3.1.5

---
 srcpkgs/inkscape/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 238426b17f97..f8b76d630bea 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
 # Template file for 'inkscape'
 pkgname=inkscape
 version=1.1
-revision=2
+revision=3
 wrksrc="inkscape-${version}_2021-05-24_c4e8f9ed74"
 build_style=cmake
 # builds executables then runs checks

From 0ba4cf4582515a69ee4f45cd5a7f1868296ae6aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 2 Oct 2021 19:10:49 +0200
Subject: [PATCH 65/73] openscad: rebuild against double-conversion-3.1.5

---
 srcpkgs/openscad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 693931379a26..60d45d60615f 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,7 +1,7 @@
 # Template file for 'openscad'
 pkgname=openscad
 version=2021.01
-revision=1
+revision=2
 build_style=qmake
 hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools"
 makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel

From e8d1d54b2c8b41525f35f9b1ec6c67fcd69e95ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 3 Oct 2021 23:33:51 +0700
Subject: [PATCH 66/73] lagrange: fix crash when select image/text

Close: #33032
---
 .../patches/fix-crash-select-text.patch       | 26 +++++++++++++++++++
 srcpkgs/lagrange/template                     |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/lagrange/patches/fix-crash-select-text.patch

diff --git a/srcpkgs/lagrange/patches/fix-crash-select-text.patch b/srcpkgs/lagrange/patches/fix-crash-select-text.patch
new file mode 100644
index 000000000000..0591157ba27b
--- /dev/null
+++ b/srcpkgs/lagrange/patches/fix-crash-select-text.patch
@@ -0,0 +1,26 @@
+From 1fe2b10bc1a2def2af86390272907206f819b7ae Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jaakko=20Kera=CC=88nen?= <jaakko.keranen@iki.fi>
+Date: Sun, 3 Oct 2021 08:02:58 +0300
+Subject: [PATCH] GmDocument: Fixed a crash when selecting text
+
+---
+ src/gmdocument.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/gmdocument.c b/src/gmdocument.c
+index 22f409a..2f4c797 100644
+--- a/src/gmdocument.c
++++ b/src/gmdocument.c
+@@ -2074,8 +2074,11 @@ iRangecc findLoc_GmRun(const iGmRun *d, iInt2 pos) {
+     iRangecc loc;
+     tryAdvanceNoWrap_Text(d->textParams.font, d->text, x, &loc.start);
+     loc.end = loc.start;
++    if (!contains_Range(&d->text, loc.start)) {
++        return iNullRange; /* it's some other text */
++    }
+     iChar ch;
+-    if (d->text.end != loc.start) {
++    if (d->text.end && d->text.end != loc.start) {
+         int chLen = decodeBytes_MultibyteChar(loc.start, d->text.end, &ch);
+         if (chLen > 0) {
+             /* End after the character. */
diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 0233fd1eaf17..3d8851ba443f 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,7 +1,7 @@
 # Template file for 'lagrange'
 pkgname=lagrange
 version=1.6.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="pcre-devel SDL2-devel openssl-devel zlib-devel libunistring-devel

From 1835d86ffae8f5e3cbe187654ca61ce959b706e2 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 3 Oct 2021 13:45:15 -0400
Subject: [PATCH 67/73] Fix python-poppler-qt5 according to xlint

---
 srcpkgs/python-poppler-qt5/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python-poppler-qt5/template b/srcpkgs/python-poppler-qt5/template
index 80f002ea91b7..e215477d6ad9 100644
--- a/srcpkgs/python-poppler-qt5/template
+++ b/srcpkgs/python-poppler-qt5/template
@@ -3,10 +3,10 @@ pkgname=python-poppler-qt5
 version=0.75.0
 revision=1
 build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-sip-devel pkg-config qt5-qmake python3-PyQt5-devel poppler-qt5-devel python3-devel qt5-devel"
+makedepends="python3-sip-devel pkg-config qt5-qmake poppler-qt5-devel
+ python3-PyQt5-devel python3-devel qt5-devel"
 depends="poppler-qt5 python3-PyQt5"
-short_desc="A Python binding for libpoppler-qt5"
+short_desc="Python bindings for libpoppler-qt5"
 maintainer="chili-b <dexter.gaonshatford@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/frescobaldi/python-poppler-qt5"
@@ -14,6 +14,6 @@ distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.g
 checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
 
 do_build() {
-    site_package_dir=$(python -c 'import site; print(site.getsitepackages()[0])')
-    python setup.py build_ext --pyqt-sip-dir=$site_package_dir/PyQt5/bindings
+	site_package_dir=$(python -c 'import site; print(site.getsitepackages()[0])')
+	python setup.py build_ext --pyqt-sip-dir=$site_package_dir/PyQt5/bindings
 }

From a13afc4b4ce79e0aff716f4efb15f576bb290d79 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 3 Oct 2021 03:24:29 -0400
Subject: [PATCH 68/73] New package: python-poppler-qt5-0.75.0

Dependency for frescobaldi
---
 srcpkgs/frescobaldi/template        |  3 ++-
 srcpkgs/python-poppler-qt5/template | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/python-poppler-qt5/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
index a71c09f23ce8..acb49db0294f 100644
--- a/srcpkgs/frescobaldi/template
+++ b/srcpkgs/frescobaldi/template
@@ -4,7 +4,8 @@ version=3.1.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi python3-cups python-ly lilypond"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi
+ python3-cups python-poppler-qt5 python-ly lilypond"
 short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
 maintainer="chili-b <dexter.gaonshatford@gmail.com>"
 license="GPL-2.0-or-later"
diff --git a/srcpkgs/python-poppler-qt5/template b/srcpkgs/python-poppler-qt5/template
new file mode 100644
index 000000000000..80f002ea91b7
--- /dev/null
+++ b/srcpkgs/python-poppler-qt5/template
@@ -0,0 +1,19 @@
+# Template file for 'python-poppler-qt5'
+pkgname=python-poppler-qt5
+version=0.75.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-sip-devel pkg-config qt5-qmake python3-PyQt5-devel poppler-qt5-devel python3-devel qt5-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="A Python binding for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+    site_package_dir=$(python -c 'import site; print(site.getsitepackages()[0])')
+    python setup.py build_ext --pyqt-sip-dir=$site_package_dir/PyQt5/bindings
+}

From fc3a2930818022cad96adbc89d26f31cf72478ae Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 3 Oct 2021 13:45:15 -0400
Subject: [PATCH 69/73] Fix python-poppler-qt5 according to xlint

---
 srcpkgs/python-poppler-qt5/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python-poppler-qt5/template b/srcpkgs/python-poppler-qt5/template
index 80f002ea91b7..e215477d6ad9 100644
--- a/srcpkgs/python-poppler-qt5/template
+++ b/srcpkgs/python-poppler-qt5/template
@@ -3,10 +3,10 @@ pkgname=python-poppler-qt5
 version=0.75.0
 revision=1
 build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-sip-devel pkg-config qt5-qmake python3-PyQt5-devel poppler-qt5-devel python3-devel qt5-devel"
+makedepends="python3-sip-devel pkg-config qt5-qmake poppler-qt5-devel
+ python3-PyQt5-devel python3-devel qt5-devel"
 depends="poppler-qt5 python3-PyQt5"
-short_desc="A Python binding for libpoppler-qt5"
+short_desc="Python bindings for libpoppler-qt5"
 maintainer="chili-b <dexter.gaonshatford@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/frescobaldi/python-poppler-qt5"
@@ -14,6 +14,6 @@ distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.g
 checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
 
 do_build() {
-    site_package_dir=$(python -c 'import site; print(site.getsitepackages()[0])')
-    python setup.py build_ext --pyqt-sip-dir=$site_package_dir/PyQt5/bindings
+	site_package_dir=$(python -c 'import site; print(site.getsitepackages()[0])')
+	python setup.py build_ext --pyqt-sip-dir=$site_package_dir/PyQt5/bindings
 }

From 6592b066141de6f1e8407dedf7c26f3707ec7e9c Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 70/73] New package: python-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python-ly/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/python-ly/template

diff --git a/srcpkgs/python-ly/template b/srcpkgs/python-ly/template
new file mode 100644
index 000000000000..18a44dc78fb4
--- /dev/null
+++ b/srcpkgs/python-ly/template
@@ -0,0 +1,12 @@
+# Template file for 'python-ly'
+pkgname=python-ly
+version=0.9.7
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 9e63b7c4beda0d05db0acea59211a9c76cf90b45 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:10:41 -0400
Subject: [PATCH 71/73] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..a71c09f23ce8
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,13 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi python3-cups python-ly lilypond"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+distfiles="https://github.com/frescobaldi/frescobaldi/releases/download/v${version}/frescobaldi-${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

From a20a1aebc3978d68a083526abc5f242d64612bdc Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 3 Oct 2021 03:24:29 -0400
Subject: [PATCH 72/73] New package: python-poppler-qt5-0.75.0

Dependency for frescobaldi
---
 srcpkgs/frescobaldi/template        |  3 ++-
 srcpkgs/python-poppler-qt5/template | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/python-poppler-qt5/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
index a71c09f23ce8..acb49db0294f 100644
--- a/srcpkgs/frescobaldi/template
+++ b/srcpkgs/frescobaldi/template
@@ -4,7 +4,8 @@ version=3.1.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi python3-cups python-ly lilypond"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi
+ python3-cups python-poppler-qt5 python-ly lilypond"
 short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
 maintainer="chili-b <dexter.gaonshatford@gmail.com>"
 license="GPL-2.0-or-later"
diff --git a/srcpkgs/python-poppler-qt5/template b/srcpkgs/python-poppler-qt5/template
new file mode 100644
index 000000000000..80f002ea91b7
--- /dev/null
+++ b/srcpkgs/python-poppler-qt5/template
@@ -0,0 +1,19 @@
+# Template file for 'python-poppler-qt5'
+pkgname=python-poppler-qt5
+version=0.75.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-sip-devel pkg-config qt5-qmake python3-PyQt5-devel poppler-qt5-devel python3-devel qt5-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="A Python binding for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+    site_package_dir=$(python -c 'import site; print(site.getsitepackages()[0])')
+    python setup.py build_ext --pyqt-sip-dir=$site_package_dir/PyQt5/bindings
+}

From 52fbc352bcd224857ac5f271146eac76cd54314e Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 3 Oct 2021 13:45:15 -0400
Subject: [PATCH 73/73] Fix python-poppler-qt5 according to xlint

---
 srcpkgs/python-poppler-qt5/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python-poppler-qt5/template b/srcpkgs/python-poppler-qt5/template
index 80f002ea91b7..e215477d6ad9 100644
--- a/srcpkgs/python-poppler-qt5/template
+++ b/srcpkgs/python-poppler-qt5/template
@@ -3,10 +3,10 @@ pkgname=python-poppler-qt5
 version=0.75.0
 revision=1
 build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-sip-devel pkg-config qt5-qmake python3-PyQt5-devel poppler-qt5-devel python3-devel qt5-devel"
+makedepends="python3-sip-devel pkg-config qt5-qmake poppler-qt5-devel
+ python3-PyQt5-devel python3-devel qt5-devel"
 depends="poppler-qt5 python3-PyQt5"
-short_desc="A Python binding for libpoppler-qt5"
+short_desc="Python bindings for libpoppler-qt5"
 maintainer="chili-b <dexter.gaonshatford@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/frescobaldi/python-poppler-qt5"
@@ -14,6 +14,6 @@ distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.g
 checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
 
 do_build() {
-    site_package_dir=$(python -c 'import site; print(site.getsitepackages()[0])')
-    python setup.py build_ext --pyqt-sip-dir=$site_package_dir/PyQt5/bindings
+	site_package_dir=$(python -c 'import site; print(site.getsitepackages()[0])')
+	python setup.py build_ext --pyqt-sip-dir=$site_package_dir/PyQt5/bindings
 }

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (6 preceding siblings ...)
  2021-10-03 17:57 ` chili-b
@ 2021-10-03 18:02 ` chili-b
  2021-10-03 18:05 ` chili-b
                   ` (76 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-03 18:02 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new package, `python-ly-0.9.7`, which is a dependency for frescobaldi.


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

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

From a048cbdb0d2f7390343b0f3b3b80580abe3abfc0 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/2] New package: python-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python-ly/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/python-ly/template

diff --git a/srcpkgs/python-ly/template b/srcpkgs/python-ly/template
new file mode 100644
index 000000000000..18a44dc78fb4
--- /dev/null
+++ b/srcpkgs/python-ly/template
@@ -0,0 +1,12 @@
+# Template file for 'python-ly'
+pkgname=python-ly
+version=0.9.7
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 8522ab673d3f4fd1de32602b9e2e481c05f64e5f Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:10:41 -0400
Subject: [PATCH 2/2] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..a71c09f23ce8
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,13 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi python3-cups python-ly lilypond"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+distfiles="https://github.com/frescobaldi/frescobaldi/releases/download/v${version}/frescobaldi-${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (7 preceding siblings ...)
  2021-10-03 18:02 ` chili-b
@ 2021-10-03 18:05 ` chili-b
  2021-10-03 18:08 ` chili-b
                   ` (75 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-03 18:05 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new package, `python-ly-0.9.7`, which is a dependency for frescobaldi.


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

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

From a048cbdb0d2f7390343b0f3b3b80580abe3abfc0 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python-ly/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/python-ly/template

diff --git a/srcpkgs/python-ly/template b/srcpkgs/python-ly/template
new file mode 100644
index 000000000000..18a44dc78fb4
--- /dev/null
+++ b/srcpkgs/python-ly/template
@@ -0,0 +1,12 @@
+# Template file for 'python-ly'
+pkgname=python-ly
+version=0.9.7
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 8522ab673d3f4fd1de32602b9e2e481c05f64e5f Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:10:41 -0400
Subject: [PATCH 2/3] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..a71c09f23ce8
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,13 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi python3-cups python-ly lilypond"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+distfiles="https://github.com/frescobaldi/frescobaldi/releases/download/v${version}/frescobaldi-${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

From 5afaab03eb1d28c0a4e03fed6c30b4f3e4f17cec Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 3 Oct 2021 14:05:04 -0400
Subject: [PATCH 3/3] New package: python-poppler-qt5-0.75.0

---
 srcpkgs/python-poppler-qt5/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python-poppler-qt5/template

diff --git a/srcpkgs/python-poppler-qt5/template b/srcpkgs/python-poppler-qt5/template
new file mode 100644
index 000000000000..d9c5018ef27f
--- /dev/null
+++ b/srcpkgs/python-poppler-qt5/template
@@ -0,0 +1,19 @@
+# Template file for 'python-poppler-qt5'
+pkgname=python-poppler-qt5
+version=0.75.0
+revision=1
+build_style=python3-module
+makedepends="python3-sip-devel pkg-config qt5-qmake poppler-qt5-devel
+ python3-PyQt5-devel python3-devel qt5-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+        site_package_dir=$(python -c 'import site; print(site.getsitepackages()[0])')
+        python setup.py build_ext --pyqt-sip-dir=$site_package_dir/PyQt5/bindings
+}

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (8 preceding siblings ...)
  2021-10-03 18:05 ` chili-b
@ 2021-10-03 18:08 ` chili-b
  2021-10-03 18:22 ` chili-b
                   ` (74 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-03 18:08 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new package, `python-ly-0.9.7`, which is a dependency for frescobaldi.


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

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

From a048cbdb0d2f7390343b0f3b3b80580abe3abfc0 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/5] New package: python-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python-ly/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/python-ly/template

diff --git a/srcpkgs/python-ly/template b/srcpkgs/python-ly/template
new file mode 100644
index 000000000000..18a44dc78fb4
--- /dev/null
+++ b/srcpkgs/python-ly/template
@@ -0,0 +1,12 @@
+# Template file for 'python-ly'
+pkgname=python-ly
+version=0.9.7
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 8522ab673d3f4fd1de32602b9e2e481c05f64e5f Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:10:41 -0400
Subject: [PATCH 2/5] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..a71c09f23ce8
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,13 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi python3-cups python-ly lilypond"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+distfiles="https://github.com/frescobaldi/frescobaldi/releases/download/v${version}/frescobaldi-${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

From 5afaab03eb1d28c0a4e03fed6c30b4f3e4f17cec Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 3 Oct 2021 14:05:04 -0400
Subject: [PATCH 3/5] New package: python-poppler-qt5-0.75.0

---
 srcpkgs/python-poppler-qt5/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python-poppler-qt5/template

diff --git a/srcpkgs/python-poppler-qt5/template b/srcpkgs/python-poppler-qt5/template
new file mode 100644
index 000000000000..d9c5018ef27f
--- /dev/null
+++ b/srcpkgs/python-poppler-qt5/template
@@ -0,0 +1,19 @@
+# Template file for 'python-poppler-qt5'
+pkgname=python-poppler-qt5
+version=0.75.0
+revision=1
+build_style=python3-module
+makedepends="python3-sip-devel pkg-config qt5-qmake poppler-qt5-devel
+ python3-PyQt5-devel python3-devel qt5-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+        site_package_dir=$(python -c 'import site; print(site.getsitepackages()[0])')
+        python setup.py build_ext --pyqt-sip-dir=$site_package_dir/PyQt5/bindings
+}

From 48e73d438fd26d53f9a02c69d92ae564ee1185e7 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:10:41 -0400
Subject: [PATCH 4/5] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..b75ea1f7c0c2
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,14 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi 
+ python3-cups python-ly lilypond python-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+distfiles="https://github.com/frescobaldi/frescobaldi/releases/download/v${version}/frescobaldi-${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

From 435fdd8f9525acb06677245e257e1a1f7c2f7cb8 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 3 Oct 2021 14:05:04 -0400
Subject: [PATCH 5/5] New package: python-poppler-qt5-0.75.0

---
 srcpkgs/python-poppler-qt5/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python-poppler-qt5/template

diff --git a/srcpkgs/python-poppler-qt5/template b/srcpkgs/python-poppler-qt5/template
new file mode 100644
index 000000000000..d9c5018ef27f
--- /dev/null
+++ b/srcpkgs/python-poppler-qt5/template
@@ -0,0 +1,19 @@
+# Template file for 'python-poppler-qt5'
+pkgname=python-poppler-qt5
+version=0.75.0
+revision=1
+build_style=python3-module
+makedepends="python3-sip-devel pkg-config qt5-qmake poppler-qt5-devel
+ python3-PyQt5-devel python3-devel qt5-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+        site_package_dir=$(python -c 'import site; print(site.getsitepackages()[0])')
+        python setup.py build_ext --pyqt-sip-dir=$site_package_dir/PyQt5/bindings
+}

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (9 preceding siblings ...)
  2021-10-03 18:08 ` chili-b
@ 2021-10-03 18:22 ` chili-b
  2021-10-04 21:38 ` chili-b
                   ` (73 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-03 18:22 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new package, `python-ly-0.9.7`, which is a dependency for frescobaldi.


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

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

From a048cbdb0d2f7390343b0f3b3b80580abe3abfc0 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python-ly/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/python-ly/template

diff --git a/srcpkgs/python-ly/template b/srcpkgs/python-ly/template
new file mode 100644
index 000000000000..18a44dc78fb4
--- /dev/null
+++ b/srcpkgs/python-ly/template
@@ -0,0 +1,12 @@
+# Template file for 'python-ly'
+pkgname=python-ly
+version=0.9.7
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 875590157b3150e5dfbb1f88224315d880728ff2 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 3 Oct 2021 14:21:41 -0400
Subject: [PATCH 2/3] New package: python-poppler-qt5

---
 srcpkgs/python-poppler-qt5/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python-poppler-qt5/template

diff --git a/srcpkgs/python-poppler-qt5/template b/srcpkgs/python-poppler-qt5/template
new file mode 100644
index 000000000000..e215477d6ad9
--- /dev/null
+++ b/srcpkgs/python-poppler-qt5/template
@@ -0,0 +1,19 @@
+# Template file for 'python-poppler-qt5'
+pkgname=python-poppler-qt5
+version=0.75.0
+revision=1
+build_style=python3-module
+makedepends="python3-sip-devel pkg-config qt5-qmake poppler-qt5-devel
+ python3-PyQt5-devel python3-devel qt5-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	site_package_dir=$(python -c 'import site; print(site.getsitepackages()[0])')
+	python setup.py build_ext --pyqt-sip-dir=$site_package_dir/PyQt5/bindings
+}

From 4cc8db67fa279db11b1d7e5af90fc015fffc073a Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 3 Oct 2021 14:22:01 -0400
Subject: [PATCH 3/3] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..b75ea1f7c0c2
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,14 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi 
+ python3-cups python-ly lilypond python-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+distfiles="https://github.com/frescobaldi/frescobaldi/releases/download/v${version}/frescobaldi-${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (10 preceding siblings ...)
  2021-10-03 18:22 ` chili-b
@ 2021-10-04 21:38 ` chili-b
  2021-10-09 15:44 ` [PR REVIEW] " NeelChotai
                   ` (72 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-04 21:38 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python-ly-0.9.7` and `python-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 4af26657310b4b3c18878bfcbd0690af2900bc7c Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/4] New package: python-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python-ly/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/python-ly/template

diff --git a/srcpkgs/python-ly/template b/srcpkgs/python-ly/template
new file mode 100644
index 000000000000..18a44dc78fb4
--- /dev/null
+++ b/srcpkgs/python-ly/template
@@ -0,0 +1,12 @@
+# Template file for 'python-ly'
+pkgname=python-ly
+version=0.9.7
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 539c17e1e6eb6797785feef1067acecb00077ae1 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 3 Oct 2021 14:21:41 -0400
Subject: [PATCH 2/4] New package: python-poppler-qt5

---
 srcpkgs/python-poppler-qt5/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python-poppler-qt5/template

diff --git a/srcpkgs/python-poppler-qt5/template b/srcpkgs/python-poppler-qt5/template
new file mode 100644
index 000000000000..e215477d6ad9
--- /dev/null
+++ b/srcpkgs/python-poppler-qt5/template
@@ -0,0 +1,19 @@
+# Template file for 'python-poppler-qt5'
+pkgname=python-poppler-qt5
+version=0.75.0
+revision=1
+build_style=python3-module
+makedepends="python3-sip-devel pkg-config qt5-qmake poppler-qt5-devel
+ python3-PyQt5-devel python3-devel qt5-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	site_package_dir=$(python -c 'import site; print(site.getsitepackages()[0])')
+	python setup.py build_ext --pyqt-sip-dir=$site_package_dir/PyQt5/bindings
+}

From a427b92d0e48ed15d542fae508466cf47affa805 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 3 Oct 2021 14:22:01 -0400
Subject: [PATCH 3/4] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..b75ea1f7c0c2
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,14 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi 
+ python3-cups python-ly lilypond python-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+distfiles="https://github.com/frescobaldi/frescobaldi/releases/download/v${version}/frescobaldi-${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

From dc9e507da497796d2c8818ca3b7b5e0f07b2a1a5 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Mon, 4 Oct 2021 17:37:28 -0400
Subject: [PATCH 4/4] Appease xlint and set correct check target

---
 srcpkgs/frescobaldi/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
index b75ea1f7c0c2..d028af1b13c6 100644
--- a/srcpkgs/frescobaldi/template
+++ b/srcpkgs/frescobaldi/template
@@ -3,8 +3,9 @@ pkgname=frescobaldi
 version=3.1.3
 revision=1
 build_style=python3-module
+make_check_target="check"
 hostmakedepends="python3-setuptools"
-depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi 
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi
  python3-cups python-ly lilypond python-poppler-qt5"
 short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
 maintainer="chili-b <dexter.gaonshatford@gmail.com>"

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

* Re: [PR REVIEW] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (11 preceding siblings ...)
  2021-10-04 21:38 ` chili-b
@ 2021-10-09 15:44 ` NeelChotai
  2021-10-09 15:44 ` NeelChotai
                   ` (71 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: NeelChotai @ 2021-10-09 15:44 UTC (permalink / raw)
  To: ml

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

New review comment by NeelChotai on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#discussion_r725501008

Comment:
This isn't necessary, you can use `py3_sitelib`, see https://github.com/void-linux/void-packages/blob/master/Manual.md#python-packages for more info.

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

* Re: [PR REVIEW] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (13 preceding siblings ...)
  2021-10-09 15:44 ` NeelChotai
@ 2021-10-09 15:44 ` NeelChotai
  2021-10-09 15:44 ` NeelChotai
                   ` (69 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: NeelChotai @ 2021-10-09 15:44 UTC (permalink / raw)
  To: ml

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

New review comment by NeelChotai on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#discussion_r725501523

Comment:
`https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz` may be preferable for brevity, but not necessary.

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

* Re: [PR REVIEW] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (14 preceding siblings ...)
  2021-10-09 15:44 ` NeelChotai
@ 2021-10-09 15:44 ` NeelChotai
  2021-10-10 19:26 ` [PR PATCH] [Updated] " chili-b
                   ` (68 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: NeelChotai @ 2021-10-09 15:44 UTC (permalink / raw)
  To: ml

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

New review comment by NeelChotai on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#discussion_r725501169

Comment:
Package name should be `python3-ly`.

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

* Re: [PR REVIEW] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (12 preceding siblings ...)
  2021-10-09 15:44 ` [PR REVIEW] " NeelChotai
@ 2021-10-09 15:44 ` NeelChotai
  2021-10-09 15:44 ` NeelChotai
                   ` (70 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: NeelChotai @ 2021-10-09 15:44 UTC (permalink / raw)
  To: ml

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

New review comment by NeelChotai on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#discussion_r725501051

Comment:
Package name should be `python3-poppler-qt5`.

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (15 preceding siblings ...)
  2021-10-09 15:44 ` NeelChotai
@ 2021-10-10 19:26 ` chili-b
  2021-10-10 19:27 ` chili-b
                   ` (67 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-10 19:26 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python-ly-0.9.7` and `python-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 4af26657310b4b3c18878bfcbd0690af2900bc7c Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/4] New package: python-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python-ly/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/python-ly/template

diff --git a/srcpkgs/python-ly/template b/srcpkgs/python-ly/template
new file mode 100644
index 000000000000..18a44dc78fb4
--- /dev/null
+++ b/srcpkgs/python-ly/template
@@ -0,0 +1,12 @@
+# Template file for 'python-ly'
+pkgname=python-ly
+version=0.9.7
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 585ae5a982f7e94d560ea7655bc34944155c51fd Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 2/4] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..92a207be7309
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,12 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From f631aead21424199880b19c51014bcecb1f81d19 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 3/4] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..f587b0b1d59d
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+build_style=python3-module
+makedepends="python3-sip-devel pkg-config qt5-qmake poppler-qt5-devel
+ python3-PyQt5-devel python3-devel qt5-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	python setup.py build_ext --pyqt-sip-dir=${py3_sitelib}/PyQt5/bindings
+}

From 2bf3ab2358c287a867968b141d517b16e61d91d6 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:14:16 -0400
Subject: [PATCH 4/4] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..d028af1b13c6
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,15 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi
+ python3-cups python-ly lilypond python-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+distfiles="https://github.com/frescobaldi/frescobaldi/releases/download/v${version}/frescobaldi-${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (16 preceding siblings ...)
  2021-10-10 19:26 ` [PR PATCH] [Updated] " chili-b
@ 2021-10-10 19:27 ` chili-b
  2021-10-10 19:30 ` chili-b
                   ` (66 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-10 19:27 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python-ly-0.9.7` and `python-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From e9c0ecb166b5e37b21c1155649071db97b21be1a Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..92a207be7309
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,12 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From d9fc5e59af4396486b759d3dac05441ab899a95a Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/3] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..f587b0b1d59d
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+build_style=python3-module
+makedepends="python3-sip-devel pkg-config qt5-qmake poppler-qt5-devel
+ python3-PyQt5-devel python3-devel qt5-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	python setup.py build_ext --pyqt-sip-dir=${py3_sitelib}/PyQt5/bindings
+}

From 4ddbb05193d15e61b5d26cbe2af0897e54d4dd49 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:14:16 -0400
Subject: [PATCH 3/3] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..d028af1b13c6
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,15 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi
+ python3-cups python-ly lilypond python-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+distfiles="https://github.com/frescobaldi/frescobaldi/releases/download/v${version}/frescobaldi-${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (17 preceding siblings ...)
  2021-10-10 19:27 ` chili-b
@ 2021-10-10 19:30 ` chili-b
  2021-10-10 19:34 ` chili-b
                   ` (65 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-10 19:30 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python-ly-0.9.7` and `python-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From e9c0ecb166b5e37b21c1155649071db97b21be1a Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/2] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..92a207be7309
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,12 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From a66fb3e3a4539e0d9c11ad45ce5577bc077810c7 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/2] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/frescobaldi/template         | 15 +++++++++++++++
 srcpkgs/python3-poppler-qt5/template | 18 ++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..7e4413726f54
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,15 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi
+ python3-cups python-ly lilypond python-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1
diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..f587b0b1d59d
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+build_style=python3-module
+makedepends="python3-sip-devel pkg-config qt5-qmake poppler-qt5-devel
+ python3-PyQt5-devel python3-devel qt5-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	python setup.py build_ext --pyqt-sip-dir=${py3_sitelib}/PyQt5/bindings
+}

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (18 preceding siblings ...)
  2021-10-10 19:30 ` chili-b
@ 2021-10-10 19:34 ` chili-b
  2021-10-10 19:35 ` chili-b
                   ` (64 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-10 19:34 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python-ly-0.9.7` and `python-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From e9c0ecb166b5e37b21c1155649071db97b21be1a Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..92a207be7309
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,12 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From d736274f2a6327aa297e35aa6f13a8c9b541a1e2 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/3] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..f587b0b1d59d
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+build_style=python3-module
+makedepends="python3-sip-devel pkg-config qt5-qmake poppler-qt5-devel
+ python3-PyQt5-devel python3-devel qt5-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	python setup.py build_ext --pyqt-sip-dir=${py3_sitelib}/PyQt5/bindings
+}

From 2eb2e16c2be7968bd6017e7bc9357485d8b403d8 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/3] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..7e4413726f54
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,15 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi
+ python3-cups python-ly lilypond python-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

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

* Re: New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (19 preceding siblings ...)
  2021-10-10 19:34 ` chili-b
@ 2021-10-10 19:35 ` chili-b
  2021-10-10 19:36 ` [PR PATCH] [Updated] " chili-b
                   ` (63 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-10 19:35 UTC (permalink / raw)
  To: ml

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

New comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#issuecomment-939539891

Comment:
@NeelChotai, I believe I've made all the changes you requested.

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (20 preceding siblings ...)
  2021-10-10 19:35 ` chili-b
@ 2021-10-10 19:36 ` chili-b
  2021-10-10 19:37 ` chili-b
                   ` (62 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-10 19:36 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python-ly-0.9.7` and `python-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 3a9af65df7930ea5d2fd39f335d749def73a90bc Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..92a207be7309
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,12 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From e03f448167072cc31a0290e8263a350f4324240b Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/3] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..f587b0b1d59d
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+build_style=python3-module
+makedepends="python3-sip-devel pkg-config qt5-qmake poppler-qt5-devel
+ python3-PyQt5-devel python3-devel qt5-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	python setup.py build_ext --pyqt-sip-dir=${py3_sitelib}/PyQt5/bindings
+}

From 3466d468f2279402e9fa1dcf281771b3b4bb4b35 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/3] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..7e4413726f54
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,15 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi
+ python3-cups python-ly lilypond python-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (21 preceding siblings ...)
  2021-10-10 19:36 ` [PR PATCH] [Updated] " chili-b
@ 2021-10-10 19:37 ` chili-b
  2021-10-10 19:38 ` chili-b
                   ` (61 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-10 19:37 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python-ly-0.9.7` and `python-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 3a9af65df7930ea5d2fd39f335d749def73a90bc Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..92a207be7309
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,12 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From e03f448167072cc31a0290e8263a350f4324240b Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/3] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..f587b0b1d59d
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+build_style=python3-module
+makedepends="python3-sip-devel pkg-config qt5-qmake poppler-qt5-devel
+ python3-PyQt5-devel python3-devel qt5-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	python setup.py build_ext --pyqt-sip-dir=${py3_sitelib}/PyQt5/bindings
+}

From 8773d561bb36d64e8191ce200e1085af6f9adf28 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/3] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..7e4413726f54
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,15 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi
+ python3-cups python-ly lilypond python-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (22 preceding siblings ...)
  2021-10-10 19:37 ` chili-b
@ 2021-10-10 19:38 ` chili-b
  2021-10-10 21:57 ` chili-b
                   ` (60 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-10 19:38 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python-ly-0.9.7` and `python-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 3a9af65df7930ea5d2fd39f335d749def73a90bc Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..92a207be7309
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,12 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From e03f448167072cc31a0290e8263a350f4324240b Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/3] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..f587b0b1d59d
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+build_style=python3-module
+makedepends="python3-sip-devel pkg-config qt5-qmake poppler-qt5-devel
+ python3-PyQt5-devel python3-devel qt5-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	python setup.py build_ext --pyqt-sip-dir=${py3_sitelib}/PyQt5/bindings
+}

From 32d9be3641363e379f6ab173585aa81ccf4b9123 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/3] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..9d2db1060bcd
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,15 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi
+ python3-cups python3-ly lilypond python3-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (23 preceding siblings ...)
  2021-10-10 19:38 ` chili-b
@ 2021-10-10 21:57 ` chili-b
  2021-10-10 22:05 ` chili-b
                   ` (59 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-10 21:57 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 83eac0716459fd53aa20a7086dd3424fbc2bbe53 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..636f5d52e58e
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+build_style=python3-module
+wrksrc="python3-ly-${version}"
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 6dea6f4aa928099da7f7c9aedd0d2d86d4405aee Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/3] New package: python3-poppler-qt5-0.75.0

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

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..67ec344a114e
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python3-poppler-qt5-${version}"
+build_style=python3-module
+makedepends="python3-sip-devel pkg-config qt5-qmake poppler-qt5-devel
+ python3-PyQt5-devel python3-devel qt5-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	python setup.py build_ext --pyqt-sip-dir=${py3_sitelib}/PyQt5/bindings
+}

From bbc1e0430e60bb80ffac0fd61e3a34dca4c94260 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/3] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..9d2db1060bcd
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,15 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi
+ python3-cups python3-ly lilypond python3-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (24 preceding siblings ...)
  2021-10-10 21:57 ` chili-b
@ 2021-10-10 22:05 ` chili-b
  2021-10-10 22:28 ` chili-b
                   ` (58 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-10 22:05 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 6da7865d1c625642f6ab3c39ece32b046a5b6de9 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..33e54feee31f
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+build_style=python3-module
+wrksrc="python-ly-${version}"
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 4389167fdcaec90421ca22c956a12b5895e1422d Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/3] New package: python3-poppler-qt5-0.75.0

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

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..0a3f06aec480
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+makedepends="python3-sip-devel pkg-config qt5-qmake poppler-qt5-devel
+ python3-PyQt5-devel python3-devel qt5-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	python setup.py build_ext --pyqt-sip-dir=${py3_sitelib}/PyQt5/bindings
+}

From a8b45225ce8602dff07abbb67da2e80cd4e906bb Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/3] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..9d2db1060bcd
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,15 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi
+ python3-cups python3-ly lilypond python3-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

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

* Re: New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (25 preceding siblings ...)
  2021-10-10 22:05 ` chili-b
@ 2021-10-10 22:28 ` chili-b
  2021-10-11  9:32 ` NeelChotai
                   ` (57 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-10 22:28 UTC (permalink / raw)
  To: ml

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

New comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#issuecomment-939563481

Comment:
Building python3-poppler-qt5 currently fails because `py3_sitelib` currently refers to python-3.10, but the version of python that is currently packaged is still 3.9. I'm assuming this will be resolved once python3.10 finishes building.

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

* Re: New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (26 preceding siblings ...)
  2021-10-10 22:28 ` chili-b
@ 2021-10-11  9:32 ` NeelChotai
  2021-10-11 15:02 ` [PR PATCH] [Updated] " chili-b
                   ` (56 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: NeelChotai @ 2021-10-11  9:32 UTC (permalink / raw)
  To: ml

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

New comment by NeelChotai on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#issuecomment-939856584

Comment:
Looks good! Excited to have this in the repo, will give it a local test once buildbot is finished with the Python rebuild but it looks ready to merge.

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (27 preceding siblings ...)
  2021-10-11  9:32 ` NeelChotai
@ 2021-10-11 15:02 ` chili-b
  2021-10-11 22:15 ` [PR REVIEW] " paper42
                   ` (55 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-11 15:02 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From f242036f72133fc99ffaab735e4ab82de29329c7 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..85802d6d6a3f
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 1fbdd380f8ec1d2cf3872b0e1ccc73aa399b6647 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/3] New package: python3-poppler-qt5-0.75.0

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

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..0a3f06aec480
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+makedepends="python3-sip-devel pkg-config qt5-qmake poppler-qt5-devel
+ python3-PyQt5-devel python3-devel qt5-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	python setup.py build_ext --pyqt-sip-dir=${py3_sitelib}/PyQt5/bindings
+}

From 63459506bee27a087f29d6b20b1ad125ff745a50 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/3] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..9d2db1060bcd
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,15 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5>=5.9 python3-PyQt5-svg poppler-qt5>=0.82.0 portmidi
+ python3-cups python3-ly lilypond python3-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

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

* Re: [PR REVIEW] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (28 preceding siblings ...)
  2021-10-11 15:02 ` [PR PATCH] [Updated] " chili-b
@ 2021-10-11 22:15 ` paper42
  2021-10-11 22:15 ` paper42
                   ` (54 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: paper42 @ 2021-10-11 22:15 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#discussion_r726604065

Comment:
could you add the changelog (also for all other packages if they have one)

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

* Re: [PR REVIEW] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (30 preceding siblings ...)
  2021-10-11 22:15 ` paper42
@ 2021-10-11 22:15 ` paper42
  2021-10-11 23:31 ` [PR PATCH] [Updated] " chili-b
                   ` (52 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: paper42 @ 2021-10-11 22:15 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#discussion_r726601586

Comment:
remove the version restrictions

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

* Re: [PR REVIEW] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (29 preceding siblings ...)
  2021-10-11 22:15 ` [PR REVIEW] " paper42
@ 2021-10-11 22:15 ` paper42
  2021-10-11 22:15 ` paper42
                   ` (53 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: paper42 @ 2021-10-11 22:15 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#discussion_r726603784

Comment:
```suggestion
makedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
 python3-PyQt5-devel python3-devel"
```

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (31 preceding siblings ...)
  2021-10-11 22:15 ` paper42
@ 2021-10-11 23:31 ` chili-b
  2021-10-11 23:32 ` chili-b
                   ` (51 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-11 23:31 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 0c4113e53919cc5075a4551b367f0960a5e17711 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 01/14] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 5e4fb95f72d7a635cb46fe086acf7bdf52a1adec Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 02/14] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..430b10a135d0
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+makedepends="python3-sip-devel pkg-config qt5-qmake poppler-qt5-devel
+ python3-PyQt5-devel python3-devel qt5-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	python setup.py build_ext --pyqt-sip-dir=${py3_sitelib}/PyQt5/bindings
+}

From 494bf9317405ae2fed540b7bf5f39f613894f2bd Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 03/14] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..a6adb07ea231
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,16 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/v${version}/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

From d889d648dca30051e05b97dfa8b7a434e21f03f0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:36 -0400
Subject: [PATCH 04/14] DarkRadiant: rebuild for Python 3.10

---
 srcpkgs/DarkRadiant/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index 0c656d3566eb..6741fc8bae37 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
 # Template file for 'DarkRadiant'
 pkgname=DarkRadiant
 version=2.13.0
-revision=1
+revision=2
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config ruby-asciidoctor"

From a8e05d94880ef930c73703a3f8b1c573b1813e62 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Oct 2021 18:21:57 +0200
Subject: [PATCH 05/14] cross-x86_64-w64-mingw32: isl moved to sourceforge.

---
 srcpkgs/cross-x86_64-w64-mingw32/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-x86_64-w64-mingw32/template b/srcpkgs/cross-x86_64-w64-mingw32/template
index c32a573bf20a..816e6f1f68eb 100644
--- a/srcpkgs/cross-x86_64-w64-mingw32/template
+++ b/srcpkgs/cross-x86_64-w64-mingw32/template
@@ -26,7 +26,7 @@ distfiles="
  ${GNU_SITE}/mpc/mpc-${_mpc_version}.tar.gz
  ${GNU_SITE}/gmp/gmp-${_gmp_version}.tar.xz
  ${GNU_SITE}/mpfr/mpfr-${_mpfr_version}.tar.xz
- http://isl.gforge.inria.fr/isl-${_isl_version}.tar.bz2
+ ${SOURCEFORGE_SITE}/libisl/isl-${_isl_version}.tar.bz2
  ${SOURCEFORGE_SITE}/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${_mingw_version}.tar.bz2"
 checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  4c4a6fb8a8396059241c2e674b85b351c26a5d678274007f076957afa1cc9ddf

From 9413b4d5ba776fe12e545dec471c9c72c0ee4168 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Oct 2021 22:28:22 +0200
Subject: [PATCH 06/14] kubecfg: update to 0.22.0.

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

diff --git a/srcpkgs/kubecfg/template b/srcpkgs/kubecfg/template
index d4b50d8de2b4..ccd329254670 100644
--- a/srcpkgs/kubecfg/template
+++ b/srcpkgs/kubecfg/template
@@ -1,6 +1,6 @@
 # Template file for 'kubecfg'
 pkgname=kubecfg
-version=0.21.0
+version=0.22.0
 revision=1
 build_style=go
 go_import_path="github.com/bitnami/kubecfg"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/bitnami/kubecfg"
 distfiles="https://github.com/bitnami/kubecfg/archive/v${version}.tar.gz"
-checksum=deb0fb737a5d792a7f8ef1b7ed1680f0ab318a5b79cddfd73c81b3119a555c36
+checksum=1a27df34f815069c843da18430bca2ae0aa7d3156ea17c5bd4efcfa23014b768

From 731f1eb9a84bbdd4bd26f016892737e5cf15a815 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Oct 2021 22:29:34 +0200
Subject: [PATCH 07/14] skaffold: update to 1.33.0.

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

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index c8d001479675..4905e07f3e10 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.32.0
+version=1.33.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=ea33655b42aa6da98ad614042c1368bab802e2b1cc1b3c6b19b5abf41c341bf9
+checksum=9e29d015e6c3f7355ac4239014fdfcf8a53e1ee16c1fb49ebac08e0e053d14ca

From 375b56e70da39a71fe668cb57c3b647de6bcb401 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 10 Oct 2021 17:51:57 +0200
Subject: [PATCH 08/14] oksh: update to 7.0.

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

diff --git a/srcpkgs/oksh/template b/srcpkgs/oksh/template
index 84e6085f54f0..d41bc21f75f3 100644
--- a/srcpkgs/oksh/template
+++ b/srcpkgs/oksh/template
@@ -1,6 +1,6 @@
 # Template file for 'oksh'
 pkgname=oksh
-version=6.9
+version=7.0
 revision=1
 build_style=gnu-configure
 makedepends="ncurses-devel"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="https://github.com/ibara/oksh"
 distfiles="https://github.com/ibara/oksh/releases/download/oksh-${version}/oksh-${version}.tar.gz"
-checksum=c08d97b2ac9ee5d88e9e508d27c75502b2d06c20d4c5ab87b496cb3b9951bd35
+checksum=21d5891f38ffea3a5d1aa8c494f0a5579c93778535e0a92275b102dec3221da1
 register_shell="/bin/oksh"
 
 alternatives="

From 8fda8cc80be56b702b27ecc189102621e18ed0c3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 10 Oct 2021 17:56:56 +0200
Subject: [PATCH 09/14] babashka: update to 0.6.2.

---
 srcpkgs/babashka/template | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 078786ee7db1..4d2c328489ed 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.6.1
+version=0.6.2
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=422bce7925b77cb4175e940d0d1d0f9439b46ad6
-_babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
+_sci_commit=9cd4b8b2eb9db2c1e9000813c58672e08b3957d9
+_babashka_curl_commit=bc021581ad89d70d456175179847abad047aa13c
+_babashka_nrepl_commit=eadb3330f0a65e781755d8b328727698f1d41fb0
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
 _process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=c86fa1bff9564f48b3513e4e4820840bc65c4188
-_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
+_deps_clj_commit=4b53187be2b44ee799cc83c22b83519a1cf34692
+_fs_commit=1f0b8ff14ffce8024a4c2340d74d7998555f2123
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="396bb8a0165f78997f0147273883c3a3d163d55ff6f8b07239aa4afbaa918920
- 8dd8b42e64a6b6511c924696c4792c2e7a597b52c5107758fee83a5ccd42f142
- e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
+checksum="a03bff53c1953dd2be34cb141213ffefbb3e73b2a300b1f55e7bc7680cf52515
+ 86988afc9f57ebf3c6465a0fb700bba43da03368bf093248f4c87171d9f70ad3
+ 83ec20e495efde12dd4cd24e786612f873fa7d627b9dd18e6b241e8d3e83f8dc
+ 916d9cc8c0a3b895a72068b95c6ac985a65d30465a9d556af8acea20aaaacc42
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
  dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 437a7d55dafe5df0bcb0ee0b15d4ef90ab9c5d30cbb43ccdb4de88c0ea55257b
- a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
+ 0ce3635be4510570d3a9593d8c2b021da2090f4e3279b8401638b4703c25bed1
+ 5d5f3159a5c8455f2142fc78c80b1e6d32f942c2eb447767488fe71520194de2"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 

From feb652f8158bdef93709109ffb39695fa3eca802 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 11 Oct 2021 15:51:29 -0400
Subject: [PATCH 10/14] gst1-python3: trigger rebuild

---
 srcpkgs/gst1-python3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst1-python3/template b/srcpkgs/gst1-python3/template
index 3f85e16de418..bc826060b984 100644
--- a/srcpkgs/gst1-python3/template
+++ b/srcpkgs/gst1-python3/template
@@ -1,4 +1,4 @@
-# Template file for 'gst1-python3'
+# Template file for 'gst1-python3'.
 pkgname=gst1-python3
 version=1.18.4
 revision=2

From 2fe56c56818a91d4b7d63a313a0193b932a70b84 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 11 Oct 2021 23:38:16 +0200
Subject: [PATCH 11/14] yt-dlp: update to 2021.10.10.

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

diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template
index 5f3204cf2fb0..7fd4f85e5467 100644
--- a/srcpkgs/yt-dlp/template
+++ b/srcpkgs/yt-dlp/template
@@ -1,7 +1,7 @@
 # Template file for 'yt-dlp'
 pkgname=yt-dlp
-version=2021.09.25
-revision=2
+version=2021.10.10
+revision=1
 wrksrc="$pkgname"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="Unlicense"
 homepage="https://github.com/yt-dlp/yt-dlp"
 changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md"
 distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/$version/yt-dlp.tar.gz"
-checksum=ae08e0b56fea59a8bfdadacd92eddc9bdfdc1473199178cb4e31bacfd991864a
+checksum=6d8faf0b6fced99213eeaa5450c2c9e4acbee78081a9f5c04933ea0d316994fb
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From 1c3a42d01229dbc9c6b51d7b9e2cee8ba5e205bb Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sun, 10 Oct 2021 20:14:28 +0200
Subject: [PATCH 12/14] lowdown: update to 0.9.2.

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

diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 74eabe1c0a0c..c76c46601e44 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.9.0
+version=0.9.2
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=a35b5dd7345395479e02585ac51275192994bc1b3178aadee9a8bef340455c43
+checksum=5c355d1db2071916b1ad6e789208de664be3781bd17dd8b6b09b1707a283a988
 
 post_install() {
 	vlicense LICENSE.md

From f05b98cbacb1c2dd4f90c93a039fcd0c1409f030 Mon Sep 17 00:00:00 2001
From: Vilhelm Bergsoe <vilhelmbergsoe@gmail.com>
Date: Sun, 10 Oct 2021 22:33:35 +0200
Subject: [PATCH 13/14] betterlockscreen: update to 4.0.3

---
 srcpkgs/betterlockscreen/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/betterlockscreen/template b/srcpkgs/betterlockscreen/template
index c0e5d710f151..bb02d9c0f01e 100644
--- a/srcpkgs/betterlockscreen/template
+++ b/srcpkgs/betterlockscreen/template
@@ -1,14 +1,14 @@
 # Template file for 'betterlockscreen'
 pkgname=betterlockscreen
-version=3.0.1
-revision=3
-depends="ImageMagick bash bc feh i3lock-color xdpyinfo xrandr xrdb"
+version=4.0.3
+revision=1
+depends="ImageMagick bash bc feh i3lock-color xdpyinfo xrandr xrdb xset"
 short_desc="Sweet looking lockscreen for linux system"
 maintainer="Aleksander Zien <Aleks@nderZien.com>"
 license="MIT"
 homepage="https://github.com/pavanjadhaw/betterlockscreen"
-distfiles="https://github.com/pavanjadhaw/betterlockscreen/archive/${version}.tar.gz"
-checksum=9b80af4b93e0b35bc916a584522ecf9eb39414c8010a2e4f2bb6941fdc5faf28
+distfiles="https://github.com/pavanjadhaw/betterlockscreen/archive/refs/tags/v${version}.tar.gz"
+checksum=d96fd64f1c94c91fec5d26b9665ba68f7f130c8a8612978ad9edbfa859710671
 
 do_install() {
 	vbin ${pkgname}

From 6f7edda21a2113dff5a1386c671eb9ad8531a4ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
Date: Sun, 3 Oct 2021 15:03:40 +0200
Subject: [PATCH 14/14] New package: parpd-1.7

---
 srcpkgs/parpd/files/parpd.conf                |  1 +
 srcpkgs/parpd/files/parpd/run                 |  3 ++
 .../patches/0001-fix-building-on-musl.patch   | 24 +++++++++++
 .../0002-Linux-File-compile-warnings.patch    | 43 +++++++++++++++++++
 srcpkgs/parpd/template                        | 20 +++++++++
 5 files changed, 91 insertions(+)
 create mode 100644 srcpkgs/parpd/files/parpd.conf
 create mode 100644 srcpkgs/parpd/files/parpd/run
 create mode 100644 srcpkgs/parpd/patches/0001-fix-building-on-musl.patch
 create mode 100644 srcpkgs/parpd/patches/0002-Linux-File-compile-warnings.patch
 create mode 100644 srcpkgs/parpd/template

diff --git a/srcpkgs/parpd/files/parpd.conf b/srcpkgs/parpd/files/parpd.conf
new file mode 100644
index 000000000000..926fc5f839d2
--- /dev/null
+++ b/srcpkgs/parpd/files/parpd.conf
@@ -0,0 +1 @@
+# see parpd.conf(5)
diff --git a/srcpkgs/parpd/files/parpd/run b/srcpkgs/parpd/files/parpd/run
new file mode 100644
index 000000000000..029dfdac68dd
--- /dev/null
+++ b/srcpkgs/parpd/files/parpd/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+exec parpd ${OPTS:=-fl} 1>&2
diff --git a/srcpkgs/parpd/patches/0001-fix-building-on-musl.patch b/srcpkgs/parpd/patches/0001-fix-building-on-musl.patch
new file mode 100644
index 000000000000..71d6efe01d33
--- /dev/null
+++ b/srcpkgs/parpd/patches/0001-fix-building-on-musl.patch
@@ -0,0 +1,24 @@
+From 466a788c7533b19f20f6d91514773e89e87f5f6e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Wed, 6 Oct 2021 11:37:14 +0200
+Subject: [PATCH 1/2] fix building on musl
+
+---
+ parpd.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/parpd.c b/parpd.c
+index a178696..19e266c 100644
+--- a/parpd.c
++++ b/parpd.c
+@@ -57,6 +57,7 @@ const char copyright[] = "Copyright (c) 2008-2017 Roy Marples";
+ #include <search.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <signal.h>
+ #include <string.h>
+ #include <syslog.h>
+ #include <unistd.h>
+-- 
+2.32.0
+
diff --git a/srcpkgs/parpd/patches/0002-Linux-File-compile-warnings.patch b/srcpkgs/parpd/patches/0002-Linux-File-compile-warnings.patch
new file mode 100644
index 000000000000..c57b45e19d51
--- /dev/null
+++ b/srcpkgs/parpd/patches/0002-Linux-File-compile-warnings.patch
@@ -0,0 +1,43 @@
+From 5b32ed79ccc1c9bb9a5bd815c28c4a4730cd1cc5 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Mon, 7 Oct 2019 15:07:25 +0100
+Subject: [PATCH 2/2] Linux: File compile warnings
+
+---
+ lpf.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/lpf.c b/lpf.c
+index 36cbd1c..cfd517b 100644
+--- a/lpf.c
++++ b/lpf.c
+@@ -27,6 +27,7 @@
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
++#include <sys/uio.h>
+ 
+ #include <arpa/inet.h>
+ #include <net/if.h>
+@@ -91,7 +92,7 @@ bpf_open_arp(struct interface *ifp)
+ 	memset(&su, 0, sizeof(su));
+ 	su.sll.sll_family = PF_PACKET;
+ 	su.sll.sll_protocol = htons(ETH_P_ALL);
+-	su.sll.sll_ifindex = if_nametoindex(ifp->ifname);
++	su.sll.sll_ifindex = (int)if_nametoindex(ifp->ifname);
+ 	if (bind(s, &su.sa, sizeof(su.sll)) == -1)
+ 		goto eexit;
+ 
+@@ -140,7 +141,7 @@ bpf_read(struct interface *ifp, void *data, size_t len)
+ 	}
+ 	bytes -= ETHER_HDR_LEN;
+ 	if ((size_t)bytes > len)
+-		bytes = len;
+-	memcpy(data, ifp->buffer + ETHER_HDR_LEN, bytes);
++		bytes = (ssize_t)len;
++	memcpy(data, ifp->buffer + ETHER_HDR_LEN, (size_t)bytes);
+ 	return bytes;
+ }
+-- 
+2.32.0
+
diff --git a/srcpkgs/parpd/template b/srcpkgs/parpd/template
new file mode 100644
index 000000000000..0991d61360f8
--- /dev/null
+++ b/srcpkgs/parpd/template
@@ -0,0 +1,20 @@
+# Template file for 'parpd'
+pkgname=parpd
+version=1.7
+revision=1
+build_style=gnu-makefile
+make_install_args="BINDIR=/usr/bin"
+short_desc="RFC 1027 compliant Proxy ARP Daemon"
+maintainer="Arsen Arsenović <arsen@aarsen.me>"
+license="BSD-2-Clause"
+homepage="https://roy.marples.name/projects/parpd/"
+distfiles="https://roy.marples.name/downloads/parpd/parpd-${version}.tar.xz"
+checksum=f1f2ed753243b86205922ab0ec1cd0f426779e6b8c273206f0568e819a3fe3b4
+conf_files=/etc/parpd.conf
+
+post_install() {
+	vsv parpd
+	vlicense LICENSE
+
+	vconf "${FILESDIR}/parpd.conf"
+}

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (32 preceding siblings ...)
  2021-10-11 23:31 ` [PR PATCH] [Updated] " chili-b
@ 2021-10-11 23:32 ` chili-b
  2021-10-11 23:34 ` chili-b
                   ` (50 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-11 23:32 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 0c4113e53919cc5075a4551b367f0960a5e17711 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 01/14] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 5e4fb95f72d7a635cb46fe086acf7bdf52a1adec Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 02/14] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..430b10a135d0
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+makedepends="python3-sip-devel pkg-config qt5-qmake poppler-qt5-devel
+ python3-PyQt5-devel python3-devel qt5-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	python setup.py build_ext --pyqt-sip-dir=${py3_sitelib}/PyQt5/bindings
+}

From 494bf9317405ae2fed540b7bf5f39f613894f2bd Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 03/14] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..a6adb07ea231
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,16 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/v${version}/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

From d889d648dca30051e05b97dfa8b7a434e21f03f0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:36 -0400
Subject: [PATCH 04/14] DarkRadiant: rebuild for Python 3.10

---
 srcpkgs/DarkRadiant/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index 0c656d3566eb..6741fc8bae37 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
 # Template file for 'DarkRadiant'
 pkgname=DarkRadiant
 version=2.13.0
-revision=1
+revision=2
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config ruby-asciidoctor"

From a8e05d94880ef930c73703a3f8b1c573b1813e62 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Oct 2021 18:21:57 +0200
Subject: [PATCH 05/14] cross-x86_64-w64-mingw32: isl moved to sourceforge.

---
 srcpkgs/cross-x86_64-w64-mingw32/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-x86_64-w64-mingw32/template b/srcpkgs/cross-x86_64-w64-mingw32/template
index c32a573bf20a..816e6f1f68eb 100644
--- a/srcpkgs/cross-x86_64-w64-mingw32/template
+++ b/srcpkgs/cross-x86_64-w64-mingw32/template
@@ -26,7 +26,7 @@ distfiles="
  ${GNU_SITE}/mpc/mpc-${_mpc_version}.tar.gz
  ${GNU_SITE}/gmp/gmp-${_gmp_version}.tar.xz
  ${GNU_SITE}/mpfr/mpfr-${_mpfr_version}.tar.xz
- http://isl.gforge.inria.fr/isl-${_isl_version}.tar.bz2
+ ${SOURCEFORGE_SITE}/libisl/isl-${_isl_version}.tar.bz2
  ${SOURCEFORGE_SITE}/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${_mingw_version}.tar.bz2"
 checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  4c4a6fb8a8396059241c2e674b85b351c26a5d678274007f076957afa1cc9ddf

From 9413b4d5ba776fe12e545dec471c9c72c0ee4168 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Oct 2021 22:28:22 +0200
Subject: [PATCH 06/14] kubecfg: update to 0.22.0.

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

diff --git a/srcpkgs/kubecfg/template b/srcpkgs/kubecfg/template
index d4b50d8de2b4..ccd329254670 100644
--- a/srcpkgs/kubecfg/template
+++ b/srcpkgs/kubecfg/template
@@ -1,6 +1,6 @@
 # Template file for 'kubecfg'
 pkgname=kubecfg
-version=0.21.0
+version=0.22.0
 revision=1
 build_style=go
 go_import_path="github.com/bitnami/kubecfg"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/bitnami/kubecfg"
 distfiles="https://github.com/bitnami/kubecfg/archive/v${version}.tar.gz"
-checksum=deb0fb737a5d792a7f8ef1b7ed1680f0ab318a5b79cddfd73c81b3119a555c36
+checksum=1a27df34f815069c843da18430bca2ae0aa7d3156ea17c5bd4efcfa23014b768

From 731f1eb9a84bbdd4bd26f016892737e5cf15a815 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Oct 2021 22:29:34 +0200
Subject: [PATCH 07/14] skaffold: update to 1.33.0.

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

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index c8d001479675..4905e07f3e10 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.32.0
+version=1.33.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=ea33655b42aa6da98ad614042c1368bab802e2b1cc1b3c6b19b5abf41c341bf9
+checksum=9e29d015e6c3f7355ac4239014fdfcf8a53e1ee16c1fb49ebac08e0e053d14ca

From 375b56e70da39a71fe668cb57c3b647de6bcb401 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 10 Oct 2021 17:51:57 +0200
Subject: [PATCH 08/14] oksh: update to 7.0.

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

diff --git a/srcpkgs/oksh/template b/srcpkgs/oksh/template
index 84e6085f54f0..d41bc21f75f3 100644
--- a/srcpkgs/oksh/template
+++ b/srcpkgs/oksh/template
@@ -1,6 +1,6 @@
 # Template file for 'oksh'
 pkgname=oksh
-version=6.9
+version=7.0
 revision=1
 build_style=gnu-configure
 makedepends="ncurses-devel"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="https://github.com/ibara/oksh"
 distfiles="https://github.com/ibara/oksh/releases/download/oksh-${version}/oksh-${version}.tar.gz"
-checksum=c08d97b2ac9ee5d88e9e508d27c75502b2d06c20d4c5ab87b496cb3b9951bd35
+checksum=21d5891f38ffea3a5d1aa8c494f0a5579c93778535e0a92275b102dec3221da1
 register_shell="/bin/oksh"
 
 alternatives="

From 8fda8cc80be56b702b27ecc189102621e18ed0c3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 10 Oct 2021 17:56:56 +0200
Subject: [PATCH 09/14] babashka: update to 0.6.2.

---
 srcpkgs/babashka/template | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 078786ee7db1..4d2c328489ed 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.6.1
+version=0.6.2
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=422bce7925b77cb4175e940d0d1d0f9439b46ad6
-_babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
+_sci_commit=9cd4b8b2eb9db2c1e9000813c58672e08b3957d9
+_babashka_curl_commit=bc021581ad89d70d456175179847abad047aa13c
+_babashka_nrepl_commit=eadb3330f0a65e781755d8b328727698f1d41fb0
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
 _process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=c86fa1bff9564f48b3513e4e4820840bc65c4188
-_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
+_deps_clj_commit=4b53187be2b44ee799cc83c22b83519a1cf34692
+_fs_commit=1f0b8ff14ffce8024a4c2340d74d7998555f2123
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="396bb8a0165f78997f0147273883c3a3d163d55ff6f8b07239aa4afbaa918920
- 8dd8b42e64a6b6511c924696c4792c2e7a597b52c5107758fee83a5ccd42f142
- e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
+checksum="a03bff53c1953dd2be34cb141213ffefbb3e73b2a300b1f55e7bc7680cf52515
+ 86988afc9f57ebf3c6465a0fb700bba43da03368bf093248f4c87171d9f70ad3
+ 83ec20e495efde12dd4cd24e786612f873fa7d627b9dd18e6b241e8d3e83f8dc
+ 916d9cc8c0a3b895a72068b95c6ac985a65d30465a9d556af8acea20aaaacc42
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
  dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 437a7d55dafe5df0bcb0ee0b15d4ef90ab9c5d30cbb43ccdb4de88c0ea55257b
- a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
+ 0ce3635be4510570d3a9593d8c2b021da2090f4e3279b8401638b4703c25bed1
+ 5d5f3159a5c8455f2142fc78c80b1e6d32f942c2eb447767488fe71520194de2"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 

From feb652f8158bdef93709109ffb39695fa3eca802 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 11 Oct 2021 15:51:29 -0400
Subject: [PATCH 10/14] gst1-python3: trigger rebuild

---
 srcpkgs/gst1-python3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst1-python3/template b/srcpkgs/gst1-python3/template
index 3f85e16de418..bc826060b984 100644
--- a/srcpkgs/gst1-python3/template
+++ b/srcpkgs/gst1-python3/template
@@ -1,4 +1,4 @@
-# Template file for 'gst1-python3'
+# Template file for 'gst1-python3'.
 pkgname=gst1-python3
 version=1.18.4
 revision=2

From 2fe56c56818a91d4b7d63a313a0193b932a70b84 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 11 Oct 2021 23:38:16 +0200
Subject: [PATCH 11/14] yt-dlp: update to 2021.10.10.

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

diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template
index 5f3204cf2fb0..7fd4f85e5467 100644
--- a/srcpkgs/yt-dlp/template
+++ b/srcpkgs/yt-dlp/template
@@ -1,7 +1,7 @@
 # Template file for 'yt-dlp'
 pkgname=yt-dlp
-version=2021.09.25
-revision=2
+version=2021.10.10
+revision=1
 wrksrc="$pkgname"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="Unlicense"
 homepage="https://github.com/yt-dlp/yt-dlp"
 changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md"
 distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/$version/yt-dlp.tar.gz"
-checksum=ae08e0b56fea59a8bfdadacd92eddc9bdfdc1473199178cb4e31bacfd991864a
+checksum=6d8faf0b6fced99213eeaa5450c2c9e4acbee78081a9f5c04933ea0d316994fb
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From 1c3a42d01229dbc9c6b51d7b9e2cee8ba5e205bb Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sun, 10 Oct 2021 20:14:28 +0200
Subject: [PATCH 12/14] lowdown: update to 0.9.2.

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

diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 74eabe1c0a0c..c76c46601e44 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.9.0
+version=0.9.2
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=a35b5dd7345395479e02585ac51275192994bc1b3178aadee9a8bef340455c43
+checksum=5c355d1db2071916b1ad6e789208de664be3781bd17dd8b6b09b1707a283a988
 
 post_install() {
 	vlicense LICENSE.md

From f05b98cbacb1c2dd4f90c93a039fcd0c1409f030 Mon Sep 17 00:00:00 2001
From: Vilhelm Bergsoe <vilhelmbergsoe@gmail.com>
Date: Sun, 10 Oct 2021 22:33:35 +0200
Subject: [PATCH 13/14] betterlockscreen: update to 4.0.3

---
 srcpkgs/betterlockscreen/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/betterlockscreen/template b/srcpkgs/betterlockscreen/template
index c0e5d710f151..bb02d9c0f01e 100644
--- a/srcpkgs/betterlockscreen/template
+++ b/srcpkgs/betterlockscreen/template
@@ -1,14 +1,14 @@
 # Template file for 'betterlockscreen'
 pkgname=betterlockscreen
-version=3.0.1
-revision=3
-depends="ImageMagick bash bc feh i3lock-color xdpyinfo xrandr xrdb"
+version=4.0.3
+revision=1
+depends="ImageMagick bash bc feh i3lock-color xdpyinfo xrandr xrdb xset"
 short_desc="Sweet looking lockscreen for linux system"
 maintainer="Aleksander Zien <Aleks@nderZien.com>"
 license="MIT"
 homepage="https://github.com/pavanjadhaw/betterlockscreen"
-distfiles="https://github.com/pavanjadhaw/betterlockscreen/archive/${version}.tar.gz"
-checksum=9b80af4b93e0b35bc916a584522ecf9eb39414c8010a2e4f2bb6941fdc5faf28
+distfiles="https://github.com/pavanjadhaw/betterlockscreen/archive/refs/tags/v${version}.tar.gz"
+checksum=d96fd64f1c94c91fec5d26b9665ba68f7f130c8a8612978ad9edbfa859710671
 
 do_install() {
 	vbin ${pkgname}

From 6f7edda21a2113dff5a1386c671eb9ad8531a4ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
Date: Sun, 3 Oct 2021 15:03:40 +0200
Subject: [PATCH 14/14] New package: parpd-1.7

---
 srcpkgs/parpd/files/parpd.conf                |  1 +
 srcpkgs/parpd/files/parpd/run                 |  3 ++
 .../patches/0001-fix-building-on-musl.patch   | 24 +++++++++++
 .../0002-Linux-File-compile-warnings.patch    | 43 +++++++++++++++++++
 srcpkgs/parpd/template                        | 20 +++++++++
 5 files changed, 91 insertions(+)
 create mode 100644 srcpkgs/parpd/files/parpd.conf
 create mode 100644 srcpkgs/parpd/files/parpd/run
 create mode 100644 srcpkgs/parpd/patches/0001-fix-building-on-musl.patch
 create mode 100644 srcpkgs/parpd/patches/0002-Linux-File-compile-warnings.patch
 create mode 100644 srcpkgs/parpd/template

diff --git a/srcpkgs/parpd/files/parpd.conf b/srcpkgs/parpd/files/parpd.conf
new file mode 100644
index 000000000000..926fc5f839d2
--- /dev/null
+++ b/srcpkgs/parpd/files/parpd.conf
@@ -0,0 +1 @@
+# see parpd.conf(5)
diff --git a/srcpkgs/parpd/files/parpd/run b/srcpkgs/parpd/files/parpd/run
new file mode 100644
index 000000000000..029dfdac68dd
--- /dev/null
+++ b/srcpkgs/parpd/files/parpd/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+exec parpd ${OPTS:=-fl} 1>&2
diff --git a/srcpkgs/parpd/patches/0001-fix-building-on-musl.patch b/srcpkgs/parpd/patches/0001-fix-building-on-musl.patch
new file mode 100644
index 000000000000..71d6efe01d33
--- /dev/null
+++ b/srcpkgs/parpd/patches/0001-fix-building-on-musl.patch
@@ -0,0 +1,24 @@
+From 466a788c7533b19f20f6d91514773e89e87f5f6e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Wed, 6 Oct 2021 11:37:14 +0200
+Subject: [PATCH 1/2] fix building on musl
+
+---
+ parpd.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/parpd.c b/parpd.c
+index a178696..19e266c 100644
+--- a/parpd.c
++++ b/parpd.c
+@@ -57,6 +57,7 @@ const char copyright[] = "Copyright (c) 2008-2017 Roy Marples";
+ #include <search.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <signal.h>
+ #include <string.h>
+ #include <syslog.h>
+ #include <unistd.h>
+-- 
+2.32.0
+
diff --git a/srcpkgs/parpd/patches/0002-Linux-File-compile-warnings.patch b/srcpkgs/parpd/patches/0002-Linux-File-compile-warnings.patch
new file mode 100644
index 000000000000..c57b45e19d51
--- /dev/null
+++ b/srcpkgs/parpd/patches/0002-Linux-File-compile-warnings.patch
@@ -0,0 +1,43 @@
+From 5b32ed79ccc1c9bb9a5bd815c28c4a4730cd1cc5 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Mon, 7 Oct 2019 15:07:25 +0100
+Subject: [PATCH 2/2] Linux: File compile warnings
+
+---
+ lpf.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/lpf.c b/lpf.c
+index 36cbd1c..cfd517b 100644
+--- a/lpf.c
++++ b/lpf.c
+@@ -27,6 +27,7 @@
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
++#include <sys/uio.h>
+ 
+ #include <arpa/inet.h>
+ #include <net/if.h>
+@@ -91,7 +92,7 @@ bpf_open_arp(struct interface *ifp)
+ 	memset(&su, 0, sizeof(su));
+ 	su.sll.sll_family = PF_PACKET;
+ 	su.sll.sll_protocol = htons(ETH_P_ALL);
+-	su.sll.sll_ifindex = if_nametoindex(ifp->ifname);
++	su.sll.sll_ifindex = (int)if_nametoindex(ifp->ifname);
+ 	if (bind(s, &su.sa, sizeof(su.sll)) == -1)
+ 		goto eexit;
+ 
+@@ -140,7 +141,7 @@ bpf_read(struct interface *ifp, void *data, size_t len)
+ 	}
+ 	bytes -= ETHER_HDR_LEN;
+ 	if ((size_t)bytes > len)
+-		bytes = len;
+-	memcpy(data, ifp->buffer + ETHER_HDR_LEN, bytes);
++		bytes = (ssize_t)len;
++	memcpy(data, ifp->buffer + ETHER_HDR_LEN, (size_t)bytes);
+ 	return bytes;
+ }
+-- 
+2.32.0
+
diff --git a/srcpkgs/parpd/template b/srcpkgs/parpd/template
new file mode 100644
index 000000000000..0991d61360f8
--- /dev/null
+++ b/srcpkgs/parpd/template
@@ -0,0 +1,20 @@
+# Template file for 'parpd'
+pkgname=parpd
+version=1.7
+revision=1
+build_style=gnu-makefile
+make_install_args="BINDIR=/usr/bin"
+short_desc="RFC 1027 compliant Proxy ARP Daemon"
+maintainer="Arsen Arsenović <arsen@aarsen.me>"
+license="BSD-2-Clause"
+homepage="https://roy.marples.name/projects/parpd/"
+distfiles="https://roy.marples.name/downloads/parpd/parpd-${version}.tar.xz"
+checksum=f1f2ed753243b86205922ab0ec1cd0f426779e6b8c273206f0568e819a3fe3b4
+conf_files=/etc/parpd.conf
+
+post_install() {
+	vsv parpd
+	vlicense LICENSE
+
+	vconf "${FILESDIR}/parpd.conf"
+}

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (33 preceding siblings ...)
  2021-10-11 23:32 ` chili-b
@ 2021-10-11 23:34 ` chili-b
  2021-10-11 23:35 ` chili-b
                   ` (49 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-11 23:34 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 0c4113e53919cc5075a4551b367f0960a5e17711 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 01/14] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 5e4fb95f72d7a635cb46fe086acf7bdf52a1adec Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 02/14] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..430b10a135d0
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+makedepends="python3-sip-devel pkg-config qt5-qmake poppler-qt5-devel
+ python3-PyQt5-devel python3-devel qt5-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	python setup.py build_ext --pyqt-sip-dir=${py3_sitelib}/PyQt5/bindings
+}

From 494bf9317405ae2fed540b7bf5f39f613894f2bd Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 03/14] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..a6adb07ea231
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,16 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/v${version}/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

From d889d648dca30051e05b97dfa8b7a434e21f03f0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 24 Sep 2021 23:15:36 -0400
Subject: [PATCH 04/14] DarkRadiant: rebuild for Python 3.10

---
 srcpkgs/DarkRadiant/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index 0c656d3566eb..6741fc8bae37 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
 # Template file for 'DarkRadiant'
 pkgname=DarkRadiant
 version=2.13.0
-revision=1
+revision=2
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config ruby-asciidoctor"

From a8e05d94880ef930c73703a3f8b1c573b1813e62 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Oct 2021 18:21:57 +0200
Subject: [PATCH 05/14] cross-x86_64-w64-mingw32: isl moved to sourceforge.

---
 srcpkgs/cross-x86_64-w64-mingw32/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-x86_64-w64-mingw32/template b/srcpkgs/cross-x86_64-w64-mingw32/template
index c32a573bf20a..816e6f1f68eb 100644
--- a/srcpkgs/cross-x86_64-w64-mingw32/template
+++ b/srcpkgs/cross-x86_64-w64-mingw32/template
@@ -26,7 +26,7 @@ distfiles="
  ${GNU_SITE}/mpc/mpc-${_mpc_version}.tar.gz
  ${GNU_SITE}/gmp/gmp-${_gmp_version}.tar.xz
  ${GNU_SITE}/mpfr/mpfr-${_mpfr_version}.tar.xz
- http://isl.gforge.inria.fr/isl-${_isl_version}.tar.bz2
+ ${SOURCEFORGE_SITE}/libisl/isl-${_isl_version}.tar.bz2
  ${SOURCEFORGE_SITE}/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${_mingw_version}.tar.bz2"
 checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
  4c4a6fb8a8396059241c2e674b85b351c26a5d678274007f076957afa1cc9ddf

From 9413b4d5ba776fe12e545dec471c9c72c0ee4168 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Oct 2021 22:28:22 +0200
Subject: [PATCH 06/14] kubecfg: update to 0.22.0.

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

diff --git a/srcpkgs/kubecfg/template b/srcpkgs/kubecfg/template
index d4b50d8de2b4..ccd329254670 100644
--- a/srcpkgs/kubecfg/template
+++ b/srcpkgs/kubecfg/template
@@ -1,6 +1,6 @@
 # Template file for 'kubecfg'
 pkgname=kubecfg
-version=0.21.0
+version=0.22.0
 revision=1
 build_style=go
 go_import_path="github.com/bitnami/kubecfg"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/bitnami/kubecfg"
 distfiles="https://github.com/bitnami/kubecfg/archive/v${version}.tar.gz"
-checksum=deb0fb737a5d792a7f8ef1b7ed1680f0ab318a5b79cddfd73c81b3119a555c36
+checksum=1a27df34f815069c843da18430bca2ae0aa7d3156ea17c5bd4efcfa23014b768

From 731f1eb9a84bbdd4bd26f016892737e5cf15a815 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Oct 2021 22:29:34 +0200
Subject: [PATCH 07/14] skaffold: update to 1.33.0.

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

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index c8d001479675..4905e07f3e10 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.32.0
+version=1.33.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=ea33655b42aa6da98ad614042c1368bab802e2b1cc1b3c6b19b5abf41c341bf9
+checksum=9e29d015e6c3f7355ac4239014fdfcf8a53e1ee16c1fb49ebac08e0e053d14ca

From 375b56e70da39a71fe668cb57c3b647de6bcb401 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 10 Oct 2021 17:51:57 +0200
Subject: [PATCH 08/14] oksh: update to 7.0.

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

diff --git a/srcpkgs/oksh/template b/srcpkgs/oksh/template
index 84e6085f54f0..d41bc21f75f3 100644
--- a/srcpkgs/oksh/template
+++ b/srcpkgs/oksh/template
@@ -1,6 +1,6 @@
 # Template file for 'oksh'
 pkgname=oksh
-version=6.9
+version=7.0
 revision=1
 build_style=gnu-configure
 makedepends="ncurses-devel"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="https://github.com/ibara/oksh"
 distfiles="https://github.com/ibara/oksh/releases/download/oksh-${version}/oksh-${version}.tar.gz"
-checksum=c08d97b2ac9ee5d88e9e508d27c75502b2d06c20d4c5ab87b496cb3b9951bd35
+checksum=21d5891f38ffea3a5d1aa8c494f0a5579c93778535e0a92275b102dec3221da1
 register_shell="/bin/oksh"
 
 alternatives="

From 8fda8cc80be56b702b27ecc189102621e18ed0c3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 10 Oct 2021 17:56:56 +0200
Subject: [PATCH 09/14] babashka: update to 0.6.2.

---
 srcpkgs/babashka/template | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 078786ee7db1..4d2c328489ed 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.6.1
+version=0.6.2
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=422bce7925b77cb4175e940d0d1d0f9439b46ad6
-_babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
+_sci_commit=9cd4b8b2eb9db2c1e9000813c58672e08b3957d9
+_babashka_curl_commit=bc021581ad89d70d456175179847abad047aa13c
+_babashka_nrepl_commit=eadb3330f0a65e781755d8b328727698f1d41fb0
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
 _process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=c86fa1bff9564f48b3513e4e4820840bc65c4188
-_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
+_deps_clj_commit=4b53187be2b44ee799cc83c22b83519a1cf34692
+_fs_commit=1f0b8ff14ffce8024a4c2340d74d7998555f2123
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="396bb8a0165f78997f0147273883c3a3d163d55ff6f8b07239aa4afbaa918920
- 8dd8b42e64a6b6511c924696c4792c2e7a597b52c5107758fee83a5ccd42f142
- e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
+checksum="a03bff53c1953dd2be34cb141213ffefbb3e73b2a300b1f55e7bc7680cf52515
+ 86988afc9f57ebf3c6465a0fb700bba43da03368bf093248f4c87171d9f70ad3
+ 83ec20e495efde12dd4cd24e786612f873fa7d627b9dd18e6b241e8d3e83f8dc
+ 916d9cc8c0a3b895a72068b95c6ac985a65d30465a9d556af8acea20aaaacc42
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
  dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 437a7d55dafe5df0bcb0ee0b15d4ef90ab9c5d30cbb43ccdb4de88c0ea55257b
- a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
+ 0ce3635be4510570d3a9593d8c2b021da2090f4e3279b8401638b4703c25bed1
+ 5d5f3159a5c8455f2142fc78c80b1e6d32f942c2eb447767488fe71520194de2"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 

From feb652f8158bdef93709109ffb39695fa3eca802 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 11 Oct 2021 15:51:29 -0400
Subject: [PATCH 10/14] gst1-python3: trigger rebuild

---
 srcpkgs/gst1-python3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst1-python3/template b/srcpkgs/gst1-python3/template
index 3f85e16de418..bc826060b984 100644
--- a/srcpkgs/gst1-python3/template
+++ b/srcpkgs/gst1-python3/template
@@ -1,4 +1,4 @@
-# Template file for 'gst1-python3'
+# Template file for 'gst1-python3'.
 pkgname=gst1-python3
 version=1.18.4
 revision=2

From 2fe56c56818a91d4b7d63a313a0193b932a70b84 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 11 Oct 2021 23:38:16 +0200
Subject: [PATCH 11/14] yt-dlp: update to 2021.10.10.

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

diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template
index 5f3204cf2fb0..7fd4f85e5467 100644
--- a/srcpkgs/yt-dlp/template
+++ b/srcpkgs/yt-dlp/template
@@ -1,7 +1,7 @@
 # Template file for 'yt-dlp'
 pkgname=yt-dlp
-version=2021.09.25
-revision=2
+version=2021.10.10
+revision=1
 wrksrc="$pkgname"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="Unlicense"
 homepage="https://github.com/yt-dlp/yt-dlp"
 changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md"
 distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/$version/yt-dlp.tar.gz"
-checksum=ae08e0b56fea59a8bfdadacd92eddc9bdfdc1473199178cb4e31bacfd991864a
+checksum=6d8faf0b6fced99213eeaa5450c2c9e4acbee78081a9f5c04933ea0d316994fb
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From 1c3a42d01229dbc9c6b51d7b9e2cee8ba5e205bb Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sun, 10 Oct 2021 20:14:28 +0200
Subject: [PATCH 12/14] lowdown: update to 0.9.2.

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

diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 74eabe1c0a0c..c76c46601e44 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.9.0
+version=0.9.2
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=a35b5dd7345395479e02585ac51275192994bc1b3178aadee9a8bef340455c43
+checksum=5c355d1db2071916b1ad6e789208de664be3781bd17dd8b6b09b1707a283a988
 
 post_install() {
 	vlicense LICENSE.md

From f05b98cbacb1c2dd4f90c93a039fcd0c1409f030 Mon Sep 17 00:00:00 2001
From: Vilhelm Bergsoe <vilhelmbergsoe@gmail.com>
Date: Sun, 10 Oct 2021 22:33:35 +0200
Subject: [PATCH 13/14] betterlockscreen: update to 4.0.3

---
 srcpkgs/betterlockscreen/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/betterlockscreen/template b/srcpkgs/betterlockscreen/template
index c0e5d710f151..bb02d9c0f01e 100644
--- a/srcpkgs/betterlockscreen/template
+++ b/srcpkgs/betterlockscreen/template
@@ -1,14 +1,14 @@
 # Template file for 'betterlockscreen'
 pkgname=betterlockscreen
-version=3.0.1
-revision=3
-depends="ImageMagick bash bc feh i3lock-color xdpyinfo xrandr xrdb"
+version=4.0.3
+revision=1
+depends="ImageMagick bash bc feh i3lock-color xdpyinfo xrandr xrdb xset"
 short_desc="Sweet looking lockscreen for linux system"
 maintainer="Aleksander Zien <Aleks@nderZien.com>"
 license="MIT"
 homepage="https://github.com/pavanjadhaw/betterlockscreen"
-distfiles="https://github.com/pavanjadhaw/betterlockscreen/archive/${version}.tar.gz"
-checksum=9b80af4b93e0b35bc916a584522ecf9eb39414c8010a2e4f2bb6941fdc5faf28
+distfiles="https://github.com/pavanjadhaw/betterlockscreen/archive/refs/tags/v${version}.tar.gz"
+checksum=d96fd64f1c94c91fec5d26b9665ba68f7f130c8a8612978ad9edbfa859710671
 
 do_install() {
 	vbin ${pkgname}

From 6f7edda21a2113dff5a1386c671eb9ad8531a4ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
Date: Sun, 3 Oct 2021 15:03:40 +0200
Subject: [PATCH 14/14] New package: parpd-1.7

---
 srcpkgs/parpd/files/parpd.conf                |  1 +
 srcpkgs/parpd/files/parpd/run                 |  3 ++
 .../patches/0001-fix-building-on-musl.patch   | 24 +++++++++++
 .../0002-Linux-File-compile-warnings.patch    | 43 +++++++++++++++++++
 srcpkgs/parpd/template                        | 20 +++++++++
 5 files changed, 91 insertions(+)
 create mode 100644 srcpkgs/parpd/files/parpd.conf
 create mode 100644 srcpkgs/parpd/files/parpd/run
 create mode 100644 srcpkgs/parpd/patches/0001-fix-building-on-musl.patch
 create mode 100644 srcpkgs/parpd/patches/0002-Linux-File-compile-warnings.patch
 create mode 100644 srcpkgs/parpd/template

diff --git a/srcpkgs/parpd/files/parpd.conf b/srcpkgs/parpd/files/parpd.conf
new file mode 100644
index 000000000000..926fc5f839d2
--- /dev/null
+++ b/srcpkgs/parpd/files/parpd.conf
@@ -0,0 +1 @@
+# see parpd.conf(5)
diff --git a/srcpkgs/parpd/files/parpd/run b/srcpkgs/parpd/files/parpd/run
new file mode 100644
index 000000000000..029dfdac68dd
--- /dev/null
+++ b/srcpkgs/parpd/files/parpd/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+exec parpd ${OPTS:=-fl} 1>&2
diff --git a/srcpkgs/parpd/patches/0001-fix-building-on-musl.patch b/srcpkgs/parpd/patches/0001-fix-building-on-musl.patch
new file mode 100644
index 000000000000..71d6efe01d33
--- /dev/null
+++ b/srcpkgs/parpd/patches/0001-fix-building-on-musl.patch
@@ -0,0 +1,24 @@
+From 466a788c7533b19f20f6d91514773e89e87f5f6e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Wed, 6 Oct 2021 11:37:14 +0200
+Subject: [PATCH 1/2] fix building on musl
+
+---
+ parpd.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/parpd.c b/parpd.c
+index a178696..19e266c 100644
+--- a/parpd.c
++++ b/parpd.c
+@@ -57,6 +57,7 @@ const char copyright[] = "Copyright (c) 2008-2017 Roy Marples";
+ #include <search.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <signal.h>
+ #include <string.h>
+ #include <syslog.h>
+ #include <unistd.h>
+-- 
+2.32.0
+
diff --git a/srcpkgs/parpd/patches/0002-Linux-File-compile-warnings.patch b/srcpkgs/parpd/patches/0002-Linux-File-compile-warnings.patch
new file mode 100644
index 000000000000..c57b45e19d51
--- /dev/null
+++ b/srcpkgs/parpd/patches/0002-Linux-File-compile-warnings.patch
@@ -0,0 +1,43 @@
+From 5b32ed79ccc1c9bb9a5bd815c28c4a4730cd1cc5 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Mon, 7 Oct 2019 15:07:25 +0100
+Subject: [PATCH 2/2] Linux: File compile warnings
+
+---
+ lpf.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/lpf.c b/lpf.c
+index 36cbd1c..cfd517b 100644
+--- a/lpf.c
++++ b/lpf.c
+@@ -27,6 +27,7 @@
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
++#include <sys/uio.h>
+ 
+ #include <arpa/inet.h>
+ #include <net/if.h>
+@@ -91,7 +92,7 @@ bpf_open_arp(struct interface *ifp)
+ 	memset(&su, 0, sizeof(su));
+ 	su.sll.sll_family = PF_PACKET;
+ 	su.sll.sll_protocol = htons(ETH_P_ALL);
+-	su.sll.sll_ifindex = if_nametoindex(ifp->ifname);
++	su.sll.sll_ifindex = (int)if_nametoindex(ifp->ifname);
+ 	if (bind(s, &su.sa, sizeof(su.sll)) == -1)
+ 		goto eexit;
+ 
+@@ -140,7 +141,7 @@ bpf_read(struct interface *ifp, void *data, size_t len)
+ 	}
+ 	bytes -= ETHER_HDR_LEN;
+ 	if ((size_t)bytes > len)
+-		bytes = len;
+-	memcpy(data, ifp->buffer + ETHER_HDR_LEN, bytes);
++		bytes = (ssize_t)len;
++	memcpy(data, ifp->buffer + ETHER_HDR_LEN, (size_t)bytes);
+ 	return bytes;
+ }
+-- 
+2.32.0
+
diff --git a/srcpkgs/parpd/template b/srcpkgs/parpd/template
new file mode 100644
index 000000000000..0991d61360f8
--- /dev/null
+++ b/srcpkgs/parpd/template
@@ -0,0 +1,20 @@
+# Template file for 'parpd'
+pkgname=parpd
+version=1.7
+revision=1
+build_style=gnu-makefile
+make_install_args="BINDIR=/usr/bin"
+short_desc="RFC 1027 compliant Proxy ARP Daemon"
+maintainer="Arsen Arsenović <arsen@aarsen.me>"
+license="BSD-2-Clause"
+homepage="https://roy.marples.name/projects/parpd/"
+distfiles="https://roy.marples.name/downloads/parpd/parpd-${version}.tar.xz"
+checksum=f1f2ed753243b86205922ab0ec1cd0f426779e6b8c273206f0568e819a3fe3b4
+conf_files=/etc/parpd.conf
+
+post_install() {
+	vsv parpd
+	vlicense LICENSE
+
+	vconf "${FILESDIR}/parpd.conf"
+}

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (34 preceding siblings ...)
  2021-10-11 23:34 ` chili-b
@ 2021-10-11 23:35 ` chili-b
  2021-10-11 23:37 ` chili-b
                   ` (48 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-11 23:35 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 0c4113e53919cc5075a4551b367f0960a5e17711 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 5e4fb95f72d7a635cb46fe086acf7bdf52a1adec Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/3] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..430b10a135d0
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+makedepends="python3-sip-devel pkg-config qt5-qmake poppler-qt5-devel
+ python3-PyQt5-devel python3-devel qt5-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	python setup.py build_ext --pyqt-sip-dir=${py3_sitelib}/PyQt5/bindings
+}

From 494bf9317405ae2fed540b7bf5f39f613894f2bd Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/3] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..a6adb07ea231
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,16 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/v${version}/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (35 preceding siblings ...)
  2021-10-11 23:35 ` chili-b
@ 2021-10-11 23:37 ` chili-b
  2021-10-11 23:38 ` chili-b
                   ` (47 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-11 23:37 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 2c9a59e8a55fb42e3f92b0f9e7927f0f79c0febc Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 3a9079dded998966e2884e8142a317ef6fd05541 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/3] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..430b10a135d0
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+makedepends="python3-sip-devel pkg-config qt5-qmake poppler-qt5-devel
+ python3-PyQt5-devel python3-devel qt5-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	python setup.py build_ext --pyqt-sip-dir=${py3_sitelib}/PyQt5/bindings
+}

From 6f287318a4dd9b025ae4a85c2f17977f13869c53 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/3] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..a6adb07ea231
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,16 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/v${version}/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (36 preceding siblings ...)
  2021-10-11 23:37 ` chili-b
@ 2021-10-11 23:38 ` chili-b
  2021-10-11 23:39 ` chili-b
                   ` (46 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-11 23:38 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 2c9a59e8a55fb42e3f92b0f9e7927f0f79c0febc Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 66ef00ddf76350b431d8a782512bd6382c3421b5 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/3] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..07247c944a1a
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+makedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	python setup.py build_ext --pyqt-sip-dir=${py3_sitelib}/PyQt5/bindings
+}

From dc79cee282a59a46c8daaa02eb35b85f7e7f794d Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/3] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..a6adb07ea231
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,16 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/v${version}/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

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

* Re: New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (37 preceding siblings ...)
  2021-10-11 23:38 ` chili-b
@ 2021-10-11 23:39 ` chili-b
  2021-10-11 23:43 ` [PR PATCH] [Updated] " chili-b
                   ` (45 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-11 23:39 UTC (permalink / raw)
  To: ml

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

New comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#issuecomment-940520018

Comment:
@paper42, I've made the changes

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (38 preceding siblings ...)
  2021-10-11 23:39 ` chili-b
@ 2021-10-11 23:43 ` chili-b
  2021-10-11 23:47 ` chili-b
                   ` (44 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-11 23:43 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 2c9a59e8a55fb42e3f92b0f9e7927f0f79c0febc Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 4b92f04aa7a8a48935371f9bd14d644ea9f0bc84 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/3] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..bf99c1493c90
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+makedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	python setup.py build_ext --pyqt-sip-dir=/${py3_sitelib}/PyQt5/bindings
+}

From 0f80accbfb6b32c1b57620468b5c37524ca2a4c9 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/3] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..a6adb07ea231
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,16 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/v${version}/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (39 preceding siblings ...)
  2021-10-11 23:43 ` [PR PATCH] [Updated] " chili-b
@ 2021-10-11 23:47 ` chili-b
  2021-10-12  0:23 ` chili-b
                   ` (43 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-11 23:47 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 2c9a59e8a55fb42e3f92b0f9e7927f0f79c0febc Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 4b92f04aa7a8a48935371f9bd14d644ea9f0bc84 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/3] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..bf99c1493c90
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+makedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	python setup.py build_ext --pyqt-sip-dir=/${py3_sitelib}/PyQt5/bindings
+}

From 5cdd2e9645f35ebecff70fb144b967dbed3eccef Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/3] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..5f23e1fc335a
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,16 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/v${version}/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=f97256ce15ab621593536e219584a2ed744c1933148ac7ed98fcef6a3a9510a6

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

* Re: New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (40 preceding siblings ...)
  2021-10-11 23:47 ` chili-b
@ 2021-10-12  0:23 ` chili-b
  2021-10-12  9:28 ` NeelChotai
                   ` (42 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-12  0:23 UTC (permalink / raw)
  To: ml

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

New comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#issuecomment-940555184

Comment:
I just tried installing frescobaldi again and it fails with:
```
error: can't copy 'linux/org.frescobaldi.Frescobaldi.desktop': doesn't exist or not a regular file
```
At the `do_install()` step. I don't think I changed anything significant in the template that would cause this. Is there anything I can do to investigate? I saw a new issue on the upstream repository which mentioned that there were issues when running under python 3.10.

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

* Re: New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (41 preceding siblings ...)
  2021-10-12  0:23 ` chili-b
@ 2021-10-12  9:28 ` NeelChotai
  2021-10-12  9:31 ` NeelChotai
                   ` (41 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: NeelChotai @ 2021-10-12  9:28 UTC (permalink / raw)
  To: ml

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

New comment by NeelChotai on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#issuecomment-940833677

Comment:
Looks like you need a `make -C linux`, something like:
```
pre_build() {
    make -C linux
}
```

This also means you will need to add `gettext` to your `hostmakedepends`.

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

* Re: New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (42 preceding siblings ...)
  2021-10-12  9:28 ` NeelChotai
@ 2021-10-12  9:31 ` NeelChotai
  2021-10-12 13:39 ` [PR PATCH] [Updated] " chili-b
                   ` (40 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: NeelChotai @ 2021-10-12  9:31 UTC (permalink / raw)
  To: ml

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

New comment by NeelChotai on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#issuecomment-940833677

Comment:
Looks like you need a `make -C linux` because frescobaldi uses a `.desktop.in` file and generates translations. Something like:
```
pre_build() {
    make -C linux
}
```

This also means you will need to add `gettext` to your `hostmakedepends`.

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (43 preceding siblings ...)
  2021-10-12  9:31 ` NeelChotai
@ 2021-10-12 13:39 ` chili-b
  2021-10-12 13:40 ` chili-b
                   ` (39 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-12 13:39 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 2c9a59e8a55fb42e3f92b0f9e7927f0f79c0febc Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 4b92f04aa7a8a48935371f9bd14d644ea9f0bc84 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/3] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..bf99c1493c90
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+makedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	python setup.py build_ext --pyqt-sip-dir=/${py3_sitelib}/PyQt5/bindings
+}

From 9c2e28f712ecd8064212c3a703aa48c2e9b87056 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/3] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..bf61cf1155c6
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,20 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools gettext"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/v${version}/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=f97256ce15ab621593536e219584a2ed744c1933148ac7ed98fcef6a3a9510a6
+
+pre_build() {
+	make -C linux
+}

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

* Re: New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (44 preceding siblings ...)
  2021-10-12 13:39 ` [PR PATCH] [Updated] " chili-b
@ 2021-10-12 13:40 ` chili-b
  2021-10-12 13:46 ` chili-b
                   ` (38 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-12 13:40 UTC (permalink / raw)
  To: ml

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

New comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#issuecomment-941024043

Comment:
> Looks like you need a `make -C linux` because frescobaldi uses a `.desktop.in` file and generates translations. Something like:
> 
> ```
> pre_build() {
>     make -C linux
> }
> ```
> 
> This also means you will need to add `gettext` to your `hostmakedepends`.

Thank you, this has resolved it. I was able to build frescobaldi locally successfully.

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

* Re: New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (45 preceding siblings ...)
  2021-10-12 13:40 ` chili-b
@ 2021-10-12 13:46 ` chili-b
  2021-10-12 15:02 ` chili-b
                   ` (37 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-12 13:46 UTC (permalink / raw)
  To: ml

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

New comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#issuecomment-941028749

Comment:
Unfortunately, I now get a runtime error similar to what's reported [here](https://github.com/frescobaldi/frescobaldi/issues/1398)

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

* Re: New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (46 preceding siblings ...)
  2021-10-12 13:46 ` chili-b
@ 2021-10-12 15:02 ` chili-b
  2021-10-12 17:19 ` paper42
                   ` (36 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-10-12 15:02 UTC (permalink / raw)
  To: ml

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

New comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#issuecomment-941095930

Comment:
Would adding python3 as an explicit dependency in `hostmakedepends`  resolve the build errors on arm? I can't test this locally.

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

* Re: New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (47 preceding siblings ...)
  2021-10-12 15:02 ` chili-b
@ 2021-10-12 17:19 ` paper42
  2021-11-09  1:24 ` chili-b
                   ` (35 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: paper42 @ 2021-10-12 17:19 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#issuecomment-941212794

Comment:
> Would adding python3 as an explicit dependency in `hostmakedepends` resolve the build errors on arm? I can't test this locally.

You can try cross compilation: https://github.com/void-linux/void-packages#cross-compiling-packages-for-a-target-architecture

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

* Re: New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (48 preceding siblings ...)
  2021-10-12 17:19 ` paper42
@ 2021-11-09  1:24 ` chili-b
  2021-11-09  2:15 ` [PR PATCH] [Updated] " chili-b
                   ` (34 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-11-09  1:24 UTC (permalink / raw)
  To: ml

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

New comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#issuecomment-963728113

Comment:
Reviving this as there's been some development upstream: the issues when running under Python3.10 are known to the maintainers and will be resolved in version 3.2. In the meantime, I am attempting to create patches that will get version 3.1.3 working properly.

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (49 preceding siblings ...)
  2021-11-09  1:24 ` chili-b
@ 2021-11-09  2:15 ` chili-b
  2021-11-09  2:23 ` chili-b
                   ` (33 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-11-09  2:15 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 70dc8434b5528c30e87c0a3b0c046e3e96b2b073 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/4] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 1931b4783f167e356f1d9cb8692348ff9556e296 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/4] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..bf99c1493c90
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+makedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	python setup.py build_ext --pyqt-sip-dir=/${py3_sitelib}/PyQt5/bindings
+}

From 0f2f051ea82c3ccd421443d434ba5487c7fce786 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/4] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..56fe13a05f99
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,20 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python python3-setuptools gettext"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/v${version}/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=f97256ce15ab621593536e219584a2ed744c1933148ac7ed98fcef6a3a9510a6
+
+pre_build() {
+	make -C linux
+}

From 35203153dc4646062ac6a9168eb7da3fb1ca4b35 Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter@gaonshatford.ca>
Date: Mon, 8 Nov 2021 21:12:41 -0500
Subject: [PATCH 4/4] Patch frescobaldi to run under Python 3.10

Python 3.10 removes implicit casts from float to int where precision
would be lost. This creates *many* runtime errors in frescobaldi.
Included are the changes made by @wbsoft mentioned in the following
issue: [https://github.com/frescobaldi/frescobaldi/issues/1398] as well
as my own efforts to fill in the gaps they missed.
---
 srcpkgs/frescobaldi/patches/python3_10.patch  | 201 ++++++++++++++++++
 .../frescobaldi/patches/python3_10_2.patch    | 137 ++++++++++++
 2 files changed, 338 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/patches/python3_10.patch
 create mode 100644 srcpkgs/frescobaldi/patches/python3_10_2.patch

diff --git a/srcpkgs/frescobaldi/patches/python3_10.patch b/srcpkgs/frescobaldi/patches/python3_10.patch
new file mode 100644
index 000000000000..c4248f38bca8
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/python3_10.patch
@@ -0,0 +1,201 @@
+# Python 3.10 made a change to how floats are cast to integers which breaks a
+# lot of things in frescobaldi. This will supposedly be fixed by the time
+# v3.2 releases, but for now we must rely on patching.
+#
+# Assuming that the issues are fixed upstream when they say they will be, this
+# patch is to be removed when frescobaldi's next release comes out.
+diff --git a/frescobaldi_app/qpageview/page.py b/frescobaldi_app/qpageview/page.py
+index f93fa9e2..754d2736 100644
+--- a/frescobaldi_app/qpageview/page.py
++++ b/frescobaldi_app/qpageview/page.py
+@@ -48,7 +48,7 @@ class AbstractPage(util.Rectangular):
+ 
+     ...that normally do not change during its lifetime:
+ 
+-        `pageWidth`     the original width  (by default in points, `dpi` is 72.0 
++        `pageWidth`     the original width  (by default in points, `dpi` is 72.0
+         `pageHeight`    the original height   but can be changed at class level)
+ 
+     ... that can be modified by the user (having defaults at the class level):
+@@ -174,15 +174,15 @@ class AbstractPage(util.Rectangular):
+ 
+     def defaultSize(self):
+         """Return the pageSize() scaled and rotated (if needed).
+-        
++
+         Based on scaleX, scaleY, and computedRotation attributes.
+-        
++
+         """
+         s = QSizeF(self.pageWidth * self.scaleX, self.pageHeight * self.scaleY)
+         if self.computedRotation & 1:
+             s.transpose()
+         return s
+-        
++
+     def updateSize(self, dpiX, dpiY, zoomFactor):
+         """Set the width and height attributes of the page.
+ 
+@@ -286,7 +286,7 @@ class AbstractPage(util.Rectangular):
+ 
+         pdf = QPdfWriter(filename)
+         pdf.setCreator("qpageview")
+-        pdf.setResolution(resolution)
++        pdf.setResolution(int(resolution))
+ 
+         layout = pdf.pageLayout()
+         layout.setMode(layout.FullPageMode)
+@@ -350,7 +350,7 @@ class AbstractPage(util.Rectangular):
+             svg.setFileName(filename)
+         else:
+             svg.setOutputDevice(filename)
+-        svg.setResolution(resolution)
++        svg.setResolution(int(resolution))
+         svg.setSize(targetSize.toSize())
+         svg.setViewBox(QRectF(0, 0, targetSize.width(), targetSize.height()))
+         return self.output(svg, source, paperColor)
+@@ -381,31 +381,31 @@ class AbstractPage(util.Rectangular):
+ 
+     def group(self):
+         """Return the group the page belongs to.
+-        
++
+         This could be some document structure, so that different Page objects
+         could refer to the same graphical contents, preventing double caching.
+-        
++
+         This object is used together with the value returned by ident() as a key
+         to cache the page. The idea is that the contents of the page are
+         uniquely identified by the objects returned by group() and ident().
+-        
++
+         This way, when the same document is opened in multiple page instances,
+         only one copy resides in the (global) cache.
+-        
++
+         By default, the page object itself is returned.
+-        
++
+         """
+         return self
+-        
++
+     def ident(self):
+         """Return a value that identifies the page within the group returned
+         by group().
+-        
++
+         By default, None is returned.
+-        
++
+         """
+         return None
+-    
++
+     def mapToPage(self, width=None, height=None):
+         """Return a MapToPage object, that can map original to Page coordinates.
+ 
+@@ -426,10 +426,10 @@ class AbstractPage(util.Rectangular):
+ 
+     def text(self, rect):
+         """Implement this method to get the text at the specified rectangle.
+-        
++
+         The rectangle should be in page coordinates. The default implementation
+         simply returns an empty string.
+-        
++
+         """
+         return ""
+ 
+@@ -437,22 +437,22 @@ class AbstractPage(util.Rectangular):
+         """Implement this method to load our links."""
+         from . import link
+         return link.Links()
+-    
++
+     def links(self):
+         """Return the Links object, containing Link objects.
+-        
++
+         Every Link denotes a clickable area on a Page, in coordinates 0.0-1.0.
+         The Links object makes it possible to quickly find a link on a Page.
+         This is cached after the first request, you should implement the
+         getLinks() method to load the links.
+-        
++
+         """
+         try:
+             return self._links
+         except AttributeError:
+             links = self._links = self.getLinks()
+         return links
+-    
++
+     def linksAt(self, point):
+         """Return a list() of zero or more links touched by QPoint point.
+ 
+@@ -468,9 +468,9 @@ class AbstractPage(util.Rectangular):
+ 
+     def linksIn(self, rect):
+         """Return an unordered set of links enclosed in rectangle.
+-        
++
+         The rectangle is in page coordinates.
+-        
++
+         """
+         return self.links().inside(*self.mapFromPage(1, 1).rect(rect).getCoords())
+ 
+@@ -481,9 +481,9 @@ class AbstractPage(util.Rectangular):
+ 
+ class AbstractRenderedPage(AbstractPage):
+     """A Page that has a renderer that performs caching and painting.
+-    
++
+     The renderer lives in the renderer attribute.
+-    
++
+     """
+     def __init__(self, renderer=None):
+         if renderer is not None:
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 26768356..810dbca5 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -259,7 +259,7 @@ class PopplerRenderer(render.AbstractRenderer):
+         (See AbstractPage.print().)
+ 
+         """
+-        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile))
++        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile)).toRect()   # rounded
+         target = QRectF(0, 0, tile.w, tile.h)
+         if key.rotation & 1:
+             target.setSize(target.size().transposed())
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 5a0c5631..6722a6db 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -365,9 +365,9 @@ class ScrollArea(QAbstractScrollArea):
+                 speed = speed * 1000 / self.scrollupdatespersec / time
+                 # compute diff to scroll
+                 sx = abs(speed.x())
+-                diffx = sx * (sx + 1) / 2
++                diffx = int(sx * (sx + 1) / 2)
+                 sy = abs(speed.y())
+-                diffy = sy * (sy + 1) / 2
++                diffy = int(sy * (sy + 1) / 2)
+                 if speed.x() < 0: diffx = -diffx
+                 if speed.y() < 0: diffy = -diffy
+                 self.kineticScrollBy(QPoint(diffx, diffy))
+@@ -444,8 +444,8 @@ class KineticScroller(Scroller):
+         dy = diff.y()
+ 
+         # solve speed*(speed+1)/2 = delta to ensure 1+2+3+...+speed is as close as possible under delta..
+-        sx = (math.sqrt(1 + 8 * abs(dx)) - 1) // 2
+-        sy = (math.sqrt(1 + 8 * abs(dy)) - 1) // 2
++        sx = int(math.sqrt(1 + 8 * abs(dx)) - 1) // 2
++        sy = int(math.sqrt(1 + 8 * abs(dy)) - 1) // 2
+ 
+         # compute the amount of displacement still needed because we're dealing with integer values.
+         # Since this function is called for exact moves (not free scrolling)
diff --git a/srcpkgs/frescobaldi/patches/python3_10_2.patch b/srcpkgs/frescobaldi/patches/python3_10_2.patch
new file mode 100644
index 000000000000..fb8848316b4d
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/python3_10_2.patch
@@ -0,0 +1,137 @@
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 17312d78..7b6699e5 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -205,8 +205,8 @@ class PopplerRenderer(render.AbstractRenderer):
+             key.rotation, paperColor)
+         if multiplier == 2:
+             image = image.scaledToWidth(tile.w, Qt.SmoothTransformation)
+-        image.setDotsPerMeterX(xres * 39.37)
+-        image.setDotsPerMeterY(yres * 39.37)
++        image.setDotsPerMeterX(round(xres * 39.37))
++        image.setDotsPerMeterY(round(yres * 39.37))
+         return image
+ 
+     def setRenderHints(self, doc):
+diff --git a/frescobaldi_app/qpageview/render.py b/frescobaldi_app/qpageview/render.py
+index a8c00de1..79a6a10b 100644
+--- a/frescobaldi_app/qpageview/render.py
++++ b/frescobaldi_app/qpageview/render.py
+@@ -241,7 +241,7 @@ class AbstractRenderer:
+         key = self.key(page, ratio)
+ 
+         # paint rect in tile coordinates
+-        target = QRect(rect.x() * ratio, rect.y() * ratio, rect.width() * ratio, rect.height() * ratio)
++        target = QRect(round(rect.x() * ratio), round(rect.y() * ratio), round(rect.width() * ratio), round(rect.height() * ratio))
+ 
+         # tiles to paint
+         tiles = [t for t in self.tiles(key.width, key.height) if QRect(*t) & target]
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 6f4dcaf1..027ce7e0 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -186,9 +186,9 @@ class ScrollArea(QAbstractScrollArea):
+         else:
+             viewport = self.viewport()
+             vbar.setRange(0, h - viewport.height())
+-            vbar.setPageStep(viewport.height() * .9)
++            vbar.setPageStep(round(viewport.height() * .9))
+             hbar.setRange(0, w - viewport.width())
+-            hbar.setPageStep(viewport.width() * .9)
++            hbar.setPageStep(round(viewport.width() * .9))
+         
+     def scrollOffset(self):
+         """Return the current scroll offset."""
+@@ -295,7 +295,7 @@ class ScrollArea(QAbstractScrollArea):
+         """Begin a scrolling operation using the specified scroller."""
+         self._scroller = scroller
+         if self._scrollTimer is None:
+-            self._scrollTimer = self.startTimer(1000 / self.scrollupdatespersec)
++            self._scrollTimer = self.startTimer(round(1000 / self.scrollupdatespersec))
+ 
+     def stopScrolling(self):
+         """Stop scrolling."""
+diff --git a/frescobaldi_app/qpageview/shadow.py b/frescobaldi_app/qpageview/shadow.py
+index c7d1c8d5..4f9cc1bf 100644
+--- a/frescobaldi_app/qpageview/shadow.py
++++ b/frescobaldi_app/qpageview/shadow.py
+@@ -37,10 +37,10 @@ class ShadowViewMixin:
+ 
+     def paintEvent(self, ev):
+         if self.dropShadowEnabled:
+-            width = self._pageLayout.spacing / 2
++            width = round(self._pageLayout.spacing / 2)
+             # make the rect slightly larger, so we "see" shadow of pages that
+             # would be outside view normally.
+-            rect = ev.rect().adjusted(-width, -width, width / 2, width / 2)
++            rect = ev.rect().adjusted(-width, -width, width // 2, width // 2)
+             painter = QPainter(self.viewport())
+             for page, rect in self.pagesToPaint(rect, painter):
+                 self.drawDropShadow(page, painter, width)
+@@ -53,14 +53,14 @@ class ShadowViewMixin:
+         
+         """
+         width = round(width)
+-        rect = page.rect().adjusted(width / 2, width / 2, 0, 0)
++        rect = page.rect().adjusted(width // 2, width // 2, 0, 0)
+         color = QColor(Qt.black)
+         pen = QPen()
+         pen.setWidth(1)
+         pen.setJoinStyle(Qt.MiterJoin)
+         for i in range(width):
+             f = (width-i)/width
+-            color.setAlpha(200**f + 55*f)
++            color.setAlpha(round(200**f + 55*f))
+             pen.setColor(color)
+             painter.setPen(pen)
+             painter.drawRect(rect.adjusted(-i, -i, i, i))
+diff --git a/frescobaldi_app/viewmanager.py b/frescobaldi_app/viewmanager.py
+index e1294c91..046c70df 100644
+--- a/frescobaldi_app/viewmanager.py
++++ b/frescobaldi_app/viewmanager.py
+@@ -332,7 +332,7 @@ class ViewManager(QSplitter):
+             splitter.setOrientation(orientation)
+             size = splitter.sizes()[0]
+             splitter.addWidget(newspace)
+-            splitter.setSizes([size / 2, size / 2])
++            splitter.setSizes([size // 2, size // 2])
+         elif splitter.orientation() == orientation:
+             index = splitter.indexOf(viewspace)
+             splitter.insertWidget(index + 1, newspace)
+@@ -346,7 +346,7 @@ class ViewManager(QSplitter):
+             splitter.setSizes(sizes)
+             size = newsplitter.sizes()[0]
+             newsplitter.addWidget(newspace)
+-            newsplitter.setSizes([size / 2, size / 2])
++            newsplitter.setSizes([size // 2, size // 2])
+         self._viewSpaces.insert(0, newspace)
+         newspace.showDocument(viewspace.document())
+         if active:
+diff --git a/frescobaldi_app/widgets/linenumberarea.py b/frescobaldi_app/widgets/linenumberarea.py
+index f097726c..93970e7d 100644
+--- a/frescobaldi_app/widgets/linenumberarea.py
++++ b/frescobaldi_app/widgets/linenumberarea.py
+@@ -80,7 +80,7 @@ class LineNumberArea(QWidget):
+             if geom.top() >= ev.rect().bottom():
+                 break
+             if block.isVisible() and geom.bottom() > ev.rect().top() + 1:
+-                rect.moveTop(geom.top())
++                rect.moveTop(round(geom.top()))
+                 text = format(block.blockNumber() + 1, 'd')
+                 painter.drawText(rect, Qt.AlignRight, text)
+             block = block.next()
+diff --git a/frescobaldi_app/widgets/progressbar.py b/frescobaldi_app/widgets/progressbar.py
+index 670bf0f5..6cd9b31d 100644
+--- a/frescobaldi_app/widgets/progressbar.py
++++ b/frescobaldi_app/widgets/progressbar.py
+@@ -71,8 +71,8 @@ class TimedProgressBar(QProgressBar):
+         """
+         self._hideTimer.stop()
+         self._timeline.stop()
+-        self._timeline.setDuration(total * 1000)
+-        self._timeline.setCurrentTime(elapsed * 1000)
++        self._timeline.setDuration(round(total * 1000))
++        self._timeline.setCurrentTime(round(elapsed * 1000))
+         self.setValue(self._timeline.currentFrame())
+         self._timeline.resume()
+         if self._hideWhileIdle and not self._hidden:

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (50 preceding siblings ...)
  2021-11-09  2:15 ` [PR PATCH] [Updated] " chili-b
@ 2021-11-09  2:23 ` chili-b
  2021-11-09  2:35 ` chili-b
                   ` (32 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-11-09  2:23 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 70dc8434b5528c30e87c0a3b0c046e3e96b2b073 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 1931b4783f167e356f1d9cb8692348ff9556e296 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/3] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..bf99c1493c90
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+makedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	python setup.py build_ext --pyqt-sip-dir=/${py3_sitelib}/PyQt5/bindings
+}

From 6180de5157c8d4f99a06409984701ca8fbec3967 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/3] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/patches/python3_10.patch  | 201 ++++++++++++++++++
 .../frescobaldi/patches/python3_10_2.patch    | 137 ++++++++++++
 srcpkgs/frescobaldi/template                  |  20 ++
 3 files changed, 358 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/patches/python3_10.patch
 create mode 100644 srcpkgs/frescobaldi/patches/python3_10_2.patch
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/patches/python3_10.patch b/srcpkgs/frescobaldi/patches/python3_10.patch
new file mode 100644
index 000000000000..c4248f38bca8
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/python3_10.patch
@@ -0,0 +1,201 @@
+# Python 3.10 made a change to how floats are cast to integers which breaks a
+# lot of things in frescobaldi. This will supposedly be fixed by the time
+# v3.2 releases, but for now we must rely on patching.
+#
+# Assuming that the issues are fixed upstream when they say they will be, this
+# patch is to be removed when frescobaldi's next release comes out.
+diff --git a/frescobaldi_app/qpageview/page.py b/frescobaldi_app/qpageview/page.py
+index f93fa9e2..754d2736 100644
+--- a/frescobaldi_app/qpageview/page.py
++++ b/frescobaldi_app/qpageview/page.py
+@@ -48,7 +48,7 @@ class AbstractPage(util.Rectangular):
+ 
+     ...that normally do not change during its lifetime:
+ 
+-        `pageWidth`     the original width  (by default in points, `dpi` is 72.0 
++        `pageWidth`     the original width  (by default in points, `dpi` is 72.0
+         `pageHeight`    the original height   but can be changed at class level)
+ 
+     ... that can be modified by the user (having defaults at the class level):
+@@ -174,15 +174,15 @@ class AbstractPage(util.Rectangular):
+ 
+     def defaultSize(self):
+         """Return the pageSize() scaled and rotated (if needed).
+-        
++
+         Based on scaleX, scaleY, and computedRotation attributes.
+-        
++
+         """
+         s = QSizeF(self.pageWidth * self.scaleX, self.pageHeight * self.scaleY)
+         if self.computedRotation & 1:
+             s.transpose()
+         return s
+-        
++
+     def updateSize(self, dpiX, dpiY, zoomFactor):
+         """Set the width and height attributes of the page.
+ 
+@@ -286,7 +286,7 @@ class AbstractPage(util.Rectangular):
+ 
+         pdf = QPdfWriter(filename)
+         pdf.setCreator("qpageview")
+-        pdf.setResolution(resolution)
++        pdf.setResolution(int(resolution))
+ 
+         layout = pdf.pageLayout()
+         layout.setMode(layout.FullPageMode)
+@@ -350,7 +350,7 @@ class AbstractPage(util.Rectangular):
+             svg.setFileName(filename)
+         else:
+             svg.setOutputDevice(filename)
+-        svg.setResolution(resolution)
++        svg.setResolution(int(resolution))
+         svg.setSize(targetSize.toSize())
+         svg.setViewBox(QRectF(0, 0, targetSize.width(), targetSize.height()))
+         return self.output(svg, source, paperColor)
+@@ -381,31 +381,31 @@ class AbstractPage(util.Rectangular):
+ 
+     def group(self):
+         """Return the group the page belongs to.
+-        
++
+         This could be some document structure, so that different Page objects
+         could refer to the same graphical contents, preventing double caching.
+-        
++
+         This object is used together with the value returned by ident() as a key
+         to cache the page. The idea is that the contents of the page are
+         uniquely identified by the objects returned by group() and ident().
+-        
++
+         This way, when the same document is opened in multiple page instances,
+         only one copy resides in the (global) cache.
+-        
++
+         By default, the page object itself is returned.
+-        
++
+         """
+         return self
+-        
++
+     def ident(self):
+         """Return a value that identifies the page within the group returned
+         by group().
+-        
++
+         By default, None is returned.
+-        
++
+         """
+         return None
+-    
++
+     def mapToPage(self, width=None, height=None):
+         """Return a MapToPage object, that can map original to Page coordinates.
+ 
+@@ -426,10 +426,10 @@ class AbstractPage(util.Rectangular):
+ 
+     def text(self, rect):
+         """Implement this method to get the text at the specified rectangle.
+-        
++
+         The rectangle should be in page coordinates. The default implementation
+         simply returns an empty string.
+-        
++
+         """
+         return ""
+ 
+@@ -437,22 +437,22 @@ class AbstractPage(util.Rectangular):
+         """Implement this method to load our links."""
+         from . import link
+         return link.Links()
+-    
++
+     def links(self):
+         """Return the Links object, containing Link objects.
+-        
++
+         Every Link denotes a clickable area on a Page, in coordinates 0.0-1.0.
+         The Links object makes it possible to quickly find a link on a Page.
+         This is cached after the first request, you should implement the
+         getLinks() method to load the links.
+-        
++
+         """
+         try:
+             return self._links
+         except AttributeError:
+             links = self._links = self.getLinks()
+         return links
+-    
++
+     def linksAt(self, point):
+         """Return a list() of zero or more links touched by QPoint point.
+ 
+@@ -468,9 +468,9 @@ class AbstractPage(util.Rectangular):
+ 
+     def linksIn(self, rect):
+         """Return an unordered set of links enclosed in rectangle.
+-        
++
+         The rectangle is in page coordinates.
+-        
++
+         """
+         return self.links().inside(*self.mapFromPage(1, 1).rect(rect).getCoords())
+ 
+@@ -481,9 +481,9 @@ class AbstractPage(util.Rectangular):
+ 
+ class AbstractRenderedPage(AbstractPage):
+     """A Page that has a renderer that performs caching and painting.
+-    
++
+     The renderer lives in the renderer attribute.
+-    
++
+     """
+     def __init__(self, renderer=None):
+         if renderer is not None:
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 26768356..810dbca5 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -259,7 +259,7 @@ class PopplerRenderer(render.AbstractRenderer):
+         (See AbstractPage.print().)
+ 
+         """
+-        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile))
++        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile)).toRect()   # rounded
+         target = QRectF(0, 0, tile.w, tile.h)
+         if key.rotation & 1:
+             target.setSize(target.size().transposed())
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 5a0c5631..6722a6db 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -365,9 +365,9 @@ class ScrollArea(QAbstractScrollArea):
+                 speed = speed * 1000 / self.scrollupdatespersec / time
+                 # compute diff to scroll
+                 sx = abs(speed.x())
+-                diffx = sx * (sx + 1) / 2
++                diffx = int(sx * (sx + 1) / 2)
+                 sy = abs(speed.y())
+-                diffy = sy * (sy + 1) / 2
++                diffy = int(sy * (sy + 1) / 2)
+                 if speed.x() < 0: diffx = -diffx
+                 if speed.y() < 0: diffy = -diffy
+                 self.kineticScrollBy(QPoint(diffx, diffy))
+@@ -444,8 +444,8 @@ class KineticScroller(Scroller):
+         dy = diff.y()
+ 
+         # solve speed*(speed+1)/2 = delta to ensure 1+2+3+...+speed is as close as possible under delta..
+-        sx = (math.sqrt(1 + 8 * abs(dx)) - 1) // 2
+-        sy = (math.sqrt(1 + 8 * abs(dy)) - 1) // 2
++        sx = int(math.sqrt(1 + 8 * abs(dx)) - 1) // 2
++        sy = int(math.sqrt(1 + 8 * abs(dy)) - 1) // 2
+ 
+         # compute the amount of displacement still needed because we're dealing with integer values.
+         # Since this function is called for exact moves (not free scrolling)
diff --git a/srcpkgs/frescobaldi/patches/python3_10_2.patch b/srcpkgs/frescobaldi/patches/python3_10_2.patch
new file mode 100644
index 000000000000..fb8848316b4d
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/python3_10_2.patch
@@ -0,0 +1,137 @@
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 17312d78..7b6699e5 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -205,8 +205,8 @@ class PopplerRenderer(render.AbstractRenderer):
+             key.rotation, paperColor)
+         if multiplier == 2:
+             image = image.scaledToWidth(tile.w, Qt.SmoothTransformation)
+-        image.setDotsPerMeterX(xres * 39.37)
+-        image.setDotsPerMeterY(yres * 39.37)
++        image.setDotsPerMeterX(round(xres * 39.37))
++        image.setDotsPerMeterY(round(yres * 39.37))
+         return image
+ 
+     def setRenderHints(self, doc):
+diff --git a/frescobaldi_app/qpageview/render.py b/frescobaldi_app/qpageview/render.py
+index a8c00de1..79a6a10b 100644
+--- a/frescobaldi_app/qpageview/render.py
++++ b/frescobaldi_app/qpageview/render.py
+@@ -241,7 +241,7 @@ class AbstractRenderer:
+         key = self.key(page, ratio)
+ 
+         # paint rect in tile coordinates
+-        target = QRect(rect.x() * ratio, rect.y() * ratio, rect.width() * ratio, rect.height() * ratio)
++        target = QRect(round(rect.x() * ratio), round(rect.y() * ratio), round(rect.width() * ratio), round(rect.height() * ratio))
+ 
+         # tiles to paint
+         tiles = [t for t in self.tiles(key.width, key.height) if QRect(*t) & target]
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 6f4dcaf1..027ce7e0 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -186,9 +186,9 @@ class ScrollArea(QAbstractScrollArea):
+         else:
+             viewport = self.viewport()
+             vbar.setRange(0, h - viewport.height())
+-            vbar.setPageStep(viewport.height() * .9)
++            vbar.setPageStep(round(viewport.height() * .9))
+             hbar.setRange(0, w - viewport.width())
+-            hbar.setPageStep(viewport.width() * .9)
++            hbar.setPageStep(round(viewport.width() * .9))
+         
+     def scrollOffset(self):
+         """Return the current scroll offset."""
+@@ -295,7 +295,7 @@ class ScrollArea(QAbstractScrollArea):
+         """Begin a scrolling operation using the specified scroller."""
+         self._scroller = scroller
+         if self._scrollTimer is None:
+-            self._scrollTimer = self.startTimer(1000 / self.scrollupdatespersec)
++            self._scrollTimer = self.startTimer(round(1000 / self.scrollupdatespersec))
+ 
+     def stopScrolling(self):
+         """Stop scrolling."""
+diff --git a/frescobaldi_app/qpageview/shadow.py b/frescobaldi_app/qpageview/shadow.py
+index c7d1c8d5..4f9cc1bf 100644
+--- a/frescobaldi_app/qpageview/shadow.py
++++ b/frescobaldi_app/qpageview/shadow.py
+@@ -37,10 +37,10 @@ class ShadowViewMixin:
+ 
+     def paintEvent(self, ev):
+         if self.dropShadowEnabled:
+-            width = self._pageLayout.spacing / 2
++            width = round(self._pageLayout.spacing / 2)
+             # make the rect slightly larger, so we "see" shadow of pages that
+             # would be outside view normally.
+-            rect = ev.rect().adjusted(-width, -width, width / 2, width / 2)
++            rect = ev.rect().adjusted(-width, -width, width // 2, width // 2)
+             painter = QPainter(self.viewport())
+             for page, rect in self.pagesToPaint(rect, painter):
+                 self.drawDropShadow(page, painter, width)
+@@ -53,14 +53,14 @@ class ShadowViewMixin:
+         
+         """
+         width = round(width)
+-        rect = page.rect().adjusted(width / 2, width / 2, 0, 0)
++        rect = page.rect().adjusted(width // 2, width // 2, 0, 0)
+         color = QColor(Qt.black)
+         pen = QPen()
+         pen.setWidth(1)
+         pen.setJoinStyle(Qt.MiterJoin)
+         for i in range(width):
+             f = (width-i)/width
+-            color.setAlpha(200**f + 55*f)
++            color.setAlpha(round(200**f + 55*f))
+             pen.setColor(color)
+             painter.setPen(pen)
+             painter.drawRect(rect.adjusted(-i, -i, i, i))
+diff --git a/frescobaldi_app/viewmanager.py b/frescobaldi_app/viewmanager.py
+index e1294c91..046c70df 100644
+--- a/frescobaldi_app/viewmanager.py
++++ b/frescobaldi_app/viewmanager.py
+@@ -332,7 +332,7 @@ class ViewManager(QSplitter):
+             splitter.setOrientation(orientation)
+             size = splitter.sizes()[0]
+             splitter.addWidget(newspace)
+-            splitter.setSizes([size / 2, size / 2])
++            splitter.setSizes([size // 2, size // 2])
+         elif splitter.orientation() == orientation:
+             index = splitter.indexOf(viewspace)
+             splitter.insertWidget(index + 1, newspace)
+@@ -346,7 +346,7 @@ class ViewManager(QSplitter):
+             splitter.setSizes(sizes)
+             size = newsplitter.sizes()[0]
+             newsplitter.addWidget(newspace)
+-            newsplitter.setSizes([size / 2, size / 2])
++            newsplitter.setSizes([size // 2, size // 2])
+         self._viewSpaces.insert(0, newspace)
+         newspace.showDocument(viewspace.document())
+         if active:
+diff --git a/frescobaldi_app/widgets/linenumberarea.py b/frescobaldi_app/widgets/linenumberarea.py
+index f097726c..93970e7d 100644
+--- a/frescobaldi_app/widgets/linenumberarea.py
++++ b/frescobaldi_app/widgets/linenumberarea.py
+@@ -80,7 +80,7 @@ class LineNumberArea(QWidget):
+             if geom.top() >= ev.rect().bottom():
+                 break
+             if block.isVisible() and geom.bottom() > ev.rect().top() + 1:
+-                rect.moveTop(geom.top())
++                rect.moveTop(round(geom.top()))
+                 text = format(block.blockNumber() + 1, 'd')
+                 painter.drawText(rect, Qt.AlignRight, text)
+             block = block.next()
+diff --git a/frescobaldi_app/widgets/progressbar.py b/frescobaldi_app/widgets/progressbar.py
+index 670bf0f5..6cd9b31d 100644
+--- a/frescobaldi_app/widgets/progressbar.py
++++ b/frescobaldi_app/widgets/progressbar.py
+@@ -71,8 +71,8 @@ class TimedProgressBar(QProgressBar):
+         """
+         self._hideTimer.stop()
+         self._timeline.stop()
+-        self._timeline.setDuration(total * 1000)
+-        self._timeline.setCurrentTime(elapsed * 1000)
++        self._timeline.setDuration(round(total * 1000))
++        self._timeline.setCurrentTime(round(elapsed * 1000))
+         self.setValue(self._timeline.currentFrame())
+         self._timeline.resume()
+         if self._hideWhileIdle and not self._hidden:
diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..56fe13a05f99
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,20 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python python3-setuptools gettext"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/v${version}/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=f97256ce15ab621593536e219584a2ed744c1933148ac7ed98fcef6a3a9510a6
+
+pre_build() {
+	make -C linux
+}

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (51 preceding siblings ...)
  2021-11-09  2:23 ` chili-b
@ 2021-11-09  2:35 ` chili-b
  2021-11-09  2:46 ` chili-b
                   ` (31 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-11-09  2:35 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 70dc8434b5528c30e87c0a3b0c046e3e96b2b073 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 46db1aa8d6e10416b3313d81be616f037809c88f Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/3] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..1a6d38ed6621
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+hostmakedepends="python3"
+makedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	python setup.py build_ext --pyqt-sip-dir=/${py3_sitelib}/PyQt5/bindings
+}

From 3e9f9df3099d56bbd54c6c07fd105c9b2f956229 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/3] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/patches/python3_10.patch  | 201 ++++++++++++++++++
 .../frescobaldi/patches/python3_10_2.patch    | 137 ++++++++++++
 srcpkgs/frescobaldi/template                  |  20 ++
 3 files changed, 358 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/patches/python3_10.patch
 create mode 100644 srcpkgs/frescobaldi/patches/python3_10_2.patch
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/patches/python3_10.patch b/srcpkgs/frescobaldi/patches/python3_10.patch
new file mode 100644
index 000000000000..c4248f38bca8
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/python3_10.patch
@@ -0,0 +1,201 @@
+# Python 3.10 made a change to how floats are cast to integers which breaks a
+# lot of things in frescobaldi. This will supposedly be fixed by the time
+# v3.2 releases, but for now we must rely on patching.
+#
+# Assuming that the issues are fixed upstream when they say they will be, this
+# patch is to be removed when frescobaldi's next release comes out.
+diff --git a/frescobaldi_app/qpageview/page.py b/frescobaldi_app/qpageview/page.py
+index f93fa9e2..754d2736 100644
+--- a/frescobaldi_app/qpageview/page.py
++++ b/frescobaldi_app/qpageview/page.py
+@@ -48,7 +48,7 @@ class AbstractPage(util.Rectangular):
+ 
+     ...that normally do not change during its lifetime:
+ 
+-        `pageWidth`     the original width  (by default in points, `dpi` is 72.0 
++        `pageWidth`     the original width  (by default in points, `dpi` is 72.0
+         `pageHeight`    the original height   but can be changed at class level)
+ 
+     ... that can be modified by the user (having defaults at the class level):
+@@ -174,15 +174,15 @@ class AbstractPage(util.Rectangular):
+ 
+     def defaultSize(self):
+         """Return the pageSize() scaled and rotated (if needed).
+-        
++
+         Based on scaleX, scaleY, and computedRotation attributes.
+-        
++
+         """
+         s = QSizeF(self.pageWidth * self.scaleX, self.pageHeight * self.scaleY)
+         if self.computedRotation & 1:
+             s.transpose()
+         return s
+-        
++
+     def updateSize(self, dpiX, dpiY, zoomFactor):
+         """Set the width and height attributes of the page.
+ 
+@@ -286,7 +286,7 @@ class AbstractPage(util.Rectangular):
+ 
+         pdf = QPdfWriter(filename)
+         pdf.setCreator("qpageview")
+-        pdf.setResolution(resolution)
++        pdf.setResolution(int(resolution))
+ 
+         layout = pdf.pageLayout()
+         layout.setMode(layout.FullPageMode)
+@@ -350,7 +350,7 @@ class AbstractPage(util.Rectangular):
+             svg.setFileName(filename)
+         else:
+             svg.setOutputDevice(filename)
+-        svg.setResolution(resolution)
++        svg.setResolution(int(resolution))
+         svg.setSize(targetSize.toSize())
+         svg.setViewBox(QRectF(0, 0, targetSize.width(), targetSize.height()))
+         return self.output(svg, source, paperColor)
+@@ -381,31 +381,31 @@ class AbstractPage(util.Rectangular):
+ 
+     def group(self):
+         """Return the group the page belongs to.
+-        
++
+         This could be some document structure, so that different Page objects
+         could refer to the same graphical contents, preventing double caching.
+-        
++
+         This object is used together with the value returned by ident() as a key
+         to cache the page. The idea is that the contents of the page are
+         uniquely identified by the objects returned by group() and ident().
+-        
++
+         This way, when the same document is opened in multiple page instances,
+         only one copy resides in the (global) cache.
+-        
++
+         By default, the page object itself is returned.
+-        
++
+         """
+         return self
+-        
++
+     def ident(self):
+         """Return a value that identifies the page within the group returned
+         by group().
+-        
++
+         By default, None is returned.
+-        
++
+         """
+         return None
+-    
++
+     def mapToPage(self, width=None, height=None):
+         """Return a MapToPage object, that can map original to Page coordinates.
+ 
+@@ -426,10 +426,10 @@ class AbstractPage(util.Rectangular):
+ 
+     def text(self, rect):
+         """Implement this method to get the text at the specified rectangle.
+-        
++
+         The rectangle should be in page coordinates. The default implementation
+         simply returns an empty string.
+-        
++
+         """
+         return ""
+ 
+@@ -437,22 +437,22 @@ class AbstractPage(util.Rectangular):
+         """Implement this method to load our links."""
+         from . import link
+         return link.Links()
+-    
++
+     def links(self):
+         """Return the Links object, containing Link objects.
+-        
++
+         Every Link denotes a clickable area on a Page, in coordinates 0.0-1.0.
+         The Links object makes it possible to quickly find a link on a Page.
+         This is cached after the first request, you should implement the
+         getLinks() method to load the links.
+-        
++
+         """
+         try:
+             return self._links
+         except AttributeError:
+             links = self._links = self.getLinks()
+         return links
+-    
++
+     def linksAt(self, point):
+         """Return a list() of zero or more links touched by QPoint point.
+ 
+@@ -468,9 +468,9 @@ class AbstractPage(util.Rectangular):
+ 
+     def linksIn(self, rect):
+         """Return an unordered set of links enclosed in rectangle.
+-        
++
+         The rectangle is in page coordinates.
+-        
++
+         """
+         return self.links().inside(*self.mapFromPage(1, 1).rect(rect).getCoords())
+ 
+@@ -481,9 +481,9 @@ class AbstractPage(util.Rectangular):
+ 
+ class AbstractRenderedPage(AbstractPage):
+     """A Page that has a renderer that performs caching and painting.
+-    
++
+     The renderer lives in the renderer attribute.
+-    
++
+     """
+     def __init__(self, renderer=None):
+         if renderer is not None:
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 26768356..810dbca5 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -259,7 +259,7 @@ class PopplerRenderer(render.AbstractRenderer):
+         (See AbstractPage.print().)
+ 
+         """
+-        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile))
++        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile)).toRect()   # rounded
+         target = QRectF(0, 0, tile.w, tile.h)
+         if key.rotation & 1:
+             target.setSize(target.size().transposed())
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 5a0c5631..6722a6db 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -365,9 +365,9 @@ class ScrollArea(QAbstractScrollArea):
+                 speed = speed * 1000 / self.scrollupdatespersec / time
+                 # compute diff to scroll
+                 sx = abs(speed.x())
+-                diffx = sx * (sx + 1) / 2
++                diffx = int(sx * (sx + 1) / 2)
+                 sy = abs(speed.y())
+-                diffy = sy * (sy + 1) / 2
++                diffy = int(sy * (sy + 1) / 2)
+                 if speed.x() < 0: diffx = -diffx
+                 if speed.y() < 0: diffy = -diffy
+                 self.kineticScrollBy(QPoint(diffx, diffy))
+@@ -444,8 +444,8 @@ class KineticScroller(Scroller):
+         dy = diff.y()
+ 
+         # solve speed*(speed+1)/2 = delta to ensure 1+2+3+...+speed is as close as possible under delta..
+-        sx = (math.sqrt(1 + 8 * abs(dx)) - 1) // 2
+-        sy = (math.sqrt(1 + 8 * abs(dy)) - 1) // 2
++        sx = int(math.sqrt(1 + 8 * abs(dx)) - 1) // 2
++        sy = int(math.sqrt(1 + 8 * abs(dy)) - 1) // 2
+ 
+         # compute the amount of displacement still needed because we're dealing with integer values.
+         # Since this function is called for exact moves (not free scrolling)
diff --git a/srcpkgs/frescobaldi/patches/python3_10_2.patch b/srcpkgs/frescobaldi/patches/python3_10_2.patch
new file mode 100644
index 000000000000..fb8848316b4d
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/python3_10_2.patch
@@ -0,0 +1,137 @@
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 17312d78..7b6699e5 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -205,8 +205,8 @@ class PopplerRenderer(render.AbstractRenderer):
+             key.rotation, paperColor)
+         if multiplier == 2:
+             image = image.scaledToWidth(tile.w, Qt.SmoothTransformation)
+-        image.setDotsPerMeterX(xres * 39.37)
+-        image.setDotsPerMeterY(yres * 39.37)
++        image.setDotsPerMeterX(round(xres * 39.37))
++        image.setDotsPerMeterY(round(yres * 39.37))
+         return image
+ 
+     def setRenderHints(self, doc):
+diff --git a/frescobaldi_app/qpageview/render.py b/frescobaldi_app/qpageview/render.py
+index a8c00de1..79a6a10b 100644
+--- a/frescobaldi_app/qpageview/render.py
++++ b/frescobaldi_app/qpageview/render.py
+@@ -241,7 +241,7 @@ class AbstractRenderer:
+         key = self.key(page, ratio)
+ 
+         # paint rect in tile coordinates
+-        target = QRect(rect.x() * ratio, rect.y() * ratio, rect.width() * ratio, rect.height() * ratio)
++        target = QRect(round(rect.x() * ratio), round(rect.y() * ratio), round(rect.width() * ratio), round(rect.height() * ratio))
+ 
+         # tiles to paint
+         tiles = [t for t in self.tiles(key.width, key.height) if QRect(*t) & target]
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 6f4dcaf1..027ce7e0 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -186,9 +186,9 @@ class ScrollArea(QAbstractScrollArea):
+         else:
+             viewport = self.viewport()
+             vbar.setRange(0, h - viewport.height())
+-            vbar.setPageStep(viewport.height() * .9)
++            vbar.setPageStep(round(viewport.height() * .9))
+             hbar.setRange(0, w - viewport.width())
+-            hbar.setPageStep(viewport.width() * .9)
++            hbar.setPageStep(round(viewport.width() * .9))
+         
+     def scrollOffset(self):
+         """Return the current scroll offset."""
+@@ -295,7 +295,7 @@ class ScrollArea(QAbstractScrollArea):
+         """Begin a scrolling operation using the specified scroller."""
+         self._scroller = scroller
+         if self._scrollTimer is None:
+-            self._scrollTimer = self.startTimer(1000 / self.scrollupdatespersec)
++            self._scrollTimer = self.startTimer(round(1000 / self.scrollupdatespersec))
+ 
+     def stopScrolling(self):
+         """Stop scrolling."""
+diff --git a/frescobaldi_app/qpageview/shadow.py b/frescobaldi_app/qpageview/shadow.py
+index c7d1c8d5..4f9cc1bf 100644
+--- a/frescobaldi_app/qpageview/shadow.py
++++ b/frescobaldi_app/qpageview/shadow.py
+@@ -37,10 +37,10 @@ class ShadowViewMixin:
+ 
+     def paintEvent(self, ev):
+         if self.dropShadowEnabled:
+-            width = self._pageLayout.spacing / 2
++            width = round(self._pageLayout.spacing / 2)
+             # make the rect slightly larger, so we "see" shadow of pages that
+             # would be outside view normally.
+-            rect = ev.rect().adjusted(-width, -width, width / 2, width / 2)
++            rect = ev.rect().adjusted(-width, -width, width // 2, width // 2)
+             painter = QPainter(self.viewport())
+             for page, rect in self.pagesToPaint(rect, painter):
+                 self.drawDropShadow(page, painter, width)
+@@ -53,14 +53,14 @@ class ShadowViewMixin:
+         
+         """
+         width = round(width)
+-        rect = page.rect().adjusted(width / 2, width / 2, 0, 0)
++        rect = page.rect().adjusted(width // 2, width // 2, 0, 0)
+         color = QColor(Qt.black)
+         pen = QPen()
+         pen.setWidth(1)
+         pen.setJoinStyle(Qt.MiterJoin)
+         for i in range(width):
+             f = (width-i)/width
+-            color.setAlpha(200**f + 55*f)
++            color.setAlpha(round(200**f + 55*f))
+             pen.setColor(color)
+             painter.setPen(pen)
+             painter.drawRect(rect.adjusted(-i, -i, i, i))
+diff --git a/frescobaldi_app/viewmanager.py b/frescobaldi_app/viewmanager.py
+index e1294c91..046c70df 100644
+--- a/frescobaldi_app/viewmanager.py
++++ b/frescobaldi_app/viewmanager.py
+@@ -332,7 +332,7 @@ class ViewManager(QSplitter):
+             splitter.setOrientation(orientation)
+             size = splitter.sizes()[0]
+             splitter.addWidget(newspace)
+-            splitter.setSizes([size / 2, size / 2])
++            splitter.setSizes([size // 2, size // 2])
+         elif splitter.orientation() == orientation:
+             index = splitter.indexOf(viewspace)
+             splitter.insertWidget(index + 1, newspace)
+@@ -346,7 +346,7 @@ class ViewManager(QSplitter):
+             splitter.setSizes(sizes)
+             size = newsplitter.sizes()[0]
+             newsplitter.addWidget(newspace)
+-            newsplitter.setSizes([size / 2, size / 2])
++            newsplitter.setSizes([size // 2, size // 2])
+         self._viewSpaces.insert(0, newspace)
+         newspace.showDocument(viewspace.document())
+         if active:
+diff --git a/frescobaldi_app/widgets/linenumberarea.py b/frescobaldi_app/widgets/linenumberarea.py
+index f097726c..93970e7d 100644
+--- a/frescobaldi_app/widgets/linenumberarea.py
++++ b/frescobaldi_app/widgets/linenumberarea.py
+@@ -80,7 +80,7 @@ class LineNumberArea(QWidget):
+             if geom.top() >= ev.rect().bottom():
+                 break
+             if block.isVisible() and geom.bottom() > ev.rect().top() + 1:
+-                rect.moveTop(geom.top())
++                rect.moveTop(round(geom.top()))
+                 text = format(block.blockNumber() + 1, 'd')
+                 painter.drawText(rect, Qt.AlignRight, text)
+             block = block.next()
+diff --git a/frescobaldi_app/widgets/progressbar.py b/frescobaldi_app/widgets/progressbar.py
+index 670bf0f5..6cd9b31d 100644
+--- a/frescobaldi_app/widgets/progressbar.py
++++ b/frescobaldi_app/widgets/progressbar.py
+@@ -71,8 +71,8 @@ class TimedProgressBar(QProgressBar):
+         """
+         self._hideTimer.stop()
+         self._timeline.stop()
+-        self._timeline.setDuration(total * 1000)
+-        self._timeline.setCurrentTime(elapsed * 1000)
++        self._timeline.setDuration(round(total * 1000))
++        self._timeline.setCurrentTime(round(elapsed * 1000))
+         self.setValue(self._timeline.currentFrame())
+         self._timeline.resume()
+         if self._hideWhileIdle and not self._hidden:
diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..bf61cf1155c6
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,20 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools gettext"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/v${version}/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=f97256ce15ab621593536e219584a2ed744c1933148ac7ed98fcef6a3a9510a6
+
+pre_build() {
+	make -C linux
+}

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (52 preceding siblings ...)
  2021-11-09  2:35 ` chili-b
@ 2021-11-09  2:46 ` chili-b
  2021-11-09  2:55 ` chili-b
                   ` (30 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-11-09  2:46 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 70dc8434b5528c30e87c0a3b0c046e3e96b2b073 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 18720baf9d8e834c9d3eea104792bb085a54d5b6 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/3] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..da7940a8c55c
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+hostmakedepends="python3 python3-sip"
+makedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	python setup.py build_ext --pyqt-sip-dir=/${py3_sitelib}/PyQt5/bindings
+}

From 55b2506d7af6e559f54500090708a6ac44228579 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/3] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/patches/python3_10.patch  | 201 ++++++++++++++++++
 .../frescobaldi/patches/python3_10_2.patch    | 137 ++++++++++++
 srcpkgs/frescobaldi/template                  |  20 ++
 3 files changed, 358 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/patches/python3_10.patch
 create mode 100644 srcpkgs/frescobaldi/patches/python3_10_2.patch
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/patches/python3_10.patch b/srcpkgs/frescobaldi/patches/python3_10.patch
new file mode 100644
index 000000000000..c4248f38bca8
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/python3_10.patch
@@ -0,0 +1,201 @@
+# Python 3.10 made a change to how floats are cast to integers which breaks a
+# lot of things in frescobaldi. This will supposedly be fixed by the time
+# v3.2 releases, but for now we must rely on patching.
+#
+# Assuming that the issues are fixed upstream when they say they will be, this
+# patch is to be removed when frescobaldi's next release comes out.
+diff --git a/frescobaldi_app/qpageview/page.py b/frescobaldi_app/qpageview/page.py
+index f93fa9e2..754d2736 100644
+--- a/frescobaldi_app/qpageview/page.py
++++ b/frescobaldi_app/qpageview/page.py
+@@ -48,7 +48,7 @@ class AbstractPage(util.Rectangular):
+ 
+     ...that normally do not change during its lifetime:
+ 
+-        `pageWidth`     the original width  (by default in points, `dpi` is 72.0 
++        `pageWidth`     the original width  (by default in points, `dpi` is 72.0
+         `pageHeight`    the original height   but can be changed at class level)
+ 
+     ... that can be modified by the user (having defaults at the class level):
+@@ -174,15 +174,15 @@ class AbstractPage(util.Rectangular):
+ 
+     def defaultSize(self):
+         """Return the pageSize() scaled and rotated (if needed).
+-        
++
+         Based on scaleX, scaleY, and computedRotation attributes.
+-        
++
+         """
+         s = QSizeF(self.pageWidth * self.scaleX, self.pageHeight * self.scaleY)
+         if self.computedRotation & 1:
+             s.transpose()
+         return s
+-        
++
+     def updateSize(self, dpiX, dpiY, zoomFactor):
+         """Set the width and height attributes of the page.
+ 
+@@ -286,7 +286,7 @@ class AbstractPage(util.Rectangular):
+ 
+         pdf = QPdfWriter(filename)
+         pdf.setCreator("qpageview")
+-        pdf.setResolution(resolution)
++        pdf.setResolution(int(resolution))
+ 
+         layout = pdf.pageLayout()
+         layout.setMode(layout.FullPageMode)
+@@ -350,7 +350,7 @@ class AbstractPage(util.Rectangular):
+             svg.setFileName(filename)
+         else:
+             svg.setOutputDevice(filename)
+-        svg.setResolution(resolution)
++        svg.setResolution(int(resolution))
+         svg.setSize(targetSize.toSize())
+         svg.setViewBox(QRectF(0, 0, targetSize.width(), targetSize.height()))
+         return self.output(svg, source, paperColor)
+@@ -381,31 +381,31 @@ class AbstractPage(util.Rectangular):
+ 
+     def group(self):
+         """Return the group the page belongs to.
+-        
++
+         This could be some document structure, so that different Page objects
+         could refer to the same graphical contents, preventing double caching.
+-        
++
+         This object is used together with the value returned by ident() as a key
+         to cache the page. The idea is that the contents of the page are
+         uniquely identified by the objects returned by group() and ident().
+-        
++
+         This way, when the same document is opened in multiple page instances,
+         only one copy resides in the (global) cache.
+-        
++
+         By default, the page object itself is returned.
+-        
++
+         """
+         return self
+-        
++
+     def ident(self):
+         """Return a value that identifies the page within the group returned
+         by group().
+-        
++
+         By default, None is returned.
+-        
++
+         """
+         return None
+-    
++
+     def mapToPage(self, width=None, height=None):
+         """Return a MapToPage object, that can map original to Page coordinates.
+ 
+@@ -426,10 +426,10 @@ class AbstractPage(util.Rectangular):
+ 
+     def text(self, rect):
+         """Implement this method to get the text at the specified rectangle.
+-        
++
+         The rectangle should be in page coordinates. The default implementation
+         simply returns an empty string.
+-        
++
+         """
+         return ""
+ 
+@@ -437,22 +437,22 @@ class AbstractPage(util.Rectangular):
+         """Implement this method to load our links."""
+         from . import link
+         return link.Links()
+-    
++
+     def links(self):
+         """Return the Links object, containing Link objects.
+-        
++
+         Every Link denotes a clickable area on a Page, in coordinates 0.0-1.0.
+         The Links object makes it possible to quickly find a link on a Page.
+         This is cached after the first request, you should implement the
+         getLinks() method to load the links.
+-        
++
+         """
+         try:
+             return self._links
+         except AttributeError:
+             links = self._links = self.getLinks()
+         return links
+-    
++
+     def linksAt(self, point):
+         """Return a list() of zero or more links touched by QPoint point.
+ 
+@@ -468,9 +468,9 @@ class AbstractPage(util.Rectangular):
+ 
+     def linksIn(self, rect):
+         """Return an unordered set of links enclosed in rectangle.
+-        
++
+         The rectangle is in page coordinates.
+-        
++
+         """
+         return self.links().inside(*self.mapFromPage(1, 1).rect(rect).getCoords())
+ 
+@@ -481,9 +481,9 @@ class AbstractPage(util.Rectangular):
+ 
+ class AbstractRenderedPage(AbstractPage):
+     """A Page that has a renderer that performs caching and painting.
+-    
++
+     The renderer lives in the renderer attribute.
+-    
++
+     """
+     def __init__(self, renderer=None):
+         if renderer is not None:
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 26768356..810dbca5 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -259,7 +259,7 @@ class PopplerRenderer(render.AbstractRenderer):
+         (See AbstractPage.print().)
+ 
+         """
+-        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile))
++        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile)).toRect()   # rounded
+         target = QRectF(0, 0, tile.w, tile.h)
+         if key.rotation & 1:
+             target.setSize(target.size().transposed())
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 5a0c5631..6722a6db 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -365,9 +365,9 @@ class ScrollArea(QAbstractScrollArea):
+                 speed = speed * 1000 / self.scrollupdatespersec / time
+                 # compute diff to scroll
+                 sx = abs(speed.x())
+-                diffx = sx * (sx + 1) / 2
++                diffx = int(sx * (sx + 1) / 2)
+                 sy = abs(speed.y())
+-                diffy = sy * (sy + 1) / 2
++                diffy = int(sy * (sy + 1) / 2)
+                 if speed.x() < 0: diffx = -diffx
+                 if speed.y() < 0: diffy = -diffy
+                 self.kineticScrollBy(QPoint(diffx, diffy))
+@@ -444,8 +444,8 @@ class KineticScroller(Scroller):
+         dy = diff.y()
+ 
+         # solve speed*(speed+1)/2 = delta to ensure 1+2+3+...+speed is as close as possible under delta..
+-        sx = (math.sqrt(1 + 8 * abs(dx)) - 1) // 2
+-        sy = (math.sqrt(1 + 8 * abs(dy)) - 1) // 2
++        sx = int(math.sqrt(1 + 8 * abs(dx)) - 1) // 2
++        sy = int(math.sqrt(1 + 8 * abs(dy)) - 1) // 2
+ 
+         # compute the amount of displacement still needed because we're dealing with integer values.
+         # Since this function is called for exact moves (not free scrolling)
diff --git a/srcpkgs/frescobaldi/patches/python3_10_2.patch b/srcpkgs/frescobaldi/patches/python3_10_2.patch
new file mode 100644
index 000000000000..fb8848316b4d
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/python3_10_2.patch
@@ -0,0 +1,137 @@
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 17312d78..7b6699e5 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -205,8 +205,8 @@ class PopplerRenderer(render.AbstractRenderer):
+             key.rotation, paperColor)
+         if multiplier == 2:
+             image = image.scaledToWidth(tile.w, Qt.SmoothTransformation)
+-        image.setDotsPerMeterX(xres * 39.37)
+-        image.setDotsPerMeterY(yres * 39.37)
++        image.setDotsPerMeterX(round(xres * 39.37))
++        image.setDotsPerMeterY(round(yres * 39.37))
+         return image
+ 
+     def setRenderHints(self, doc):
+diff --git a/frescobaldi_app/qpageview/render.py b/frescobaldi_app/qpageview/render.py
+index a8c00de1..79a6a10b 100644
+--- a/frescobaldi_app/qpageview/render.py
++++ b/frescobaldi_app/qpageview/render.py
+@@ -241,7 +241,7 @@ class AbstractRenderer:
+         key = self.key(page, ratio)
+ 
+         # paint rect in tile coordinates
+-        target = QRect(rect.x() * ratio, rect.y() * ratio, rect.width() * ratio, rect.height() * ratio)
++        target = QRect(round(rect.x() * ratio), round(rect.y() * ratio), round(rect.width() * ratio), round(rect.height() * ratio))
+ 
+         # tiles to paint
+         tiles = [t for t in self.tiles(key.width, key.height) if QRect(*t) & target]
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 6f4dcaf1..027ce7e0 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -186,9 +186,9 @@ class ScrollArea(QAbstractScrollArea):
+         else:
+             viewport = self.viewport()
+             vbar.setRange(0, h - viewport.height())
+-            vbar.setPageStep(viewport.height() * .9)
++            vbar.setPageStep(round(viewport.height() * .9))
+             hbar.setRange(0, w - viewport.width())
+-            hbar.setPageStep(viewport.width() * .9)
++            hbar.setPageStep(round(viewport.width() * .9))
+         
+     def scrollOffset(self):
+         """Return the current scroll offset."""
+@@ -295,7 +295,7 @@ class ScrollArea(QAbstractScrollArea):
+         """Begin a scrolling operation using the specified scroller."""
+         self._scroller = scroller
+         if self._scrollTimer is None:
+-            self._scrollTimer = self.startTimer(1000 / self.scrollupdatespersec)
++            self._scrollTimer = self.startTimer(round(1000 / self.scrollupdatespersec))
+ 
+     def stopScrolling(self):
+         """Stop scrolling."""
+diff --git a/frescobaldi_app/qpageview/shadow.py b/frescobaldi_app/qpageview/shadow.py
+index c7d1c8d5..4f9cc1bf 100644
+--- a/frescobaldi_app/qpageview/shadow.py
++++ b/frescobaldi_app/qpageview/shadow.py
+@@ -37,10 +37,10 @@ class ShadowViewMixin:
+ 
+     def paintEvent(self, ev):
+         if self.dropShadowEnabled:
+-            width = self._pageLayout.spacing / 2
++            width = round(self._pageLayout.spacing / 2)
+             # make the rect slightly larger, so we "see" shadow of pages that
+             # would be outside view normally.
+-            rect = ev.rect().adjusted(-width, -width, width / 2, width / 2)
++            rect = ev.rect().adjusted(-width, -width, width // 2, width // 2)
+             painter = QPainter(self.viewport())
+             for page, rect in self.pagesToPaint(rect, painter):
+                 self.drawDropShadow(page, painter, width)
+@@ -53,14 +53,14 @@ class ShadowViewMixin:
+         
+         """
+         width = round(width)
+-        rect = page.rect().adjusted(width / 2, width / 2, 0, 0)
++        rect = page.rect().adjusted(width // 2, width // 2, 0, 0)
+         color = QColor(Qt.black)
+         pen = QPen()
+         pen.setWidth(1)
+         pen.setJoinStyle(Qt.MiterJoin)
+         for i in range(width):
+             f = (width-i)/width
+-            color.setAlpha(200**f + 55*f)
++            color.setAlpha(round(200**f + 55*f))
+             pen.setColor(color)
+             painter.setPen(pen)
+             painter.drawRect(rect.adjusted(-i, -i, i, i))
+diff --git a/frescobaldi_app/viewmanager.py b/frescobaldi_app/viewmanager.py
+index e1294c91..046c70df 100644
+--- a/frescobaldi_app/viewmanager.py
++++ b/frescobaldi_app/viewmanager.py
+@@ -332,7 +332,7 @@ class ViewManager(QSplitter):
+             splitter.setOrientation(orientation)
+             size = splitter.sizes()[0]
+             splitter.addWidget(newspace)
+-            splitter.setSizes([size / 2, size / 2])
++            splitter.setSizes([size // 2, size // 2])
+         elif splitter.orientation() == orientation:
+             index = splitter.indexOf(viewspace)
+             splitter.insertWidget(index + 1, newspace)
+@@ -346,7 +346,7 @@ class ViewManager(QSplitter):
+             splitter.setSizes(sizes)
+             size = newsplitter.sizes()[0]
+             newsplitter.addWidget(newspace)
+-            newsplitter.setSizes([size / 2, size / 2])
++            newsplitter.setSizes([size // 2, size // 2])
+         self._viewSpaces.insert(0, newspace)
+         newspace.showDocument(viewspace.document())
+         if active:
+diff --git a/frescobaldi_app/widgets/linenumberarea.py b/frescobaldi_app/widgets/linenumberarea.py
+index f097726c..93970e7d 100644
+--- a/frescobaldi_app/widgets/linenumberarea.py
++++ b/frescobaldi_app/widgets/linenumberarea.py
+@@ -80,7 +80,7 @@ class LineNumberArea(QWidget):
+             if geom.top() >= ev.rect().bottom():
+                 break
+             if block.isVisible() and geom.bottom() > ev.rect().top() + 1:
+-                rect.moveTop(geom.top())
++                rect.moveTop(round(geom.top()))
+                 text = format(block.blockNumber() + 1, 'd')
+                 painter.drawText(rect, Qt.AlignRight, text)
+             block = block.next()
+diff --git a/frescobaldi_app/widgets/progressbar.py b/frescobaldi_app/widgets/progressbar.py
+index 670bf0f5..6cd9b31d 100644
+--- a/frescobaldi_app/widgets/progressbar.py
++++ b/frescobaldi_app/widgets/progressbar.py
+@@ -71,8 +71,8 @@ class TimedProgressBar(QProgressBar):
+         """
+         self._hideTimer.stop()
+         self._timeline.stop()
+-        self._timeline.setDuration(total * 1000)
+-        self._timeline.setCurrentTime(elapsed * 1000)
++        self._timeline.setDuration(round(total * 1000))
++        self._timeline.setCurrentTime(round(elapsed * 1000))
+         self.setValue(self._timeline.currentFrame())
+         self._timeline.resume()
+         if self._hideWhileIdle and not self._hidden:
diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..bf61cf1155c6
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,20 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools gettext"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/v${version}/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=f97256ce15ab621593536e219584a2ed744c1933148ac7ed98fcef6a3a9510a6
+
+pre_build() {
+	make -C linux
+}

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (53 preceding siblings ...)
  2021-11-09  2:46 ` chili-b
@ 2021-11-09  2:55 ` chili-b
  2021-11-09  3:02 ` chili-b
                   ` (29 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-11-09  2:55 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 70dc8434b5528c30e87c0a3b0c046e3e96b2b073 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 5252b7ef9f76597751ac996ff60afdd6d0c14689 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/3] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..0f53fb4532fe
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+hostmakedepends="python3 python3-sip-devel"
+makedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	python setup.py build_ext --pyqt-sip-dir=/${py3_sitelib}/PyQt5/bindings
+}

From 33ba09ca5d774a50b22dc9fa7385ee307db82bda Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/3] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/patches/python3_10.patch  | 201 ++++++++++++++++++
 .../frescobaldi/patches/python3_10_2.patch    | 137 ++++++++++++
 srcpkgs/frescobaldi/template                  |  20 ++
 3 files changed, 358 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/patches/python3_10.patch
 create mode 100644 srcpkgs/frescobaldi/patches/python3_10_2.patch
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/patches/python3_10.patch b/srcpkgs/frescobaldi/patches/python3_10.patch
new file mode 100644
index 000000000000..c4248f38bca8
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/python3_10.patch
@@ -0,0 +1,201 @@
+# Python 3.10 made a change to how floats are cast to integers which breaks a
+# lot of things in frescobaldi. This will supposedly be fixed by the time
+# v3.2 releases, but for now we must rely on patching.
+#
+# Assuming that the issues are fixed upstream when they say they will be, this
+# patch is to be removed when frescobaldi's next release comes out.
+diff --git a/frescobaldi_app/qpageview/page.py b/frescobaldi_app/qpageview/page.py
+index f93fa9e2..754d2736 100644
+--- a/frescobaldi_app/qpageview/page.py
++++ b/frescobaldi_app/qpageview/page.py
+@@ -48,7 +48,7 @@ class AbstractPage(util.Rectangular):
+ 
+     ...that normally do not change during its lifetime:
+ 
+-        `pageWidth`     the original width  (by default in points, `dpi` is 72.0 
++        `pageWidth`     the original width  (by default in points, `dpi` is 72.0
+         `pageHeight`    the original height   but can be changed at class level)
+ 
+     ... that can be modified by the user (having defaults at the class level):
+@@ -174,15 +174,15 @@ class AbstractPage(util.Rectangular):
+ 
+     def defaultSize(self):
+         """Return the pageSize() scaled and rotated (if needed).
+-        
++
+         Based on scaleX, scaleY, and computedRotation attributes.
+-        
++
+         """
+         s = QSizeF(self.pageWidth * self.scaleX, self.pageHeight * self.scaleY)
+         if self.computedRotation & 1:
+             s.transpose()
+         return s
+-        
++
+     def updateSize(self, dpiX, dpiY, zoomFactor):
+         """Set the width and height attributes of the page.
+ 
+@@ -286,7 +286,7 @@ class AbstractPage(util.Rectangular):
+ 
+         pdf = QPdfWriter(filename)
+         pdf.setCreator("qpageview")
+-        pdf.setResolution(resolution)
++        pdf.setResolution(int(resolution))
+ 
+         layout = pdf.pageLayout()
+         layout.setMode(layout.FullPageMode)
+@@ -350,7 +350,7 @@ class AbstractPage(util.Rectangular):
+             svg.setFileName(filename)
+         else:
+             svg.setOutputDevice(filename)
+-        svg.setResolution(resolution)
++        svg.setResolution(int(resolution))
+         svg.setSize(targetSize.toSize())
+         svg.setViewBox(QRectF(0, 0, targetSize.width(), targetSize.height()))
+         return self.output(svg, source, paperColor)
+@@ -381,31 +381,31 @@ class AbstractPage(util.Rectangular):
+ 
+     def group(self):
+         """Return the group the page belongs to.
+-        
++
+         This could be some document structure, so that different Page objects
+         could refer to the same graphical contents, preventing double caching.
+-        
++
+         This object is used together with the value returned by ident() as a key
+         to cache the page. The idea is that the contents of the page are
+         uniquely identified by the objects returned by group() and ident().
+-        
++
+         This way, when the same document is opened in multiple page instances,
+         only one copy resides in the (global) cache.
+-        
++
+         By default, the page object itself is returned.
+-        
++
+         """
+         return self
+-        
++
+     def ident(self):
+         """Return a value that identifies the page within the group returned
+         by group().
+-        
++
+         By default, None is returned.
+-        
++
+         """
+         return None
+-    
++
+     def mapToPage(self, width=None, height=None):
+         """Return a MapToPage object, that can map original to Page coordinates.
+ 
+@@ -426,10 +426,10 @@ class AbstractPage(util.Rectangular):
+ 
+     def text(self, rect):
+         """Implement this method to get the text at the specified rectangle.
+-        
++
+         The rectangle should be in page coordinates. The default implementation
+         simply returns an empty string.
+-        
++
+         """
+         return ""
+ 
+@@ -437,22 +437,22 @@ class AbstractPage(util.Rectangular):
+         """Implement this method to load our links."""
+         from . import link
+         return link.Links()
+-    
++
+     def links(self):
+         """Return the Links object, containing Link objects.
+-        
++
+         Every Link denotes a clickable area on a Page, in coordinates 0.0-1.0.
+         The Links object makes it possible to quickly find a link on a Page.
+         This is cached after the first request, you should implement the
+         getLinks() method to load the links.
+-        
++
+         """
+         try:
+             return self._links
+         except AttributeError:
+             links = self._links = self.getLinks()
+         return links
+-    
++
+     def linksAt(self, point):
+         """Return a list() of zero or more links touched by QPoint point.
+ 
+@@ -468,9 +468,9 @@ class AbstractPage(util.Rectangular):
+ 
+     def linksIn(self, rect):
+         """Return an unordered set of links enclosed in rectangle.
+-        
++
+         The rectangle is in page coordinates.
+-        
++
+         """
+         return self.links().inside(*self.mapFromPage(1, 1).rect(rect).getCoords())
+ 
+@@ -481,9 +481,9 @@ class AbstractPage(util.Rectangular):
+ 
+ class AbstractRenderedPage(AbstractPage):
+     """A Page that has a renderer that performs caching and painting.
+-    
++
+     The renderer lives in the renderer attribute.
+-    
++
+     """
+     def __init__(self, renderer=None):
+         if renderer is not None:
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 26768356..810dbca5 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -259,7 +259,7 @@ class PopplerRenderer(render.AbstractRenderer):
+         (See AbstractPage.print().)
+ 
+         """
+-        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile))
++        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile)).toRect()   # rounded
+         target = QRectF(0, 0, tile.w, tile.h)
+         if key.rotation & 1:
+             target.setSize(target.size().transposed())
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 5a0c5631..6722a6db 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -365,9 +365,9 @@ class ScrollArea(QAbstractScrollArea):
+                 speed = speed * 1000 / self.scrollupdatespersec / time
+                 # compute diff to scroll
+                 sx = abs(speed.x())
+-                diffx = sx * (sx + 1) / 2
++                diffx = int(sx * (sx + 1) / 2)
+                 sy = abs(speed.y())
+-                diffy = sy * (sy + 1) / 2
++                diffy = int(sy * (sy + 1) / 2)
+                 if speed.x() < 0: diffx = -diffx
+                 if speed.y() < 0: diffy = -diffy
+                 self.kineticScrollBy(QPoint(diffx, diffy))
+@@ -444,8 +444,8 @@ class KineticScroller(Scroller):
+         dy = diff.y()
+ 
+         # solve speed*(speed+1)/2 = delta to ensure 1+2+3+...+speed is as close as possible under delta..
+-        sx = (math.sqrt(1 + 8 * abs(dx)) - 1) // 2
+-        sy = (math.sqrt(1 + 8 * abs(dy)) - 1) // 2
++        sx = int(math.sqrt(1 + 8 * abs(dx)) - 1) // 2
++        sy = int(math.sqrt(1 + 8 * abs(dy)) - 1) // 2
+ 
+         # compute the amount of displacement still needed because we're dealing with integer values.
+         # Since this function is called for exact moves (not free scrolling)
diff --git a/srcpkgs/frescobaldi/patches/python3_10_2.patch b/srcpkgs/frescobaldi/patches/python3_10_2.patch
new file mode 100644
index 000000000000..fb8848316b4d
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/python3_10_2.patch
@@ -0,0 +1,137 @@
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 17312d78..7b6699e5 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -205,8 +205,8 @@ class PopplerRenderer(render.AbstractRenderer):
+             key.rotation, paperColor)
+         if multiplier == 2:
+             image = image.scaledToWidth(tile.w, Qt.SmoothTransformation)
+-        image.setDotsPerMeterX(xres * 39.37)
+-        image.setDotsPerMeterY(yres * 39.37)
++        image.setDotsPerMeterX(round(xres * 39.37))
++        image.setDotsPerMeterY(round(yres * 39.37))
+         return image
+ 
+     def setRenderHints(self, doc):
+diff --git a/frescobaldi_app/qpageview/render.py b/frescobaldi_app/qpageview/render.py
+index a8c00de1..79a6a10b 100644
+--- a/frescobaldi_app/qpageview/render.py
++++ b/frescobaldi_app/qpageview/render.py
+@@ -241,7 +241,7 @@ class AbstractRenderer:
+         key = self.key(page, ratio)
+ 
+         # paint rect in tile coordinates
+-        target = QRect(rect.x() * ratio, rect.y() * ratio, rect.width() * ratio, rect.height() * ratio)
++        target = QRect(round(rect.x() * ratio), round(rect.y() * ratio), round(rect.width() * ratio), round(rect.height() * ratio))
+ 
+         # tiles to paint
+         tiles = [t for t in self.tiles(key.width, key.height) if QRect(*t) & target]
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 6f4dcaf1..027ce7e0 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -186,9 +186,9 @@ class ScrollArea(QAbstractScrollArea):
+         else:
+             viewport = self.viewport()
+             vbar.setRange(0, h - viewport.height())
+-            vbar.setPageStep(viewport.height() * .9)
++            vbar.setPageStep(round(viewport.height() * .9))
+             hbar.setRange(0, w - viewport.width())
+-            hbar.setPageStep(viewport.width() * .9)
++            hbar.setPageStep(round(viewport.width() * .9))
+         
+     def scrollOffset(self):
+         """Return the current scroll offset."""
+@@ -295,7 +295,7 @@ class ScrollArea(QAbstractScrollArea):
+         """Begin a scrolling operation using the specified scroller."""
+         self._scroller = scroller
+         if self._scrollTimer is None:
+-            self._scrollTimer = self.startTimer(1000 / self.scrollupdatespersec)
++            self._scrollTimer = self.startTimer(round(1000 / self.scrollupdatespersec))
+ 
+     def stopScrolling(self):
+         """Stop scrolling."""
+diff --git a/frescobaldi_app/qpageview/shadow.py b/frescobaldi_app/qpageview/shadow.py
+index c7d1c8d5..4f9cc1bf 100644
+--- a/frescobaldi_app/qpageview/shadow.py
++++ b/frescobaldi_app/qpageview/shadow.py
+@@ -37,10 +37,10 @@ class ShadowViewMixin:
+ 
+     def paintEvent(self, ev):
+         if self.dropShadowEnabled:
+-            width = self._pageLayout.spacing / 2
++            width = round(self._pageLayout.spacing / 2)
+             # make the rect slightly larger, so we "see" shadow of pages that
+             # would be outside view normally.
+-            rect = ev.rect().adjusted(-width, -width, width / 2, width / 2)
++            rect = ev.rect().adjusted(-width, -width, width // 2, width // 2)
+             painter = QPainter(self.viewport())
+             for page, rect in self.pagesToPaint(rect, painter):
+                 self.drawDropShadow(page, painter, width)
+@@ -53,14 +53,14 @@ class ShadowViewMixin:
+         
+         """
+         width = round(width)
+-        rect = page.rect().adjusted(width / 2, width / 2, 0, 0)
++        rect = page.rect().adjusted(width // 2, width // 2, 0, 0)
+         color = QColor(Qt.black)
+         pen = QPen()
+         pen.setWidth(1)
+         pen.setJoinStyle(Qt.MiterJoin)
+         for i in range(width):
+             f = (width-i)/width
+-            color.setAlpha(200**f + 55*f)
++            color.setAlpha(round(200**f + 55*f))
+             pen.setColor(color)
+             painter.setPen(pen)
+             painter.drawRect(rect.adjusted(-i, -i, i, i))
+diff --git a/frescobaldi_app/viewmanager.py b/frescobaldi_app/viewmanager.py
+index e1294c91..046c70df 100644
+--- a/frescobaldi_app/viewmanager.py
++++ b/frescobaldi_app/viewmanager.py
+@@ -332,7 +332,7 @@ class ViewManager(QSplitter):
+             splitter.setOrientation(orientation)
+             size = splitter.sizes()[0]
+             splitter.addWidget(newspace)
+-            splitter.setSizes([size / 2, size / 2])
++            splitter.setSizes([size // 2, size // 2])
+         elif splitter.orientation() == orientation:
+             index = splitter.indexOf(viewspace)
+             splitter.insertWidget(index + 1, newspace)
+@@ -346,7 +346,7 @@ class ViewManager(QSplitter):
+             splitter.setSizes(sizes)
+             size = newsplitter.sizes()[0]
+             newsplitter.addWidget(newspace)
+-            newsplitter.setSizes([size / 2, size / 2])
++            newsplitter.setSizes([size // 2, size // 2])
+         self._viewSpaces.insert(0, newspace)
+         newspace.showDocument(viewspace.document())
+         if active:
+diff --git a/frescobaldi_app/widgets/linenumberarea.py b/frescobaldi_app/widgets/linenumberarea.py
+index f097726c..93970e7d 100644
+--- a/frescobaldi_app/widgets/linenumberarea.py
++++ b/frescobaldi_app/widgets/linenumberarea.py
+@@ -80,7 +80,7 @@ class LineNumberArea(QWidget):
+             if geom.top() >= ev.rect().bottom():
+                 break
+             if block.isVisible() and geom.bottom() > ev.rect().top() + 1:
+-                rect.moveTop(geom.top())
++                rect.moveTop(round(geom.top()))
+                 text = format(block.blockNumber() + 1, 'd')
+                 painter.drawText(rect, Qt.AlignRight, text)
+             block = block.next()
+diff --git a/frescobaldi_app/widgets/progressbar.py b/frescobaldi_app/widgets/progressbar.py
+index 670bf0f5..6cd9b31d 100644
+--- a/frescobaldi_app/widgets/progressbar.py
++++ b/frescobaldi_app/widgets/progressbar.py
+@@ -71,8 +71,8 @@ class TimedProgressBar(QProgressBar):
+         """
+         self._hideTimer.stop()
+         self._timeline.stop()
+-        self._timeline.setDuration(total * 1000)
+-        self._timeline.setCurrentTime(elapsed * 1000)
++        self._timeline.setDuration(round(total * 1000))
++        self._timeline.setCurrentTime(round(elapsed * 1000))
+         self.setValue(self._timeline.currentFrame())
+         self._timeline.resume()
+         if self._hideWhileIdle and not self._hidden:
diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..bf61cf1155c6
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,20 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools gettext"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/v${version}/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=f97256ce15ab621593536e219584a2ed744c1933148ac7ed98fcef6a3a9510a6
+
+pre_build() {
+	make -C linux
+}

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (54 preceding siblings ...)
  2021-11-09  2:55 ` chili-b
@ 2021-11-09  3:02 ` chili-b
  2021-11-09  3:13 ` chili-b
                   ` (28 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-11-09  3:02 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 70dc8434b5528c30e87c0a3b0c046e3e96b2b073 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From a966a20b372ffe2915c7cacb05aa0a0dad4d4f7d Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/3] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..a78f33d1f64e
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+hostmakedepends="python3 python3-sip-devel sip"
+makedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	python setup.py build_ext --pyqt-sip-dir=/${py3_sitelib}/PyQt5/bindings
+}

From 5443718b64476b31f200f34fd4f46b013c7e84b2 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/3] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/patches/python3_10.patch  | 201 ++++++++++++++++++
 .../frescobaldi/patches/python3_10_2.patch    | 137 ++++++++++++
 srcpkgs/frescobaldi/template                  |  20 ++
 3 files changed, 358 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/patches/python3_10.patch
 create mode 100644 srcpkgs/frescobaldi/patches/python3_10_2.patch
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/patches/python3_10.patch b/srcpkgs/frescobaldi/patches/python3_10.patch
new file mode 100644
index 000000000000..c4248f38bca8
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/python3_10.patch
@@ -0,0 +1,201 @@
+# Python 3.10 made a change to how floats are cast to integers which breaks a
+# lot of things in frescobaldi. This will supposedly be fixed by the time
+# v3.2 releases, but for now we must rely on patching.
+#
+# Assuming that the issues are fixed upstream when they say they will be, this
+# patch is to be removed when frescobaldi's next release comes out.
+diff --git a/frescobaldi_app/qpageview/page.py b/frescobaldi_app/qpageview/page.py
+index f93fa9e2..754d2736 100644
+--- a/frescobaldi_app/qpageview/page.py
++++ b/frescobaldi_app/qpageview/page.py
+@@ -48,7 +48,7 @@ class AbstractPage(util.Rectangular):
+ 
+     ...that normally do not change during its lifetime:
+ 
+-        `pageWidth`     the original width  (by default in points, `dpi` is 72.0 
++        `pageWidth`     the original width  (by default in points, `dpi` is 72.0
+         `pageHeight`    the original height   but can be changed at class level)
+ 
+     ... that can be modified by the user (having defaults at the class level):
+@@ -174,15 +174,15 @@ class AbstractPage(util.Rectangular):
+ 
+     def defaultSize(self):
+         """Return the pageSize() scaled and rotated (if needed).
+-        
++
+         Based on scaleX, scaleY, and computedRotation attributes.
+-        
++
+         """
+         s = QSizeF(self.pageWidth * self.scaleX, self.pageHeight * self.scaleY)
+         if self.computedRotation & 1:
+             s.transpose()
+         return s
+-        
++
+     def updateSize(self, dpiX, dpiY, zoomFactor):
+         """Set the width and height attributes of the page.
+ 
+@@ -286,7 +286,7 @@ class AbstractPage(util.Rectangular):
+ 
+         pdf = QPdfWriter(filename)
+         pdf.setCreator("qpageview")
+-        pdf.setResolution(resolution)
++        pdf.setResolution(int(resolution))
+ 
+         layout = pdf.pageLayout()
+         layout.setMode(layout.FullPageMode)
+@@ -350,7 +350,7 @@ class AbstractPage(util.Rectangular):
+             svg.setFileName(filename)
+         else:
+             svg.setOutputDevice(filename)
+-        svg.setResolution(resolution)
++        svg.setResolution(int(resolution))
+         svg.setSize(targetSize.toSize())
+         svg.setViewBox(QRectF(0, 0, targetSize.width(), targetSize.height()))
+         return self.output(svg, source, paperColor)
+@@ -381,31 +381,31 @@ class AbstractPage(util.Rectangular):
+ 
+     def group(self):
+         """Return the group the page belongs to.
+-        
++
+         This could be some document structure, so that different Page objects
+         could refer to the same graphical contents, preventing double caching.
+-        
++
+         This object is used together with the value returned by ident() as a key
+         to cache the page. The idea is that the contents of the page are
+         uniquely identified by the objects returned by group() and ident().
+-        
++
+         This way, when the same document is opened in multiple page instances,
+         only one copy resides in the (global) cache.
+-        
++
+         By default, the page object itself is returned.
+-        
++
+         """
+         return self
+-        
++
+     def ident(self):
+         """Return a value that identifies the page within the group returned
+         by group().
+-        
++
+         By default, None is returned.
+-        
++
+         """
+         return None
+-    
++
+     def mapToPage(self, width=None, height=None):
+         """Return a MapToPage object, that can map original to Page coordinates.
+ 
+@@ -426,10 +426,10 @@ class AbstractPage(util.Rectangular):
+ 
+     def text(self, rect):
+         """Implement this method to get the text at the specified rectangle.
+-        
++
+         The rectangle should be in page coordinates. The default implementation
+         simply returns an empty string.
+-        
++
+         """
+         return ""
+ 
+@@ -437,22 +437,22 @@ class AbstractPage(util.Rectangular):
+         """Implement this method to load our links."""
+         from . import link
+         return link.Links()
+-    
++
+     def links(self):
+         """Return the Links object, containing Link objects.
+-        
++
+         Every Link denotes a clickable area on a Page, in coordinates 0.0-1.0.
+         The Links object makes it possible to quickly find a link on a Page.
+         This is cached after the first request, you should implement the
+         getLinks() method to load the links.
+-        
++
+         """
+         try:
+             return self._links
+         except AttributeError:
+             links = self._links = self.getLinks()
+         return links
+-    
++
+     def linksAt(self, point):
+         """Return a list() of zero or more links touched by QPoint point.
+ 
+@@ -468,9 +468,9 @@ class AbstractPage(util.Rectangular):
+ 
+     def linksIn(self, rect):
+         """Return an unordered set of links enclosed in rectangle.
+-        
++
+         The rectangle is in page coordinates.
+-        
++
+         """
+         return self.links().inside(*self.mapFromPage(1, 1).rect(rect).getCoords())
+ 
+@@ -481,9 +481,9 @@ class AbstractPage(util.Rectangular):
+ 
+ class AbstractRenderedPage(AbstractPage):
+     """A Page that has a renderer that performs caching and painting.
+-    
++
+     The renderer lives in the renderer attribute.
+-    
++
+     """
+     def __init__(self, renderer=None):
+         if renderer is not None:
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 26768356..810dbca5 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -259,7 +259,7 @@ class PopplerRenderer(render.AbstractRenderer):
+         (See AbstractPage.print().)
+ 
+         """
+-        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile))
++        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile)).toRect()   # rounded
+         target = QRectF(0, 0, tile.w, tile.h)
+         if key.rotation & 1:
+             target.setSize(target.size().transposed())
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 5a0c5631..6722a6db 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -365,9 +365,9 @@ class ScrollArea(QAbstractScrollArea):
+                 speed = speed * 1000 / self.scrollupdatespersec / time
+                 # compute diff to scroll
+                 sx = abs(speed.x())
+-                diffx = sx * (sx + 1) / 2
++                diffx = int(sx * (sx + 1) / 2)
+                 sy = abs(speed.y())
+-                diffy = sy * (sy + 1) / 2
++                diffy = int(sy * (sy + 1) / 2)
+                 if speed.x() < 0: diffx = -diffx
+                 if speed.y() < 0: diffy = -diffy
+                 self.kineticScrollBy(QPoint(diffx, diffy))
+@@ -444,8 +444,8 @@ class KineticScroller(Scroller):
+         dy = diff.y()
+ 
+         # solve speed*(speed+1)/2 = delta to ensure 1+2+3+...+speed is as close as possible under delta..
+-        sx = (math.sqrt(1 + 8 * abs(dx)) - 1) // 2
+-        sy = (math.sqrt(1 + 8 * abs(dy)) - 1) // 2
++        sx = int(math.sqrt(1 + 8 * abs(dx)) - 1) // 2
++        sy = int(math.sqrt(1 + 8 * abs(dy)) - 1) // 2
+ 
+         # compute the amount of displacement still needed because we're dealing with integer values.
+         # Since this function is called for exact moves (not free scrolling)
diff --git a/srcpkgs/frescobaldi/patches/python3_10_2.patch b/srcpkgs/frescobaldi/patches/python3_10_2.patch
new file mode 100644
index 000000000000..fb8848316b4d
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/python3_10_2.patch
@@ -0,0 +1,137 @@
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 17312d78..7b6699e5 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -205,8 +205,8 @@ class PopplerRenderer(render.AbstractRenderer):
+             key.rotation, paperColor)
+         if multiplier == 2:
+             image = image.scaledToWidth(tile.w, Qt.SmoothTransformation)
+-        image.setDotsPerMeterX(xres * 39.37)
+-        image.setDotsPerMeterY(yres * 39.37)
++        image.setDotsPerMeterX(round(xres * 39.37))
++        image.setDotsPerMeterY(round(yres * 39.37))
+         return image
+ 
+     def setRenderHints(self, doc):
+diff --git a/frescobaldi_app/qpageview/render.py b/frescobaldi_app/qpageview/render.py
+index a8c00de1..79a6a10b 100644
+--- a/frescobaldi_app/qpageview/render.py
++++ b/frescobaldi_app/qpageview/render.py
+@@ -241,7 +241,7 @@ class AbstractRenderer:
+         key = self.key(page, ratio)
+ 
+         # paint rect in tile coordinates
+-        target = QRect(rect.x() * ratio, rect.y() * ratio, rect.width() * ratio, rect.height() * ratio)
++        target = QRect(round(rect.x() * ratio), round(rect.y() * ratio), round(rect.width() * ratio), round(rect.height() * ratio))
+ 
+         # tiles to paint
+         tiles = [t for t in self.tiles(key.width, key.height) if QRect(*t) & target]
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 6f4dcaf1..027ce7e0 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -186,9 +186,9 @@ class ScrollArea(QAbstractScrollArea):
+         else:
+             viewport = self.viewport()
+             vbar.setRange(0, h - viewport.height())
+-            vbar.setPageStep(viewport.height() * .9)
++            vbar.setPageStep(round(viewport.height() * .9))
+             hbar.setRange(0, w - viewport.width())
+-            hbar.setPageStep(viewport.width() * .9)
++            hbar.setPageStep(round(viewport.width() * .9))
+         
+     def scrollOffset(self):
+         """Return the current scroll offset."""
+@@ -295,7 +295,7 @@ class ScrollArea(QAbstractScrollArea):
+         """Begin a scrolling operation using the specified scroller."""
+         self._scroller = scroller
+         if self._scrollTimer is None:
+-            self._scrollTimer = self.startTimer(1000 / self.scrollupdatespersec)
++            self._scrollTimer = self.startTimer(round(1000 / self.scrollupdatespersec))
+ 
+     def stopScrolling(self):
+         """Stop scrolling."""
+diff --git a/frescobaldi_app/qpageview/shadow.py b/frescobaldi_app/qpageview/shadow.py
+index c7d1c8d5..4f9cc1bf 100644
+--- a/frescobaldi_app/qpageview/shadow.py
++++ b/frescobaldi_app/qpageview/shadow.py
+@@ -37,10 +37,10 @@ class ShadowViewMixin:
+ 
+     def paintEvent(self, ev):
+         if self.dropShadowEnabled:
+-            width = self._pageLayout.spacing / 2
++            width = round(self._pageLayout.spacing / 2)
+             # make the rect slightly larger, so we "see" shadow of pages that
+             # would be outside view normally.
+-            rect = ev.rect().adjusted(-width, -width, width / 2, width / 2)
++            rect = ev.rect().adjusted(-width, -width, width // 2, width // 2)
+             painter = QPainter(self.viewport())
+             for page, rect in self.pagesToPaint(rect, painter):
+                 self.drawDropShadow(page, painter, width)
+@@ -53,14 +53,14 @@ class ShadowViewMixin:
+         
+         """
+         width = round(width)
+-        rect = page.rect().adjusted(width / 2, width / 2, 0, 0)
++        rect = page.rect().adjusted(width // 2, width // 2, 0, 0)
+         color = QColor(Qt.black)
+         pen = QPen()
+         pen.setWidth(1)
+         pen.setJoinStyle(Qt.MiterJoin)
+         for i in range(width):
+             f = (width-i)/width
+-            color.setAlpha(200**f + 55*f)
++            color.setAlpha(round(200**f + 55*f))
+             pen.setColor(color)
+             painter.setPen(pen)
+             painter.drawRect(rect.adjusted(-i, -i, i, i))
+diff --git a/frescobaldi_app/viewmanager.py b/frescobaldi_app/viewmanager.py
+index e1294c91..046c70df 100644
+--- a/frescobaldi_app/viewmanager.py
++++ b/frescobaldi_app/viewmanager.py
+@@ -332,7 +332,7 @@ class ViewManager(QSplitter):
+             splitter.setOrientation(orientation)
+             size = splitter.sizes()[0]
+             splitter.addWidget(newspace)
+-            splitter.setSizes([size / 2, size / 2])
++            splitter.setSizes([size // 2, size // 2])
+         elif splitter.orientation() == orientation:
+             index = splitter.indexOf(viewspace)
+             splitter.insertWidget(index + 1, newspace)
+@@ -346,7 +346,7 @@ class ViewManager(QSplitter):
+             splitter.setSizes(sizes)
+             size = newsplitter.sizes()[0]
+             newsplitter.addWidget(newspace)
+-            newsplitter.setSizes([size / 2, size / 2])
++            newsplitter.setSizes([size // 2, size // 2])
+         self._viewSpaces.insert(0, newspace)
+         newspace.showDocument(viewspace.document())
+         if active:
+diff --git a/frescobaldi_app/widgets/linenumberarea.py b/frescobaldi_app/widgets/linenumberarea.py
+index f097726c..93970e7d 100644
+--- a/frescobaldi_app/widgets/linenumberarea.py
++++ b/frescobaldi_app/widgets/linenumberarea.py
+@@ -80,7 +80,7 @@ class LineNumberArea(QWidget):
+             if geom.top() >= ev.rect().bottom():
+                 break
+             if block.isVisible() and geom.bottom() > ev.rect().top() + 1:
+-                rect.moveTop(geom.top())
++                rect.moveTop(round(geom.top()))
+                 text = format(block.blockNumber() + 1, 'd')
+                 painter.drawText(rect, Qt.AlignRight, text)
+             block = block.next()
+diff --git a/frescobaldi_app/widgets/progressbar.py b/frescobaldi_app/widgets/progressbar.py
+index 670bf0f5..6cd9b31d 100644
+--- a/frescobaldi_app/widgets/progressbar.py
++++ b/frescobaldi_app/widgets/progressbar.py
+@@ -71,8 +71,8 @@ class TimedProgressBar(QProgressBar):
+         """
+         self._hideTimer.stop()
+         self._timeline.stop()
+-        self._timeline.setDuration(total * 1000)
+-        self._timeline.setCurrentTime(elapsed * 1000)
++        self._timeline.setDuration(round(total * 1000))
++        self._timeline.setCurrentTime(round(elapsed * 1000))
+         self.setValue(self._timeline.currentFrame())
+         self._timeline.resume()
+         if self._hideWhileIdle and not self._hidden:
diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..bf61cf1155c6
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,20 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools gettext"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/v${version}/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=f97256ce15ab621593536e219584a2ed744c1933148ac7ed98fcef6a3a9510a6
+
+pre_build() {
+	make -C linux
+}

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (55 preceding siblings ...)
  2021-11-09  3:02 ` chili-b
@ 2021-11-09  3:13 ` chili-b
  2021-11-09  3:39 ` chili-b
                   ` (27 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-11-09  3:13 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 70dc8434b5528c30e87c0a3b0c046e3e96b2b073 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 2c7b209669b689a4d40a60f18c51da876c85b2e8 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/3] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..086d41b8d0f1
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+hostmakedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+makedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	python setup.py build_ext --pyqt-sip-dir=/${py3_sitelib}/PyQt5/bindings
+}

From ddcaba3052978792be1a3bbaadafdf235c6cda87 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/3] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/patches/python3_10.patch  | 201 ++++++++++++++++++
 .../frescobaldi/patches/python3_10_2.patch    | 137 ++++++++++++
 srcpkgs/frescobaldi/template                  |  20 ++
 3 files changed, 358 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/patches/python3_10.patch
 create mode 100644 srcpkgs/frescobaldi/patches/python3_10_2.patch
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/patches/python3_10.patch b/srcpkgs/frescobaldi/patches/python3_10.patch
new file mode 100644
index 000000000000..c4248f38bca8
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/python3_10.patch
@@ -0,0 +1,201 @@
+# Python 3.10 made a change to how floats are cast to integers which breaks a
+# lot of things in frescobaldi. This will supposedly be fixed by the time
+# v3.2 releases, but for now we must rely on patching.
+#
+# Assuming that the issues are fixed upstream when they say they will be, this
+# patch is to be removed when frescobaldi's next release comes out.
+diff --git a/frescobaldi_app/qpageview/page.py b/frescobaldi_app/qpageview/page.py
+index f93fa9e2..754d2736 100644
+--- a/frescobaldi_app/qpageview/page.py
++++ b/frescobaldi_app/qpageview/page.py
+@@ -48,7 +48,7 @@ class AbstractPage(util.Rectangular):
+ 
+     ...that normally do not change during its lifetime:
+ 
+-        `pageWidth`     the original width  (by default in points, `dpi` is 72.0 
++        `pageWidth`     the original width  (by default in points, `dpi` is 72.0
+         `pageHeight`    the original height   but can be changed at class level)
+ 
+     ... that can be modified by the user (having defaults at the class level):
+@@ -174,15 +174,15 @@ class AbstractPage(util.Rectangular):
+ 
+     def defaultSize(self):
+         """Return the pageSize() scaled and rotated (if needed).
+-        
++
+         Based on scaleX, scaleY, and computedRotation attributes.
+-        
++
+         """
+         s = QSizeF(self.pageWidth * self.scaleX, self.pageHeight * self.scaleY)
+         if self.computedRotation & 1:
+             s.transpose()
+         return s
+-        
++
+     def updateSize(self, dpiX, dpiY, zoomFactor):
+         """Set the width and height attributes of the page.
+ 
+@@ -286,7 +286,7 @@ class AbstractPage(util.Rectangular):
+ 
+         pdf = QPdfWriter(filename)
+         pdf.setCreator("qpageview")
+-        pdf.setResolution(resolution)
++        pdf.setResolution(int(resolution))
+ 
+         layout = pdf.pageLayout()
+         layout.setMode(layout.FullPageMode)
+@@ -350,7 +350,7 @@ class AbstractPage(util.Rectangular):
+             svg.setFileName(filename)
+         else:
+             svg.setOutputDevice(filename)
+-        svg.setResolution(resolution)
++        svg.setResolution(int(resolution))
+         svg.setSize(targetSize.toSize())
+         svg.setViewBox(QRectF(0, 0, targetSize.width(), targetSize.height()))
+         return self.output(svg, source, paperColor)
+@@ -381,31 +381,31 @@ class AbstractPage(util.Rectangular):
+ 
+     def group(self):
+         """Return the group the page belongs to.
+-        
++
+         This could be some document structure, so that different Page objects
+         could refer to the same graphical contents, preventing double caching.
+-        
++
+         This object is used together with the value returned by ident() as a key
+         to cache the page. The idea is that the contents of the page are
+         uniquely identified by the objects returned by group() and ident().
+-        
++
+         This way, when the same document is opened in multiple page instances,
+         only one copy resides in the (global) cache.
+-        
++
+         By default, the page object itself is returned.
+-        
++
+         """
+         return self
+-        
++
+     def ident(self):
+         """Return a value that identifies the page within the group returned
+         by group().
+-        
++
+         By default, None is returned.
+-        
++
+         """
+         return None
+-    
++
+     def mapToPage(self, width=None, height=None):
+         """Return a MapToPage object, that can map original to Page coordinates.
+ 
+@@ -426,10 +426,10 @@ class AbstractPage(util.Rectangular):
+ 
+     def text(self, rect):
+         """Implement this method to get the text at the specified rectangle.
+-        
++
+         The rectangle should be in page coordinates. The default implementation
+         simply returns an empty string.
+-        
++
+         """
+         return ""
+ 
+@@ -437,22 +437,22 @@ class AbstractPage(util.Rectangular):
+         """Implement this method to load our links."""
+         from . import link
+         return link.Links()
+-    
++
+     def links(self):
+         """Return the Links object, containing Link objects.
+-        
++
+         Every Link denotes a clickable area on a Page, in coordinates 0.0-1.0.
+         The Links object makes it possible to quickly find a link on a Page.
+         This is cached after the first request, you should implement the
+         getLinks() method to load the links.
+-        
++
+         """
+         try:
+             return self._links
+         except AttributeError:
+             links = self._links = self.getLinks()
+         return links
+-    
++
+     def linksAt(self, point):
+         """Return a list() of zero or more links touched by QPoint point.
+ 
+@@ -468,9 +468,9 @@ class AbstractPage(util.Rectangular):
+ 
+     def linksIn(self, rect):
+         """Return an unordered set of links enclosed in rectangle.
+-        
++
+         The rectangle is in page coordinates.
+-        
++
+         """
+         return self.links().inside(*self.mapFromPage(1, 1).rect(rect).getCoords())
+ 
+@@ -481,9 +481,9 @@ class AbstractPage(util.Rectangular):
+ 
+ class AbstractRenderedPage(AbstractPage):
+     """A Page that has a renderer that performs caching and painting.
+-    
++
+     The renderer lives in the renderer attribute.
+-    
++
+     """
+     def __init__(self, renderer=None):
+         if renderer is not None:
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 26768356..810dbca5 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -259,7 +259,7 @@ class PopplerRenderer(render.AbstractRenderer):
+         (See AbstractPage.print().)
+ 
+         """
+-        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile))
++        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile)).toRect()   # rounded
+         target = QRectF(0, 0, tile.w, tile.h)
+         if key.rotation & 1:
+             target.setSize(target.size().transposed())
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 5a0c5631..6722a6db 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -365,9 +365,9 @@ class ScrollArea(QAbstractScrollArea):
+                 speed = speed * 1000 / self.scrollupdatespersec / time
+                 # compute diff to scroll
+                 sx = abs(speed.x())
+-                diffx = sx * (sx + 1) / 2
++                diffx = int(sx * (sx + 1) / 2)
+                 sy = abs(speed.y())
+-                diffy = sy * (sy + 1) / 2
++                diffy = int(sy * (sy + 1) / 2)
+                 if speed.x() < 0: diffx = -diffx
+                 if speed.y() < 0: diffy = -diffy
+                 self.kineticScrollBy(QPoint(diffx, diffy))
+@@ -444,8 +444,8 @@ class KineticScroller(Scroller):
+         dy = diff.y()
+ 
+         # solve speed*(speed+1)/2 = delta to ensure 1+2+3+...+speed is as close as possible under delta..
+-        sx = (math.sqrt(1 + 8 * abs(dx)) - 1) // 2
+-        sy = (math.sqrt(1 + 8 * abs(dy)) - 1) // 2
++        sx = int(math.sqrt(1 + 8 * abs(dx)) - 1) // 2
++        sy = int(math.sqrt(1 + 8 * abs(dy)) - 1) // 2
+ 
+         # compute the amount of displacement still needed because we're dealing with integer values.
+         # Since this function is called for exact moves (not free scrolling)
diff --git a/srcpkgs/frescobaldi/patches/python3_10_2.patch b/srcpkgs/frescobaldi/patches/python3_10_2.patch
new file mode 100644
index 000000000000..fb8848316b4d
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/python3_10_2.patch
@@ -0,0 +1,137 @@
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 17312d78..7b6699e5 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -205,8 +205,8 @@ class PopplerRenderer(render.AbstractRenderer):
+             key.rotation, paperColor)
+         if multiplier == 2:
+             image = image.scaledToWidth(tile.w, Qt.SmoothTransformation)
+-        image.setDotsPerMeterX(xres * 39.37)
+-        image.setDotsPerMeterY(yres * 39.37)
++        image.setDotsPerMeterX(round(xres * 39.37))
++        image.setDotsPerMeterY(round(yres * 39.37))
+         return image
+ 
+     def setRenderHints(self, doc):
+diff --git a/frescobaldi_app/qpageview/render.py b/frescobaldi_app/qpageview/render.py
+index a8c00de1..79a6a10b 100644
+--- a/frescobaldi_app/qpageview/render.py
++++ b/frescobaldi_app/qpageview/render.py
+@@ -241,7 +241,7 @@ class AbstractRenderer:
+         key = self.key(page, ratio)
+ 
+         # paint rect in tile coordinates
+-        target = QRect(rect.x() * ratio, rect.y() * ratio, rect.width() * ratio, rect.height() * ratio)
++        target = QRect(round(rect.x() * ratio), round(rect.y() * ratio), round(rect.width() * ratio), round(rect.height() * ratio))
+ 
+         # tiles to paint
+         tiles = [t for t in self.tiles(key.width, key.height) if QRect(*t) & target]
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 6f4dcaf1..027ce7e0 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -186,9 +186,9 @@ class ScrollArea(QAbstractScrollArea):
+         else:
+             viewport = self.viewport()
+             vbar.setRange(0, h - viewport.height())
+-            vbar.setPageStep(viewport.height() * .9)
++            vbar.setPageStep(round(viewport.height() * .9))
+             hbar.setRange(0, w - viewport.width())
+-            hbar.setPageStep(viewport.width() * .9)
++            hbar.setPageStep(round(viewport.width() * .9))
+         
+     def scrollOffset(self):
+         """Return the current scroll offset."""
+@@ -295,7 +295,7 @@ class ScrollArea(QAbstractScrollArea):
+         """Begin a scrolling operation using the specified scroller."""
+         self._scroller = scroller
+         if self._scrollTimer is None:
+-            self._scrollTimer = self.startTimer(1000 / self.scrollupdatespersec)
++            self._scrollTimer = self.startTimer(round(1000 / self.scrollupdatespersec))
+ 
+     def stopScrolling(self):
+         """Stop scrolling."""
+diff --git a/frescobaldi_app/qpageview/shadow.py b/frescobaldi_app/qpageview/shadow.py
+index c7d1c8d5..4f9cc1bf 100644
+--- a/frescobaldi_app/qpageview/shadow.py
++++ b/frescobaldi_app/qpageview/shadow.py
+@@ -37,10 +37,10 @@ class ShadowViewMixin:
+ 
+     def paintEvent(self, ev):
+         if self.dropShadowEnabled:
+-            width = self._pageLayout.spacing / 2
++            width = round(self._pageLayout.spacing / 2)
+             # make the rect slightly larger, so we "see" shadow of pages that
+             # would be outside view normally.
+-            rect = ev.rect().adjusted(-width, -width, width / 2, width / 2)
++            rect = ev.rect().adjusted(-width, -width, width // 2, width // 2)
+             painter = QPainter(self.viewport())
+             for page, rect in self.pagesToPaint(rect, painter):
+                 self.drawDropShadow(page, painter, width)
+@@ -53,14 +53,14 @@ class ShadowViewMixin:
+         
+         """
+         width = round(width)
+-        rect = page.rect().adjusted(width / 2, width / 2, 0, 0)
++        rect = page.rect().adjusted(width // 2, width // 2, 0, 0)
+         color = QColor(Qt.black)
+         pen = QPen()
+         pen.setWidth(1)
+         pen.setJoinStyle(Qt.MiterJoin)
+         for i in range(width):
+             f = (width-i)/width
+-            color.setAlpha(200**f + 55*f)
++            color.setAlpha(round(200**f + 55*f))
+             pen.setColor(color)
+             painter.setPen(pen)
+             painter.drawRect(rect.adjusted(-i, -i, i, i))
+diff --git a/frescobaldi_app/viewmanager.py b/frescobaldi_app/viewmanager.py
+index e1294c91..046c70df 100644
+--- a/frescobaldi_app/viewmanager.py
++++ b/frescobaldi_app/viewmanager.py
+@@ -332,7 +332,7 @@ class ViewManager(QSplitter):
+             splitter.setOrientation(orientation)
+             size = splitter.sizes()[0]
+             splitter.addWidget(newspace)
+-            splitter.setSizes([size / 2, size / 2])
++            splitter.setSizes([size // 2, size // 2])
+         elif splitter.orientation() == orientation:
+             index = splitter.indexOf(viewspace)
+             splitter.insertWidget(index + 1, newspace)
+@@ -346,7 +346,7 @@ class ViewManager(QSplitter):
+             splitter.setSizes(sizes)
+             size = newsplitter.sizes()[0]
+             newsplitter.addWidget(newspace)
+-            newsplitter.setSizes([size / 2, size / 2])
++            newsplitter.setSizes([size // 2, size // 2])
+         self._viewSpaces.insert(0, newspace)
+         newspace.showDocument(viewspace.document())
+         if active:
+diff --git a/frescobaldi_app/widgets/linenumberarea.py b/frescobaldi_app/widgets/linenumberarea.py
+index f097726c..93970e7d 100644
+--- a/frescobaldi_app/widgets/linenumberarea.py
++++ b/frescobaldi_app/widgets/linenumberarea.py
+@@ -80,7 +80,7 @@ class LineNumberArea(QWidget):
+             if geom.top() >= ev.rect().bottom():
+                 break
+             if block.isVisible() and geom.bottom() > ev.rect().top() + 1:
+-                rect.moveTop(geom.top())
++                rect.moveTop(round(geom.top()))
+                 text = format(block.blockNumber() + 1, 'd')
+                 painter.drawText(rect, Qt.AlignRight, text)
+             block = block.next()
+diff --git a/frescobaldi_app/widgets/progressbar.py b/frescobaldi_app/widgets/progressbar.py
+index 670bf0f5..6cd9b31d 100644
+--- a/frescobaldi_app/widgets/progressbar.py
++++ b/frescobaldi_app/widgets/progressbar.py
+@@ -71,8 +71,8 @@ class TimedProgressBar(QProgressBar):
+         """
+         self._hideTimer.stop()
+         self._timeline.stop()
+-        self._timeline.setDuration(total * 1000)
+-        self._timeline.setCurrentTime(elapsed * 1000)
++        self._timeline.setDuration(round(total * 1000))
++        self._timeline.setCurrentTime(round(elapsed * 1000))
+         self.setValue(self._timeline.currentFrame())
+         self._timeline.resume()
+         if self._hideWhileIdle and not self._hidden:
diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..bf61cf1155c6
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,20 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools gettext"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/v${version}/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=f97256ce15ab621593536e219584a2ed744c1933148ac7ed98fcef6a3a9510a6
+
+pre_build() {
+	make -C linux
+}

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

* Re: New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (56 preceding siblings ...)
  2021-11-09  3:13 ` chili-b
@ 2021-11-09  3:39 ` chili-b
  2021-11-10 18:31 ` [PR PATCH] [Updated] " chili-b
                   ` (26 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-11-09  3:39 UTC (permalink / raw)
  To: ml

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

New comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#issuecomment-963787937

Comment:
Okay, I've applied the patches to get frescobaldi working under Python 3.10, but the build is failing for armv7 and armv6. The error seems to come from the compilation step during the generation of python bindings to poppler-qt5, but I don't know how to proceed beyond that.

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (57 preceding siblings ...)
  2021-11-09  3:39 ` chili-b
@ 2021-11-10 18:31 ` chili-b
  2021-11-10 19:10 ` chili-b
                   ` (25 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-11-10 18:31 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From dab09477c8618247e8d81114c1256aea60290c9b Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From ee3f64b2a8feabb78277786a86792712db16205b Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/3] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..412e774537ed
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,28 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+hostmakedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+makedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	# Cludge to fix build under armv7l, armv6l
+	if [[ $XBPS_TARGET_MACHINE == arm* ]]; then
+		export CFLAGS="-mtune=generic-armv7-a "
+		export CFLAGS+="-I/usr/${XBPS_TARGET_MACHINE}-linux-gnueabihf/${py3_inc}"
+	fi
+
+	python setup.py build_ext --pyqt-sip-dir=/${py3_sitelib}/PyQt5/bindings
+}

From 8ebc3fa0d5218290c76a2fb7ccfcce4075701e2c Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/3] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/patches/python3_10.patch  | 201 ++++++++++++++++++
 .../frescobaldi/patches/python3_10_2.patch    | 137 ++++++++++++
 srcpkgs/frescobaldi/template                  |  20 ++
 3 files changed, 358 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/patches/python3_10.patch
 create mode 100644 srcpkgs/frescobaldi/patches/python3_10_2.patch
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/patches/python3_10.patch b/srcpkgs/frescobaldi/patches/python3_10.patch
new file mode 100644
index 000000000000..c4248f38bca8
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/python3_10.patch
@@ -0,0 +1,201 @@
+# Python 3.10 made a change to how floats are cast to integers which breaks a
+# lot of things in frescobaldi. This will supposedly be fixed by the time
+# v3.2 releases, but for now we must rely on patching.
+#
+# Assuming that the issues are fixed upstream when they say they will be, this
+# patch is to be removed when frescobaldi's next release comes out.
+diff --git a/frescobaldi_app/qpageview/page.py b/frescobaldi_app/qpageview/page.py
+index f93fa9e2..754d2736 100644
+--- a/frescobaldi_app/qpageview/page.py
++++ b/frescobaldi_app/qpageview/page.py
+@@ -48,7 +48,7 @@ class AbstractPage(util.Rectangular):
+ 
+     ...that normally do not change during its lifetime:
+ 
+-        `pageWidth`     the original width  (by default in points, `dpi` is 72.0 
++        `pageWidth`     the original width  (by default in points, `dpi` is 72.0
+         `pageHeight`    the original height   but can be changed at class level)
+ 
+     ... that can be modified by the user (having defaults at the class level):
+@@ -174,15 +174,15 @@ class AbstractPage(util.Rectangular):
+ 
+     def defaultSize(self):
+         """Return the pageSize() scaled and rotated (if needed).
+-        
++
+         Based on scaleX, scaleY, and computedRotation attributes.
+-        
++
+         """
+         s = QSizeF(self.pageWidth * self.scaleX, self.pageHeight * self.scaleY)
+         if self.computedRotation & 1:
+             s.transpose()
+         return s
+-        
++
+     def updateSize(self, dpiX, dpiY, zoomFactor):
+         """Set the width and height attributes of the page.
+ 
+@@ -286,7 +286,7 @@ class AbstractPage(util.Rectangular):
+ 
+         pdf = QPdfWriter(filename)
+         pdf.setCreator("qpageview")
+-        pdf.setResolution(resolution)
++        pdf.setResolution(int(resolution))
+ 
+         layout = pdf.pageLayout()
+         layout.setMode(layout.FullPageMode)
+@@ -350,7 +350,7 @@ class AbstractPage(util.Rectangular):
+             svg.setFileName(filename)
+         else:
+             svg.setOutputDevice(filename)
+-        svg.setResolution(resolution)
++        svg.setResolution(int(resolution))
+         svg.setSize(targetSize.toSize())
+         svg.setViewBox(QRectF(0, 0, targetSize.width(), targetSize.height()))
+         return self.output(svg, source, paperColor)
+@@ -381,31 +381,31 @@ class AbstractPage(util.Rectangular):
+ 
+     def group(self):
+         """Return the group the page belongs to.
+-        
++
+         This could be some document structure, so that different Page objects
+         could refer to the same graphical contents, preventing double caching.
+-        
++
+         This object is used together with the value returned by ident() as a key
+         to cache the page. The idea is that the contents of the page are
+         uniquely identified by the objects returned by group() and ident().
+-        
++
+         This way, when the same document is opened in multiple page instances,
+         only one copy resides in the (global) cache.
+-        
++
+         By default, the page object itself is returned.
+-        
++
+         """
+         return self
+-        
++
+     def ident(self):
+         """Return a value that identifies the page within the group returned
+         by group().
+-        
++
+         By default, None is returned.
+-        
++
+         """
+         return None
+-    
++
+     def mapToPage(self, width=None, height=None):
+         """Return a MapToPage object, that can map original to Page coordinates.
+ 
+@@ -426,10 +426,10 @@ class AbstractPage(util.Rectangular):
+ 
+     def text(self, rect):
+         """Implement this method to get the text at the specified rectangle.
+-        
++
+         The rectangle should be in page coordinates. The default implementation
+         simply returns an empty string.
+-        
++
+         """
+         return ""
+ 
+@@ -437,22 +437,22 @@ class AbstractPage(util.Rectangular):
+         """Implement this method to load our links."""
+         from . import link
+         return link.Links()
+-    
++
+     def links(self):
+         """Return the Links object, containing Link objects.
+-        
++
+         Every Link denotes a clickable area on a Page, in coordinates 0.0-1.0.
+         The Links object makes it possible to quickly find a link on a Page.
+         This is cached after the first request, you should implement the
+         getLinks() method to load the links.
+-        
++
+         """
+         try:
+             return self._links
+         except AttributeError:
+             links = self._links = self.getLinks()
+         return links
+-    
++
+     def linksAt(self, point):
+         """Return a list() of zero or more links touched by QPoint point.
+ 
+@@ -468,9 +468,9 @@ class AbstractPage(util.Rectangular):
+ 
+     def linksIn(self, rect):
+         """Return an unordered set of links enclosed in rectangle.
+-        
++
+         The rectangle is in page coordinates.
+-        
++
+         """
+         return self.links().inside(*self.mapFromPage(1, 1).rect(rect).getCoords())
+ 
+@@ -481,9 +481,9 @@ class AbstractPage(util.Rectangular):
+ 
+ class AbstractRenderedPage(AbstractPage):
+     """A Page that has a renderer that performs caching and painting.
+-    
++
+     The renderer lives in the renderer attribute.
+-    
++
+     """
+     def __init__(self, renderer=None):
+         if renderer is not None:
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 26768356..810dbca5 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -259,7 +259,7 @@ class PopplerRenderer(render.AbstractRenderer):
+         (See AbstractPage.print().)
+ 
+         """
+-        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile))
++        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile)).toRect()   # rounded
+         target = QRectF(0, 0, tile.w, tile.h)
+         if key.rotation & 1:
+             target.setSize(target.size().transposed())
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 5a0c5631..6722a6db 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -365,9 +365,9 @@ class ScrollArea(QAbstractScrollArea):
+                 speed = speed * 1000 / self.scrollupdatespersec / time
+                 # compute diff to scroll
+                 sx = abs(speed.x())
+-                diffx = sx * (sx + 1) / 2
++                diffx = int(sx * (sx + 1) / 2)
+                 sy = abs(speed.y())
+-                diffy = sy * (sy + 1) / 2
++                diffy = int(sy * (sy + 1) / 2)
+                 if speed.x() < 0: diffx = -diffx
+                 if speed.y() < 0: diffy = -diffy
+                 self.kineticScrollBy(QPoint(diffx, diffy))
+@@ -444,8 +444,8 @@ class KineticScroller(Scroller):
+         dy = diff.y()
+ 
+         # solve speed*(speed+1)/2 = delta to ensure 1+2+3+...+speed is as close as possible under delta..
+-        sx = (math.sqrt(1 + 8 * abs(dx)) - 1) // 2
+-        sy = (math.sqrt(1 + 8 * abs(dy)) - 1) // 2
++        sx = int(math.sqrt(1 + 8 * abs(dx)) - 1) // 2
++        sy = int(math.sqrt(1 + 8 * abs(dy)) - 1) // 2
+ 
+         # compute the amount of displacement still needed because we're dealing with integer values.
+         # Since this function is called for exact moves (not free scrolling)
diff --git a/srcpkgs/frescobaldi/patches/python3_10_2.patch b/srcpkgs/frescobaldi/patches/python3_10_2.patch
new file mode 100644
index 000000000000..fb8848316b4d
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/python3_10_2.patch
@@ -0,0 +1,137 @@
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 17312d78..7b6699e5 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -205,8 +205,8 @@ class PopplerRenderer(render.AbstractRenderer):
+             key.rotation, paperColor)
+         if multiplier == 2:
+             image = image.scaledToWidth(tile.w, Qt.SmoothTransformation)
+-        image.setDotsPerMeterX(xres * 39.37)
+-        image.setDotsPerMeterY(yres * 39.37)
++        image.setDotsPerMeterX(round(xres * 39.37))
++        image.setDotsPerMeterY(round(yres * 39.37))
+         return image
+ 
+     def setRenderHints(self, doc):
+diff --git a/frescobaldi_app/qpageview/render.py b/frescobaldi_app/qpageview/render.py
+index a8c00de1..79a6a10b 100644
+--- a/frescobaldi_app/qpageview/render.py
++++ b/frescobaldi_app/qpageview/render.py
+@@ -241,7 +241,7 @@ class AbstractRenderer:
+         key = self.key(page, ratio)
+ 
+         # paint rect in tile coordinates
+-        target = QRect(rect.x() * ratio, rect.y() * ratio, rect.width() * ratio, rect.height() * ratio)
++        target = QRect(round(rect.x() * ratio), round(rect.y() * ratio), round(rect.width() * ratio), round(rect.height() * ratio))
+ 
+         # tiles to paint
+         tiles = [t for t in self.tiles(key.width, key.height) if QRect(*t) & target]
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 6f4dcaf1..027ce7e0 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -186,9 +186,9 @@ class ScrollArea(QAbstractScrollArea):
+         else:
+             viewport = self.viewport()
+             vbar.setRange(0, h - viewport.height())
+-            vbar.setPageStep(viewport.height() * .9)
++            vbar.setPageStep(round(viewport.height() * .9))
+             hbar.setRange(0, w - viewport.width())
+-            hbar.setPageStep(viewport.width() * .9)
++            hbar.setPageStep(round(viewport.width() * .9))
+         
+     def scrollOffset(self):
+         """Return the current scroll offset."""
+@@ -295,7 +295,7 @@ class ScrollArea(QAbstractScrollArea):
+         """Begin a scrolling operation using the specified scroller."""
+         self._scroller = scroller
+         if self._scrollTimer is None:
+-            self._scrollTimer = self.startTimer(1000 / self.scrollupdatespersec)
++            self._scrollTimer = self.startTimer(round(1000 / self.scrollupdatespersec))
+ 
+     def stopScrolling(self):
+         """Stop scrolling."""
+diff --git a/frescobaldi_app/qpageview/shadow.py b/frescobaldi_app/qpageview/shadow.py
+index c7d1c8d5..4f9cc1bf 100644
+--- a/frescobaldi_app/qpageview/shadow.py
++++ b/frescobaldi_app/qpageview/shadow.py
+@@ -37,10 +37,10 @@ class ShadowViewMixin:
+ 
+     def paintEvent(self, ev):
+         if self.dropShadowEnabled:
+-            width = self._pageLayout.spacing / 2
++            width = round(self._pageLayout.spacing / 2)
+             # make the rect slightly larger, so we "see" shadow of pages that
+             # would be outside view normally.
+-            rect = ev.rect().adjusted(-width, -width, width / 2, width / 2)
++            rect = ev.rect().adjusted(-width, -width, width // 2, width // 2)
+             painter = QPainter(self.viewport())
+             for page, rect in self.pagesToPaint(rect, painter):
+                 self.drawDropShadow(page, painter, width)
+@@ -53,14 +53,14 @@ class ShadowViewMixin:
+         
+         """
+         width = round(width)
+-        rect = page.rect().adjusted(width / 2, width / 2, 0, 0)
++        rect = page.rect().adjusted(width // 2, width // 2, 0, 0)
+         color = QColor(Qt.black)
+         pen = QPen()
+         pen.setWidth(1)
+         pen.setJoinStyle(Qt.MiterJoin)
+         for i in range(width):
+             f = (width-i)/width
+-            color.setAlpha(200**f + 55*f)
++            color.setAlpha(round(200**f + 55*f))
+             pen.setColor(color)
+             painter.setPen(pen)
+             painter.drawRect(rect.adjusted(-i, -i, i, i))
+diff --git a/frescobaldi_app/viewmanager.py b/frescobaldi_app/viewmanager.py
+index e1294c91..046c70df 100644
+--- a/frescobaldi_app/viewmanager.py
++++ b/frescobaldi_app/viewmanager.py
+@@ -332,7 +332,7 @@ class ViewManager(QSplitter):
+             splitter.setOrientation(orientation)
+             size = splitter.sizes()[0]
+             splitter.addWidget(newspace)
+-            splitter.setSizes([size / 2, size / 2])
++            splitter.setSizes([size // 2, size // 2])
+         elif splitter.orientation() == orientation:
+             index = splitter.indexOf(viewspace)
+             splitter.insertWidget(index + 1, newspace)
+@@ -346,7 +346,7 @@ class ViewManager(QSplitter):
+             splitter.setSizes(sizes)
+             size = newsplitter.sizes()[0]
+             newsplitter.addWidget(newspace)
+-            newsplitter.setSizes([size / 2, size / 2])
++            newsplitter.setSizes([size // 2, size // 2])
+         self._viewSpaces.insert(0, newspace)
+         newspace.showDocument(viewspace.document())
+         if active:
+diff --git a/frescobaldi_app/widgets/linenumberarea.py b/frescobaldi_app/widgets/linenumberarea.py
+index f097726c..93970e7d 100644
+--- a/frescobaldi_app/widgets/linenumberarea.py
++++ b/frescobaldi_app/widgets/linenumberarea.py
+@@ -80,7 +80,7 @@ class LineNumberArea(QWidget):
+             if geom.top() >= ev.rect().bottom():
+                 break
+             if block.isVisible() and geom.bottom() > ev.rect().top() + 1:
+-                rect.moveTop(geom.top())
++                rect.moveTop(round(geom.top()))
+                 text = format(block.blockNumber() + 1, 'd')
+                 painter.drawText(rect, Qt.AlignRight, text)
+             block = block.next()
+diff --git a/frescobaldi_app/widgets/progressbar.py b/frescobaldi_app/widgets/progressbar.py
+index 670bf0f5..6cd9b31d 100644
+--- a/frescobaldi_app/widgets/progressbar.py
++++ b/frescobaldi_app/widgets/progressbar.py
+@@ -71,8 +71,8 @@ class TimedProgressBar(QProgressBar):
+         """
+         self._hideTimer.stop()
+         self._timeline.stop()
+-        self._timeline.setDuration(total * 1000)
+-        self._timeline.setCurrentTime(elapsed * 1000)
++        self._timeline.setDuration(round(total * 1000))
++        self._timeline.setCurrentTime(round(elapsed * 1000))
+         self.setValue(self._timeline.currentFrame())
+         self._timeline.resume()
+         if self._hideWhileIdle and not self._hidden:
diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..bf61cf1155c6
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,20 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools gettext"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/v${version}/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=f97256ce15ab621593536e219584a2ed744c1933148ac7ed98fcef6a3a9510a6
+
+pre_build() {
+	make -C linux
+}

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (58 preceding siblings ...)
  2021-11-10 18:31 ` [PR PATCH] [Updated] " chili-b
@ 2021-11-10 19:10 ` chili-b
  2021-11-10 19:24 ` chili-b
                   ` (24 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-11-10 19:10 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From dab09477c8618247e8d81114c1256aea60290c9b Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 56c5fa011f47804df180a97ea7988eda8c5eba76 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/3] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..2d4370475dba
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,28 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+hostmakedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+makedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	# Cludge to fix build under armv7l, armv6l
+	if [[ $XBPS_TARGET_MACHINE == arm* ]]; then
+		export CFLAGS="-mtune=generic-armv7-a "
+		export CFLAGS+="-I/usr/${XBPS_CROSS_BASE}/${py3_inc}"
+	fi
+
+	python setup.py build_ext --pyqt-sip-dir=/${py3_sitelib}/PyQt5/bindings
+}

From 9972fce135a4034e2b13ec3c8d7914e1308025d1 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/3] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/patches/python3_10.patch  | 201 ++++++++++++++++++
 .../frescobaldi/patches/python3_10_2.patch    | 137 ++++++++++++
 srcpkgs/frescobaldi/template                  |  20 ++
 3 files changed, 358 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/patches/python3_10.patch
 create mode 100644 srcpkgs/frescobaldi/patches/python3_10_2.patch
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/patches/python3_10.patch b/srcpkgs/frescobaldi/patches/python3_10.patch
new file mode 100644
index 000000000000..c4248f38bca8
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/python3_10.patch
@@ -0,0 +1,201 @@
+# Python 3.10 made a change to how floats are cast to integers which breaks a
+# lot of things in frescobaldi. This will supposedly be fixed by the time
+# v3.2 releases, but for now we must rely on patching.
+#
+# Assuming that the issues are fixed upstream when they say they will be, this
+# patch is to be removed when frescobaldi's next release comes out.
+diff --git a/frescobaldi_app/qpageview/page.py b/frescobaldi_app/qpageview/page.py
+index f93fa9e2..754d2736 100644
+--- a/frescobaldi_app/qpageview/page.py
++++ b/frescobaldi_app/qpageview/page.py
+@@ -48,7 +48,7 @@ class AbstractPage(util.Rectangular):
+ 
+     ...that normally do not change during its lifetime:
+ 
+-        `pageWidth`     the original width  (by default in points, `dpi` is 72.0 
++        `pageWidth`     the original width  (by default in points, `dpi` is 72.0
+         `pageHeight`    the original height   but can be changed at class level)
+ 
+     ... that can be modified by the user (having defaults at the class level):
+@@ -174,15 +174,15 @@ class AbstractPage(util.Rectangular):
+ 
+     def defaultSize(self):
+         """Return the pageSize() scaled and rotated (if needed).
+-        
++
+         Based on scaleX, scaleY, and computedRotation attributes.
+-        
++
+         """
+         s = QSizeF(self.pageWidth * self.scaleX, self.pageHeight * self.scaleY)
+         if self.computedRotation & 1:
+             s.transpose()
+         return s
+-        
++
+     def updateSize(self, dpiX, dpiY, zoomFactor):
+         """Set the width and height attributes of the page.
+ 
+@@ -286,7 +286,7 @@ class AbstractPage(util.Rectangular):
+ 
+         pdf = QPdfWriter(filename)
+         pdf.setCreator("qpageview")
+-        pdf.setResolution(resolution)
++        pdf.setResolution(int(resolution))
+ 
+         layout = pdf.pageLayout()
+         layout.setMode(layout.FullPageMode)
+@@ -350,7 +350,7 @@ class AbstractPage(util.Rectangular):
+             svg.setFileName(filename)
+         else:
+             svg.setOutputDevice(filename)
+-        svg.setResolution(resolution)
++        svg.setResolution(int(resolution))
+         svg.setSize(targetSize.toSize())
+         svg.setViewBox(QRectF(0, 0, targetSize.width(), targetSize.height()))
+         return self.output(svg, source, paperColor)
+@@ -381,31 +381,31 @@ class AbstractPage(util.Rectangular):
+ 
+     def group(self):
+         """Return the group the page belongs to.
+-        
++
+         This could be some document structure, so that different Page objects
+         could refer to the same graphical contents, preventing double caching.
+-        
++
+         This object is used together with the value returned by ident() as a key
+         to cache the page. The idea is that the contents of the page are
+         uniquely identified by the objects returned by group() and ident().
+-        
++
+         This way, when the same document is opened in multiple page instances,
+         only one copy resides in the (global) cache.
+-        
++
+         By default, the page object itself is returned.
+-        
++
+         """
+         return self
+-        
++
+     def ident(self):
+         """Return a value that identifies the page within the group returned
+         by group().
+-        
++
+         By default, None is returned.
+-        
++
+         """
+         return None
+-    
++
+     def mapToPage(self, width=None, height=None):
+         """Return a MapToPage object, that can map original to Page coordinates.
+ 
+@@ -426,10 +426,10 @@ class AbstractPage(util.Rectangular):
+ 
+     def text(self, rect):
+         """Implement this method to get the text at the specified rectangle.
+-        
++
+         The rectangle should be in page coordinates. The default implementation
+         simply returns an empty string.
+-        
++
+         """
+         return ""
+ 
+@@ -437,22 +437,22 @@ class AbstractPage(util.Rectangular):
+         """Implement this method to load our links."""
+         from . import link
+         return link.Links()
+-    
++
+     def links(self):
+         """Return the Links object, containing Link objects.
+-        
++
+         Every Link denotes a clickable area on a Page, in coordinates 0.0-1.0.
+         The Links object makes it possible to quickly find a link on a Page.
+         This is cached after the first request, you should implement the
+         getLinks() method to load the links.
+-        
++
+         """
+         try:
+             return self._links
+         except AttributeError:
+             links = self._links = self.getLinks()
+         return links
+-    
++
+     def linksAt(self, point):
+         """Return a list() of zero or more links touched by QPoint point.
+ 
+@@ -468,9 +468,9 @@ class AbstractPage(util.Rectangular):
+ 
+     def linksIn(self, rect):
+         """Return an unordered set of links enclosed in rectangle.
+-        
++
+         The rectangle is in page coordinates.
+-        
++
+         """
+         return self.links().inside(*self.mapFromPage(1, 1).rect(rect).getCoords())
+ 
+@@ -481,9 +481,9 @@ class AbstractPage(util.Rectangular):
+ 
+ class AbstractRenderedPage(AbstractPage):
+     """A Page that has a renderer that performs caching and painting.
+-    
++
+     The renderer lives in the renderer attribute.
+-    
++
+     """
+     def __init__(self, renderer=None):
+         if renderer is not None:
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 26768356..810dbca5 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -259,7 +259,7 @@ class PopplerRenderer(render.AbstractRenderer):
+         (See AbstractPage.print().)
+ 
+         """
+-        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile))
++        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile)).toRect()   # rounded
+         target = QRectF(0, 0, tile.w, tile.h)
+         if key.rotation & 1:
+             target.setSize(target.size().transposed())
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 5a0c5631..6722a6db 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -365,9 +365,9 @@ class ScrollArea(QAbstractScrollArea):
+                 speed = speed * 1000 / self.scrollupdatespersec / time
+                 # compute diff to scroll
+                 sx = abs(speed.x())
+-                diffx = sx * (sx + 1) / 2
++                diffx = int(sx * (sx + 1) / 2)
+                 sy = abs(speed.y())
+-                diffy = sy * (sy + 1) / 2
++                diffy = int(sy * (sy + 1) / 2)
+                 if speed.x() < 0: diffx = -diffx
+                 if speed.y() < 0: diffy = -diffy
+                 self.kineticScrollBy(QPoint(diffx, diffy))
+@@ -444,8 +444,8 @@ class KineticScroller(Scroller):
+         dy = diff.y()
+ 
+         # solve speed*(speed+1)/2 = delta to ensure 1+2+3+...+speed is as close as possible under delta..
+-        sx = (math.sqrt(1 + 8 * abs(dx)) - 1) // 2
+-        sy = (math.sqrt(1 + 8 * abs(dy)) - 1) // 2
++        sx = int(math.sqrt(1 + 8 * abs(dx)) - 1) // 2
++        sy = int(math.sqrt(1 + 8 * abs(dy)) - 1) // 2
+ 
+         # compute the amount of displacement still needed because we're dealing with integer values.
+         # Since this function is called for exact moves (not free scrolling)
diff --git a/srcpkgs/frescobaldi/patches/python3_10_2.patch b/srcpkgs/frescobaldi/patches/python3_10_2.patch
new file mode 100644
index 000000000000..fb8848316b4d
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/python3_10_2.patch
@@ -0,0 +1,137 @@
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 17312d78..7b6699e5 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -205,8 +205,8 @@ class PopplerRenderer(render.AbstractRenderer):
+             key.rotation, paperColor)
+         if multiplier == 2:
+             image = image.scaledToWidth(tile.w, Qt.SmoothTransformation)
+-        image.setDotsPerMeterX(xres * 39.37)
+-        image.setDotsPerMeterY(yres * 39.37)
++        image.setDotsPerMeterX(round(xres * 39.37))
++        image.setDotsPerMeterY(round(yres * 39.37))
+         return image
+ 
+     def setRenderHints(self, doc):
+diff --git a/frescobaldi_app/qpageview/render.py b/frescobaldi_app/qpageview/render.py
+index a8c00de1..79a6a10b 100644
+--- a/frescobaldi_app/qpageview/render.py
++++ b/frescobaldi_app/qpageview/render.py
+@@ -241,7 +241,7 @@ class AbstractRenderer:
+         key = self.key(page, ratio)
+ 
+         # paint rect in tile coordinates
+-        target = QRect(rect.x() * ratio, rect.y() * ratio, rect.width() * ratio, rect.height() * ratio)
++        target = QRect(round(rect.x() * ratio), round(rect.y() * ratio), round(rect.width() * ratio), round(rect.height() * ratio))
+ 
+         # tiles to paint
+         tiles = [t for t in self.tiles(key.width, key.height) if QRect(*t) & target]
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 6f4dcaf1..027ce7e0 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -186,9 +186,9 @@ class ScrollArea(QAbstractScrollArea):
+         else:
+             viewport = self.viewport()
+             vbar.setRange(0, h - viewport.height())
+-            vbar.setPageStep(viewport.height() * .9)
++            vbar.setPageStep(round(viewport.height() * .9))
+             hbar.setRange(0, w - viewport.width())
+-            hbar.setPageStep(viewport.width() * .9)
++            hbar.setPageStep(round(viewport.width() * .9))
+         
+     def scrollOffset(self):
+         """Return the current scroll offset."""
+@@ -295,7 +295,7 @@ class ScrollArea(QAbstractScrollArea):
+         """Begin a scrolling operation using the specified scroller."""
+         self._scroller = scroller
+         if self._scrollTimer is None:
+-            self._scrollTimer = self.startTimer(1000 / self.scrollupdatespersec)
++            self._scrollTimer = self.startTimer(round(1000 / self.scrollupdatespersec))
+ 
+     def stopScrolling(self):
+         """Stop scrolling."""
+diff --git a/frescobaldi_app/qpageview/shadow.py b/frescobaldi_app/qpageview/shadow.py
+index c7d1c8d5..4f9cc1bf 100644
+--- a/frescobaldi_app/qpageview/shadow.py
++++ b/frescobaldi_app/qpageview/shadow.py
+@@ -37,10 +37,10 @@ class ShadowViewMixin:
+ 
+     def paintEvent(self, ev):
+         if self.dropShadowEnabled:
+-            width = self._pageLayout.spacing / 2
++            width = round(self._pageLayout.spacing / 2)
+             # make the rect slightly larger, so we "see" shadow of pages that
+             # would be outside view normally.
+-            rect = ev.rect().adjusted(-width, -width, width / 2, width / 2)
++            rect = ev.rect().adjusted(-width, -width, width // 2, width // 2)
+             painter = QPainter(self.viewport())
+             for page, rect in self.pagesToPaint(rect, painter):
+                 self.drawDropShadow(page, painter, width)
+@@ -53,14 +53,14 @@ class ShadowViewMixin:
+         
+         """
+         width = round(width)
+-        rect = page.rect().adjusted(width / 2, width / 2, 0, 0)
++        rect = page.rect().adjusted(width // 2, width // 2, 0, 0)
+         color = QColor(Qt.black)
+         pen = QPen()
+         pen.setWidth(1)
+         pen.setJoinStyle(Qt.MiterJoin)
+         for i in range(width):
+             f = (width-i)/width
+-            color.setAlpha(200**f + 55*f)
++            color.setAlpha(round(200**f + 55*f))
+             pen.setColor(color)
+             painter.setPen(pen)
+             painter.drawRect(rect.adjusted(-i, -i, i, i))
+diff --git a/frescobaldi_app/viewmanager.py b/frescobaldi_app/viewmanager.py
+index e1294c91..046c70df 100644
+--- a/frescobaldi_app/viewmanager.py
++++ b/frescobaldi_app/viewmanager.py
+@@ -332,7 +332,7 @@ class ViewManager(QSplitter):
+             splitter.setOrientation(orientation)
+             size = splitter.sizes()[0]
+             splitter.addWidget(newspace)
+-            splitter.setSizes([size / 2, size / 2])
++            splitter.setSizes([size // 2, size // 2])
+         elif splitter.orientation() == orientation:
+             index = splitter.indexOf(viewspace)
+             splitter.insertWidget(index + 1, newspace)
+@@ -346,7 +346,7 @@ class ViewManager(QSplitter):
+             splitter.setSizes(sizes)
+             size = newsplitter.sizes()[0]
+             newsplitter.addWidget(newspace)
+-            newsplitter.setSizes([size / 2, size / 2])
++            newsplitter.setSizes([size // 2, size // 2])
+         self._viewSpaces.insert(0, newspace)
+         newspace.showDocument(viewspace.document())
+         if active:
+diff --git a/frescobaldi_app/widgets/linenumberarea.py b/frescobaldi_app/widgets/linenumberarea.py
+index f097726c..93970e7d 100644
+--- a/frescobaldi_app/widgets/linenumberarea.py
++++ b/frescobaldi_app/widgets/linenumberarea.py
+@@ -80,7 +80,7 @@ class LineNumberArea(QWidget):
+             if geom.top() >= ev.rect().bottom():
+                 break
+             if block.isVisible() and geom.bottom() > ev.rect().top() + 1:
+-                rect.moveTop(geom.top())
++                rect.moveTop(round(geom.top()))
+                 text = format(block.blockNumber() + 1, 'd')
+                 painter.drawText(rect, Qt.AlignRight, text)
+             block = block.next()
+diff --git a/frescobaldi_app/widgets/progressbar.py b/frescobaldi_app/widgets/progressbar.py
+index 670bf0f5..6cd9b31d 100644
+--- a/frescobaldi_app/widgets/progressbar.py
++++ b/frescobaldi_app/widgets/progressbar.py
+@@ -71,8 +71,8 @@ class TimedProgressBar(QProgressBar):
+         """
+         self._hideTimer.stop()
+         self._timeline.stop()
+-        self._timeline.setDuration(total * 1000)
+-        self._timeline.setCurrentTime(elapsed * 1000)
++        self._timeline.setDuration(round(total * 1000))
++        self._timeline.setCurrentTime(round(elapsed * 1000))
+         self.setValue(self._timeline.currentFrame())
+         self._timeline.resume()
+         if self._hideWhileIdle and not self._hidden:
diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..bf61cf1155c6
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,20 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools gettext"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/v${version}/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=f97256ce15ab621593536e219584a2ed744c1933148ac7ed98fcef6a3a9510a6
+
+pre_build() {
+	make -C linux
+}

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (59 preceding siblings ...)
  2021-11-10 19:10 ` chili-b
@ 2021-11-10 19:24 ` chili-b
  2021-11-10 22:20 ` chili-b
                   ` (23 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-11-10 19:24 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From dab09477c8618247e8d81114c1256aea60290c9b Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From e478464b9df16e9a0aeeed565278e304e106c0ea Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/3] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..efbd3c65d357
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,28 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+hostmakedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+makedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	# Cludge to fix build under armv7l, armv6l
+	if [[ $XBPS_TARGET_MACHINE == arm* ]]; then
+		export CFLAGS="-mtune=generic-armv7-a "
+		export CFLAGS+="-I${XBPS_CROSS_BASE}/${py3_inc}"
+	fi
+
+	python setup.py build_ext --pyqt-sip-dir=/${py3_sitelib}/PyQt5/bindings
+}

From 9ad978d76f083c63cf55d4856fa22b4343321e62 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/3] New package: frescobaldi-3.1.3

---
 srcpkgs/frescobaldi/patches/python3_10.patch  | 201 ++++++++++++++++++
 .../frescobaldi/patches/python3_10_2.patch    | 137 ++++++++++++
 srcpkgs/frescobaldi/template                  |  20 ++
 3 files changed, 358 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/patches/python3_10.patch
 create mode 100644 srcpkgs/frescobaldi/patches/python3_10_2.patch
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/patches/python3_10.patch b/srcpkgs/frescobaldi/patches/python3_10.patch
new file mode 100644
index 000000000000..c4248f38bca8
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/python3_10.patch
@@ -0,0 +1,201 @@
+# Python 3.10 made a change to how floats are cast to integers which breaks a
+# lot of things in frescobaldi. This will supposedly be fixed by the time
+# v3.2 releases, but for now we must rely on patching.
+#
+# Assuming that the issues are fixed upstream when they say they will be, this
+# patch is to be removed when frescobaldi's next release comes out.
+diff --git a/frescobaldi_app/qpageview/page.py b/frescobaldi_app/qpageview/page.py
+index f93fa9e2..754d2736 100644
+--- a/frescobaldi_app/qpageview/page.py
++++ b/frescobaldi_app/qpageview/page.py
+@@ -48,7 +48,7 @@ class AbstractPage(util.Rectangular):
+ 
+     ...that normally do not change during its lifetime:
+ 
+-        `pageWidth`     the original width  (by default in points, `dpi` is 72.0 
++        `pageWidth`     the original width  (by default in points, `dpi` is 72.0
+         `pageHeight`    the original height   but can be changed at class level)
+ 
+     ... that can be modified by the user (having defaults at the class level):
+@@ -174,15 +174,15 @@ class AbstractPage(util.Rectangular):
+ 
+     def defaultSize(self):
+         """Return the pageSize() scaled and rotated (if needed).
+-        
++
+         Based on scaleX, scaleY, and computedRotation attributes.
+-        
++
+         """
+         s = QSizeF(self.pageWidth * self.scaleX, self.pageHeight * self.scaleY)
+         if self.computedRotation & 1:
+             s.transpose()
+         return s
+-        
++
+     def updateSize(self, dpiX, dpiY, zoomFactor):
+         """Set the width and height attributes of the page.
+ 
+@@ -286,7 +286,7 @@ class AbstractPage(util.Rectangular):
+ 
+         pdf = QPdfWriter(filename)
+         pdf.setCreator("qpageview")
+-        pdf.setResolution(resolution)
++        pdf.setResolution(int(resolution))
+ 
+         layout = pdf.pageLayout()
+         layout.setMode(layout.FullPageMode)
+@@ -350,7 +350,7 @@ class AbstractPage(util.Rectangular):
+             svg.setFileName(filename)
+         else:
+             svg.setOutputDevice(filename)
+-        svg.setResolution(resolution)
++        svg.setResolution(int(resolution))
+         svg.setSize(targetSize.toSize())
+         svg.setViewBox(QRectF(0, 0, targetSize.width(), targetSize.height()))
+         return self.output(svg, source, paperColor)
+@@ -381,31 +381,31 @@ class AbstractPage(util.Rectangular):
+ 
+     def group(self):
+         """Return the group the page belongs to.
+-        
++
+         This could be some document structure, so that different Page objects
+         could refer to the same graphical contents, preventing double caching.
+-        
++
+         This object is used together with the value returned by ident() as a key
+         to cache the page. The idea is that the contents of the page are
+         uniquely identified by the objects returned by group() and ident().
+-        
++
+         This way, when the same document is opened in multiple page instances,
+         only one copy resides in the (global) cache.
+-        
++
+         By default, the page object itself is returned.
+-        
++
+         """
+         return self
+-        
++
+     def ident(self):
+         """Return a value that identifies the page within the group returned
+         by group().
+-        
++
+         By default, None is returned.
+-        
++
+         """
+         return None
+-    
++
+     def mapToPage(self, width=None, height=None):
+         """Return a MapToPage object, that can map original to Page coordinates.
+ 
+@@ -426,10 +426,10 @@ class AbstractPage(util.Rectangular):
+ 
+     def text(self, rect):
+         """Implement this method to get the text at the specified rectangle.
+-        
++
+         The rectangle should be in page coordinates. The default implementation
+         simply returns an empty string.
+-        
++
+         """
+         return ""
+ 
+@@ -437,22 +437,22 @@ class AbstractPage(util.Rectangular):
+         """Implement this method to load our links."""
+         from . import link
+         return link.Links()
+-    
++
+     def links(self):
+         """Return the Links object, containing Link objects.
+-        
++
+         Every Link denotes a clickable area on a Page, in coordinates 0.0-1.0.
+         The Links object makes it possible to quickly find a link on a Page.
+         This is cached after the first request, you should implement the
+         getLinks() method to load the links.
+-        
++
+         """
+         try:
+             return self._links
+         except AttributeError:
+             links = self._links = self.getLinks()
+         return links
+-    
++
+     def linksAt(self, point):
+         """Return a list() of zero or more links touched by QPoint point.
+ 
+@@ -468,9 +468,9 @@ class AbstractPage(util.Rectangular):
+ 
+     def linksIn(self, rect):
+         """Return an unordered set of links enclosed in rectangle.
+-        
++
+         The rectangle is in page coordinates.
+-        
++
+         """
+         return self.links().inside(*self.mapFromPage(1, 1).rect(rect).getCoords())
+ 
+@@ -481,9 +481,9 @@ class AbstractPage(util.Rectangular):
+ 
+ class AbstractRenderedPage(AbstractPage):
+     """A Page that has a renderer that performs caching and painting.
+-    
++
+     The renderer lives in the renderer attribute.
+-    
++
+     """
+     def __init__(self, renderer=None):
+         if renderer is not None:
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 26768356..810dbca5 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -259,7 +259,7 @@ class PopplerRenderer(render.AbstractRenderer):
+         (See AbstractPage.print().)
+ 
+         """
+-        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile))
++        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile)).toRect()   # rounded
+         target = QRectF(0, 0, tile.w, tile.h)
+         if key.rotation & 1:
+             target.setSize(target.size().transposed())
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 5a0c5631..6722a6db 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -365,9 +365,9 @@ class ScrollArea(QAbstractScrollArea):
+                 speed = speed * 1000 / self.scrollupdatespersec / time
+                 # compute diff to scroll
+                 sx = abs(speed.x())
+-                diffx = sx * (sx + 1) / 2
++                diffx = int(sx * (sx + 1) / 2)
+                 sy = abs(speed.y())
+-                diffy = sy * (sy + 1) / 2
++                diffy = int(sy * (sy + 1) / 2)
+                 if speed.x() < 0: diffx = -diffx
+                 if speed.y() < 0: diffy = -diffy
+                 self.kineticScrollBy(QPoint(diffx, diffy))
+@@ -444,8 +444,8 @@ class KineticScroller(Scroller):
+         dy = diff.y()
+ 
+         # solve speed*(speed+1)/2 = delta to ensure 1+2+3+...+speed is as close as possible under delta..
+-        sx = (math.sqrt(1 + 8 * abs(dx)) - 1) // 2
+-        sy = (math.sqrt(1 + 8 * abs(dy)) - 1) // 2
++        sx = int(math.sqrt(1 + 8 * abs(dx)) - 1) // 2
++        sy = int(math.sqrt(1 + 8 * abs(dy)) - 1) // 2
+ 
+         # compute the amount of displacement still needed because we're dealing with integer values.
+         # Since this function is called for exact moves (not free scrolling)
diff --git a/srcpkgs/frescobaldi/patches/python3_10_2.patch b/srcpkgs/frescobaldi/patches/python3_10_2.patch
new file mode 100644
index 000000000000..fb8848316b4d
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/python3_10_2.patch
@@ -0,0 +1,137 @@
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 17312d78..7b6699e5 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -205,8 +205,8 @@ class PopplerRenderer(render.AbstractRenderer):
+             key.rotation, paperColor)
+         if multiplier == 2:
+             image = image.scaledToWidth(tile.w, Qt.SmoothTransformation)
+-        image.setDotsPerMeterX(xres * 39.37)
+-        image.setDotsPerMeterY(yres * 39.37)
++        image.setDotsPerMeterX(round(xres * 39.37))
++        image.setDotsPerMeterY(round(yres * 39.37))
+         return image
+ 
+     def setRenderHints(self, doc):
+diff --git a/frescobaldi_app/qpageview/render.py b/frescobaldi_app/qpageview/render.py
+index a8c00de1..79a6a10b 100644
+--- a/frescobaldi_app/qpageview/render.py
++++ b/frescobaldi_app/qpageview/render.py
+@@ -241,7 +241,7 @@ class AbstractRenderer:
+         key = self.key(page, ratio)
+ 
+         # paint rect in tile coordinates
+-        target = QRect(rect.x() * ratio, rect.y() * ratio, rect.width() * ratio, rect.height() * ratio)
++        target = QRect(round(rect.x() * ratio), round(rect.y() * ratio), round(rect.width() * ratio), round(rect.height() * ratio))
+ 
+         # tiles to paint
+         tiles = [t for t in self.tiles(key.width, key.height) if QRect(*t) & target]
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 6f4dcaf1..027ce7e0 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -186,9 +186,9 @@ class ScrollArea(QAbstractScrollArea):
+         else:
+             viewport = self.viewport()
+             vbar.setRange(0, h - viewport.height())
+-            vbar.setPageStep(viewport.height() * .9)
++            vbar.setPageStep(round(viewport.height() * .9))
+             hbar.setRange(0, w - viewport.width())
+-            hbar.setPageStep(viewport.width() * .9)
++            hbar.setPageStep(round(viewport.width() * .9))
+         
+     def scrollOffset(self):
+         """Return the current scroll offset."""
+@@ -295,7 +295,7 @@ class ScrollArea(QAbstractScrollArea):
+         """Begin a scrolling operation using the specified scroller."""
+         self._scroller = scroller
+         if self._scrollTimer is None:
+-            self._scrollTimer = self.startTimer(1000 / self.scrollupdatespersec)
++            self._scrollTimer = self.startTimer(round(1000 / self.scrollupdatespersec))
+ 
+     def stopScrolling(self):
+         """Stop scrolling."""
+diff --git a/frescobaldi_app/qpageview/shadow.py b/frescobaldi_app/qpageview/shadow.py
+index c7d1c8d5..4f9cc1bf 100644
+--- a/frescobaldi_app/qpageview/shadow.py
++++ b/frescobaldi_app/qpageview/shadow.py
+@@ -37,10 +37,10 @@ class ShadowViewMixin:
+ 
+     def paintEvent(self, ev):
+         if self.dropShadowEnabled:
+-            width = self._pageLayout.spacing / 2
++            width = round(self._pageLayout.spacing / 2)
+             # make the rect slightly larger, so we "see" shadow of pages that
+             # would be outside view normally.
+-            rect = ev.rect().adjusted(-width, -width, width / 2, width / 2)
++            rect = ev.rect().adjusted(-width, -width, width // 2, width // 2)
+             painter = QPainter(self.viewport())
+             for page, rect in self.pagesToPaint(rect, painter):
+                 self.drawDropShadow(page, painter, width)
+@@ -53,14 +53,14 @@ class ShadowViewMixin:
+         
+         """
+         width = round(width)
+-        rect = page.rect().adjusted(width / 2, width / 2, 0, 0)
++        rect = page.rect().adjusted(width // 2, width // 2, 0, 0)
+         color = QColor(Qt.black)
+         pen = QPen()
+         pen.setWidth(1)
+         pen.setJoinStyle(Qt.MiterJoin)
+         for i in range(width):
+             f = (width-i)/width
+-            color.setAlpha(200**f + 55*f)
++            color.setAlpha(round(200**f + 55*f))
+             pen.setColor(color)
+             painter.setPen(pen)
+             painter.drawRect(rect.adjusted(-i, -i, i, i))
+diff --git a/frescobaldi_app/viewmanager.py b/frescobaldi_app/viewmanager.py
+index e1294c91..046c70df 100644
+--- a/frescobaldi_app/viewmanager.py
++++ b/frescobaldi_app/viewmanager.py
+@@ -332,7 +332,7 @@ class ViewManager(QSplitter):
+             splitter.setOrientation(orientation)
+             size = splitter.sizes()[0]
+             splitter.addWidget(newspace)
+-            splitter.setSizes([size / 2, size / 2])
++            splitter.setSizes([size // 2, size // 2])
+         elif splitter.orientation() == orientation:
+             index = splitter.indexOf(viewspace)
+             splitter.insertWidget(index + 1, newspace)
+@@ -346,7 +346,7 @@ class ViewManager(QSplitter):
+             splitter.setSizes(sizes)
+             size = newsplitter.sizes()[0]
+             newsplitter.addWidget(newspace)
+-            newsplitter.setSizes([size / 2, size / 2])
++            newsplitter.setSizes([size // 2, size // 2])
+         self._viewSpaces.insert(0, newspace)
+         newspace.showDocument(viewspace.document())
+         if active:
+diff --git a/frescobaldi_app/widgets/linenumberarea.py b/frescobaldi_app/widgets/linenumberarea.py
+index f097726c..93970e7d 100644
+--- a/frescobaldi_app/widgets/linenumberarea.py
++++ b/frescobaldi_app/widgets/linenumberarea.py
+@@ -80,7 +80,7 @@ class LineNumberArea(QWidget):
+             if geom.top() >= ev.rect().bottom():
+                 break
+             if block.isVisible() and geom.bottom() > ev.rect().top() + 1:
+-                rect.moveTop(geom.top())
++                rect.moveTop(round(geom.top()))
+                 text = format(block.blockNumber() + 1, 'd')
+                 painter.drawText(rect, Qt.AlignRight, text)
+             block = block.next()
+diff --git a/frescobaldi_app/widgets/progressbar.py b/frescobaldi_app/widgets/progressbar.py
+index 670bf0f5..6cd9b31d 100644
+--- a/frescobaldi_app/widgets/progressbar.py
++++ b/frescobaldi_app/widgets/progressbar.py
+@@ -71,8 +71,8 @@ class TimedProgressBar(QProgressBar):
+         """
+         self._hideTimer.stop()
+         self._timeline.stop()
+-        self._timeline.setDuration(total * 1000)
+-        self._timeline.setCurrentTime(elapsed * 1000)
++        self._timeline.setDuration(round(total * 1000))
++        self._timeline.setCurrentTime(round(elapsed * 1000))
+         self.setValue(self._timeline.currentFrame())
+         self._timeline.resume()
+         if self._hideWhileIdle and not self._hidden:
diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..bf61cf1155c6
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,20 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools gettext"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/v${version}/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=f97256ce15ab621593536e219584a2ed744c1933148ac7ed98fcef6a3a9510a6
+
+pre_build() {
+	make -C linux
+}

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (60 preceding siblings ...)
  2021-11-10 19:24 ` chili-b
@ 2021-11-10 22:20 ` chili-b
  2022-01-17  1:06 ` chili-b
                   ` (22 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2021-11-10 22:20 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From dab09477c8618247e8d81114c1256aea60290c9b Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From e478464b9df16e9a0aeeed565278e304e106c0ea Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/3] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..efbd3c65d357
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,28 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+hostmakedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+makedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	# Cludge to fix build under armv7l, armv6l
+	if [[ $XBPS_TARGET_MACHINE == arm* ]]; then
+		export CFLAGS="-mtune=generic-armv7-a "
+		export CFLAGS+="-I${XBPS_CROSS_BASE}/${py3_inc}"
+	fi
+
+	python setup.py build_ext --pyqt-sip-dir=/${py3_sitelib}/PyQt5/bindings
+}

From b61056664106202b2a6772e7f1ac38ad59df65b2 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/3] New package: frescobaldi-3.1.3

---
 ...f-py-3.10-float-int-fixes-issue-1398.patch | 530 ++++++++++++++++++
 ...e-py-3.10-float-int-fixes-issue-1398.patch | 209 +++++++
 ...nges-to-fix-errors-under-Python-3.10.patch |  50 ++
 srcpkgs/frescobaldi/template                  |  20 +
 4 files changed, 809 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/patches/0001-first-batch-of-py-3.10-float-int-fixes-issue-1398.patch
 create mode 100644 srcpkgs/frescobaldi/patches/0002-more-py-3.10-float-int-fixes-issue-1398.patch
 create mode 100644 srcpkgs/frescobaldi/patches/0003-More-changes-to-fix-errors-under-Python-3.10.patch
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/patches/0001-first-batch-of-py-3.10-float-int-fixes-issue-1398.patch b/srcpkgs/frescobaldi/patches/0001-first-batch-of-py-3.10-float-int-fixes-issue-1398.patch
new file mode 100644
index 000000000000..1b80ed879f93
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/0001-first-batch-of-py-3.10-float-int-fixes-issue-1398.patch
@@ -0,0 +1,530 @@
+From 51886dba8a3cb3db6eba9a6cf1d65bd8eaf877aa Mon Sep 17 00:00:00 2001
+From: Wilbert Berendsen <wbsoft@xs4all.nl>
+Date: Sun, 7 Nov 2021 14:53:33 +0100
+Subject: [PATCH 1/2] first batch of py 3.10 float->int fixes, issue #1398
+
+---
+ frescobaldi_app/qpageview/magnifier.py    | 10 +++---
+ frescobaldi_app/qpageview/poppler.py      | 18 +++++------
+ frescobaldi_app/qpageview/render.py       | 18 +++++------
+ frescobaldi_app/qpageview/rubberband.py   | 38 +++++++++++------------
+ frescobaldi_app/qpageview/scrollarea.py   | 34 ++++++++++----------
+ frescobaldi_app/qpageview/shadow.py       | 12 +++----
+ frescobaldi_app/widgets/linenumberarea.py |  4 +--
+ frescobaldi_app/widgets/progressbar.py    |  4 +--
+ 8 files changed, 69 insertions(+), 69 deletions(-)
+
+diff --git a/frescobaldi_app/qpageview/magnifier.py b/frescobaldi_app/qpageview/magnifier.py
+index 3a2759fb..b93d05be 100644
+--- a/frescobaldi_app/qpageview/magnifier.py
++++ b/frescobaldi_app/qpageview/magnifier.py
+@@ -156,7 +156,7 @@ class Magnifier(QWidget):
+ 
+     def moveEvent(self, ev):
+         """Called on move, updates the contents."""
+-        # we also update on paint events, but they are not generated if the 
++        # we also update on paint events, but they are not generated if the
+         # magnifiers fully covers the viewport
+         self.update()
+ 
+@@ -240,8 +240,8 @@ class Magnifier(QWidget):
+                 factor = 1.1 ** (ev.angleDelta().y() / 120)
+                 g = self.geometry()
+                 c = g.center()
+-                g.setWidth(min(max(g.width() * factor, self.MIN_SIZE), self.MAX_SIZE))
+-                g.setHeight(min(max(g.height() * factor, self.MIN_SIZE), self.MAX_SIZE))
++                g.setWidth(int(min(max(g.width() * factor, self.MIN_SIZE), self.MAX_SIZE)))
++                g.setHeight(int(min(max(g.height() * factor, self.MIN_SIZE), self.MAX_SIZE)))
+                 g.moveCenter(c)
+                 self.setGeometry(g)
+             else:
+@@ -278,13 +278,13 @@ class Magnifier(QWidget):
+ 
+         # the virtual position of the whole scaled-up layout
+         ev_rect = ev.rect().translated(our_rect.topLeft())
+-        
++
+         # draw shadow border?
+         shadow = False
+         if hasattr(view, "drawDropShadow") and view.dropShadowEnabled:
+             shadow = True
+             shadow_width = layout.spacing * scale // 2
+-        
++
+         painter = QPainter(self)
+         for p in layout.pagesAt(region.boundingRect()):
+             # get a (reused) the copy of the page
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 17312d78..26768356 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -62,7 +62,7 @@ class Link(link.Link):
+     def __init__(self, linkobj):
+         self.linkobj = linkobj
+         self.area = link.Area(*linkobj.linkArea().normalized().getCoords())
+-    
++
+     @property
+     def url(self):
+         if isinstance(self.linkobj, popplerqt5.Poppler.LinkBrowse):
+@@ -105,8 +105,8 @@ class PopplerPage(page.AbstractRenderedPage):
+     def load(cls, filename, renderer=None):
+         """Load a Poppler document, and yield of instances of this class.
+ 
+-        The filename can also be a QByteArray or a popplerqt5.Poppler.Document 
+-        instance. The specified Renderer is used, or else the global poppler 
++        The filename can also be a QByteArray or a popplerqt5.Poppler.Document
++        instance. The specified Renderer is used, or else the global poppler
+         renderer.
+ 
+         """
+@@ -116,11 +116,11 @@ class PopplerPage(page.AbstractRenderedPage):
+     def mutex(self):
+         """No two pages of same Poppler document are rendered at the same time."""
+         return self.document
+-    
++
+     def group(self):
+         """Reimplemented to return the Poppler document our page displays a page from."""
+         return self.document
+-    
++
+     def ident(self):
+         """Reimplemented to return the page number of this page."""
+         return self.pageNumber
+@@ -131,7 +131,7 @@ class PopplerPage(page.AbstractRenderedPage):
+         with locking.lock(self.document):
+             page = self.document.page(self.pageNumber)
+             return page.text(rect)
+-    
++
+     def links(self):
+         """Reimplemented to use a different caching mechanism."""
+         document, pageNumber = self.document, self.pageNumber
+@@ -184,7 +184,7 @@ class PopplerRenderer(render.AbstractRenderer):
+         renderBackend = printRenderBackend = 0
+ 
+     oversampleThreshold = 96
+-    
++
+     def render(self, page, key, tile, paperColor=None):
+         """Generate an image for the Page referred to by key."""
+         if paperColor is None:
+@@ -205,8 +205,8 @@ class PopplerRenderer(render.AbstractRenderer):
+             key.rotation, paperColor)
+         if multiplier == 2:
+             image = image.scaledToWidth(tile.w, Qt.SmoothTransformation)
+-        image.setDotsPerMeterX(xres * 39.37)
+-        image.setDotsPerMeterY(yres * 39.37)
++        image.setDotsPerMeterX(int(xres * 39.37))
++        image.setDotsPerMeterY(int(yres * 39.37))
+         return image
+ 
+     def setRenderHints(self, doc):
+diff --git a/frescobaldi_app/qpageview/render.py b/frescobaldi_app/qpageview/render.py
+index a8c00de1..5560fa2f 100644
+--- a/frescobaldi_app/qpageview/render.py
++++ b/frescobaldi_app/qpageview/render.py
+@@ -146,11 +146,11 @@ class AbstractRenderer:
+ 
+     def map(self, key, box):
+         """Return a QTransform converting from Key coordinates to a box.
+-        
++
+         The box should be a QRectF or QRect, and describes the original area of
+         the page.  The returned matrix can be used to convert e.g. tile
+         coordinates to the position on the original page.
+-        
++
+         """
+         t = QTransform()
+         t.translate(box.x(), box.y())
+@@ -182,17 +182,17 @@ class AbstractRenderer:
+ 
+     def render(self, page, key, tile, paperColor=None):
+         """Generate a QImage for tile of the Page.
+-        
++
+         The width, height and rotation to render at should be taken from the
+         key, as the page could be resized or rotated in the mean time.
+-        
++
+         The default implementation prepares the image, a painter and then
+         calls draw() to actually draw the contents.
+-        
++
+         If the paperColor is not specified, it will be read from the Page's
+         paperColor attribute (if not None) or else from the renderer's
+         paperColor attribute.
+-        
++
+         """
+         if paperColor is None:
+             paperColor = page.paperColor or self.paperColor
+@@ -200,7 +200,7 @@ class AbstractRenderer:
+         i = QImage(tile.w, tile.h, self.imageFormat)
+         i.fill(paperColor)
+         painter = QPainter(i)
+-        
++
+         # rotate the painter accordingly
+         util.rotate(painter, key.rotation, tile.w, tile.h, True)
+ 
+@@ -241,7 +241,7 @@ class AbstractRenderer:
+         key = self.key(page, ratio)
+ 
+         # paint rect in tile coordinates
+-        target = QRect(rect.x() * ratio, rect.y() * ratio, rect.width() * ratio, rect.height() * ratio)
++        target = QRect(int(rect.x() * ratio), int(rect.y() * ratio), int(rect.width() * ratio), int(rect.height() * ratio))
+ 
+         # tiles to paint
+         tiles = [t for t in self.tiles(key.width, key.height) if QRect(*t) & target]
+@@ -314,7 +314,7 @@ class AbstractRenderer:
+                 vscale = key.height / height
+                 for t in tileset:
+                     # scale to our image size
+-                    r = QRect(t.x * hscale, t.y * vscale, t.w * hscale, t.h * vscale) & target
++                    r = QRect(int(t.x * hscale), int(t.y * vscale), int(t.w * hscale), int(t.h * vscale)) & target
+                     if r and QRegion(r).subtracted(region):
+                         # we have an image that can be drawn in rect r
+                         source = QRectF(r.x() / hscale - t.x, r.y() / vscale - t.y,
+diff --git a/frescobaldi_app/qpageview/rubberband.py b/frescobaldi_app/qpageview/rubberband.py
+index dbab772a..4a073bc8 100644
+--- a/frescobaldi_app/qpageview/rubberband.py
++++ b/frescobaldi_app/qpageview/rubberband.py
+@@ -41,7 +41,7 @@ class Rubberband(QWidget):
+     """A Rubberband to select a rectangular region.
+ 
+     A Rubberband is added to a View with view.setRubberband().
+-    
++
+     The Rubberband lets the user select a rectangular region. When the
+     selection is changed, the `selectionChanged` signal is emitted, having the
+     selection rectangle in layout coordinates as argument.
+@@ -51,7 +51,7 @@ class Rubberband(QWidget):
+         showbutton (Qt.RightButton), the button used to drag a new rectangle
+ 
+         dragbutton (Qt.LeftButton), the button to alter an existing rectangle
+-        
++
+         trackSelection (False), whether to continuously emit selectionChanged().
+                 When True, selectionChanged() is emitted on every change, when
+                 False, the signal is only emitted when the mouse button is
+@@ -93,7 +93,7 @@ class Rubberband(QWidget):
+         color.setAlpha(150)
+         painter.setPen(color)
+         # XXX can this adjustment be done smarter?
+-        adjust = -1 / self.devicePixelRatio()
++        adjust = int(-1 / self.devicePixelRatio())
+         painter.drawRect(self.rect().adjusted(0, 0, adjust, adjust))
+ 
+         # Pseudo-handles at the corners and sides
+@@ -148,21 +148,21 @@ class Rubberband(QWidget):
+             self.setCursor(cursor)
+         else:
+             self.unsetCursor()
+-    
++
+     def hasSelection(self):
+         """Return True when there is a selection."""
+         return bool(self._selection)
+-    
++
+     def selection(self):
+         """Return our selection rectangle, relative to the view's layout position."""
+         return self._selection
+-    
++
+     def selectedPages(self):
+         """Yield tuples (page, rect) describing the selection.
+-        
++
+         Every rect is intersected with the page rect and translated to the
+         page's position.
+-        
++
+         """
+         rect = self.selection()
+         if rect:
+@@ -170,7 +170,7 @@ class Rubberband(QWidget):
+             layout = view.pageLayout()
+             for page in layout.pagesAt(rect):
+                 yield page, rect.intersected(page.geometry()).translated(-page.pos())
+-    
++
+     def selectedPage(self):
+         """Returns (page, rect) if there is a selection.
+ 
+@@ -211,10 +211,10 @@ class Rubberband(QWidget):
+ 
+     def selectedLinks(self):
+         """Yield tuples (page, links) for every page in the selection.
+-        
++
+         links is a non-empty set() of Link instances on that page that intersect
+         with the selection.
+-        
++
+         """
+         for page, rect in self.selectedPages():
+             links = page.linksIn(rect)
+@@ -234,19 +234,19 @@ class Rubberband(QWidget):
+         else:
+             self.hide()
+             self._setSelectionFromGeometry(QRect())
+-    
++
+     def clearSelection(self):
+         """Hide ourselves and clear the selection."""
+         self.hide()
+         self._dragging = False
+         self._setSelectionFromGeometry(QRect())
+-        
++
+     def _setSelectionFromGeometry(self, rect):
+         """(Internal) Called to emit the selectionChanged signal.
+-        
++
+         Only emits the signal when the selection really changed.
+         The rect should be our geometry or an empty QRect().
+-        
++
+         """
+         if rect:
+             view = self.parent().parent()
+@@ -254,16 +254,16 @@ class Rubberband(QWidget):
+         old, self._selection = self._selection, rect
+         if rect != old:
+             self.selectionChanged.emit(rect)
+-    
++
+     def _setLayoutOffset(self, pos):
+         """Store the position as offset from the layout, and also from the page
+         at that position. Used for keeping the same spot on zoom change.
+-        
++
+         """
+         view = self.parent().parent()
+         pos = pos - view.layoutPosition()
+         self._layoutOffset = view.pageLayout().pos2offset(pos)
+-    
++
+     def _getLayoutOffset(self):
+         """Get the stored layout offset position back, after zoom or move."""
+         view = self.parent().parent()
+@@ -340,7 +340,7 @@ class Rubberband(QWidget):
+             geom = QRect(self._getLayoutOffset(), self.size() * factor)
+             self.setGeometry(geom)
+             self._setSelectionFromGeometry(geom)
+-    
++
+     def eventFilter(self, viewport, ev):
+         """Act on events in the viewport:
+ 
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 6f4dcaf1..5a0c5631 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -46,7 +46,7 @@ class ScrollArea(QAbstractScrollArea):
+         draggingEnabled (True):
+             If enabled, the user can drag the contents of the scrollarea to
+             move it with the mouse.
+-            
++
+     """
+ 
+     alignment = Qt.AlignCenter
+@@ -109,10 +109,10 @@ class ScrollArea(QAbstractScrollArea):
+ 
+     def areaPos(self):
+         """Return the position of the area relative to the viewport.
+-        
++
+         The alignment attribute is taken into account when the area is smaller
+         than the viewport (horizontally and/or vertically).
+-        
++
+         """
+         w, h = self._areaSize
+         vw = self.viewport().width()
+@@ -123,13 +123,13 @@ class ScrollArea(QAbstractScrollArea):
+         if top < 0:
+             top = -self.verticalScrollBar().value()
+         return QPoint(left, top)
+-    
++
+     def visibleArea(self):
+         """Return a rectangle describing the part of the area that is visible."""
+         pos = self.areaPos()
+         r = self.viewport().rect() & QRect(pos, self.areaSize())
+         return r.translated(-pos)
+-        
++
+     def offsetToEnsureVisible(self, rect):
+         """Return an offset QPoint with the minimal scroll to make rect visible.
+ 
+@@ -153,12 +153,12 @@ class ScrollArea(QAbstractScrollArea):
+ 
+     def ensureVisible(self, rect, margins=None, allowKinetic=True):
+         """Performs the minimal scroll to make rect visible.
+-        
++
+         If the rect is not completely visible it is scrolled into view, adding
+         the margins if given (a QMargins instance). If allowKinetic is False,
+         immediately jumps to the position, otherwise scrolls smoothly (if
+         kinetic scrolling is enabled).
+-        
++
+         """
+         if rect not in self.visibleArea():
+             if margins is not None:
+@@ -171,9 +171,9 @@ class ScrollArea(QAbstractScrollArea):
+ 
+     def _updateScrollBars(self):
+         """Internal. Adjust the range of the scrollbars to the area size.
+-        
++
+         Called in setAreaSize() and resizeEvent().
+-        
++
+         """
+         w, h = self._areaSize
+         maxsize = self.maximumViewportSize()
+@@ -186,10 +186,10 @@ class ScrollArea(QAbstractScrollArea):
+         else:
+             viewport = self.viewport()
+             vbar.setRange(0, h - viewport.height())
+-            vbar.setPageStep(viewport.height() * .9)
++            vbar.setPageStep(int(viewport.height() * .9))
+             hbar.setRange(0, w - viewport.width())
+-            hbar.setPageStep(viewport.width() * .9)
+-        
++            hbar.setPageStep(int(viewport.width() * .9))
++
+     def scrollOffset(self):
+         """Return the current scroll offset."""
+         x = self.horizontalScrollBar().value()
+@@ -295,7 +295,7 @@ class ScrollArea(QAbstractScrollArea):
+         """Begin a scrolling operation using the specified scroller."""
+         self._scroller = scroller
+         if self._scrollTimer is None:
+-            self._scrollTimer = self.startTimer(1000 / self.scrollupdatespersec)
++            self._scrollTimer = self.startTimer(int(1000 // self.scrollupdatespersec))
+ 
+     def stopScrolling(self):
+         """Stop scrolling."""
+@@ -307,7 +307,7 @@ class ScrollArea(QAbstractScrollArea):
+     def isScrolling(self):
+         """Return True if a scrolling movement is active."""
+         return self._scroller is not None
+-    
++
+     def remainingScrollTime(self):
+         """If a kinetic scroll is active, return how many msecs the scroll wil last.
+ 
+@@ -375,7 +375,7 @@ class ScrollArea(QAbstractScrollArea):
+             self._dragTime = None
+             self._dragSpeed = None
+         super().mouseReleaseEvent(ev)
+-        
++
+ 
+ class Scroller:
+     """Abstract base class, encapsulates scrolling behaviour.
+@@ -453,13 +453,13 @@ class KineticScroller(Scroller):
+         # (TODO: adapt for other ticker speeds? WB)
+         if sy > 100:
+             sy = 100
+-        offy = abs(dy) - sy * (sy + 1) // 2
++        offy = int(abs(dy) - sy * (sy + 1) // 2)
+ 
+         # Although it is less likely to go beyond that limit for horizontal scrolling,
+         # do it for x as well.
+         if sx > 100:
+             sx = 100
+-        offx = abs(dx) - sx * (sx + 1) // 2
++        offx = int(abs(dx) - sx * (sx + 1) // 2)
+ 
+         # adjust directions
+         if dx < 0:
+diff --git a/frescobaldi_app/qpageview/shadow.py b/frescobaldi_app/qpageview/shadow.py
+index c7d1c8d5..5b0cd17b 100644
+--- a/frescobaldi_app/qpageview/shadow.py
++++ b/frescobaldi_app/qpageview/shadow.py
+@@ -37,10 +37,10 @@ class ShadowViewMixin:
+ 
+     def paintEvent(self, ev):
+         if self.dropShadowEnabled:
+-            width = self._pageLayout.spacing / 2
++            width = round(self._pageLayout.spacing / 2.0)
+             # make the rect slightly larger, so we "see" shadow of pages that
+             # would be outside view normally.
+-            rect = ev.rect().adjusted(-width, -width, width / 2, width / 2)
++            rect = ev.rect().adjusted(-width, -width, int(width // 2), int(width // 2))
+             painter = QPainter(self.viewport())
+             for page, rect in self.pagesToPaint(rect, painter):
+                 self.drawDropShadow(page, painter, width)
+@@ -48,19 +48,19 @@ class ShadowViewMixin:
+ 
+     def drawDropShadow(self, page, painter, width):
+         """Draw a drop shadow of width pixels around the Page.
+-        
++
+         The painter is already translated to the topleft corner of the Page.
+-        
++
+         """
+         width = round(width)
+-        rect = page.rect().adjusted(width / 2, width / 2, 0, 0)
++        rect = page.rect().adjusted(int(width // 2), int(width // 2), 0, 0)
+         color = QColor(Qt.black)
+         pen = QPen()
+         pen.setWidth(1)
+         pen.setJoinStyle(Qt.MiterJoin)
+         for i in range(width):
+             f = (width-i)/width
+-            color.setAlpha(200**f + 55*f)
++            color.setAlpha(int(200**f + 55*f))
+             pen.setColor(color)
+             painter.setPen(pen)
+             painter.drawRect(rect.adjusted(-i, -i, i, i))
+diff --git a/frescobaldi_app/widgets/linenumberarea.py b/frescobaldi_app/widgets/linenumberarea.py
+index f097726c..ff38bcc6 100644
+--- a/frescobaldi_app/widgets/linenumberarea.py
++++ b/frescobaldi_app/widgets/linenumberarea.py
+@@ -21,7 +21,7 @@
+ A line number area to be used in a QPlainTextEdit.
+ """
+ 
+-from PyQt5.QtCore import QEvent, QPoint, QRect, QSize, Qt
++from PyQt5.QtCore import QEvent, QPoint, QRectF, QSize, Qt
+ from PyQt5.QtGui import QFontMetrics, QMouseEvent, QPainter
+ from PyQt5.QtWidgets import QApplication, QWidget
+ 
+@@ -72,7 +72,7 @@ class LineNumberArea(QWidget):
+             return
+         painter = QPainter(self)
+         painter.setFont(edit.font())
+-        rect = QRect(0, 0, self.width() - 2, QFontMetrics(edit.font()).height())
++        rect = QRectF(0, 0, self.width() - 2, QFontMetrics(edit.font()).height())
+         block = edit.firstVisibleBlock()
+         while block.isValid():
+             geom = edit.blockBoundingGeometry(block)
+diff --git a/frescobaldi_app/widgets/progressbar.py b/frescobaldi_app/widgets/progressbar.py
+index 670bf0f5..183ab625 100644
+--- a/frescobaldi_app/widgets/progressbar.py
++++ b/frescobaldi_app/widgets/progressbar.py
+@@ -71,8 +71,8 @@ class TimedProgressBar(QProgressBar):
+         """
+         self._hideTimer.stop()
+         self._timeline.stop()
+-        self._timeline.setDuration(total * 1000)
+-        self._timeline.setCurrentTime(elapsed * 1000)
++        self._timeline.setDuration(int(total * 1000))
++        self._timeline.setCurrentTime(int(elapsed * 1000))
+         self.setValue(self._timeline.currentFrame())
+         self._timeline.resume()
+         if self._hideWhileIdle and not self._hidden:
+-- 
+2.33.1
+
diff --git a/srcpkgs/frescobaldi/patches/0002-more-py-3.10-float-int-fixes-issue-1398.patch b/srcpkgs/frescobaldi/patches/0002-more-py-3.10-float-int-fixes-issue-1398.patch
new file mode 100644
index 000000000000..8338ca2a362c
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/0002-more-py-3.10-float-int-fixes-issue-1398.patch
@@ -0,0 +1,209 @@
+From bd4dfe036b8dbc5d75552fe6b6b081c024e5beea Mon Sep 17 00:00:00 2001
+From: Wilbert Berendsen <wbsoft@xs4all.nl>
+Date: Mon, 8 Nov 2021 09:35:59 +0100
+Subject: [PATCH 2/2] more py 3.10 float->int fixes, issue #1398
+
+---
+ frescobaldi_app/qpageview/page.py       | 50 ++++++++++++-------------
+ frescobaldi_app/qpageview/poppler.py    |  2 +-
+ frescobaldi_app/qpageview/scrollarea.py |  8 ++--
+ 3 files changed, 30 insertions(+), 30 deletions(-)
+
+diff --git a/frescobaldi_app/qpageview/page.py b/frescobaldi_app/qpageview/page.py
+index f93fa9e2..754d2736 100644
+--- a/frescobaldi_app/qpageview/page.py
++++ b/frescobaldi_app/qpageview/page.py
+@@ -48,7 +48,7 @@ class AbstractPage(util.Rectangular):
+ 
+     ...that normally do not change during its lifetime:
+ 
+-        `pageWidth`     the original width  (by default in points, `dpi` is 72.0 
++        `pageWidth`     the original width  (by default in points, `dpi` is 72.0
+         `pageHeight`    the original height   but can be changed at class level)
+ 
+     ... that can be modified by the user (having defaults at the class level):
+@@ -174,15 +174,15 @@ class AbstractPage(util.Rectangular):
+ 
+     def defaultSize(self):
+         """Return the pageSize() scaled and rotated (if needed).
+-        
++
+         Based on scaleX, scaleY, and computedRotation attributes.
+-        
++
+         """
+         s = QSizeF(self.pageWidth * self.scaleX, self.pageHeight * self.scaleY)
+         if self.computedRotation & 1:
+             s.transpose()
+         return s
+-        
++
+     def updateSize(self, dpiX, dpiY, zoomFactor):
+         """Set the width and height attributes of the page.
+ 
+@@ -286,7 +286,7 @@ class AbstractPage(util.Rectangular):
+ 
+         pdf = QPdfWriter(filename)
+         pdf.setCreator("qpageview")
+-        pdf.setResolution(resolution)
++        pdf.setResolution(int(resolution))
+ 
+         layout = pdf.pageLayout()
+         layout.setMode(layout.FullPageMode)
+@@ -350,7 +350,7 @@ class AbstractPage(util.Rectangular):
+             svg.setFileName(filename)
+         else:
+             svg.setOutputDevice(filename)
+-        svg.setResolution(resolution)
++        svg.setResolution(int(resolution))
+         svg.setSize(targetSize.toSize())
+         svg.setViewBox(QRectF(0, 0, targetSize.width(), targetSize.height()))
+         return self.output(svg, source, paperColor)
+@@ -381,31 +381,31 @@ class AbstractPage(util.Rectangular):
+ 
+     def group(self):
+         """Return the group the page belongs to.
+-        
++
+         This could be some document structure, so that different Page objects
+         could refer to the same graphical contents, preventing double caching.
+-        
++
+         This object is used together with the value returned by ident() as a key
+         to cache the page. The idea is that the contents of the page are
+         uniquely identified by the objects returned by group() and ident().
+-        
++
+         This way, when the same document is opened in multiple page instances,
+         only one copy resides in the (global) cache.
+-        
++
+         By default, the page object itself is returned.
+-        
++
+         """
+         return self
+-        
++
+     def ident(self):
+         """Return a value that identifies the page within the group returned
+         by group().
+-        
++
+         By default, None is returned.
+-        
++
+         """
+         return None
+-    
++
+     def mapToPage(self, width=None, height=None):
+         """Return a MapToPage object, that can map original to Page coordinates.
+ 
+@@ -426,10 +426,10 @@ class AbstractPage(util.Rectangular):
+ 
+     def text(self, rect):
+         """Implement this method to get the text at the specified rectangle.
+-        
++
+         The rectangle should be in page coordinates. The default implementation
+         simply returns an empty string.
+-        
++
+         """
+         return ""
+ 
+@@ -437,22 +437,22 @@ class AbstractPage(util.Rectangular):
+         """Implement this method to load our links."""
+         from . import link
+         return link.Links()
+-    
++
+     def links(self):
+         """Return the Links object, containing Link objects.
+-        
++
+         Every Link denotes a clickable area on a Page, in coordinates 0.0-1.0.
+         The Links object makes it possible to quickly find a link on a Page.
+         This is cached after the first request, you should implement the
+         getLinks() method to load the links.
+-        
++
+         """
+         try:
+             return self._links
+         except AttributeError:
+             links = self._links = self.getLinks()
+         return links
+-    
++
+     def linksAt(self, point):
+         """Return a list() of zero or more links touched by QPoint point.
+ 
+@@ -468,9 +468,9 @@ class AbstractPage(util.Rectangular):
+ 
+     def linksIn(self, rect):
+         """Return an unordered set of links enclosed in rectangle.
+-        
++
+         The rectangle is in page coordinates.
+-        
++
+         """
+         return self.links().inside(*self.mapFromPage(1, 1).rect(rect).getCoords())
+ 
+@@ -481,9 +481,9 @@ class AbstractPage(util.Rectangular):
+ 
+ class AbstractRenderedPage(AbstractPage):
+     """A Page that has a renderer that performs caching and painting.
+-    
++
+     The renderer lives in the renderer attribute.
+-    
++
+     """
+     def __init__(self, renderer=None):
+         if renderer is not None:
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 26768356..810dbca5 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -259,7 +259,7 @@ class PopplerRenderer(render.AbstractRenderer):
+         (See AbstractPage.print().)
+ 
+         """
+-        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile))
++        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile)).toRect()   # rounded
+         target = QRectF(0, 0, tile.w, tile.h)
+         if key.rotation & 1:
+             target.setSize(target.size().transposed())
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 5a0c5631..6722a6db 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -365,9 +365,9 @@ class ScrollArea(QAbstractScrollArea):
+                 speed = speed * 1000 / self.scrollupdatespersec / time
+                 # compute diff to scroll
+                 sx = abs(speed.x())
+-                diffx = sx * (sx + 1) / 2
++                diffx = int(sx * (sx + 1) / 2)
+                 sy = abs(speed.y())
+-                diffy = sy * (sy + 1) / 2
++                diffy = int(sy * (sy + 1) / 2)
+                 if speed.x() < 0: diffx = -diffx
+                 if speed.y() < 0: diffy = -diffy
+                 self.kineticScrollBy(QPoint(diffx, diffy))
+@@ -444,8 +444,8 @@ class KineticScroller(Scroller):
+         dy = diff.y()
+ 
+         # solve speed*(speed+1)/2 = delta to ensure 1+2+3+...+speed is as close as possible under delta..
+-        sx = (math.sqrt(1 + 8 * abs(dx)) - 1) // 2
+-        sy = (math.sqrt(1 + 8 * abs(dy)) - 1) // 2
++        sx = int(math.sqrt(1 + 8 * abs(dx)) - 1) // 2
++        sy = int(math.sqrt(1 + 8 * abs(dy)) - 1) // 2
+ 
+         # compute the amount of displacement still needed because we're dealing with integer values.
+         # Since this function is called for exact moves (not free scrolling)
+-- 
+2.33.1
+
diff --git a/srcpkgs/frescobaldi/patches/0003-More-changes-to-fix-errors-under-Python-3.10.patch b/srcpkgs/frescobaldi/patches/0003-More-changes-to-fix-errors-under-Python-3.10.patch
new file mode 100644
index 000000000000..b212b515e8ab
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/0003-More-changes-to-fix-errors-under-Python-3.10.patch
@@ -0,0 +1,50 @@
+From 4e910e55f6700fafe1683af770e4bc299cdd71a2 Mon Sep 17 00:00:00 2001
+From: Dexter Gaon-Shatford <dexter@gaonshatford.ca>
+Date: Wed, 10 Nov 2021 17:04:34 -0500
+Subject: [PATCH] More changes to fix errors under Python 3.10
+
+There are a few errors that are encountered when engraving a score in
+the editor that were not addressed in the changes made by wbsoft
+---
+ frescobaldi_app/viewmanager.py            | 4 ++--
+ frescobaldi_app/widgets/linenumberarea.py | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/frescobaldi_app/viewmanager.py b/frescobaldi_app/viewmanager.py
+index e1294c91..046c70df 100644
+--- a/frescobaldi_app/viewmanager.py
++++ b/frescobaldi_app/viewmanager.py
+@@ -332,7 +332,7 @@ class ViewManager(QSplitter):
+             splitter.setOrientation(orientation)
+             size = splitter.sizes()[0]
+             splitter.addWidget(newspace)
+-            splitter.setSizes([size / 2, size / 2])
++            splitter.setSizes([size // 2, size // 2])
+         elif splitter.orientation() == orientation:
+             index = splitter.indexOf(viewspace)
+             splitter.insertWidget(index + 1, newspace)
+@@ -346,7 +346,7 @@ class ViewManager(QSplitter):
+             splitter.setSizes(sizes)
+             size = newsplitter.sizes()[0]
+             newsplitter.addWidget(newspace)
+-            newsplitter.setSizes([size / 2, size / 2])
++            newsplitter.setSizes([size // 2, size // 2])
+         self._viewSpaces.insert(0, newspace)
+         newspace.showDocument(viewspace.document())
+         if active:
+diff --git a/frescobaldi_app/widgets/linenumberarea.py b/frescobaldi_app/widgets/linenumberarea.py
+index ff38bcc6..aa133ac7 100644
+--- a/frescobaldi_app/widgets/linenumberarea.py
++++ b/frescobaldi_app/widgets/linenumberarea.py
+@@ -80,7 +80,7 @@ class LineNumberArea(QWidget):
+             if geom.top() >= ev.rect().bottom():
+                 break
+             if block.isVisible() and geom.bottom() > ev.rect().top() + 1:
+-                rect.moveTop(geom.top())
++                rect.moveTop(int(geom.top()))
+                 text = format(block.blockNumber() + 1, 'd')
+                 painter.drawText(rect, Qt.AlignRight, text)
+             block = block.next()
+-- 
+2.33.1
+
diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..bf61cf1155c6
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,20 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools gettext"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/v${version}/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=f97256ce15ab621593536e219584a2ed744c1933148ac7ed98fcef6a3a9510a6
+
+pre_build() {
+	make -C linux
+}

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (61 preceding siblings ...)
  2021-11-10 22:20 ` chili-b
@ 2022-01-17  1:06 ` chili-b
  2022-01-19 22:10 ` chili-b
                   ` (21 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2022-01-17  1:06 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 3161ff24232fd8790297380a9311fa5908ee37c3 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/4] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 3a3610afcfd839fa5f4326d557a9619135677419 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/4] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..efbd3c65d357
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,28 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+hostmakedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+makedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	# Cludge to fix build under armv7l, armv6l
+	if [[ $XBPS_TARGET_MACHINE == arm* ]]; then
+		export CFLAGS="-mtune=generic-armv7-a "
+		export CFLAGS+="-I${XBPS_CROSS_BASE}/${py3_inc}"
+	fi
+
+	python setup.py build_ext --pyqt-sip-dir=/${py3_sitelib}/PyQt5/bindings
+}

From dd124320d8c2e82f96f7c9017e9b8bb0a1401b27 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/4] New package: frescobaldi-3.1.3

---
 ...f-py-3.10-float-int-fixes-issue-1398.patch | 530 ++++++++++++++++++
 ...e-py-3.10-float-int-fixes-issue-1398.patch | 209 +++++++
 ...nges-to-fix-errors-under-Python-3.10.patch |  50 ++
 srcpkgs/frescobaldi/template                  |  20 +
 4 files changed, 809 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/patches/0001-first-batch-of-py-3.10-float-int-fixes-issue-1398.patch
 create mode 100644 srcpkgs/frescobaldi/patches/0002-more-py-3.10-float-int-fixes-issue-1398.patch
 create mode 100644 srcpkgs/frescobaldi/patches/0003-More-changes-to-fix-errors-under-Python-3.10.patch
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/patches/0001-first-batch-of-py-3.10-float-int-fixes-issue-1398.patch b/srcpkgs/frescobaldi/patches/0001-first-batch-of-py-3.10-float-int-fixes-issue-1398.patch
new file mode 100644
index 000000000000..1b80ed879f93
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/0001-first-batch-of-py-3.10-float-int-fixes-issue-1398.patch
@@ -0,0 +1,530 @@
+From 51886dba8a3cb3db6eba9a6cf1d65bd8eaf877aa Mon Sep 17 00:00:00 2001
+From: Wilbert Berendsen <wbsoft@xs4all.nl>
+Date: Sun, 7 Nov 2021 14:53:33 +0100
+Subject: [PATCH 1/2] first batch of py 3.10 float->int fixes, issue #1398
+
+---
+ frescobaldi_app/qpageview/magnifier.py    | 10 +++---
+ frescobaldi_app/qpageview/poppler.py      | 18 +++++------
+ frescobaldi_app/qpageview/render.py       | 18 +++++------
+ frescobaldi_app/qpageview/rubberband.py   | 38 +++++++++++------------
+ frescobaldi_app/qpageview/scrollarea.py   | 34 ++++++++++----------
+ frescobaldi_app/qpageview/shadow.py       | 12 +++----
+ frescobaldi_app/widgets/linenumberarea.py |  4 +--
+ frescobaldi_app/widgets/progressbar.py    |  4 +--
+ 8 files changed, 69 insertions(+), 69 deletions(-)
+
+diff --git a/frescobaldi_app/qpageview/magnifier.py b/frescobaldi_app/qpageview/magnifier.py
+index 3a2759fb..b93d05be 100644
+--- a/frescobaldi_app/qpageview/magnifier.py
++++ b/frescobaldi_app/qpageview/magnifier.py
+@@ -156,7 +156,7 @@ class Magnifier(QWidget):
+ 
+     def moveEvent(self, ev):
+         """Called on move, updates the contents."""
+-        # we also update on paint events, but they are not generated if the 
++        # we also update on paint events, but they are not generated if the
+         # magnifiers fully covers the viewport
+         self.update()
+ 
+@@ -240,8 +240,8 @@ class Magnifier(QWidget):
+                 factor = 1.1 ** (ev.angleDelta().y() / 120)
+                 g = self.geometry()
+                 c = g.center()
+-                g.setWidth(min(max(g.width() * factor, self.MIN_SIZE), self.MAX_SIZE))
+-                g.setHeight(min(max(g.height() * factor, self.MIN_SIZE), self.MAX_SIZE))
++                g.setWidth(int(min(max(g.width() * factor, self.MIN_SIZE), self.MAX_SIZE)))
++                g.setHeight(int(min(max(g.height() * factor, self.MIN_SIZE), self.MAX_SIZE)))
+                 g.moveCenter(c)
+                 self.setGeometry(g)
+             else:
+@@ -278,13 +278,13 @@ class Magnifier(QWidget):
+ 
+         # the virtual position of the whole scaled-up layout
+         ev_rect = ev.rect().translated(our_rect.topLeft())
+-        
++
+         # draw shadow border?
+         shadow = False
+         if hasattr(view, "drawDropShadow") and view.dropShadowEnabled:
+             shadow = True
+             shadow_width = layout.spacing * scale // 2
+-        
++
+         painter = QPainter(self)
+         for p in layout.pagesAt(region.boundingRect()):
+             # get a (reused) the copy of the page
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 17312d78..26768356 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -62,7 +62,7 @@ class Link(link.Link):
+     def __init__(self, linkobj):
+         self.linkobj = linkobj
+         self.area = link.Area(*linkobj.linkArea().normalized().getCoords())
+-    
++
+     @property
+     def url(self):
+         if isinstance(self.linkobj, popplerqt5.Poppler.LinkBrowse):
+@@ -105,8 +105,8 @@ class PopplerPage(page.AbstractRenderedPage):
+     def load(cls, filename, renderer=None):
+         """Load a Poppler document, and yield of instances of this class.
+ 
+-        The filename can also be a QByteArray or a popplerqt5.Poppler.Document 
+-        instance. The specified Renderer is used, or else the global poppler 
++        The filename can also be a QByteArray or a popplerqt5.Poppler.Document
++        instance. The specified Renderer is used, or else the global poppler
+         renderer.
+ 
+         """
+@@ -116,11 +116,11 @@ class PopplerPage(page.AbstractRenderedPage):
+     def mutex(self):
+         """No two pages of same Poppler document are rendered at the same time."""
+         return self.document
+-    
++
+     def group(self):
+         """Reimplemented to return the Poppler document our page displays a page from."""
+         return self.document
+-    
++
+     def ident(self):
+         """Reimplemented to return the page number of this page."""
+         return self.pageNumber
+@@ -131,7 +131,7 @@ class PopplerPage(page.AbstractRenderedPage):
+         with locking.lock(self.document):
+             page = self.document.page(self.pageNumber)
+             return page.text(rect)
+-    
++
+     def links(self):
+         """Reimplemented to use a different caching mechanism."""
+         document, pageNumber = self.document, self.pageNumber
+@@ -184,7 +184,7 @@ class PopplerRenderer(render.AbstractRenderer):
+         renderBackend = printRenderBackend = 0
+ 
+     oversampleThreshold = 96
+-    
++
+     def render(self, page, key, tile, paperColor=None):
+         """Generate an image for the Page referred to by key."""
+         if paperColor is None:
+@@ -205,8 +205,8 @@ class PopplerRenderer(render.AbstractRenderer):
+             key.rotation, paperColor)
+         if multiplier == 2:
+             image = image.scaledToWidth(tile.w, Qt.SmoothTransformation)
+-        image.setDotsPerMeterX(xres * 39.37)
+-        image.setDotsPerMeterY(yres * 39.37)
++        image.setDotsPerMeterX(int(xres * 39.37))
++        image.setDotsPerMeterY(int(yres * 39.37))
+         return image
+ 
+     def setRenderHints(self, doc):
+diff --git a/frescobaldi_app/qpageview/render.py b/frescobaldi_app/qpageview/render.py
+index a8c00de1..5560fa2f 100644
+--- a/frescobaldi_app/qpageview/render.py
++++ b/frescobaldi_app/qpageview/render.py
+@@ -146,11 +146,11 @@ class AbstractRenderer:
+ 
+     def map(self, key, box):
+         """Return a QTransform converting from Key coordinates to a box.
+-        
++
+         The box should be a QRectF or QRect, and describes the original area of
+         the page.  The returned matrix can be used to convert e.g. tile
+         coordinates to the position on the original page.
+-        
++
+         """
+         t = QTransform()
+         t.translate(box.x(), box.y())
+@@ -182,17 +182,17 @@ class AbstractRenderer:
+ 
+     def render(self, page, key, tile, paperColor=None):
+         """Generate a QImage for tile of the Page.
+-        
++
+         The width, height and rotation to render at should be taken from the
+         key, as the page could be resized or rotated in the mean time.
+-        
++
+         The default implementation prepares the image, a painter and then
+         calls draw() to actually draw the contents.
+-        
++
+         If the paperColor is not specified, it will be read from the Page's
+         paperColor attribute (if not None) or else from the renderer's
+         paperColor attribute.
+-        
++
+         """
+         if paperColor is None:
+             paperColor = page.paperColor or self.paperColor
+@@ -200,7 +200,7 @@ class AbstractRenderer:
+         i = QImage(tile.w, tile.h, self.imageFormat)
+         i.fill(paperColor)
+         painter = QPainter(i)
+-        
++
+         # rotate the painter accordingly
+         util.rotate(painter, key.rotation, tile.w, tile.h, True)
+ 
+@@ -241,7 +241,7 @@ class AbstractRenderer:
+         key = self.key(page, ratio)
+ 
+         # paint rect in tile coordinates
+-        target = QRect(rect.x() * ratio, rect.y() * ratio, rect.width() * ratio, rect.height() * ratio)
++        target = QRect(int(rect.x() * ratio), int(rect.y() * ratio), int(rect.width() * ratio), int(rect.height() * ratio))
+ 
+         # tiles to paint
+         tiles = [t for t in self.tiles(key.width, key.height) if QRect(*t) & target]
+@@ -314,7 +314,7 @@ class AbstractRenderer:
+                 vscale = key.height / height
+                 for t in tileset:
+                     # scale to our image size
+-                    r = QRect(t.x * hscale, t.y * vscale, t.w * hscale, t.h * vscale) & target
++                    r = QRect(int(t.x * hscale), int(t.y * vscale), int(t.w * hscale), int(t.h * vscale)) & target
+                     if r and QRegion(r).subtracted(region):
+                         # we have an image that can be drawn in rect r
+                         source = QRectF(r.x() / hscale - t.x, r.y() / vscale - t.y,
+diff --git a/frescobaldi_app/qpageview/rubberband.py b/frescobaldi_app/qpageview/rubberband.py
+index dbab772a..4a073bc8 100644
+--- a/frescobaldi_app/qpageview/rubberband.py
++++ b/frescobaldi_app/qpageview/rubberband.py
+@@ -41,7 +41,7 @@ class Rubberband(QWidget):
+     """A Rubberband to select a rectangular region.
+ 
+     A Rubberband is added to a View with view.setRubberband().
+-    
++
+     The Rubberband lets the user select a rectangular region. When the
+     selection is changed, the `selectionChanged` signal is emitted, having the
+     selection rectangle in layout coordinates as argument.
+@@ -51,7 +51,7 @@ class Rubberband(QWidget):
+         showbutton (Qt.RightButton), the button used to drag a new rectangle
+ 
+         dragbutton (Qt.LeftButton), the button to alter an existing rectangle
+-        
++
+         trackSelection (False), whether to continuously emit selectionChanged().
+                 When True, selectionChanged() is emitted on every change, when
+                 False, the signal is only emitted when the mouse button is
+@@ -93,7 +93,7 @@ class Rubberband(QWidget):
+         color.setAlpha(150)
+         painter.setPen(color)
+         # XXX can this adjustment be done smarter?
+-        adjust = -1 / self.devicePixelRatio()
++        adjust = int(-1 / self.devicePixelRatio())
+         painter.drawRect(self.rect().adjusted(0, 0, adjust, adjust))
+ 
+         # Pseudo-handles at the corners and sides
+@@ -148,21 +148,21 @@ class Rubberband(QWidget):
+             self.setCursor(cursor)
+         else:
+             self.unsetCursor()
+-    
++
+     def hasSelection(self):
+         """Return True when there is a selection."""
+         return bool(self._selection)
+-    
++
+     def selection(self):
+         """Return our selection rectangle, relative to the view's layout position."""
+         return self._selection
+-    
++
+     def selectedPages(self):
+         """Yield tuples (page, rect) describing the selection.
+-        
++
+         Every rect is intersected with the page rect and translated to the
+         page's position.
+-        
++
+         """
+         rect = self.selection()
+         if rect:
+@@ -170,7 +170,7 @@ class Rubberband(QWidget):
+             layout = view.pageLayout()
+             for page in layout.pagesAt(rect):
+                 yield page, rect.intersected(page.geometry()).translated(-page.pos())
+-    
++
+     def selectedPage(self):
+         """Returns (page, rect) if there is a selection.
+ 
+@@ -211,10 +211,10 @@ class Rubberband(QWidget):
+ 
+     def selectedLinks(self):
+         """Yield tuples (page, links) for every page in the selection.
+-        
++
+         links is a non-empty set() of Link instances on that page that intersect
+         with the selection.
+-        
++
+         """
+         for page, rect in self.selectedPages():
+             links = page.linksIn(rect)
+@@ -234,19 +234,19 @@ class Rubberband(QWidget):
+         else:
+             self.hide()
+             self._setSelectionFromGeometry(QRect())
+-    
++
+     def clearSelection(self):
+         """Hide ourselves and clear the selection."""
+         self.hide()
+         self._dragging = False
+         self._setSelectionFromGeometry(QRect())
+-        
++
+     def _setSelectionFromGeometry(self, rect):
+         """(Internal) Called to emit the selectionChanged signal.
+-        
++
+         Only emits the signal when the selection really changed.
+         The rect should be our geometry or an empty QRect().
+-        
++
+         """
+         if rect:
+             view = self.parent().parent()
+@@ -254,16 +254,16 @@ class Rubberband(QWidget):
+         old, self._selection = self._selection, rect
+         if rect != old:
+             self.selectionChanged.emit(rect)
+-    
++
+     def _setLayoutOffset(self, pos):
+         """Store the position as offset from the layout, and also from the page
+         at that position. Used for keeping the same spot on zoom change.
+-        
++
+         """
+         view = self.parent().parent()
+         pos = pos - view.layoutPosition()
+         self._layoutOffset = view.pageLayout().pos2offset(pos)
+-    
++
+     def _getLayoutOffset(self):
+         """Get the stored layout offset position back, after zoom or move."""
+         view = self.parent().parent()
+@@ -340,7 +340,7 @@ class Rubberband(QWidget):
+             geom = QRect(self._getLayoutOffset(), self.size() * factor)
+             self.setGeometry(geom)
+             self._setSelectionFromGeometry(geom)
+-    
++
+     def eventFilter(self, viewport, ev):
+         """Act on events in the viewport:
+ 
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 6f4dcaf1..5a0c5631 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -46,7 +46,7 @@ class ScrollArea(QAbstractScrollArea):
+         draggingEnabled (True):
+             If enabled, the user can drag the contents of the scrollarea to
+             move it with the mouse.
+-            
++
+     """
+ 
+     alignment = Qt.AlignCenter
+@@ -109,10 +109,10 @@ class ScrollArea(QAbstractScrollArea):
+ 
+     def areaPos(self):
+         """Return the position of the area relative to the viewport.
+-        
++
+         The alignment attribute is taken into account when the area is smaller
+         than the viewport (horizontally and/or vertically).
+-        
++
+         """
+         w, h = self._areaSize
+         vw = self.viewport().width()
+@@ -123,13 +123,13 @@ class ScrollArea(QAbstractScrollArea):
+         if top < 0:
+             top = -self.verticalScrollBar().value()
+         return QPoint(left, top)
+-    
++
+     def visibleArea(self):
+         """Return a rectangle describing the part of the area that is visible."""
+         pos = self.areaPos()
+         r = self.viewport().rect() & QRect(pos, self.areaSize())
+         return r.translated(-pos)
+-        
++
+     def offsetToEnsureVisible(self, rect):
+         """Return an offset QPoint with the minimal scroll to make rect visible.
+ 
+@@ -153,12 +153,12 @@ class ScrollArea(QAbstractScrollArea):
+ 
+     def ensureVisible(self, rect, margins=None, allowKinetic=True):
+         """Performs the minimal scroll to make rect visible.
+-        
++
+         If the rect is not completely visible it is scrolled into view, adding
+         the margins if given (a QMargins instance). If allowKinetic is False,
+         immediately jumps to the position, otherwise scrolls smoothly (if
+         kinetic scrolling is enabled).
+-        
++
+         """
+         if rect not in self.visibleArea():
+             if margins is not None:
+@@ -171,9 +171,9 @@ class ScrollArea(QAbstractScrollArea):
+ 
+     def _updateScrollBars(self):
+         """Internal. Adjust the range of the scrollbars to the area size.
+-        
++
+         Called in setAreaSize() and resizeEvent().
+-        
++
+         """
+         w, h = self._areaSize
+         maxsize = self.maximumViewportSize()
+@@ -186,10 +186,10 @@ class ScrollArea(QAbstractScrollArea):
+         else:
+             viewport = self.viewport()
+             vbar.setRange(0, h - viewport.height())
+-            vbar.setPageStep(viewport.height() * .9)
++            vbar.setPageStep(int(viewport.height() * .9))
+             hbar.setRange(0, w - viewport.width())
+-            hbar.setPageStep(viewport.width() * .9)
+-        
++            hbar.setPageStep(int(viewport.width() * .9))
++
+     def scrollOffset(self):
+         """Return the current scroll offset."""
+         x = self.horizontalScrollBar().value()
+@@ -295,7 +295,7 @@ class ScrollArea(QAbstractScrollArea):
+         """Begin a scrolling operation using the specified scroller."""
+         self._scroller = scroller
+         if self._scrollTimer is None:
+-            self._scrollTimer = self.startTimer(1000 / self.scrollupdatespersec)
++            self._scrollTimer = self.startTimer(int(1000 // self.scrollupdatespersec))
+ 
+     def stopScrolling(self):
+         """Stop scrolling."""
+@@ -307,7 +307,7 @@ class ScrollArea(QAbstractScrollArea):
+     def isScrolling(self):
+         """Return True if a scrolling movement is active."""
+         return self._scroller is not None
+-    
++
+     def remainingScrollTime(self):
+         """If a kinetic scroll is active, return how many msecs the scroll wil last.
+ 
+@@ -375,7 +375,7 @@ class ScrollArea(QAbstractScrollArea):
+             self._dragTime = None
+             self._dragSpeed = None
+         super().mouseReleaseEvent(ev)
+-        
++
+ 
+ class Scroller:
+     """Abstract base class, encapsulates scrolling behaviour.
+@@ -453,13 +453,13 @@ class KineticScroller(Scroller):
+         # (TODO: adapt for other ticker speeds? WB)
+         if sy > 100:
+             sy = 100
+-        offy = abs(dy) - sy * (sy + 1) // 2
++        offy = int(abs(dy) - sy * (sy + 1) // 2)
+ 
+         # Although it is less likely to go beyond that limit for horizontal scrolling,
+         # do it for x as well.
+         if sx > 100:
+             sx = 100
+-        offx = abs(dx) - sx * (sx + 1) // 2
++        offx = int(abs(dx) - sx * (sx + 1) // 2)
+ 
+         # adjust directions
+         if dx < 0:
+diff --git a/frescobaldi_app/qpageview/shadow.py b/frescobaldi_app/qpageview/shadow.py
+index c7d1c8d5..5b0cd17b 100644
+--- a/frescobaldi_app/qpageview/shadow.py
++++ b/frescobaldi_app/qpageview/shadow.py
+@@ -37,10 +37,10 @@ class ShadowViewMixin:
+ 
+     def paintEvent(self, ev):
+         if self.dropShadowEnabled:
+-            width = self._pageLayout.spacing / 2
++            width = round(self._pageLayout.spacing / 2.0)
+             # make the rect slightly larger, so we "see" shadow of pages that
+             # would be outside view normally.
+-            rect = ev.rect().adjusted(-width, -width, width / 2, width / 2)
++            rect = ev.rect().adjusted(-width, -width, int(width // 2), int(width // 2))
+             painter = QPainter(self.viewport())
+             for page, rect in self.pagesToPaint(rect, painter):
+                 self.drawDropShadow(page, painter, width)
+@@ -48,19 +48,19 @@ class ShadowViewMixin:
+ 
+     def drawDropShadow(self, page, painter, width):
+         """Draw a drop shadow of width pixels around the Page.
+-        
++
+         The painter is already translated to the topleft corner of the Page.
+-        
++
+         """
+         width = round(width)
+-        rect = page.rect().adjusted(width / 2, width / 2, 0, 0)
++        rect = page.rect().adjusted(int(width // 2), int(width // 2), 0, 0)
+         color = QColor(Qt.black)
+         pen = QPen()
+         pen.setWidth(1)
+         pen.setJoinStyle(Qt.MiterJoin)
+         for i in range(width):
+             f = (width-i)/width
+-            color.setAlpha(200**f + 55*f)
++            color.setAlpha(int(200**f + 55*f))
+             pen.setColor(color)
+             painter.setPen(pen)
+             painter.drawRect(rect.adjusted(-i, -i, i, i))
+diff --git a/frescobaldi_app/widgets/linenumberarea.py b/frescobaldi_app/widgets/linenumberarea.py
+index f097726c..ff38bcc6 100644
+--- a/frescobaldi_app/widgets/linenumberarea.py
++++ b/frescobaldi_app/widgets/linenumberarea.py
+@@ -21,7 +21,7 @@
+ A line number area to be used in a QPlainTextEdit.
+ """
+ 
+-from PyQt5.QtCore import QEvent, QPoint, QRect, QSize, Qt
++from PyQt5.QtCore import QEvent, QPoint, QRectF, QSize, Qt
+ from PyQt5.QtGui import QFontMetrics, QMouseEvent, QPainter
+ from PyQt5.QtWidgets import QApplication, QWidget
+ 
+@@ -72,7 +72,7 @@ class LineNumberArea(QWidget):
+             return
+         painter = QPainter(self)
+         painter.setFont(edit.font())
+-        rect = QRect(0, 0, self.width() - 2, QFontMetrics(edit.font()).height())
++        rect = QRectF(0, 0, self.width() - 2, QFontMetrics(edit.font()).height())
+         block = edit.firstVisibleBlock()
+         while block.isValid():
+             geom = edit.blockBoundingGeometry(block)
+diff --git a/frescobaldi_app/widgets/progressbar.py b/frescobaldi_app/widgets/progressbar.py
+index 670bf0f5..183ab625 100644
+--- a/frescobaldi_app/widgets/progressbar.py
++++ b/frescobaldi_app/widgets/progressbar.py
+@@ -71,8 +71,8 @@ class TimedProgressBar(QProgressBar):
+         """
+         self._hideTimer.stop()
+         self._timeline.stop()
+-        self._timeline.setDuration(total * 1000)
+-        self._timeline.setCurrentTime(elapsed * 1000)
++        self._timeline.setDuration(int(total * 1000))
++        self._timeline.setCurrentTime(int(elapsed * 1000))
+         self.setValue(self._timeline.currentFrame())
+         self._timeline.resume()
+         if self._hideWhileIdle and not self._hidden:
+-- 
+2.33.1
+
diff --git a/srcpkgs/frescobaldi/patches/0002-more-py-3.10-float-int-fixes-issue-1398.patch b/srcpkgs/frescobaldi/patches/0002-more-py-3.10-float-int-fixes-issue-1398.patch
new file mode 100644
index 000000000000..8338ca2a362c
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/0002-more-py-3.10-float-int-fixes-issue-1398.patch
@@ -0,0 +1,209 @@
+From bd4dfe036b8dbc5d75552fe6b6b081c024e5beea Mon Sep 17 00:00:00 2001
+From: Wilbert Berendsen <wbsoft@xs4all.nl>
+Date: Mon, 8 Nov 2021 09:35:59 +0100
+Subject: [PATCH 2/2] more py 3.10 float->int fixes, issue #1398
+
+---
+ frescobaldi_app/qpageview/page.py       | 50 ++++++++++++-------------
+ frescobaldi_app/qpageview/poppler.py    |  2 +-
+ frescobaldi_app/qpageview/scrollarea.py |  8 ++--
+ 3 files changed, 30 insertions(+), 30 deletions(-)
+
+diff --git a/frescobaldi_app/qpageview/page.py b/frescobaldi_app/qpageview/page.py
+index f93fa9e2..754d2736 100644
+--- a/frescobaldi_app/qpageview/page.py
++++ b/frescobaldi_app/qpageview/page.py
+@@ -48,7 +48,7 @@ class AbstractPage(util.Rectangular):
+ 
+     ...that normally do not change during its lifetime:
+ 
+-        `pageWidth`     the original width  (by default in points, `dpi` is 72.0 
++        `pageWidth`     the original width  (by default in points, `dpi` is 72.0
+         `pageHeight`    the original height   but can be changed at class level)
+ 
+     ... that can be modified by the user (having defaults at the class level):
+@@ -174,15 +174,15 @@ class AbstractPage(util.Rectangular):
+ 
+     def defaultSize(self):
+         """Return the pageSize() scaled and rotated (if needed).
+-        
++
+         Based on scaleX, scaleY, and computedRotation attributes.
+-        
++
+         """
+         s = QSizeF(self.pageWidth * self.scaleX, self.pageHeight * self.scaleY)
+         if self.computedRotation & 1:
+             s.transpose()
+         return s
+-        
++
+     def updateSize(self, dpiX, dpiY, zoomFactor):
+         """Set the width and height attributes of the page.
+ 
+@@ -286,7 +286,7 @@ class AbstractPage(util.Rectangular):
+ 
+         pdf = QPdfWriter(filename)
+         pdf.setCreator("qpageview")
+-        pdf.setResolution(resolution)
++        pdf.setResolution(int(resolution))
+ 
+         layout = pdf.pageLayout()
+         layout.setMode(layout.FullPageMode)
+@@ -350,7 +350,7 @@ class AbstractPage(util.Rectangular):
+             svg.setFileName(filename)
+         else:
+             svg.setOutputDevice(filename)
+-        svg.setResolution(resolution)
++        svg.setResolution(int(resolution))
+         svg.setSize(targetSize.toSize())
+         svg.setViewBox(QRectF(0, 0, targetSize.width(), targetSize.height()))
+         return self.output(svg, source, paperColor)
+@@ -381,31 +381,31 @@ class AbstractPage(util.Rectangular):
+ 
+     def group(self):
+         """Return the group the page belongs to.
+-        
++
+         This could be some document structure, so that different Page objects
+         could refer to the same graphical contents, preventing double caching.
+-        
++
+         This object is used together with the value returned by ident() as a key
+         to cache the page. The idea is that the contents of the page are
+         uniquely identified by the objects returned by group() and ident().
+-        
++
+         This way, when the same document is opened in multiple page instances,
+         only one copy resides in the (global) cache.
+-        
++
+         By default, the page object itself is returned.
+-        
++
+         """
+         return self
+-        
++
+     def ident(self):
+         """Return a value that identifies the page within the group returned
+         by group().
+-        
++
+         By default, None is returned.
+-        
++
+         """
+         return None
+-    
++
+     def mapToPage(self, width=None, height=None):
+         """Return a MapToPage object, that can map original to Page coordinates.
+ 
+@@ -426,10 +426,10 @@ class AbstractPage(util.Rectangular):
+ 
+     def text(self, rect):
+         """Implement this method to get the text at the specified rectangle.
+-        
++
+         The rectangle should be in page coordinates. The default implementation
+         simply returns an empty string.
+-        
++
+         """
+         return ""
+ 
+@@ -437,22 +437,22 @@ class AbstractPage(util.Rectangular):
+         """Implement this method to load our links."""
+         from . import link
+         return link.Links()
+-    
++
+     def links(self):
+         """Return the Links object, containing Link objects.
+-        
++
+         Every Link denotes a clickable area on a Page, in coordinates 0.0-1.0.
+         The Links object makes it possible to quickly find a link on a Page.
+         This is cached after the first request, you should implement the
+         getLinks() method to load the links.
+-        
++
+         """
+         try:
+             return self._links
+         except AttributeError:
+             links = self._links = self.getLinks()
+         return links
+-    
++
+     def linksAt(self, point):
+         """Return a list() of zero or more links touched by QPoint point.
+ 
+@@ -468,9 +468,9 @@ class AbstractPage(util.Rectangular):
+ 
+     def linksIn(self, rect):
+         """Return an unordered set of links enclosed in rectangle.
+-        
++
+         The rectangle is in page coordinates.
+-        
++
+         """
+         return self.links().inside(*self.mapFromPage(1, 1).rect(rect).getCoords())
+ 
+@@ -481,9 +481,9 @@ class AbstractPage(util.Rectangular):
+ 
+ class AbstractRenderedPage(AbstractPage):
+     """A Page that has a renderer that performs caching and painting.
+-    
++
+     The renderer lives in the renderer attribute.
+-    
++
+     """
+     def __init__(self, renderer=None):
+         if renderer is not None:
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 26768356..810dbca5 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -259,7 +259,7 @@ class PopplerRenderer(render.AbstractRenderer):
+         (See AbstractPage.print().)
+ 
+         """
+-        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile))
++        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile)).toRect()   # rounded
+         target = QRectF(0, 0, tile.w, tile.h)
+         if key.rotation & 1:
+             target.setSize(target.size().transposed())
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 5a0c5631..6722a6db 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -365,9 +365,9 @@ class ScrollArea(QAbstractScrollArea):
+                 speed = speed * 1000 / self.scrollupdatespersec / time
+                 # compute diff to scroll
+                 sx = abs(speed.x())
+-                diffx = sx * (sx + 1) / 2
++                diffx = int(sx * (sx + 1) / 2)
+                 sy = abs(speed.y())
+-                diffy = sy * (sy + 1) / 2
++                diffy = int(sy * (sy + 1) / 2)
+                 if speed.x() < 0: diffx = -diffx
+                 if speed.y() < 0: diffy = -diffy
+                 self.kineticScrollBy(QPoint(diffx, diffy))
+@@ -444,8 +444,8 @@ class KineticScroller(Scroller):
+         dy = diff.y()
+ 
+         # solve speed*(speed+1)/2 = delta to ensure 1+2+3+...+speed is as close as possible under delta..
+-        sx = (math.sqrt(1 + 8 * abs(dx)) - 1) // 2
+-        sy = (math.sqrt(1 + 8 * abs(dy)) - 1) // 2
++        sx = int(math.sqrt(1 + 8 * abs(dx)) - 1) // 2
++        sy = int(math.sqrt(1 + 8 * abs(dy)) - 1) // 2
+ 
+         # compute the amount of displacement still needed because we're dealing with integer values.
+         # Since this function is called for exact moves (not free scrolling)
+-- 
+2.33.1
+
diff --git a/srcpkgs/frescobaldi/patches/0003-More-changes-to-fix-errors-under-Python-3.10.patch b/srcpkgs/frescobaldi/patches/0003-More-changes-to-fix-errors-under-Python-3.10.patch
new file mode 100644
index 000000000000..b212b515e8ab
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/0003-More-changes-to-fix-errors-under-Python-3.10.patch
@@ -0,0 +1,50 @@
+From 4e910e55f6700fafe1683af770e4bc299cdd71a2 Mon Sep 17 00:00:00 2001
+From: Dexter Gaon-Shatford <dexter@gaonshatford.ca>
+Date: Wed, 10 Nov 2021 17:04:34 -0500
+Subject: [PATCH] More changes to fix errors under Python 3.10
+
+There are a few errors that are encountered when engraving a score in
+the editor that were not addressed in the changes made by wbsoft
+---
+ frescobaldi_app/viewmanager.py            | 4 ++--
+ frescobaldi_app/widgets/linenumberarea.py | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/frescobaldi_app/viewmanager.py b/frescobaldi_app/viewmanager.py
+index e1294c91..046c70df 100644
+--- a/frescobaldi_app/viewmanager.py
++++ b/frescobaldi_app/viewmanager.py
+@@ -332,7 +332,7 @@ class ViewManager(QSplitter):
+             splitter.setOrientation(orientation)
+             size = splitter.sizes()[0]
+             splitter.addWidget(newspace)
+-            splitter.setSizes([size / 2, size / 2])
++            splitter.setSizes([size // 2, size // 2])
+         elif splitter.orientation() == orientation:
+             index = splitter.indexOf(viewspace)
+             splitter.insertWidget(index + 1, newspace)
+@@ -346,7 +346,7 @@ class ViewManager(QSplitter):
+             splitter.setSizes(sizes)
+             size = newsplitter.sizes()[0]
+             newsplitter.addWidget(newspace)
+-            newsplitter.setSizes([size / 2, size / 2])
++            newsplitter.setSizes([size // 2, size // 2])
+         self._viewSpaces.insert(0, newspace)
+         newspace.showDocument(viewspace.document())
+         if active:
+diff --git a/frescobaldi_app/widgets/linenumberarea.py b/frescobaldi_app/widgets/linenumberarea.py
+index ff38bcc6..aa133ac7 100644
+--- a/frescobaldi_app/widgets/linenumberarea.py
++++ b/frescobaldi_app/widgets/linenumberarea.py
+@@ -80,7 +80,7 @@ class LineNumberArea(QWidget):
+             if geom.top() >= ev.rect().bottom():
+                 break
+             if block.isVisible() and geom.bottom() > ev.rect().top() + 1:
+-                rect.moveTop(geom.top())
++                rect.moveTop(int(geom.top()))
+                 text = format(block.blockNumber() + 1, 'd')
+                 painter.drawText(rect, Qt.AlignRight, text)
+             block = block.next()
+-- 
+2.33.1
+
diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..bf61cf1155c6
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,20 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools gettext"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/v${version}/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=f97256ce15ab621593536e219584a2ed744c1933148ac7ed98fcef6a3a9510a6
+
+pre_build() {
+	make -C linux
+}

From 0b51dbe154e9c8f6acc79ea1f9a8cfde70b3f165 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 16 Jan 2022 20:05:58 -0500
Subject: [PATCH 4/4] mumble: update to 1.4.230.

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

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index 69a5cb3c7961..7adc0a903a30 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
-version=1.3.4
-revision=7
+version=1.4.230
+revision=1
 build_style=qmake
 configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (62 preceding siblings ...)
  2022-01-17  1:06 ` chili-b
@ 2022-01-19 22:10 ` chili-b
  2022-01-20  5:11 ` chili-b
                   ` (20 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2022-01-19 22:10 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 3161ff24232fd8790297380a9311fa5908ee37c3 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 3a3610afcfd839fa5f4326d557a9619135677419 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/3] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..efbd3c65d357
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,28 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+hostmakedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+makedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	# Cludge to fix build under armv7l, armv6l
+	if [[ $XBPS_TARGET_MACHINE == arm* ]]; then
+		export CFLAGS="-mtune=generic-armv7-a "
+		export CFLAGS+="-I${XBPS_CROSS_BASE}/${py3_inc}"
+	fi
+
+	python setup.py build_ext --pyqt-sip-dir=/${py3_sitelib}/PyQt5/bindings
+}

From dd124320d8c2e82f96f7c9017e9b8bb0a1401b27 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/3] New package: frescobaldi-3.1.3

---
 ...f-py-3.10-float-int-fixes-issue-1398.patch | 530 ++++++++++++++++++
 ...e-py-3.10-float-int-fixes-issue-1398.patch | 209 +++++++
 ...nges-to-fix-errors-under-Python-3.10.patch |  50 ++
 srcpkgs/frescobaldi/template                  |  20 +
 4 files changed, 809 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/patches/0001-first-batch-of-py-3.10-float-int-fixes-issue-1398.patch
 create mode 100644 srcpkgs/frescobaldi/patches/0002-more-py-3.10-float-int-fixes-issue-1398.patch
 create mode 100644 srcpkgs/frescobaldi/patches/0003-More-changes-to-fix-errors-under-Python-3.10.patch
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/patches/0001-first-batch-of-py-3.10-float-int-fixes-issue-1398.patch b/srcpkgs/frescobaldi/patches/0001-first-batch-of-py-3.10-float-int-fixes-issue-1398.patch
new file mode 100644
index 000000000000..1b80ed879f93
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/0001-first-batch-of-py-3.10-float-int-fixes-issue-1398.patch
@@ -0,0 +1,530 @@
+From 51886dba8a3cb3db6eba9a6cf1d65bd8eaf877aa Mon Sep 17 00:00:00 2001
+From: Wilbert Berendsen <wbsoft@xs4all.nl>
+Date: Sun, 7 Nov 2021 14:53:33 +0100
+Subject: [PATCH 1/2] first batch of py 3.10 float->int fixes, issue #1398
+
+---
+ frescobaldi_app/qpageview/magnifier.py    | 10 +++---
+ frescobaldi_app/qpageview/poppler.py      | 18 +++++------
+ frescobaldi_app/qpageview/render.py       | 18 +++++------
+ frescobaldi_app/qpageview/rubberband.py   | 38 +++++++++++------------
+ frescobaldi_app/qpageview/scrollarea.py   | 34 ++++++++++----------
+ frescobaldi_app/qpageview/shadow.py       | 12 +++----
+ frescobaldi_app/widgets/linenumberarea.py |  4 +--
+ frescobaldi_app/widgets/progressbar.py    |  4 +--
+ 8 files changed, 69 insertions(+), 69 deletions(-)
+
+diff --git a/frescobaldi_app/qpageview/magnifier.py b/frescobaldi_app/qpageview/magnifier.py
+index 3a2759fb..b93d05be 100644
+--- a/frescobaldi_app/qpageview/magnifier.py
++++ b/frescobaldi_app/qpageview/magnifier.py
+@@ -156,7 +156,7 @@ class Magnifier(QWidget):
+ 
+     def moveEvent(self, ev):
+         """Called on move, updates the contents."""
+-        # we also update on paint events, but they are not generated if the 
++        # we also update on paint events, but they are not generated if the
+         # magnifiers fully covers the viewport
+         self.update()
+ 
+@@ -240,8 +240,8 @@ class Magnifier(QWidget):
+                 factor = 1.1 ** (ev.angleDelta().y() / 120)
+                 g = self.geometry()
+                 c = g.center()
+-                g.setWidth(min(max(g.width() * factor, self.MIN_SIZE), self.MAX_SIZE))
+-                g.setHeight(min(max(g.height() * factor, self.MIN_SIZE), self.MAX_SIZE))
++                g.setWidth(int(min(max(g.width() * factor, self.MIN_SIZE), self.MAX_SIZE)))
++                g.setHeight(int(min(max(g.height() * factor, self.MIN_SIZE), self.MAX_SIZE)))
+                 g.moveCenter(c)
+                 self.setGeometry(g)
+             else:
+@@ -278,13 +278,13 @@ class Magnifier(QWidget):
+ 
+         # the virtual position of the whole scaled-up layout
+         ev_rect = ev.rect().translated(our_rect.topLeft())
+-        
++
+         # draw shadow border?
+         shadow = False
+         if hasattr(view, "drawDropShadow") and view.dropShadowEnabled:
+             shadow = True
+             shadow_width = layout.spacing * scale // 2
+-        
++
+         painter = QPainter(self)
+         for p in layout.pagesAt(region.boundingRect()):
+             # get a (reused) the copy of the page
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 17312d78..26768356 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -62,7 +62,7 @@ class Link(link.Link):
+     def __init__(self, linkobj):
+         self.linkobj = linkobj
+         self.area = link.Area(*linkobj.linkArea().normalized().getCoords())
+-    
++
+     @property
+     def url(self):
+         if isinstance(self.linkobj, popplerqt5.Poppler.LinkBrowse):
+@@ -105,8 +105,8 @@ class PopplerPage(page.AbstractRenderedPage):
+     def load(cls, filename, renderer=None):
+         """Load a Poppler document, and yield of instances of this class.
+ 
+-        The filename can also be a QByteArray or a popplerqt5.Poppler.Document 
+-        instance. The specified Renderer is used, or else the global poppler 
++        The filename can also be a QByteArray or a popplerqt5.Poppler.Document
++        instance. The specified Renderer is used, or else the global poppler
+         renderer.
+ 
+         """
+@@ -116,11 +116,11 @@ class PopplerPage(page.AbstractRenderedPage):
+     def mutex(self):
+         """No two pages of same Poppler document are rendered at the same time."""
+         return self.document
+-    
++
+     def group(self):
+         """Reimplemented to return the Poppler document our page displays a page from."""
+         return self.document
+-    
++
+     def ident(self):
+         """Reimplemented to return the page number of this page."""
+         return self.pageNumber
+@@ -131,7 +131,7 @@ class PopplerPage(page.AbstractRenderedPage):
+         with locking.lock(self.document):
+             page = self.document.page(self.pageNumber)
+             return page.text(rect)
+-    
++
+     def links(self):
+         """Reimplemented to use a different caching mechanism."""
+         document, pageNumber = self.document, self.pageNumber
+@@ -184,7 +184,7 @@ class PopplerRenderer(render.AbstractRenderer):
+         renderBackend = printRenderBackend = 0
+ 
+     oversampleThreshold = 96
+-    
++
+     def render(self, page, key, tile, paperColor=None):
+         """Generate an image for the Page referred to by key."""
+         if paperColor is None:
+@@ -205,8 +205,8 @@ class PopplerRenderer(render.AbstractRenderer):
+             key.rotation, paperColor)
+         if multiplier == 2:
+             image = image.scaledToWidth(tile.w, Qt.SmoothTransformation)
+-        image.setDotsPerMeterX(xres * 39.37)
+-        image.setDotsPerMeterY(yres * 39.37)
++        image.setDotsPerMeterX(int(xres * 39.37))
++        image.setDotsPerMeterY(int(yres * 39.37))
+         return image
+ 
+     def setRenderHints(self, doc):
+diff --git a/frescobaldi_app/qpageview/render.py b/frescobaldi_app/qpageview/render.py
+index a8c00de1..5560fa2f 100644
+--- a/frescobaldi_app/qpageview/render.py
++++ b/frescobaldi_app/qpageview/render.py
+@@ -146,11 +146,11 @@ class AbstractRenderer:
+ 
+     def map(self, key, box):
+         """Return a QTransform converting from Key coordinates to a box.
+-        
++
+         The box should be a QRectF or QRect, and describes the original area of
+         the page.  The returned matrix can be used to convert e.g. tile
+         coordinates to the position on the original page.
+-        
++
+         """
+         t = QTransform()
+         t.translate(box.x(), box.y())
+@@ -182,17 +182,17 @@ class AbstractRenderer:
+ 
+     def render(self, page, key, tile, paperColor=None):
+         """Generate a QImage for tile of the Page.
+-        
++
+         The width, height and rotation to render at should be taken from the
+         key, as the page could be resized or rotated in the mean time.
+-        
++
+         The default implementation prepares the image, a painter and then
+         calls draw() to actually draw the contents.
+-        
++
+         If the paperColor is not specified, it will be read from the Page's
+         paperColor attribute (if not None) or else from the renderer's
+         paperColor attribute.
+-        
++
+         """
+         if paperColor is None:
+             paperColor = page.paperColor or self.paperColor
+@@ -200,7 +200,7 @@ class AbstractRenderer:
+         i = QImage(tile.w, tile.h, self.imageFormat)
+         i.fill(paperColor)
+         painter = QPainter(i)
+-        
++
+         # rotate the painter accordingly
+         util.rotate(painter, key.rotation, tile.w, tile.h, True)
+ 
+@@ -241,7 +241,7 @@ class AbstractRenderer:
+         key = self.key(page, ratio)
+ 
+         # paint rect in tile coordinates
+-        target = QRect(rect.x() * ratio, rect.y() * ratio, rect.width() * ratio, rect.height() * ratio)
++        target = QRect(int(rect.x() * ratio), int(rect.y() * ratio), int(rect.width() * ratio), int(rect.height() * ratio))
+ 
+         # tiles to paint
+         tiles = [t for t in self.tiles(key.width, key.height) if QRect(*t) & target]
+@@ -314,7 +314,7 @@ class AbstractRenderer:
+                 vscale = key.height / height
+                 for t in tileset:
+                     # scale to our image size
+-                    r = QRect(t.x * hscale, t.y * vscale, t.w * hscale, t.h * vscale) & target
++                    r = QRect(int(t.x * hscale), int(t.y * vscale), int(t.w * hscale), int(t.h * vscale)) & target
+                     if r and QRegion(r).subtracted(region):
+                         # we have an image that can be drawn in rect r
+                         source = QRectF(r.x() / hscale - t.x, r.y() / vscale - t.y,
+diff --git a/frescobaldi_app/qpageview/rubberband.py b/frescobaldi_app/qpageview/rubberband.py
+index dbab772a..4a073bc8 100644
+--- a/frescobaldi_app/qpageview/rubberband.py
++++ b/frescobaldi_app/qpageview/rubberband.py
+@@ -41,7 +41,7 @@ class Rubberband(QWidget):
+     """A Rubberband to select a rectangular region.
+ 
+     A Rubberband is added to a View with view.setRubberband().
+-    
++
+     The Rubberband lets the user select a rectangular region. When the
+     selection is changed, the `selectionChanged` signal is emitted, having the
+     selection rectangle in layout coordinates as argument.
+@@ -51,7 +51,7 @@ class Rubberband(QWidget):
+         showbutton (Qt.RightButton), the button used to drag a new rectangle
+ 
+         dragbutton (Qt.LeftButton), the button to alter an existing rectangle
+-        
++
+         trackSelection (False), whether to continuously emit selectionChanged().
+                 When True, selectionChanged() is emitted on every change, when
+                 False, the signal is only emitted when the mouse button is
+@@ -93,7 +93,7 @@ class Rubberband(QWidget):
+         color.setAlpha(150)
+         painter.setPen(color)
+         # XXX can this adjustment be done smarter?
+-        adjust = -1 / self.devicePixelRatio()
++        adjust = int(-1 / self.devicePixelRatio())
+         painter.drawRect(self.rect().adjusted(0, 0, adjust, adjust))
+ 
+         # Pseudo-handles at the corners and sides
+@@ -148,21 +148,21 @@ class Rubberband(QWidget):
+             self.setCursor(cursor)
+         else:
+             self.unsetCursor()
+-    
++
+     def hasSelection(self):
+         """Return True when there is a selection."""
+         return bool(self._selection)
+-    
++
+     def selection(self):
+         """Return our selection rectangle, relative to the view's layout position."""
+         return self._selection
+-    
++
+     def selectedPages(self):
+         """Yield tuples (page, rect) describing the selection.
+-        
++
+         Every rect is intersected with the page rect and translated to the
+         page's position.
+-        
++
+         """
+         rect = self.selection()
+         if rect:
+@@ -170,7 +170,7 @@ class Rubberband(QWidget):
+             layout = view.pageLayout()
+             for page in layout.pagesAt(rect):
+                 yield page, rect.intersected(page.geometry()).translated(-page.pos())
+-    
++
+     def selectedPage(self):
+         """Returns (page, rect) if there is a selection.
+ 
+@@ -211,10 +211,10 @@ class Rubberband(QWidget):
+ 
+     def selectedLinks(self):
+         """Yield tuples (page, links) for every page in the selection.
+-        
++
+         links is a non-empty set() of Link instances on that page that intersect
+         with the selection.
+-        
++
+         """
+         for page, rect in self.selectedPages():
+             links = page.linksIn(rect)
+@@ -234,19 +234,19 @@ class Rubberband(QWidget):
+         else:
+             self.hide()
+             self._setSelectionFromGeometry(QRect())
+-    
++
+     def clearSelection(self):
+         """Hide ourselves and clear the selection."""
+         self.hide()
+         self._dragging = False
+         self._setSelectionFromGeometry(QRect())
+-        
++
+     def _setSelectionFromGeometry(self, rect):
+         """(Internal) Called to emit the selectionChanged signal.
+-        
++
+         Only emits the signal when the selection really changed.
+         The rect should be our geometry or an empty QRect().
+-        
++
+         """
+         if rect:
+             view = self.parent().parent()
+@@ -254,16 +254,16 @@ class Rubberband(QWidget):
+         old, self._selection = self._selection, rect
+         if rect != old:
+             self.selectionChanged.emit(rect)
+-    
++
+     def _setLayoutOffset(self, pos):
+         """Store the position as offset from the layout, and also from the page
+         at that position. Used for keeping the same spot on zoom change.
+-        
++
+         """
+         view = self.parent().parent()
+         pos = pos - view.layoutPosition()
+         self._layoutOffset = view.pageLayout().pos2offset(pos)
+-    
++
+     def _getLayoutOffset(self):
+         """Get the stored layout offset position back, after zoom or move."""
+         view = self.parent().parent()
+@@ -340,7 +340,7 @@ class Rubberband(QWidget):
+             geom = QRect(self._getLayoutOffset(), self.size() * factor)
+             self.setGeometry(geom)
+             self._setSelectionFromGeometry(geom)
+-    
++
+     def eventFilter(self, viewport, ev):
+         """Act on events in the viewport:
+ 
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 6f4dcaf1..5a0c5631 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -46,7 +46,7 @@ class ScrollArea(QAbstractScrollArea):
+         draggingEnabled (True):
+             If enabled, the user can drag the contents of the scrollarea to
+             move it with the mouse.
+-            
++
+     """
+ 
+     alignment = Qt.AlignCenter
+@@ -109,10 +109,10 @@ class ScrollArea(QAbstractScrollArea):
+ 
+     def areaPos(self):
+         """Return the position of the area relative to the viewport.
+-        
++
+         The alignment attribute is taken into account when the area is smaller
+         than the viewport (horizontally and/or vertically).
+-        
++
+         """
+         w, h = self._areaSize
+         vw = self.viewport().width()
+@@ -123,13 +123,13 @@ class ScrollArea(QAbstractScrollArea):
+         if top < 0:
+             top = -self.verticalScrollBar().value()
+         return QPoint(left, top)
+-    
++
+     def visibleArea(self):
+         """Return a rectangle describing the part of the area that is visible."""
+         pos = self.areaPos()
+         r = self.viewport().rect() & QRect(pos, self.areaSize())
+         return r.translated(-pos)
+-        
++
+     def offsetToEnsureVisible(self, rect):
+         """Return an offset QPoint with the minimal scroll to make rect visible.
+ 
+@@ -153,12 +153,12 @@ class ScrollArea(QAbstractScrollArea):
+ 
+     def ensureVisible(self, rect, margins=None, allowKinetic=True):
+         """Performs the minimal scroll to make rect visible.
+-        
++
+         If the rect is not completely visible it is scrolled into view, adding
+         the margins if given (a QMargins instance). If allowKinetic is False,
+         immediately jumps to the position, otherwise scrolls smoothly (if
+         kinetic scrolling is enabled).
+-        
++
+         """
+         if rect not in self.visibleArea():
+             if margins is not None:
+@@ -171,9 +171,9 @@ class ScrollArea(QAbstractScrollArea):
+ 
+     def _updateScrollBars(self):
+         """Internal. Adjust the range of the scrollbars to the area size.
+-        
++
+         Called in setAreaSize() and resizeEvent().
+-        
++
+         """
+         w, h = self._areaSize
+         maxsize = self.maximumViewportSize()
+@@ -186,10 +186,10 @@ class ScrollArea(QAbstractScrollArea):
+         else:
+             viewport = self.viewport()
+             vbar.setRange(0, h - viewport.height())
+-            vbar.setPageStep(viewport.height() * .9)
++            vbar.setPageStep(int(viewport.height() * .9))
+             hbar.setRange(0, w - viewport.width())
+-            hbar.setPageStep(viewport.width() * .9)
+-        
++            hbar.setPageStep(int(viewport.width() * .9))
++
+     def scrollOffset(self):
+         """Return the current scroll offset."""
+         x = self.horizontalScrollBar().value()
+@@ -295,7 +295,7 @@ class ScrollArea(QAbstractScrollArea):
+         """Begin a scrolling operation using the specified scroller."""
+         self._scroller = scroller
+         if self._scrollTimer is None:
+-            self._scrollTimer = self.startTimer(1000 / self.scrollupdatespersec)
++            self._scrollTimer = self.startTimer(int(1000 // self.scrollupdatespersec))
+ 
+     def stopScrolling(self):
+         """Stop scrolling."""
+@@ -307,7 +307,7 @@ class ScrollArea(QAbstractScrollArea):
+     def isScrolling(self):
+         """Return True if a scrolling movement is active."""
+         return self._scroller is not None
+-    
++
+     def remainingScrollTime(self):
+         """If a kinetic scroll is active, return how many msecs the scroll wil last.
+ 
+@@ -375,7 +375,7 @@ class ScrollArea(QAbstractScrollArea):
+             self._dragTime = None
+             self._dragSpeed = None
+         super().mouseReleaseEvent(ev)
+-        
++
+ 
+ class Scroller:
+     """Abstract base class, encapsulates scrolling behaviour.
+@@ -453,13 +453,13 @@ class KineticScroller(Scroller):
+         # (TODO: adapt for other ticker speeds? WB)
+         if sy > 100:
+             sy = 100
+-        offy = abs(dy) - sy * (sy + 1) // 2
++        offy = int(abs(dy) - sy * (sy + 1) // 2)
+ 
+         # Although it is less likely to go beyond that limit for horizontal scrolling,
+         # do it for x as well.
+         if sx > 100:
+             sx = 100
+-        offx = abs(dx) - sx * (sx + 1) // 2
++        offx = int(abs(dx) - sx * (sx + 1) // 2)
+ 
+         # adjust directions
+         if dx < 0:
+diff --git a/frescobaldi_app/qpageview/shadow.py b/frescobaldi_app/qpageview/shadow.py
+index c7d1c8d5..5b0cd17b 100644
+--- a/frescobaldi_app/qpageview/shadow.py
++++ b/frescobaldi_app/qpageview/shadow.py
+@@ -37,10 +37,10 @@ class ShadowViewMixin:
+ 
+     def paintEvent(self, ev):
+         if self.dropShadowEnabled:
+-            width = self._pageLayout.spacing / 2
++            width = round(self._pageLayout.spacing / 2.0)
+             # make the rect slightly larger, so we "see" shadow of pages that
+             # would be outside view normally.
+-            rect = ev.rect().adjusted(-width, -width, width / 2, width / 2)
++            rect = ev.rect().adjusted(-width, -width, int(width // 2), int(width // 2))
+             painter = QPainter(self.viewport())
+             for page, rect in self.pagesToPaint(rect, painter):
+                 self.drawDropShadow(page, painter, width)
+@@ -48,19 +48,19 @@ class ShadowViewMixin:
+ 
+     def drawDropShadow(self, page, painter, width):
+         """Draw a drop shadow of width pixels around the Page.
+-        
++
+         The painter is already translated to the topleft corner of the Page.
+-        
++
+         """
+         width = round(width)
+-        rect = page.rect().adjusted(width / 2, width / 2, 0, 0)
++        rect = page.rect().adjusted(int(width // 2), int(width // 2), 0, 0)
+         color = QColor(Qt.black)
+         pen = QPen()
+         pen.setWidth(1)
+         pen.setJoinStyle(Qt.MiterJoin)
+         for i in range(width):
+             f = (width-i)/width
+-            color.setAlpha(200**f + 55*f)
++            color.setAlpha(int(200**f + 55*f))
+             pen.setColor(color)
+             painter.setPen(pen)
+             painter.drawRect(rect.adjusted(-i, -i, i, i))
+diff --git a/frescobaldi_app/widgets/linenumberarea.py b/frescobaldi_app/widgets/linenumberarea.py
+index f097726c..ff38bcc6 100644
+--- a/frescobaldi_app/widgets/linenumberarea.py
++++ b/frescobaldi_app/widgets/linenumberarea.py
+@@ -21,7 +21,7 @@
+ A line number area to be used in a QPlainTextEdit.
+ """
+ 
+-from PyQt5.QtCore import QEvent, QPoint, QRect, QSize, Qt
++from PyQt5.QtCore import QEvent, QPoint, QRectF, QSize, Qt
+ from PyQt5.QtGui import QFontMetrics, QMouseEvent, QPainter
+ from PyQt5.QtWidgets import QApplication, QWidget
+ 
+@@ -72,7 +72,7 @@ class LineNumberArea(QWidget):
+             return
+         painter = QPainter(self)
+         painter.setFont(edit.font())
+-        rect = QRect(0, 0, self.width() - 2, QFontMetrics(edit.font()).height())
++        rect = QRectF(0, 0, self.width() - 2, QFontMetrics(edit.font()).height())
+         block = edit.firstVisibleBlock()
+         while block.isValid():
+             geom = edit.blockBoundingGeometry(block)
+diff --git a/frescobaldi_app/widgets/progressbar.py b/frescobaldi_app/widgets/progressbar.py
+index 670bf0f5..183ab625 100644
+--- a/frescobaldi_app/widgets/progressbar.py
++++ b/frescobaldi_app/widgets/progressbar.py
+@@ -71,8 +71,8 @@ class TimedProgressBar(QProgressBar):
+         """
+         self._hideTimer.stop()
+         self._timeline.stop()
+-        self._timeline.setDuration(total * 1000)
+-        self._timeline.setCurrentTime(elapsed * 1000)
++        self._timeline.setDuration(int(total * 1000))
++        self._timeline.setCurrentTime(int(elapsed * 1000))
+         self.setValue(self._timeline.currentFrame())
+         self._timeline.resume()
+         if self._hideWhileIdle and not self._hidden:
+-- 
+2.33.1
+
diff --git a/srcpkgs/frescobaldi/patches/0002-more-py-3.10-float-int-fixes-issue-1398.patch b/srcpkgs/frescobaldi/patches/0002-more-py-3.10-float-int-fixes-issue-1398.patch
new file mode 100644
index 000000000000..8338ca2a362c
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/0002-more-py-3.10-float-int-fixes-issue-1398.patch
@@ -0,0 +1,209 @@
+From bd4dfe036b8dbc5d75552fe6b6b081c024e5beea Mon Sep 17 00:00:00 2001
+From: Wilbert Berendsen <wbsoft@xs4all.nl>
+Date: Mon, 8 Nov 2021 09:35:59 +0100
+Subject: [PATCH 2/2] more py 3.10 float->int fixes, issue #1398
+
+---
+ frescobaldi_app/qpageview/page.py       | 50 ++++++++++++-------------
+ frescobaldi_app/qpageview/poppler.py    |  2 +-
+ frescobaldi_app/qpageview/scrollarea.py |  8 ++--
+ 3 files changed, 30 insertions(+), 30 deletions(-)
+
+diff --git a/frescobaldi_app/qpageview/page.py b/frescobaldi_app/qpageview/page.py
+index f93fa9e2..754d2736 100644
+--- a/frescobaldi_app/qpageview/page.py
++++ b/frescobaldi_app/qpageview/page.py
+@@ -48,7 +48,7 @@ class AbstractPage(util.Rectangular):
+ 
+     ...that normally do not change during its lifetime:
+ 
+-        `pageWidth`     the original width  (by default in points, `dpi` is 72.0 
++        `pageWidth`     the original width  (by default in points, `dpi` is 72.0
+         `pageHeight`    the original height   but can be changed at class level)
+ 
+     ... that can be modified by the user (having defaults at the class level):
+@@ -174,15 +174,15 @@ class AbstractPage(util.Rectangular):
+ 
+     def defaultSize(self):
+         """Return the pageSize() scaled and rotated (if needed).
+-        
++
+         Based on scaleX, scaleY, and computedRotation attributes.
+-        
++
+         """
+         s = QSizeF(self.pageWidth * self.scaleX, self.pageHeight * self.scaleY)
+         if self.computedRotation & 1:
+             s.transpose()
+         return s
+-        
++
+     def updateSize(self, dpiX, dpiY, zoomFactor):
+         """Set the width and height attributes of the page.
+ 
+@@ -286,7 +286,7 @@ class AbstractPage(util.Rectangular):
+ 
+         pdf = QPdfWriter(filename)
+         pdf.setCreator("qpageview")
+-        pdf.setResolution(resolution)
++        pdf.setResolution(int(resolution))
+ 
+         layout = pdf.pageLayout()
+         layout.setMode(layout.FullPageMode)
+@@ -350,7 +350,7 @@ class AbstractPage(util.Rectangular):
+             svg.setFileName(filename)
+         else:
+             svg.setOutputDevice(filename)
+-        svg.setResolution(resolution)
++        svg.setResolution(int(resolution))
+         svg.setSize(targetSize.toSize())
+         svg.setViewBox(QRectF(0, 0, targetSize.width(), targetSize.height()))
+         return self.output(svg, source, paperColor)
+@@ -381,31 +381,31 @@ class AbstractPage(util.Rectangular):
+ 
+     def group(self):
+         """Return the group the page belongs to.
+-        
++
+         This could be some document structure, so that different Page objects
+         could refer to the same graphical contents, preventing double caching.
+-        
++
+         This object is used together with the value returned by ident() as a key
+         to cache the page. The idea is that the contents of the page are
+         uniquely identified by the objects returned by group() and ident().
+-        
++
+         This way, when the same document is opened in multiple page instances,
+         only one copy resides in the (global) cache.
+-        
++
+         By default, the page object itself is returned.
+-        
++
+         """
+         return self
+-        
++
+     def ident(self):
+         """Return a value that identifies the page within the group returned
+         by group().
+-        
++
+         By default, None is returned.
+-        
++
+         """
+         return None
+-    
++
+     def mapToPage(self, width=None, height=None):
+         """Return a MapToPage object, that can map original to Page coordinates.
+ 
+@@ -426,10 +426,10 @@ class AbstractPage(util.Rectangular):
+ 
+     def text(self, rect):
+         """Implement this method to get the text at the specified rectangle.
+-        
++
+         The rectangle should be in page coordinates. The default implementation
+         simply returns an empty string.
+-        
++
+         """
+         return ""
+ 
+@@ -437,22 +437,22 @@ class AbstractPage(util.Rectangular):
+         """Implement this method to load our links."""
+         from . import link
+         return link.Links()
+-    
++
+     def links(self):
+         """Return the Links object, containing Link objects.
+-        
++
+         Every Link denotes a clickable area on a Page, in coordinates 0.0-1.0.
+         The Links object makes it possible to quickly find a link on a Page.
+         This is cached after the first request, you should implement the
+         getLinks() method to load the links.
+-        
++
+         """
+         try:
+             return self._links
+         except AttributeError:
+             links = self._links = self.getLinks()
+         return links
+-    
++
+     def linksAt(self, point):
+         """Return a list() of zero or more links touched by QPoint point.
+ 
+@@ -468,9 +468,9 @@ class AbstractPage(util.Rectangular):
+ 
+     def linksIn(self, rect):
+         """Return an unordered set of links enclosed in rectangle.
+-        
++
+         The rectangle is in page coordinates.
+-        
++
+         """
+         return self.links().inside(*self.mapFromPage(1, 1).rect(rect).getCoords())
+ 
+@@ -481,9 +481,9 @@ class AbstractPage(util.Rectangular):
+ 
+ class AbstractRenderedPage(AbstractPage):
+     """A Page that has a renderer that performs caching and painting.
+-    
++
+     The renderer lives in the renderer attribute.
+-    
++
+     """
+     def __init__(self, renderer=None):
+         if renderer is not None:
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 26768356..810dbca5 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -259,7 +259,7 @@ class PopplerRenderer(render.AbstractRenderer):
+         (See AbstractPage.print().)
+ 
+         """
+-        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile))
++        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile)).toRect()   # rounded
+         target = QRectF(0, 0, tile.w, tile.h)
+         if key.rotation & 1:
+             target.setSize(target.size().transposed())
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 5a0c5631..6722a6db 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -365,9 +365,9 @@ class ScrollArea(QAbstractScrollArea):
+                 speed = speed * 1000 / self.scrollupdatespersec / time
+                 # compute diff to scroll
+                 sx = abs(speed.x())
+-                diffx = sx * (sx + 1) / 2
++                diffx = int(sx * (sx + 1) / 2)
+                 sy = abs(speed.y())
+-                diffy = sy * (sy + 1) / 2
++                diffy = int(sy * (sy + 1) / 2)
+                 if speed.x() < 0: diffx = -diffx
+                 if speed.y() < 0: diffy = -diffy
+                 self.kineticScrollBy(QPoint(diffx, diffy))
+@@ -444,8 +444,8 @@ class KineticScroller(Scroller):
+         dy = diff.y()
+ 
+         # solve speed*(speed+1)/2 = delta to ensure 1+2+3+...+speed is as close as possible under delta..
+-        sx = (math.sqrt(1 + 8 * abs(dx)) - 1) // 2
+-        sy = (math.sqrt(1 + 8 * abs(dy)) - 1) // 2
++        sx = int(math.sqrt(1 + 8 * abs(dx)) - 1) // 2
++        sy = int(math.sqrt(1 + 8 * abs(dy)) - 1) // 2
+ 
+         # compute the amount of displacement still needed because we're dealing with integer values.
+         # Since this function is called for exact moves (not free scrolling)
+-- 
+2.33.1
+
diff --git a/srcpkgs/frescobaldi/patches/0003-More-changes-to-fix-errors-under-Python-3.10.patch b/srcpkgs/frescobaldi/patches/0003-More-changes-to-fix-errors-under-Python-3.10.patch
new file mode 100644
index 000000000000..b212b515e8ab
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/0003-More-changes-to-fix-errors-under-Python-3.10.patch
@@ -0,0 +1,50 @@
+From 4e910e55f6700fafe1683af770e4bc299cdd71a2 Mon Sep 17 00:00:00 2001
+From: Dexter Gaon-Shatford <dexter@gaonshatford.ca>
+Date: Wed, 10 Nov 2021 17:04:34 -0500
+Subject: [PATCH] More changes to fix errors under Python 3.10
+
+There are a few errors that are encountered when engraving a score in
+the editor that were not addressed in the changes made by wbsoft
+---
+ frescobaldi_app/viewmanager.py            | 4 ++--
+ frescobaldi_app/widgets/linenumberarea.py | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/frescobaldi_app/viewmanager.py b/frescobaldi_app/viewmanager.py
+index e1294c91..046c70df 100644
+--- a/frescobaldi_app/viewmanager.py
++++ b/frescobaldi_app/viewmanager.py
+@@ -332,7 +332,7 @@ class ViewManager(QSplitter):
+             splitter.setOrientation(orientation)
+             size = splitter.sizes()[0]
+             splitter.addWidget(newspace)
+-            splitter.setSizes([size / 2, size / 2])
++            splitter.setSizes([size // 2, size // 2])
+         elif splitter.orientation() == orientation:
+             index = splitter.indexOf(viewspace)
+             splitter.insertWidget(index + 1, newspace)
+@@ -346,7 +346,7 @@ class ViewManager(QSplitter):
+             splitter.setSizes(sizes)
+             size = newsplitter.sizes()[0]
+             newsplitter.addWidget(newspace)
+-            newsplitter.setSizes([size / 2, size / 2])
++            newsplitter.setSizes([size // 2, size // 2])
+         self._viewSpaces.insert(0, newspace)
+         newspace.showDocument(viewspace.document())
+         if active:
+diff --git a/frescobaldi_app/widgets/linenumberarea.py b/frescobaldi_app/widgets/linenumberarea.py
+index ff38bcc6..aa133ac7 100644
+--- a/frescobaldi_app/widgets/linenumberarea.py
++++ b/frescobaldi_app/widgets/linenumberarea.py
+@@ -80,7 +80,7 @@ class LineNumberArea(QWidget):
+             if geom.top() >= ev.rect().bottom():
+                 break
+             if block.isVisible() and geom.bottom() > ev.rect().top() + 1:
+-                rect.moveTop(geom.top())
++                rect.moveTop(int(geom.top()))
+                 text = format(block.blockNumber() + 1, 'd')
+                 painter.drawText(rect, Qt.AlignRight, text)
+             block = block.next()
+-- 
+2.33.1
+
diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..bf61cf1155c6
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,20 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools gettext"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/v${version}/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=f97256ce15ab621593536e219584a2ed744c1933148ac7ed98fcef6a3a9510a6
+
+pre_build() {
+	make -C linux
+}

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

* Re: New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (63 preceding siblings ...)
  2022-01-19 22:10 ` chili-b
@ 2022-01-20  5:11 ` chili-b
  2022-02-02  9:55 ` [PR REVIEW] " ericonr
                   ` (19 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2022-01-20  5:11 UTC (permalink / raw)
  To: ml

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

New comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#issuecomment-1017126379

Comment:
Bumping this because the template has been working for quite a while now. Is there anything else that needs to be done before it gets accepted?

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

* Re: [PR REVIEW] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (67 preceding siblings ...)
  2022-02-02  9:55 ` ericonr
@ 2022-02-02  9:55 ` ericonr
  2022-02-03 16:03 ` chili-b
                   ` (15 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: ericonr @ 2022-02-02  9:55 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#discussion_r797433213

Comment:
Can you remove these whitespace changes from the patch as well?

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

* Re: [PR REVIEW] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (66 preceding siblings ...)
  2022-02-02  9:55 ` ericonr
@ 2022-02-02  9:55 ` ericonr
  2022-02-02  9:55 ` ericonr
                   ` (16 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: ericonr @ 2022-02-02  9:55 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#discussion_r797434204

Comment:
Is a release with python 3.10 fixes expected? It'd be nice to see one from upstream.

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

* Re: [PR REVIEW] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (65 preceding siblings ...)
  2022-02-02  9:55 ` [PR REVIEW] " ericonr
@ 2022-02-02  9:55 ` ericonr
  2022-02-02  9:55 ` ericonr
                   ` (17 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: ericonr @ 2022-02-02  9:55 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#discussion_r797435805

Comment:
If you need those CFLAGS,  you should set at least the `-I` one for all builds.

And I'd like to see a CI run with the mtune cludge removed.

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

* Re: [PR REVIEW] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (64 preceding siblings ...)
  2022-01-20  5:11 ` chili-b
@ 2022-02-02  9:55 ` ericonr
  2022-02-02  9:55 ` ericonr
                   ` (18 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: ericonr @ 2022-02-02  9:55 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#discussion_r797433731

Comment:
Same for whitespace changes in this patch.

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

* Re: [PR REVIEW] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (68 preceding siblings ...)
  2022-02-02  9:55 ` ericonr
@ 2022-02-03 16:03 ` chili-b
  2022-02-03 16:04 ` chili-b
                   ` (14 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2022-02-03 16:03 UTC (permalink / raw)
  To: ml

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

New review comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#discussion_r798719778

Comment:
The changes that include whitespace in this patch are from a commit by the upstream maintainer themself. I remember discussing this on IRC and being advised to just leave it.

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

* Re: [PR REVIEW] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (69 preceding siblings ...)
  2022-02-03 16:03 ` chili-b
@ 2022-02-03 16:04 ` chili-b
  2022-02-03 16:21 ` chili-b
                   ` (13 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2022-02-03 16:04 UTC (permalink / raw)
  To: ml

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

New review comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#discussion_r798720897

Comment:
Yes, the patches included here are taken from commits to the upstream repository that will eventually end up in a release.

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

* Re: [PR REVIEW] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (70 preceding siblings ...)
  2022-02-03 16:04 ` chili-b
@ 2022-02-03 16:21 ` chili-b
  2022-02-03 16:24 ` [PR PATCH] [Updated] " chili-b
                   ` (12 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2022-02-03 16:21 UTC (permalink / raw)
  To: ml

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

New review comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#discussion_r798737761

Comment:
IIRC the CFLAGS are needed only for cross builds to ARM because their options aren't automatically configured correctly at build time. I will push a version with the mtune thing removed so you can see.

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (71 preceding siblings ...)
  2022-02-03 16:21 ` chili-b
@ 2022-02-03 16:24 ` chili-b
  2022-02-03 19:50 ` chili-b
                   ` (11 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2022-02-03 16:24 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From f6a06a32f51a8d5342e69a7f7d1d5bad959314fb Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/3] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From c08b055606e6464ebd9f531078bcdb80508fdf01 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/3] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..4ed033d7e901
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,28 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+hostmakedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+makedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	# Cludge to fix build under armv7l, armv6l
+	# if [[ $XBPS_TARGET_MACHINE == arm* ]]; then
+	#	  export CFLAGS="-mtune=generic-armv7-a "
+	# fi
+	export CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
+
+	python setup.py build_ext --pyqt-sip-dir=/${py3_sitelib}/PyQt5/bindings
+}

From 3e111989c43276f4a556268d6ddb1660e2a1a6f4 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/3] New package: frescobaldi-3.1.3

---
 ...f-py-3.10-float-int-fixes-issue-1398.patch | 530 ++++++++++++++++++
 ...e-py-3.10-float-int-fixes-issue-1398.patch | 209 +++++++
 ...nges-to-fix-errors-under-Python-3.10.patch |  50 ++
 srcpkgs/frescobaldi/template                  |  20 +
 4 files changed, 809 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/patches/0001-first-batch-of-py-3.10-float-int-fixes-issue-1398.patch
 create mode 100644 srcpkgs/frescobaldi/patches/0002-more-py-3.10-float-int-fixes-issue-1398.patch
 create mode 100644 srcpkgs/frescobaldi/patches/0003-More-changes-to-fix-errors-under-Python-3.10.patch
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/patches/0001-first-batch-of-py-3.10-float-int-fixes-issue-1398.patch b/srcpkgs/frescobaldi/patches/0001-first-batch-of-py-3.10-float-int-fixes-issue-1398.patch
new file mode 100644
index 000000000000..1b80ed879f93
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/0001-first-batch-of-py-3.10-float-int-fixes-issue-1398.patch
@@ -0,0 +1,530 @@
+From 51886dba8a3cb3db6eba9a6cf1d65bd8eaf877aa Mon Sep 17 00:00:00 2001
+From: Wilbert Berendsen <wbsoft@xs4all.nl>
+Date: Sun, 7 Nov 2021 14:53:33 +0100
+Subject: [PATCH 1/2] first batch of py 3.10 float->int fixes, issue #1398
+
+---
+ frescobaldi_app/qpageview/magnifier.py    | 10 +++---
+ frescobaldi_app/qpageview/poppler.py      | 18 +++++------
+ frescobaldi_app/qpageview/render.py       | 18 +++++------
+ frescobaldi_app/qpageview/rubberband.py   | 38 +++++++++++------------
+ frescobaldi_app/qpageview/scrollarea.py   | 34 ++++++++++----------
+ frescobaldi_app/qpageview/shadow.py       | 12 +++----
+ frescobaldi_app/widgets/linenumberarea.py |  4 +--
+ frescobaldi_app/widgets/progressbar.py    |  4 +--
+ 8 files changed, 69 insertions(+), 69 deletions(-)
+
+diff --git a/frescobaldi_app/qpageview/magnifier.py b/frescobaldi_app/qpageview/magnifier.py
+index 3a2759fb..b93d05be 100644
+--- a/frescobaldi_app/qpageview/magnifier.py
++++ b/frescobaldi_app/qpageview/magnifier.py
+@@ -156,7 +156,7 @@ class Magnifier(QWidget):
+ 
+     def moveEvent(self, ev):
+         """Called on move, updates the contents."""
+-        # we also update on paint events, but they are not generated if the 
++        # we also update on paint events, but they are not generated if the
+         # magnifiers fully covers the viewport
+         self.update()
+ 
+@@ -240,8 +240,8 @@ class Magnifier(QWidget):
+                 factor = 1.1 ** (ev.angleDelta().y() / 120)
+                 g = self.geometry()
+                 c = g.center()
+-                g.setWidth(min(max(g.width() * factor, self.MIN_SIZE), self.MAX_SIZE))
+-                g.setHeight(min(max(g.height() * factor, self.MIN_SIZE), self.MAX_SIZE))
++                g.setWidth(int(min(max(g.width() * factor, self.MIN_SIZE), self.MAX_SIZE)))
++                g.setHeight(int(min(max(g.height() * factor, self.MIN_SIZE), self.MAX_SIZE)))
+                 g.moveCenter(c)
+                 self.setGeometry(g)
+             else:
+@@ -278,13 +278,13 @@ class Magnifier(QWidget):
+ 
+         # the virtual position of the whole scaled-up layout
+         ev_rect = ev.rect().translated(our_rect.topLeft())
+-        
++
+         # draw shadow border?
+         shadow = False
+         if hasattr(view, "drawDropShadow") and view.dropShadowEnabled:
+             shadow = True
+             shadow_width = layout.spacing * scale // 2
+-        
++
+         painter = QPainter(self)
+         for p in layout.pagesAt(region.boundingRect()):
+             # get a (reused) the copy of the page
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 17312d78..26768356 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -62,7 +62,7 @@ class Link(link.Link):
+     def __init__(self, linkobj):
+         self.linkobj = linkobj
+         self.area = link.Area(*linkobj.linkArea().normalized().getCoords())
+-    
++
+     @property
+     def url(self):
+         if isinstance(self.linkobj, popplerqt5.Poppler.LinkBrowse):
+@@ -105,8 +105,8 @@ class PopplerPage(page.AbstractRenderedPage):
+     def load(cls, filename, renderer=None):
+         """Load a Poppler document, and yield of instances of this class.
+ 
+-        The filename can also be a QByteArray or a popplerqt5.Poppler.Document 
+-        instance. The specified Renderer is used, or else the global poppler 
++        The filename can also be a QByteArray or a popplerqt5.Poppler.Document
++        instance. The specified Renderer is used, or else the global poppler
+         renderer.
+ 
+         """
+@@ -116,11 +116,11 @@ class PopplerPage(page.AbstractRenderedPage):
+     def mutex(self):
+         """No two pages of same Poppler document are rendered at the same time."""
+         return self.document
+-    
++
+     def group(self):
+         """Reimplemented to return the Poppler document our page displays a page from."""
+         return self.document
+-    
++
+     def ident(self):
+         """Reimplemented to return the page number of this page."""
+         return self.pageNumber
+@@ -131,7 +131,7 @@ class PopplerPage(page.AbstractRenderedPage):
+         with locking.lock(self.document):
+             page = self.document.page(self.pageNumber)
+             return page.text(rect)
+-    
++
+     def links(self):
+         """Reimplemented to use a different caching mechanism."""
+         document, pageNumber = self.document, self.pageNumber
+@@ -184,7 +184,7 @@ class PopplerRenderer(render.AbstractRenderer):
+         renderBackend = printRenderBackend = 0
+ 
+     oversampleThreshold = 96
+-    
++
+     def render(self, page, key, tile, paperColor=None):
+         """Generate an image for the Page referred to by key."""
+         if paperColor is None:
+@@ -205,8 +205,8 @@ class PopplerRenderer(render.AbstractRenderer):
+             key.rotation, paperColor)
+         if multiplier == 2:
+             image = image.scaledToWidth(tile.w, Qt.SmoothTransformation)
+-        image.setDotsPerMeterX(xres * 39.37)
+-        image.setDotsPerMeterY(yres * 39.37)
++        image.setDotsPerMeterX(int(xres * 39.37))
++        image.setDotsPerMeterY(int(yres * 39.37))
+         return image
+ 
+     def setRenderHints(self, doc):
+diff --git a/frescobaldi_app/qpageview/render.py b/frescobaldi_app/qpageview/render.py
+index a8c00de1..5560fa2f 100644
+--- a/frescobaldi_app/qpageview/render.py
++++ b/frescobaldi_app/qpageview/render.py
+@@ -146,11 +146,11 @@ class AbstractRenderer:
+ 
+     def map(self, key, box):
+         """Return a QTransform converting from Key coordinates to a box.
+-        
++
+         The box should be a QRectF or QRect, and describes the original area of
+         the page.  The returned matrix can be used to convert e.g. tile
+         coordinates to the position on the original page.
+-        
++
+         """
+         t = QTransform()
+         t.translate(box.x(), box.y())
+@@ -182,17 +182,17 @@ class AbstractRenderer:
+ 
+     def render(self, page, key, tile, paperColor=None):
+         """Generate a QImage for tile of the Page.
+-        
++
+         The width, height and rotation to render at should be taken from the
+         key, as the page could be resized or rotated in the mean time.
+-        
++
+         The default implementation prepares the image, a painter and then
+         calls draw() to actually draw the contents.
+-        
++
+         If the paperColor is not specified, it will be read from the Page's
+         paperColor attribute (if not None) or else from the renderer's
+         paperColor attribute.
+-        
++
+         """
+         if paperColor is None:
+             paperColor = page.paperColor or self.paperColor
+@@ -200,7 +200,7 @@ class AbstractRenderer:
+         i = QImage(tile.w, tile.h, self.imageFormat)
+         i.fill(paperColor)
+         painter = QPainter(i)
+-        
++
+         # rotate the painter accordingly
+         util.rotate(painter, key.rotation, tile.w, tile.h, True)
+ 
+@@ -241,7 +241,7 @@ class AbstractRenderer:
+         key = self.key(page, ratio)
+ 
+         # paint rect in tile coordinates
+-        target = QRect(rect.x() * ratio, rect.y() * ratio, rect.width() * ratio, rect.height() * ratio)
++        target = QRect(int(rect.x() * ratio), int(rect.y() * ratio), int(rect.width() * ratio), int(rect.height() * ratio))
+ 
+         # tiles to paint
+         tiles = [t for t in self.tiles(key.width, key.height) if QRect(*t) & target]
+@@ -314,7 +314,7 @@ class AbstractRenderer:
+                 vscale = key.height / height
+                 for t in tileset:
+                     # scale to our image size
+-                    r = QRect(t.x * hscale, t.y * vscale, t.w * hscale, t.h * vscale) & target
++                    r = QRect(int(t.x * hscale), int(t.y * vscale), int(t.w * hscale), int(t.h * vscale)) & target
+                     if r and QRegion(r).subtracted(region):
+                         # we have an image that can be drawn in rect r
+                         source = QRectF(r.x() / hscale - t.x, r.y() / vscale - t.y,
+diff --git a/frescobaldi_app/qpageview/rubberband.py b/frescobaldi_app/qpageview/rubberband.py
+index dbab772a..4a073bc8 100644
+--- a/frescobaldi_app/qpageview/rubberband.py
++++ b/frescobaldi_app/qpageview/rubberband.py
+@@ -41,7 +41,7 @@ class Rubberband(QWidget):
+     """A Rubberband to select a rectangular region.
+ 
+     A Rubberband is added to a View with view.setRubberband().
+-    
++
+     The Rubberband lets the user select a rectangular region. When the
+     selection is changed, the `selectionChanged` signal is emitted, having the
+     selection rectangle in layout coordinates as argument.
+@@ -51,7 +51,7 @@ class Rubberband(QWidget):
+         showbutton (Qt.RightButton), the button used to drag a new rectangle
+ 
+         dragbutton (Qt.LeftButton), the button to alter an existing rectangle
+-        
++
+         trackSelection (False), whether to continuously emit selectionChanged().
+                 When True, selectionChanged() is emitted on every change, when
+                 False, the signal is only emitted when the mouse button is
+@@ -93,7 +93,7 @@ class Rubberband(QWidget):
+         color.setAlpha(150)
+         painter.setPen(color)
+         # XXX can this adjustment be done smarter?
+-        adjust = -1 / self.devicePixelRatio()
++        adjust = int(-1 / self.devicePixelRatio())
+         painter.drawRect(self.rect().adjusted(0, 0, adjust, adjust))
+ 
+         # Pseudo-handles at the corners and sides
+@@ -148,21 +148,21 @@ class Rubberband(QWidget):
+             self.setCursor(cursor)
+         else:
+             self.unsetCursor()
+-    
++
+     def hasSelection(self):
+         """Return True when there is a selection."""
+         return bool(self._selection)
+-    
++
+     def selection(self):
+         """Return our selection rectangle, relative to the view's layout position."""
+         return self._selection
+-    
++
+     def selectedPages(self):
+         """Yield tuples (page, rect) describing the selection.
+-        
++
+         Every rect is intersected with the page rect and translated to the
+         page's position.
+-        
++
+         """
+         rect = self.selection()
+         if rect:
+@@ -170,7 +170,7 @@ class Rubberband(QWidget):
+             layout = view.pageLayout()
+             for page in layout.pagesAt(rect):
+                 yield page, rect.intersected(page.geometry()).translated(-page.pos())
+-    
++
+     def selectedPage(self):
+         """Returns (page, rect) if there is a selection.
+ 
+@@ -211,10 +211,10 @@ class Rubberband(QWidget):
+ 
+     def selectedLinks(self):
+         """Yield tuples (page, links) for every page in the selection.
+-        
++
+         links is a non-empty set() of Link instances on that page that intersect
+         with the selection.
+-        
++
+         """
+         for page, rect in self.selectedPages():
+             links = page.linksIn(rect)
+@@ -234,19 +234,19 @@ class Rubberband(QWidget):
+         else:
+             self.hide()
+             self._setSelectionFromGeometry(QRect())
+-    
++
+     def clearSelection(self):
+         """Hide ourselves and clear the selection."""
+         self.hide()
+         self._dragging = False
+         self._setSelectionFromGeometry(QRect())
+-        
++
+     def _setSelectionFromGeometry(self, rect):
+         """(Internal) Called to emit the selectionChanged signal.
+-        
++
+         Only emits the signal when the selection really changed.
+         The rect should be our geometry or an empty QRect().
+-        
++
+         """
+         if rect:
+             view = self.parent().parent()
+@@ -254,16 +254,16 @@ class Rubberband(QWidget):
+         old, self._selection = self._selection, rect
+         if rect != old:
+             self.selectionChanged.emit(rect)
+-    
++
+     def _setLayoutOffset(self, pos):
+         """Store the position as offset from the layout, and also from the page
+         at that position. Used for keeping the same spot on zoom change.
+-        
++
+         """
+         view = self.parent().parent()
+         pos = pos - view.layoutPosition()
+         self._layoutOffset = view.pageLayout().pos2offset(pos)
+-    
++
+     def _getLayoutOffset(self):
+         """Get the stored layout offset position back, after zoom or move."""
+         view = self.parent().parent()
+@@ -340,7 +340,7 @@ class Rubberband(QWidget):
+             geom = QRect(self._getLayoutOffset(), self.size() * factor)
+             self.setGeometry(geom)
+             self._setSelectionFromGeometry(geom)
+-    
++
+     def eventFilter(self, viewport, ev):
+         """Act on events in the viewport:
+ 
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 6f4dcaf1..5a0c5631 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -46,7 +46,7 @@ class ScrollArea(QAbstractScrollArea):
+         draggingEnabled (True):
+             If enabled, the user can drag the contents of the scrollarea to
+             move it with the mouse.
+-            
++
+     """
+ 
+     alignment = Qt.AlignCenter
+@@ -109,10 +109,10 @@ class ScrollArea(QAbstractScrollArea):
+ 
+     def areaPos(self):
+         """Return the position of the area relative to the viewport.
+-        
++
+         The alignment attribute is taken into account when the area is smaller
+         than the viewport (horizontally and/or vertically).
+-        
++
+         """
+         w, h = self._areaSize
+         vw = self.viewport().width()
+@@ -123,13 +123,13 @@ class ScrollArea(QAbstractScrollArea):
+         if top < 0:
+             top = -self.verticalScrollBar().value()
+         return QPoint(left, top)
+-    
++
+     def visibleArea(self):
+         """Return a rectangle describing the part of the area that is visible."""
+         pos = self.areaPos()
+         r = self.viewport().rect() & QRect(pos, self.areaSize())
+         return r.translated(-pos)
+-        
++
+     def offsetToEnsureVisible(self, rect):
+         """Return an offset QPoint with the minimal scroll to make rect visible.
+ 
+@@ -153,12 +153,12 @@ class ScrollArea(QAbstractScrollArea):
+ 
+     def ensureVisible(self, rect, margins=None, allowKinetic=True):
+         """Performs the minimal scroll to make rect visible.
+-        
++
+         If the rect is not completely visible it is scrolled into view, adding
+         the margins if given (a QMargins instance). If allowKinetic is False,
+         immediately jumps to the position, otherwise scrolls smoothly (if
+         kinetic scrolling is enabled).
+-        
++
+         """
+         if rect not in self.visibleArea():
+             if margins is not None:
+@@ -171,9 +171,9 @@ class ScrollArea(QAbstractScrollArea):
+ 
+     def _updateScrollBars(self):
+         """Internal. Adjust the range of the scrollbars to the area size.
+-        
++
+         Called in setAreaSize() and resizeEvent().
+-        
++
+         """
+         w, h = self._areaSize
+         maxsize = self.maximumViewportSize()
+@@ -186,10 +186,10 @@ class ScrollArea(QAbstractScrollArea):
+         else:
+             viewport = self.viewport()
+             vbar.setRange(0, h - viewport.height())
+-            vbar.setPageStep(viewport.height() * .9)
++            vbar.setPageStep(int(viewport.height() * .9))
+             hbar.setRange(0, w - viewport.width())
+-            hbar.setPageStep(viewport.width() * .9)
+-        
++            hbar.setPageStep(int(viewport.width() * .9))
++
+     def scrollOffset(self):
+         """Return the current scroll offset."""
+         x = self.horizontalScrollBar().value()
+@@ -295,7 +295,7 @@ class ScrollArea(QAbstractScrollArea):
+         """Begin a scrolling operation using the specified scroller."""
+         self._scroller = scroller
+         if self._scrollTimer is None:
+-            self._scrollTimer = self.startTimer(1000 / self.scrollupdatespersec)
++            self._scrollTimer = self.startTimer(int(1000 // self.scrollupdatespersec))
+ 
+     def stopScrolling(self):
+         """Stop scrolling."""
+@@ -307,7 +307,7 @@ class ScrollArea(QAbstractScrollArea):
+     def isScrolling(self):
+         """Return True if a scrolling movement is active."""
+         return self._scroller is not None
+-    
++
+     def remainingScrollTime(self):
+         """If a kinetic scroll is active, return how many msecs the scroll wil last.
+ 
+@@ -375,7 +375,7 @@ class ScrollArea(QAbstractScrollArea):
+             self._dragTime = None
+             self._dragSpeed = None
+         super().mouseReleaseEvent(ev)
+-        
++
+ 
+ class Scroller:
+     """Abstract base class, encapsulates scrolling behaviour.
+@@ -453,13 +453,13 @@ class KineticScroller(Scroller):
+         # (TODO: adapt for other ticker speeds? WB)
+         if sy > 100:
+             sy = 100
+-        offy = abs(dy) - sy * (sy + 1) // 2
++        offy = int(abs(dy) - sy * (sy + 1) // 2)
+ 
+         # Although it is less likely to go beyond that limit for horizontal scrolling,
+         # do it for x as well.
+         if sx > 100:
+             sx = 100
+-        offx = abs(dx) - sx * (sx + 1) // 2
++        offx = int(abs(dx) - sx * (sx + 1) // 2)
+ 
+         # adjust directions
+         if dx < 0:
+diff --git a/frescobaldi_app/qpageview/shadow.py b/frescobaldi_app/qpageview/shadow.py
+index c7d1c8d5..5b0cd17b 100644
+--- a/frescobaldi_app/qpageview/shadow.py
++++ b/frescobaldi_app/qpageview/shadow.py
+@@ -37,10 +37,10 @@ class ShadowViewMixin:
+ 
+     def paintEvent(self, ev):
+         if self.dropShadowEnabled:
+-            width = self._pageLayout.spacing / 2
++            width = round(self._pageLayout.spacing / 2.0)
+             # make the rect slightly larger, so we "see" shadow of pages that
+             # would be outside view normally.
+-            rect = ev.rect().adjusted(-width, -width, width / 2, width / 2)
++            rect = ev.rect().adjusted(-width, -width, int(width // 2), int(width // 2))
+             painter = QPainter(self.viewport())
+             for page, rect in self.pagesToPaint(rect, painter):
+                 self.drawDropShadow(page, painter, width)
+@@ -48,19 +48,19 @@ class ShadowViewMixin:
+ 
+     def drawDropShadow(self, page, painter, width):
+         """Draw a drop shadow of width pixels around the Page.
+-        
++
+         The painter is already translated to the topleft corner of the Page.
+-        
++
+         """
+         width = round(width)
+-        rect = page.rect().adjusted(width / 2, width / 2, 0, 0)
++        rect = page.rect().adjusted(int(width // 2), int(width // 2), 0, 0)
+         color = QColor(Qt.black)
+         pen = QPen()
+         pen.setWidth(1)
+         pen.setJoinStyle(Qt.MiterJoin)
+         for i in range(width):
+             f = (width-i)/width
+-            color.setAlpha(200**f + 55*f)
++            color.setAlpha(int(200**f + 55*f))
+             pen.setColor(color)
+             painter.setPen(pen)
+             painter.drawRect(rect.adjusted(-i, -i, i, i))
+diff --git a/frescobaldi_app/widgets/linenumberarea.py b/frescobaldi_app/widgets/linenumberarea.py
+index f097726c..ff38bcc6 100644
+--- a/frescobaldi_app/widgets/linenumberarea.py
++++ b/frescobaldi_app/widgets/linenumberarea.py
+@@ -21,7 +21,7 @@
+ A line number area to be used in a QPlainTextEdit.
+ """
+ 
+-from PyQt5.QtCore import QEvent, QPoint, QRect, QSize, Qt
++from PyQt5.QtCore import QEvent, QPoint, QRectF, QSize, Qt
+ from PyQt5.QtGui import QFontMetrics, QMouseEvent, QPainter
+ from PyQt5.QtWidgets import QApplication, QWidget
+ 
+@@ -72,7 +72,7 @@ class LineNumberArea(QWidget):
+             return
+         painter = QPainter(self)
+         painter.setFont(edit.font())
+-        rect = QRect(0, 0, self.width() - 2, QFontMetrics(edit.font()).height())
++        rect = QRectF(0, 0, self.width() - 2, QFontMetrics(edit.font()).height())
+         block = edit.firstVisibleBlock()
+         while block.isValid():
+             geom = edit.blockBoundingGeometry(block)
+diff --git a/frescobaldi_app/widgets/progressbar.py b/frescobaldi_app/widgets/progressbar.py
+index 670bf0f5..183ab625 100644
+--- a/frescobaldi_app/widgets/progressbar.py
++++ b/frescobaldi_app/widgets/progressbar.py
+@@ -71,8 +71,8 @@ class TimedProgressBar(QProgressBar):
+         """
+         self._hideTimer.stop()
+         self._timeline.stop()
+-        self._timeline.setDuration(total * 1000)
+-        self._timeline.setCurrentTime(elapsed * 1000)
++        self._timeline.setDuration(int(total * 1000))
++        self._timeline.setCurrentTime(int(elapsed * 1000))
+         self.setValue(self._timeline.currentFrame())
+         self._timeline.resume()
+         if self._hideWhileIdle and not self._hidden:
+-- 
+2.33.1
+
diff --git a/srcpkgs/frescobaldi/patches/0002-more-py-3.10-float-int-fixes-issue-1398.patch b/srcpkgs/frescobaldi/patches/0002-more-py-3.10-float-int-fixes-issue-1398.patch
new file mode 100644
index 000000000000..8338ca2a362c
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/0002-more-py-3.10-float-int-fixes-issue-1398.patch
@@ -0,0 +1,209 @@
+From bd4dfe036b8dbc5d75552fe6b6b081c024e5beea Mon Sep 17 00:00:00 2001
+From: Wilbert Berendsen <wbsoft@xs4all.nl>
+Date: Mon, 8 Nov 2021 09:35:59 +0100
+Subject: [PATCH 2/2] more py 3.10 float->int fixes, issue #1398
+
+---
+ frescobaldi_app/qpageview/page.py       | 50 ++++++++++++-------------
+ frescobaldi_app/qpageview/poppler.py    |  2 +-
+ frescobaldi_app/qpageview/scrollarea.py |  8 ++--
+ 3 files changed, 30 insertions(+), 30 deletions(-)
+
+diff --git a/frescobaldi_app/qpageview/page.py b/frescobaldi_app/qpageview/page.py
+index f93fa9e2..754d2736 100644
+--- a/frescobaldi_app/qpageview/page.py
++++ b/frescobaldi_app/qpageview/page.py
+@@ -48,7 +48,7 @@ class AbstractPage(util.Rectangular):
+ 
+     ...that normally do not change during its lifetime:
+ 
+-        `pageWidth`     the original width  (by default in points, `dpi` is 72.0 
++        `pageWidth`     the original width  (by default in points, `dpi` is 72.0
+         `pageHeight`    the original height   but can be changed at class level)
+ 
+     ... that can be modified by the user (having defaults at the class level):
+@@ -174,15 +174,15 @@ class AbstractPage(util.Rectangular):
+ 
+     def defaultSize(self):
+         """Return the pageSize() scaled and rotated (if needed).
+-        
++
+         Based on scaleX, scaleY, and computedRotation attributes.
+-        
++
+         """
+         s = QSizeF(self.pageWidth * self.scaleX, self.pageHeight * self.scaleY)
+         if self.computedRotation & 1:
+             s.transpose()
+         return s
+-        
++
+     def updateSize(self, dpiX, dpiY, zoomFactor):
+         """Set the width and height attributes of the page.
+ 
+@@ -286,7 +286,7 @@ class AbstractPage(util.Rectangular):
+ 
+         pdf = QPdfWriter(filename)
+         pdf.setCreator("qpageview")
+-        pdf.setResolution(resolution)
++        pdf.setResolution(int(resolution))
+ 
+         layout = pdf.pageLayout()
+         layout.setMode(layout.FullPageMode)
+@@ -350,7 +350,7 @@ class AbstractPage(util.Rectangular):
+             svg.setFileName(filename)
+         else:
+             svg.setOutputDevice(filename)
+-        svg.setResolution(resolution)
++        svg.setResolution(int(resolution))
+         svg.setSize(targetSize.toSize())
+         svg.setViewBox(QRectF(0, 0, targetSize.width(), targetSize.height()))
+         return self.output(svg, source, paperColor)
+@@ -381,31 +381,31 @@ class AbstractPage(util.Rectangular):
+ 
+     def group(self):
+         """Return the group the page belongs to.
+-        
++
+         This could be some document structure, so that different Page objects
+         could refer to the same graphical contents, preventing double caching.
+-        
++
+         This object is used together with the value returned by ident() as a key
+         to cache the page. The idea is that the contents of the page are
+         uniquely identified by the objects returned by group() and ident().
+-        
++
+         This way, when the same document is opened in multiple page instances,
+         only one copy resides in the (global) cache.
+-        
++
+         By default, the page object itself is returned.
+-        
++
+         """
+         return self
+-        
++
+     def ident(self):
+         """Return a value that identifies the page within the group returned
+         by group().
+-        
++
+         By default, None is returned.
+-        
++
+         """
+         return None
+-    
++
+     def mapToPage(self, width=None, height=None):
+         """Return a MapToPage object, that can map original to Page coordinates.
+ 
+@@ -426,10 +426,10 @@ class AbstractPage(util.Rectangular):
+ 
+     def text(self, rect):
+         """Implement this method to get the text at the specified rectangle.
+-        
++
+         The rectangle should be in page coordinates. The default implementation
+         simply returns an empty string.
+-        
++
+         """
+         return ""
+ 
+@@ -437,22 +437,22 @@ class AbstractPage(util.Rectangular):
+         """Implement this method to load our links."""
+         from . import link
+         return link.Links()
+-    
++
+     def links(self):
+         """Return the Links object, containing Link objects.
+-        
++
+         Every Link denotes a clickable area on a Page, in coordinates 0.0-1.0.
+         The Links object makes it possible to quickly find a link on a Page.
+         This is cached after the first request, you should implement the
+         getLinks() method to load the links.
+-        
++
+         """
+         try:
+             return self._links
+         except AttributeError:
+             links = self._links = self.getLinks()
+         return links
+-    
++
+     def linksAt(self, point):
+         """Return a list() of zero or more links touched by QPoint point.
+ 
+@@ -468,9 +468,9 @@ class AbstractPage(util.Rectangular):
+ 
+     def linksIn(self, rect):
+         """Return an unordered set of links enclosed in rectangle.
+-        
++
+         The rectangle is in page coordinates.
+-        
++
+         """
+         return self.links().inside(*self.mapFromPage(1, 1).rect(rect).getCoords())
+ 
+@@ -481,9 +481,9 @@ class AbstractPage(util.Rectangular):
+ 
+ class AbstractRenderedPage(AbstractPage):
+     """A Page that has a renderer that performs caching and painting.
+-    
++
+     The renderer lives in the renderer attribute.
+-    
++
+     """
+     def __init__(self, renderer=None):
+         if renderer is not None:
+diff --git a/frescobaldi_app/qpageview/poppler.py b/frescobaldi_app/qpageview/poppler.py
+index 26768356..810dbca5 100644
+--- a/frescobaldi_app/qpageview/poppler.py
++++ b/frescobaldi_app/qpageview/poppler.py
+@@ -259,7 +259,7 @@ class PopplerRenderer(render.AbstractRenderer):
+         (See AbstractPage.print().)
+ 
+         """
+-        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile))
++        source = self.map(key, page.pageRect()).mapRect(QRectF(*tile)).toRect()   # rounded
+         target = QRectF(0, 0, tile.w, tile.h)
+         if key.rotation & 1:
+             target.setSize(target.size().transposed())
+diff --git a/frescobaldi_app/qpageview/scrollarea.py b/frescobaldi_app/qpageview/scrollarea.py
+index 5a0c5631..6722a6db 100644
+--- a/frescobaldi_app/qpageview/scrollarea.py
++++ b/frescobaldi_app/qpageview/scrollarea.py
+@@ -365,9 +365,9 @@ class ScrollArea(QAbstractScrollArea):
+                 speed = speed * 1000 / self.scrollupdatespersec / time
+                 # compute diff to scroll
+                 sx = abs(speed.x())
+-                diffx = sx * (sx + 1) / 2
++                diffx = int(sx * (sx + 1) / 2)
+                 sy = abs(speed.y())
+-                diffy = sy * (sy + 1) / 2
++                diffy = int(sy * (sy + 1) / 2)
+                 if speed.x() < 0: diffx = -diffx
+                 if speed.y() < 0: diffy = -diffy
+                 self.kineticScrollBy(QPoint(diffx, diffy))
+@@ -444,8 +444,8 @@ class KineticScroller(Scroller):
+         dy = diff.y()
+ 
+         # solve speed*(speed+1)/2 = delta to ensure 1+2+3+...+speed is as close as possible under delta..
+-        sx = (math.sqrt(1 + 8 * abs(dx)) - 1) // 2
+-        sy = (math.sqrt(1 + 8 * abs(dy)) - 1) // 2
++        sx = int(math.sqrt(1 + 8 * abs(dx)) - 1) // 2
++        sy = int(math.sqrt(1 + 8 * abs(dy)) - 1) // 2
+ 
+         # compute the amount of displacement still needed because we're dealing with integer values.
+         # Since this function is called for exact moves (not free scrolling)
+-- 
+2.33.1
+
diff --git a/srcpkgs/frescobaldi/patches/0003-More-changes-to-fix-errors-under-Python-3.10.patch b/srcpkgs/frescobaldi/patches/0003-More-changes-to-fix-errors-under-Python-3.10.patch
new file mode 100644
index 000000000000..b212b515e8ab
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/0003-More-changes-to-fix-errors-under-Python-3.10.patch
@@ -0,0 +1,50 @@
+From 4e910e55f6700fafe1683af770e4bc299cdd71a2 Mon Sep 17 00:00:00 2001
+From: Dexter Gaon-Shatford <dexter@gaonshatford.ca>
+Date: Wed, 10 Nov 2021 17:04:34 -0500
+Subject: [PATCH] More changes to fix errors under Python 3.10
+
+There are a few errors that are encountered when engraving a score in
+the editor that were not addressed in the changes made by wbsoft
+---
+ frescobaldi_app/viewmanager.py            | 4 ++--
+ frescobaldi_app/widgets/linenumberarea.py | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/frescobaldi_app/viewmanager.py b/frescobaldi_app/viewmanager.py
+index e1294c91..046c70df 100644
+--- a/frescobaldi_app/viewmanager.py
++++ b/frescobaldi_app/viewmanager.py
+@@ -332,7 +332,7 @@ class ViewManager(QSplitter):
+             splitter.setOrientation(orientation)
+             size = splitter.sizes()[0]
+             splitter.addWidget(newspace)
+-            splitter.setSizes([size / 2, size / 2])
++            splitter.setSizes([size // 2, size // 2])
+         elif splitter.orientation() == orientation:
+             index = splitter.indexOf(viewspace)
+             splitter.insertWidget(index + 1, newspace)
+@@ -346,7 +346,7 @@ class ViewManager(QSplitter):
+             splitter.setSizes(sizes)
+             size = newsplitter.sizes()[0]
+             newsplitter.addWidget(newspace)
+-            newsplitter.setSizes([size / 2, size / 2])
++            newsplitter.setSizes([size // 2, size // 2])
+         self._viewSpaces.insert(0, newspace)
+         newspace.showDocument(viewspace.document())
+         if active:
+diff --git a/frescobaldi_app/widgets/linenumberarea.py b/frescobaldi_app/widgets/linenumberarea.py
+index ff38bcc6..aa133ac7 100644
+--- a/frescobaldi_app/widgets/linenumberarea.py
++++ b/frescobaldi_app/widgets/linenumberarea.py
+@@ -80,7 +80,7 @@ class LineNumberArea(QWidget):
+             if geom.top() >= ev.rect().bottom():
+                 break
+             if block.isVisible() and geom.bottom() > ev.rect().top() + 1:
+-                rect.moveTop(geom.top())
++                rect.moveTop(int(geom.top()))
+                 text = format(block.blockNumber() + 1, 'd')
+                 painter.drawText(rect, Qt.AlignRight, text)
+             block = block.next()
+-- 
+2.33.1
+
diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..bf61cf1155c6
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,20 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.1.3
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools gettext"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-poppler-qt5"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/v${version}/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=f97256ce15ab621593536e219584a2ed744c1933148ac7ed98fcef6a3a9510a6
+
+pre_build() {
+	make -C linux
+}

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

* Re: New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (72 preceding siblings ...)
  2022-02-03 16:24 ` [PR PATCH] [Updated] " chili-b
@ 2022-02-03 19:50 ` chili-b
  2022-02-03 19:50 ` chili-b
                   ` (10 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2022-02-03 19:50 UTC (permalink / raw)
  To: ml

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

New comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#issuecomment-1029343458

Comment:
> I'd like to see a CI run with the mtune cludge removed.
@ericonr, done

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

* Re: New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (73 preceding siblings ...)
  2022-02-03 19:50 ` chili-b
@ 2022-02-03 19:50 ` chili-b
  2022-03-09  5:46 ` chili-b
                   ` (9 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2022-02-03 19:50 UTC (permalink / raw)
  To: ml

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

New comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#issuecomment-1029343458

Comment:
> I'd like to see a CI run with the mtune cludge removed.

@ericonr, done

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

* Re: New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (74 preceding siblings ...)
  2022-02-03 19:50 ` chili-b
@ 2022-03-09  5:46 ` chili-b
  2022-05-22 15:13 ` [PR PATCH] [Updated] " chili-b
                   ` (8 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2022-03-09  5:46 UTC (permalink / raw)
  To: ml

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

New comment by chili-b on void-packages repository

https://github.com/void-linux/void-packages/pull/33279#issuecomment-1062576249

Comment:
@ericonr Any update on this?

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.1.3
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (75 preceding siblings ...)
  2022-03-09  5:46 ` chili-b
@ 2022-05-22 15:13 ` chili-b
  2022-05-22 15:18 ` [PR PATCH] [Updated] New package: frescobaldi-3.2 chili-b
                   ` (7 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2022-05-22 15:13 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.1.3
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 626066fb10ef9660537f57924e51085c5d0ea527 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/4] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 7c4d0712410940983735ea7777e217ae9eafd832 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/4] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..4ed033d7e901
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,28 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+hostmakedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+makedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	# Cludge to fix build under armv7l, armv6l
+	# if [[ $XBPS_TARGET_MACHINE == arm* ]]; then
+	#	  export CFLAGS="-mtune=generic-armv7-a "
+	# fi
+	export CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
+
+	python setup.py build_ext --pyqt-sip-dir=/${py3_sitelib}/PyQt5/bindings
+}

From ca34aaec978745d32991bc5b05dfd2f8d8fcd025 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/4] New package: frescobaldi-3.2

---
 srcpkgs/frescobaldi/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..a93ba81aa2dd
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,20 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.2
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools gettext"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-qpageview"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/v${version}/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=f7bb9b5f708f902f8f512ab6f0de1a6272d9e176f678027e576b06e5ceec8fe8
+
+pre_build() {
+	make -C linux
+}

From b4bd514bd7e49f5cb69bd3cdf67e5befcd8d9212 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 22 May 2022 11:13:25 -0400
Subject: [PATCH 4/4] New package: python3-qpageview-0.6.2

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

diff --git a/srcpkgs/python3-qpageview/template b/srcpkgs/python3-qpageview/template
new file mode 100644
index 000000000000..7e7c099e7c53
--- /dev/null
+++ b/srcpkgs/python3-qpageview/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-qpageview'
+pkgname=python3-qpageview
+version=0.6.2
+revision=1
+wrksrc="qpageview-${version}"
+build_style=python3-module
+makedepends="qt5-devel python3-PyQt5-devel python3-PyQt5-svg"
+depends="qt5 python3-PyQt5-svg python3-poppler-qt5"
+short_desc="Page based document viewer widget for Qt5/PyQt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://qpageview.org/"
+changelog="https://raw.githubusercontent.com/frescobaldi/qpageview/master/ChangeLog"
+distfiles="https://github.com/frescobaldi/qpageview/archive/v${version}.tar.gz"
+checksum=5ac3140396f11b15d6438ce34d5ce77f8b7e76f7dcd4c0439c85740d9e5d3674

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.2
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (76 preceding siblings ...)
  2022-05-22 15:13 ` [PR PATCH] [Updated] " chili-b
@ 2022-05-22 15:18 ` chili-b
  2022-05-22 15:27 ` chili-b
                   ` (6 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2022-05-22 15:18 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.2
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 626066fb10ef9660537f57924e51085c5d0ea527 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/4] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 7c4d0712410940983735ea7777e217ae9eafd832 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/4] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..4ed033d7e901
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,28 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+hostmakedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+makedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	# Cludge to fix build under armv7l, armv6l
+	# if [[ $XBPS_TARGET_MACHINE == arm* ]]; then
+	#	  export CFLAGS="-mtune=generic-armv7-a "
+	# fi
+	export CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
+
+	python setup.py build_ext --pyqt-sip-dir=/${py3_sitelib}/PyQt5/bindings
+}

From f4ed29c28aa8df7565e10cf56dc7462d7e203452 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/4] New package: frescobaldi-3.2

---
 srcpkgs/frescobaldi/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..e9874763b01a
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,20 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.2
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools gettext"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-qpageview"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/master/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=f7bb9b5f708f902f8f512ab6f0de1a6272d9e176f678027e576b06e5ceec8fe8
+
+pre_build() {
+	make -C linux
+}

From 7a8fddcc581b3e71357cb28a5e2ed99c634c648d Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 22 May 2022 11:13:25 -0400
Subject: [PATCH 4/4] New package: python3-qpageview-0.6.2

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

diff --git a/srcpkgs/python3-qpageview/template b/srcpkgs/python3-qpageview/template
new file mode 100644
index 000000000000..7e7c099e7c53
--- /dev/null
+++ b/srcpkgs/python3-qpageview/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-qpageview'
+pkgname=python3-qpageview
+version=0.6.2
+revision=1
+wrksrc="qpageview-${version}"
+build_style=python3-module
+makedepends="qt5-devel python3-PyQt5-devel python3-PyQt5-svg"
+depends="qt5 python3-PyQt5-svg python3-poppler-qt5"
+short_desc="Page based document viewer widget for Qt5/PyQt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://qpageview.org/"
+changelog="https://raw.githubusercontent.com/frescobaldi/qpageview/master/ChangeLog"
+distfiles="https://github.com/frescobaldi/qpageview/archive/v${version}.tar.gz"
+checksum=5ac3140396f11b15d6438ce34d5ce77f8b7e76f7dcd4c0439c85740d9e5d3674

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.2
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (77 preceding siblings ...)
  2022-05-22 15:18 ` [PR PATCH] [Updated] New package: frescobaldi-3.2 chili-b
@ 2022-05-22 15:27 ` chili-b
  2022-05-22 19:17 ` chili-b
                   ` (5 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2022-05-22 15:27 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.2
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 626066fb10ef9660537f57924e51085c5d0ea527 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/4] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 046e08da72cdbbc4083474d809a87411dec4e037 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/4] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 29 ++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..e6211659c446
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,29 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+hostmakedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+makedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	# Cludge to fix build under armv7l, armv6l
+	if [[ $XBPS_TARGET_MACHINE == arm* ]]; then
+		  export CFLAGS="-mtune=generic-armv7-a "
+	fi
+	# Fix include path for cross builds
+	export CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
+
+	python setup.py build_ext --pyqt-sip-dir=/${py3_sitelib}/PyQt5/bindings
+}

From 3dafb48c817c453759802719e204fec4abc1ee4d Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/4] New package: frescobaldi-3.2

---
 srcpkgs/frescobaldi/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..e9874763b01a
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,20 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.2
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools gettext"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-qpageview"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/master/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=f7bb9b5f708f902f8f512ab6f0de1a6272d9e176f678027e576b06e5ceec8fe8
+
+pre_build() {
+	make -C linux
+}

From bfcf7698cbe71ee297f1f2dfb971b5575a2f5021 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 22 May 2022 11:13:25 -0400
Subject: [PATCH 4/4] New package: python3-qpageview-0.6.2

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

diff --git a/srcpkgs/python3-qpageview/template b/srcpkgs/python3-qpageview/template
new file mode 100644
index 000000000000..7e7c099e7c53
--- /dev/null
+++ b/srcpkgs/python3-qpageview/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-qpageview'
+pkgname=python3-qpageview
+version=0.6.2
+revision=1
+wrksrc="qpageview-${version}"
+build_style=python3-module
+makedepends="qt5-devel python3-PyQt5-devel python3-PyQt5-svg"
+depends="qt5 python3-PyQt5-svg python3-poppler-qt5"
+short_desc="Page based document viewer widget for Qt5/PyQt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://qpageview.org/"
+changelog="https://raw.githubusercontent.com/frescobaldi/qpageview/master/ChangeLog"
+distfiles="https://github.com/frescobaldi/qpageview/archive/v${version}.tar.gz"
+checksum=5ac3140396f11b15d6438ce34d5ce77f8b7e76f7dcd4c0439c85740d9e5d3674

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.2
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (78 preceding siblings ...)
  2022-05-22 15:27 ` chili-b
@ 2022-05-22 19:17 ` chili-b
  2022-05-22 19:54 ` chili-b
                   ` (4 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2022-05-22 19:17 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.2
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 626066fb10ef9660537f57924e51085c5d0ea527 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/4] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 046e08da72cdbbc4083474d809a87411dec4e037 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/4] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 29 ++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..e6211659c446
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,29 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+hostmakedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+makedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	# Cludge to fix build under armv7l, armv6l
+	if [[ $XBPS_TARGET_MACHINE == arm* ]]; then
+		  export CFLAGS="-mtune=generic-armv7-a "
+	fi
+	# Fix include path for cross builds
+	export CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
+
+	python setup.py build_ext --pyqt-sip-dir=/${py3_sitelib}/PyQt5/bindings
+}

From 3dafb48c817c453759802719e204fec4abc1ee4d Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/4] New package: frescobaldi-3.2

---
 srcpkgs/frescobaldi/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..e9874763b01a
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,20 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.2
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools gettext"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-qpageview"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/master/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=f7bb9b5f708f902f8f512ab6f0de1a6272d9e176f678027e576b06e5ceec8fe8
+
+pre_build() {
+	make -C linux
+}

From 8b385710427e2904c2e9400869ef8ad23db7abd3 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 22 May 2022 11:13:25 -0400
Subject: [PATCH 4/4] New package: python3-qpageview-0.6.2

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

diff --git a/srcpkgs/python3-qpageview/template b/srcpkgs/python3-qpageview/template
new file mode 100644
index 000000000000..81562476d315
--- /dev/null
+++ b/srcpkgs/python3-qpageview/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-qpageview'
+pkgname=python3-qpageview
+version=0.6.2
+revision=1
+wrksrc="qpageview-${version}"
+build_style=python3-module
+hostmakedepends="python3"
+makedepends="qt5-devel python3-PyQt5-devel python3-PyQt5-svg"
+depends="qt5 python3-PyQt5-svg python3-poppler-qt5"
+short_desc="Page based document viewer widget for Qt5/PyQt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://qpageview.org/"
+changelog="https://raw.githubusercontent.com/frescobaldi/qpageview/master/ChangeLog"
+distfiles="https://github.com/frescobaldi/qpageview/archive/v${version}.tar.gz"
+checksum=5ac3140396f11b15d6438ce34d5ce77f8b7e76f7dcd4c0439c85740d9e5d3674

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

* Re: [PR PATCH] [Updated] New package: frescobaldi-3.2
  2021-10-03  1:16 [PR PATCH] New package: frescobaldi-3.1.3 chili-b
                   ` (79 preceding siblings ...)
  2022-05-22 19:17 ` chili-b
@ 2022-05-22 19:54 ` chili-b
  2022-05-22 20:10 ` chili-b
                   ` (3 subsequent siblings)
  84 siblings, 0 replies; 86+ messages in thread
From: chili-b @ 2022-05-22 19:54 UTC (permalink / raw)
  To: ml

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

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

https://github.com/chili-b/void-packages master
https://github.com/void-linux/void-packages/pull/33279

New package: frescobaldi-3.2
<!-- Mark items with [x] where applicable -->

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

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

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

This PR also includes the new packages, `python3-ly-0.9.7` and `python3-poppler-qt5-0.75.0`, which are dependencies for frescobaldi.


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

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

From 626066fb10ef9660537f57924e51085c5d0ea527 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 2 Oct 2021 21:07:56 -0400
Subject: [PATCH 1/4] New package: python3-ly-0.9.7

Python modules parse, manipulate or create documents in LilyPond format.
Depended upon by the Frescobaldi LilyPond editor.
---
 srcpkgs/python3-ly/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-ly/template

diff --git a/srcpkgs/python3-ly/template b/srcpkgs/python3-ly/template
new file mode 100644
index 000000000000..a795013096db
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ly'
+pkgname=python3-ly
+version=0.9.7
+revision=1
+wrksrc="python-ly-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Modules to parse, manipulate or create documents in LilyPond format"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-ly"
+changelog="https://github.com/frescobaldi/python-ly/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-ly/python-ly-${version}.tar.gz"
+checksum=d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8

From 046e08da72cdbbc4083474d809a87411dec4e037 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:20:53 -0400
Subject: [PATCH 2/4] New package: python3-poppler-qt5-0.75.0

---
 srcpkgs/python3-poppler-qt5/template | 29 ++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 srcpkgs/python3-poppler-qt5/template

diff --git a/srcpkgs/python3-poppler-qt5/template b/srcpkgs/python3-poppler-qt5/template
new file mode 100644
index 000000000000..e6211659c446
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,29 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=0.75.0
+revision=1
+wrksrc="python-poppler-qt5-${version}"
+build_style=python3-module
+hostmakedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+makedepends="python3-sip-devel pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt5-devel python3-devel"
+depends="poppler-qt5 python3-PyQt5"
+short_desc="Python bindings for libpoppler-qt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/frescobaldi/python-poppler-qt5"
+changelog="https://github.com/frescobaldi/python-poppler-qt5/blob/v${version}/ChangeLog"
+distfiles="${PYPI_SITE}/p/python-poppler-qt5/python-poppler-qt5-${version}.tar.gz"
+checksum=ea0ec9ebe995705ab19a301290365652e62bab5c9b05db5697c7bf2173335107
+
+do_build() {
+	# Cludge to fix build under armv7l, armv6l
+	if [[ $XBPS_TARGET_MACHINE == arm* ]]; then
+		  export CFLAGS="-mtune=generic-armv7-a "
+	fi
+	# Fix include path for cross builds
+	export CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
+
+	python setup.py build_ext --pyqt-sip-dir=/${py3_sitelib}/PyQt5/bindings
+}

From 3dafb48c817c453759802719e204fec4abc1ee4d Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 10 Oct 2021 15:33:36 -0400
Subject: [PATCH 3/4] New package: frescobaldi-3.2

---
 srcpkgs/frescobaldi/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/template b/srcpkgs/frescobaldi/template
new file mode 100644
index 000000000000..e9874763b01a
--- /dev/null
+++ b/srcpkgs/frescobaldi/template
@@ -0,0 +1,20 @@
+# Template file for 'frescobaldi'
+pkgname=frescobaldi
+version=3.2
+revision=1
+build_style=python3-module
+make_check_target="check"
+hostmakedepends="python3-setuptools gettext"
+depends="python3-PyQt5 python3-PyQt5-svg poppler-qt5 portmidi
+ python3-cups python3-ly lilypond python3-qpageview"
+short_desc="Powerful, lightweight and easy to use LilyPond sheet music text editor"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://frescobaldi.org/"
+changelog="https://github.com/frescobaldi/frescobaldi/blob/master/ChangeLog"
+distfiles="https://github.com/frescobaldi/frescobaldi/archive/v${version}.tar.gz"
+checksum=f7bb9b5f708f902f8f512ab6f0de1a6272d9e176f678027e576b06e5ceec8fe8
+
+pre_build() {
+	make -C linux
+}

From a4e21a4d5f3eb32e2f93bc2e6a0646b8900750b9 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sun, 22 May 2022 11:13:25 -0400
Subject: [PATCH 4/4] New package: python3-qpageview-0.6.2

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

diff --git a/srcpkgs/python3-qpageview/template b/srcpkgs/python3-qpageview/template
new file mode 100644
index 000000000000..16f86e173104
--- /dev/null
+++ b/srcpkgs/python3-qpageview/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-qpageview'
+pkgname=python3-qpageview
+version=0.6.2
+revision=1
+wrksrc="qpageview-${version}"
+build_style=python3-module
+hostmakedepends="python3 python3-PyQt5-devel python3-PyQt5-svg"
+makedepends="qt5-devel"
+depends="qt5 python3-PyQt5-svg python3-poppler-qt5"
+short_desc="Page based document viewer widget for Qt5/PyQt5"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://qpageview.org/"
+changelog="https://raw.githubusercontent.com/frescobaldi/qpageview/master/ChangeLog"
+distfiles="https://gith