Re: [PR PATCH] [Updated] New package: frescobaldi-3.2

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

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

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

https://github.com/dexgs/void-packages frescobaldi
https://github.com/void-linux/void-packages/pull/39374

New package: frescobaldi-3.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

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

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

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

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

From 00880dab89d0664997e3849b54b62489151dc3e5 Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>
Date: Mon, 19 Sep 2022 13:59:16 -0400
Subject: [PATCH 1/4] New package: python3-ly-0.9.7

---
 srcpkgs/python3-ly/template | 17 +++++++++++++++++
 1 file changed, 17 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..f3a36aeda42b
--- /dev/null
+++ b/srcpkgs/python3-ly/template
@@ -0,0 +1,17 @@
+# 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-2.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
+
+# The source is distributed *without* any tests and the test runner fails, so
+# disabling the check stage solves the problem.
+make_check=no

From 5d0d908da687280ff2f9873f6f96037398a82d05 Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>
Date: Mon, 19 Sep 2022 13:59:47 -0400
Subject: [PATCH 2/4] New package: python3-poppler-qt5-21.3.0

---
 srcpkgs/python3-poppler-qt5/template | 17 +++++++++++++++++
 1 file changed, 17 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..c56fb3d55f61
--- /dev/null
+++ b/srcpkgs/python3-poppler-qt5/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-poppler-qt5'
+pkgname=python3-poppler-qt5
+version=21.3.0
+revision=1
+build_style=sip-build
+hostmakedepends="pkg-config qt5-devel poppler-qt5-devel
+ python3-PyQt-builder python3-PyQt5-devel python3-devel"
+makedepends="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=b477e8841f0ea0e09fdab6f2f305cf38df977d9e142e5693a374605d75dd6fe0

From 605cf6b73192f367665751f4436321dd3ce37760 Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>
Date: Mon, 19 Sep 2022 14:00:12 -0400
Subject: [PATCH 3/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..e9e6335a67fa
--- /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
+build_style=python3-module
+hostmakedepends="python3-PyQt5-svg"
+makedepends="qt5-devel python3-PyQt5-devel"
+depends="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-or-later"
+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

From e37a83ea493569b22bd79739ebba65885a1bdb0e Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>
Date: Mon, 19 Sep 2022 14:00:51 -0400
Subject: [PATCH 4/4] New package: frescobaldi-3.2

---
 ...r-when-treating-Type-as-QKeySequence.patch | 60 +++++++++++++++++++
 srcpkgs/frescobaldi/template                  | 20 +++++++
 2 files changed, 80 insertions(+)
 create mode 100644 srcpkgs/frescobaldi/patches/0001-fix-TypeError-when-treating-Type-as-QKeySequence.patch
 create mode 100644 srcpkgs/frescobaldi/template

diff --git a/srcpkgs/frescobaldi/patches/0001-fix-TypeError-when-treating-Type-as-QKeySequence.patch b/srcpkgs/frescobaldi/patches/0001-fix-TypeError-when-treating-Type-as-QKeySequence.patch
new file mode 100644
index 000000000000..a5b74f33bede
--- /dev/null
+++ b/srcpkgs/frescobaldi/patches/0001-fix-TypeError-when-treating-Type-as-QKeySequence.patch
@@ -0,0 +1,60 @@
+From ac002d5534c57f2e2f86fbde0ece166a90c4b7e0 Mon Sep 17 00:00:00 2001
+From: Dexter Gaon-Shatford <dexter@gaonshatford.ca>
+Date: Fri, 11 Nov 2022 15:23:41 -0500
+Subject: [PATCH] fix: TypeError when treating Type as QKeySequence
+
+Removed code which treats instances of QEvent.Type as QKeySequence as
+they result in a TypeError on Python 3.11
+---
+ frescobaldi_app/search/__init__.py |  6 +-----
+ frescobaldi_app/view.py            | 14 --------------
+ 2 files changed, 1 insertion(+), 19 deletions(-)
+
+diff --git a/frescobaldi_app/search/__init__.py b/frescobaldi_app/search/__init__.py
+index ea184506..448c2d3a 100644
+--- a/frescobaldi_app/search/__init__.py
++++ b/frescobaldi_app/search/__init__.py
+@@ -357,11 +357,7 @@ class Search(plugin.MainWindowPlugin, QWidget):
+ 
+     def event(self, ev):
+         """Reimplemented to catch F1 for help and Tab so it does not reach the View."""
+-        if ev == QKeySequence.HelpContents:
+-            userguide.show("search_replace")
+-            ev.accept()
+-            return True
+-        elif ev.type() == QEvent.KeyPress:
++        if ev.type() == QEvent.KeyPress:
+             modifiers = int(ev.modifiers() & (Qt.SHIFT | Qt.CTRL | Qt.ALT | Qt.META))
+             if ev.key() == Qt.Key_Tab and modifiers == 0:
+                 # prevent Tab from reaching the View widget
+diff --git a/frescobaldi_app/view.py b/frescobaldi_app/view.py
+index 245847b2..69de7330 100644
+--- a/frescobaldi_app/view.py
++++ b/frescobaldi_app/view.py
+@@ -86,23 +86,9 @@ class View(QPlainTextEdit):
+ 
+         This is reimplemented to:
+ 
+-        - prevent inserting the hard line separator, which makes no sense in
+-          plain text
+-
+-        - prevent handling Undo and Redo, they work better via the menu actions
+-
+         - handle Tab and Backtab to change the indent
+ 
+         """
+-        if ev in (
+-                # avoid the line separator, makes no sense in plain text
+-                QKeySequence.InsertLineSeparator,
+-                # those can better be called via the menu actions, then they
+-                # work better
+-                QKeySequence.Undo,
+-                QKeySequence.Redo,
+-            ):
+-            return False
+         # handle Tab and Backtab
+         if ev.type() == QEvent.KeyPress:
+             cursor = self.textCursor()
+-- 
+2.38.1
+
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
+}