[bug#62649] [PATCH] gnu: frescobaldi: Update to 3.3.0.

[bug#62649] [PATCH] gnu: frescobaldi: Update to 3.3.0.

[Nicolas Goaziou]

* gnu/packages/music.scm (frescobaldi): Update to 3.3.0.
---
 gnu/packages/music.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index ae57600c22..1072f21e06 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -3034,7 +3034,7 @@ (define-public python-pyportmidi
 (define-public frescobaldi
   (package
     (name "frescobaldi")
-    (version "3.1.3")
+    (version "3.3.0")
     (source
      (origin
        (method url-fetch)
@@ -3042,7 +3042,7 @@ (define-public frescobaldi
              "https://github.com/wbsoft/frescobaldi/releases/download/v"
              version "/frescobaldi-" version ".tar.gz"))
        (sha256
-        (base32 "1hg9yc8kj445fjsby92g3qf50crcl1pb079zfma18sb7ycv50zww"))))
+        (base32 "1n60gfnf6x0l1bac088g9adzx0lskbl9knd4y1ynr3y0zcs0kfcz"))))
     (build-system python-build-system)
     (arguments
      `(#:tests? #f))                    ;no tests included

base-commit: f3424ada316a9962818b60ae22236efce8bd9fb7
-- 
2.39.2

[bug#62649] [PATCH] gnu: frescobaldi: Update to 3.3.0.

[Jonathan Brielmaier]

Salut Nicolas,

frescobaldi doesn't start for me as it the qpageview module, which was
moved to a separate repository:
https://github.com/frescobaldi/frescobaldi/blob/master/CHANGELOG.md#changed-1

~Jonathan

[bug#62649] [PATCH] gnu: frescobaldi: Update to 3.3.0.

[Nicolas Goaziou]

Hello,

Jonathan Brielmaier <jonathan.brielmaier@web.de> writes:

> frescobaldi doesn't start for me as it the qpageview module, which was
> moved to a separate repository:
> https://github.com/frescobaldi/frescobaldi/blob/master/CHANGELOG.md#changed-1

Thank you for the feedback. I'm sending an updated patch, which
hopefully fixes that.

Regards,
-- 
Nicolas Goaziou

[bug#62649] [PATCH v2 1/2] gnu: Add qpageview.

[Nicolas Goaziou]

* gnu/packages/image-viewers.scm (qpageview): New variable.
---
 gnu/packages/image-viewers.scm | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index d0b7e93a84..96a3fa6615 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -9,7 +9,7 @@
 ;;; Copyright © 2017 nee <nee-git@hidamari.blue>
 ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2019, 2022 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2019, 2022, 2023 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2019, 2020, 2022 Guy Fleury Iteriteka <gfleury@disroot.org>
 ;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2020 Peng Mei Yu <pengmeiyu@riseup.net>
@@ -667,6 +667,31 @@ (define-public mcomix
 For PDF support, install the @emph{mupdf} package.")
     (license license:gpl2+)))
 
+(define-public qpageview
+  (package
+    (name "qpageview")
+    (version "0.6.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/frescobaldi/qpageview")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0xdhiglzqxyp05blp66l52nbzbpn10hmdm2idhncz6pf7qw16lsw"))))
+    (build-system python-build-system)
+    (home-page "https://qpageview.org/")
+    (synopsis "Page based document viewer widget for Qt5/PyQt5")
+    (inputs
+     (list python-pyqt qtbase-5))
+    (description
+     "@code{qpageview} provides a page based document viewer widget for Qt5
+and PyQt5.  It has a flexible architecture potentionally supporting many
+formats.  Currently, it supports SVG documents, images, and, using the
+Poppler-Qt5 binding, PDF documents.")
+    (license license:gpl3+)))
+
 (define-public qview
   (package
     (name "qview")

base-commit: 6311493d7a6271bfbc51f4693857f9a12fe9965d
-- 
2.39.2

[bug#62649] [PATCH v2 2/2] gnu: frescobaldi: Update to 3.3.0.

[Nicolas Goaziou]

* gnu/packages/music.scm (frescobaldi): Update to 3.3.0.
[arguments]: Generate translations, metainfo.xml and desktop file.
[inputs]: Add QPAGEVIEW.
---
 gnu/packages/music.scm | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index c63dc69972..c613e7fb08 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -140,6 +140,7 @@ (define-module (gnu packages music)
   #:use-module (gnu packages haskell)
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages image-viewers)
   #:use-module (gnu packages imagemagick)
   #:use-module (gnu packages java)
   #:use-module (gnu packages libffi)
@@ -3034,7 +3035,7 @@ (define-public python-pyportmidi
 (define-public frescobaldi
   (package
     (name "frescobaldi")
-    (version "3.1.3")
+    (version "3.3.0")
     (source
      (origin
        (method url-fetch)
@@ -3042,10 +3043,19 @@ (define-public frescobaldi
              "https://github.com/wbsoft/frescobaldi/releases/download/v"
              version "/frescobaldi-" version ".tar.gz"))
        (sha256
-        (base32 "1hg9yc8kj445fjsby92g3qf50crcl1pb079zfma18sb7ycv50zww"))))
+        (base32 "1n60gfnf6x0l1bac088g9adzx0lskbl9knd4y1ynr3y0zcs0kfcz"))))
     (build-system python-build-system)
     (arguments
-     `(#:tests? #f))                    ;no tests included
+     (list
+      #:tests? #f                       ;no tests included
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'build 'generate-translations
+            (lambda _
+              (invoke "make" "-C" "i18n")))
+          (add-before 'build 'generate-metadata
+            (lambda _
+              (invoke "make" "-C" "linux"))))))
     (inputs
      (list lilypond
            poppler
@@ -3054,7 +3064,8 @@ (define-public frescobaldi
            python-poppler-qt5
            python-pyportmidi
            python-pyqt
-           python-sip))
+           python-sip
+           qpageview))
     (home-page "https://www.frescobaldi.org/")
     (synopsis "LilyPond sheet music text editor")
     (description
-- 
2.39.2

bug#62649: [PATCH v2 1/2] gnu: Add qpageview.

[Nicolas Goaziou]

Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:

> * gnu/packages/image-viewers.scm (qpageview): New variable.

Applied the full patch-set. Closing.

[bug#62649] [PATCH v3 1/2] gnu: Add qpageview.

[Nicolas Goaziou]

* gnu/packages/image-viewers.scm (qpageview): New variable.
---
 gnu/packages/image-viewers.scm | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index d0b7e93a84..96a3fa6615 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -9,7 +9,7 @@
 ;;; Copyright © 2017 nee <nee-git@hidamari.blue>
 ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2019, 2022 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2019, 2022, 2023 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2019, 2020, 2022 Guy Fleury Iteriteka <gfleury@disroot.org>
 ;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2020 Peng Mei Yu <pengmeiyu@riseup.net>
@@ -667,6 +667,31 @@ (define-public mcomix
 For PDF support, install the @emph{mupdf} package.")
     (license license:gpl2+)))
 
+(define-public qpageview
+  (package
+    (name "qpageview")
+    (version "0.6.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/frescobaldi/qpageview")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0xdhiglzqxyp05blp66l52nbzbpn10hmdm2idhncz6pf7qw16lsw"))))
+    (build-system python-build-system)
+    (home-page "https://qpageview.org/")
+    (synopsis "Page based document viewer widget for Qt5/PyQt5")
+    (inputs
+     (list python-pyqt qtbase-5))
+    (description
+     "@code{qpageview} provides a page based document viewer widget for Qt5
+and PyQt5.  It has a flexible architecture potentionally supporting many
+formats.  Currently, it supports SVG documents, images, and, using the
+Poppler-Qt5 binding, PDF documents.")
+    (license license:gpl3+)))
+
 (define-public qview
   (package
     (name "qview")

base-commit: d3bc56da0475bc643ccb065483c53c6d28cf8e39
-- 
2.39.2

[bug#62649] [PATCH v3 2/2] gnu: frescobaldi: Update to 3.3.0.

[Nicolas Goaziou]

* gnu/packages/music.scm (frescobaldi): Update to 3.3.0.
[arguments]: Generate translations, metainfo.xml and desktop file.
[inputs]: Add QPAGEVIEW.
---
 gnu/packages/music.scm | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 0a66ece40a..815327de05 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -142,6 +142,7 @@ (define-module (gnu packages music)
   #:use-module (gnu packages haskell)
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages image-viewers)
   #:use-module (gnu packages imagemagick)
   #:use-module (gnu packages java)
   #:use-module (gnu packages kde-frameworks)
@@ -3034,7 +3035,7 @@ (define-public python-pyportmidi
 (define-public frescobaldi
   (package
     (name "frescobaldi")
-    (version "3.1.3")
+    (version "3.3.0")
     (source
      (origin
        (method url-fetch)
@@ -3042,10 +3043,19 @@ (define-public frescobaldi
              "https://github.com/wbsoft/frescobaldi/releases/download/v"
              version "/frescobaldi-" version ".tar.gz"))
        (sha256
-        (base32 "1hg9yc8kj445fjsby92g3qf50crcl1pb079zfma18sb7ycv50zww"))))
+        (base32 "1n60gfnf6x0l1bac088g9adzx0lskbl9knd4y1ynr3y0zcs0kfcz"))))
     (build-system python-build-system)
     (arguments
-     `(#:tests? #f))                    ;no tests included
+     (list
+      #:tests? #f                       ;no tests included
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'build 'generate-translations
+            (lambda _
+              (invoke "make" "-C" "i18n")))
+          (add-before 'build 'generate-metadata
+            (lambda _
+              (invoke "make" "-C" "linux"))))))
     (inputs
      (list lilypond
            poppler
@@ -3054,7 +3064,8 @@ (define-public frescobaldi
            python-poppler-qt5
            python-pyportmidi
            python-pyqt
-           python-sip))
+           python-sip
+           qpageview))
     (home-page "https://www.frescobaldi.org/")
     (synopsis "LilyPond sheet music text editor")
     (description
-- 
2.39.2