From 3f9f0f3507a9143e46a252564739c16b882374c8 Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Jan 31 2022 21:43:42 +0000
Subject: Additional float patch.


---

diff --git a/73cd53e7e089537aa853eea7d43f212145bd5ef5.patch b/73cd53e7e089537aa853eea7d43f212145bd5ef5.patch
new file mode 100644
index 0000000..81ac36c
--- /dev/null
+++ b/73cd53e7e089537aa853eea7d43f212145bd5ef5.patch
@@ -0,0 +1,48 @@
+From 73cd53e7e089537aa853eea7d43f212145bd5ef5 Mon Sep 17 00:00:00 2001
+From: Wilbert Berendsen <wbsoft@xs4all.nl>
+Date: Mon, 8 Nov 2021 09:30:39 +0100
+Subject: [PATCH] fix implicit conversion float->int, not supported anymore in
+ Python 3.10
+
+---
+ frescobaldi_app/widgets/linenumberarea.py | 4 ++--
+ frescobaldi_app/widgets/progressbar.py    | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/frescobaldi_app/widgets/linenumberarea.py b/frescobaldi_app/widgets/linenumberarea.py
+index f097726c4..ff38bcc6f 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 @@ def paintEvent(self, ev):
+             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 670bf0f5b..183ab6257 100644
+--- a/frescobaldi_app/widgets/progressbar.py
++++ b/frescobaldi_app/widgets/progressbar.py
+@@ -71,8 +71,8 @@ def start(self, total, elapsed=0.0):
+         """
+         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:
diff --git a/frescobaldi.spec b/frescobaldi.spec
index 1c49904..3d21ddc 100644
--- a/frescobaldi.spec
+++ b/frescobaldi.spec
@@ -2,7 +2,7 @@
 
 Name:           frescobaldi
 Version:        3.1.3
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Edit LilyPond sheet music with ease!
 
 # hyphenator.py is LGPLv2+
@@ -18,7 +18,7 @@ Patch4:         0a195936b3f1be7c0e41ce9fdd7f016e6e1c7bbd.patch
 Patch5:         c0d68b4e1a6c8f6ed4e4f5d0147dc0d83f5c889c.patch
 Patch6:         87f87249f1ef0ab0e54490dfed47db0718f4f072.patch
 Patch7:         849f299ee97f0b2cd0bc81c9a01153f349c1d340.patch
-Patch8:         progressbar.patch
+Patch8:         73cd53e7e089537aa853eea7d43f212145bd5ef5.patch
 
 BuildArch:      noarch
 ExclusiveArch: %{qt5_qtwebengine_arches}
@@ -72,7 +72,7 @@ find -name "*.py"  -exec sed -i -e 's|#! python||' {} \;
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p0
+%patch8 -p1
 
 %build
 python3 ./setup.py build
@@ -110,6 +110,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml
 %{_metainfodir}/*.metainfo.xml
 
 %changelog
+* Mon Jan 31 2022 Gwyn Ciesla <gwync@protonmail.com> - 3.1.3-9
+- Line number float patch.
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/progressbar.patch b/progressbar.patch
deleted file mode 100644
index 6b33ce2..0000000
--- a/progressbar.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- frescobaldi_app/widgets/progressbar.py~	2022-01-05 13:46:54.939018944 -0600
-+++ frescobaldi_app/widgets/progressbar.py	2022-01-05 13:47:18.133896110 -0600
-@@ -71,8 +71,8 @@
-         """
-         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: