bug#26425: [PATCH 1/2] gnu: Add python-poppler-qt5.

bug#26425: [PATCH 1/2] gnu: Add python-poppler-qt5.

[Ricardo Wurmus]

* gnu/packages/pdf.scm (python-poppler-qt5): New variable.
---
 gnu/packages/pdf.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 7f3dccc8b..0882d3b94 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -184,6 +184,53 @@
 Poppler PDF rendering library.")
     (license license:lgpl2.1+)))
 
+(define-public python-poppler-qt5
+  (package
+    (name "python-poppler-qt5")
+    (version "0.24.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "python-poppler-qt5" version))
+        (sha256
+         (base32
+          "0l69llw1fzwz8y90q0qp9q5pifbrqjjbwii7di54dwghw5fc6w1r"))))
+    (build-system python-build-system)
+    (arguments
+     `(;; There are no tests.  The check phase just causes a rebuild.
+       #:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'build
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "setup.py"
+               ;; This check always fails, so disable it.
+               (("if not check_qtxml\\(\\)")
+                "if True")
+               ;; Enable C++11, which is needed because of Qt5.
+               (("\\*\\*ext_args" line)
+                (string-append "extra_compile_args=['-std=gnu++11'], " line)))
+             ;; We need to pass an extra flag here.  This cannot be in
+             ;; configure-flags because it should not be passed for the
+             ;; installation phase.
+             ((@@ (guix build python-build-system) call-setuppy)
+              "build_ext" (list (string-append "--pyqt-sip-dir="
+                                               (assoc-ref inputs "python-pyqt")
+                                               "/share/sip")) #t))))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("python-sip" ,python-sip)
+       ("python-pyqt" ,python-pyqt)
+       ("poppler-qt5" ,poppler-qt5)
+       ("qtbase" ,qtbase)))
+    (home-page "https://pypi.python.org/pypi/python-poppler-qt5")
+    (synopsis "Python bindings for Poppler-Qt5")
+    (description
+     "This package provides Python bindings for the Qt5 interface of the
+Poppler PDF rendering library.")
+    (license license:lgpl2.1+)))
+
 (define-public libharu
   (package
    (name "libharu")
-- 
2.12.2

bug#26426: [PATCH 2/2] gnu: frescobaldi: Update to 3.0.0.

[Ricardo Wurmus]

* gnu/packages/music.scm (frescobaldi): Update to 3.0.0.
[inputs]: Replace "python-pyqt-4" and "python-poppler-qt4" with "python-pyqt"
and "python-poppler-qt5", respectively.
---
 gnu/packages/music.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 1fe5cef41..bf2fa8fe8 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1513,7 +1513,7 @@ using a system-independent interface.")
 (define-public frescobaldi
   (package
     (name "frescobaldi")
-    (version "2.19.0")
+    (version "3.0.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1521,17 +1521,17 @@ using a system-independent interface.")
                     version "/frescobaldi-" version ".tar.gz"))
               (sha256
                (base32
-                "1rnk8i8dlshzx16n2qxcsqcs7kywgyazzyzw2vy4vp2gsm9vs9ml"))))
+                "15cqhbjbjikr7ljgiq56bz2gxrr38j8p0f78p2vhyzydaviy9a2z"))))
     (build-system python-build-system)
     (arguments `(#:tests? #f)) ; no tests included
     (inputs
      `(("lilypond" ,lilypond)
        ("portmidi" ,portmidi)
-       ("python-pyqt-4" ,python-pyqt-4)
+       ("python-pyqt" ,python-pyqt)
        ("python-ly" ,python-ly)
        ("python-pyportmidi" ,python-pyportmidi)
        ("poppler" ,poppler)
-       ("python-poppler-qt4" ,python-poppler-qt4)
+       ("python-poppler-qt5" ,python-poppler-qt5)
        ("python-sip" ,python-sip)))
     (home-page "http://www.frescobaldi.org/")
     (synopsis "LilyPond sheet music text editor")
-- 
2.12.2

bug#26426: [PATCH 2/2] gnu: frescobaldi: Update to 3.0.0.

[Ludovic Courtès]

Ricardo Wurmus <rekado@elephly.net> skribis:

> * gnu/packages/music.scm (frescobaldi): Update to 3.0.0.
> [inputs]: Replace "python-pyqt-4" and "python-poppler-qt4" with "python-pyqt"
> and "python-poppler-qt5", respectively.

LGTM, thanks!  Good to see qt@4 fading away.

Ludo'.

bug#26426: [PATCH 2/2] gnu: frescobaldi: Update to 3.0.0.

[Leo Famulari]

On Mon, Apr 10, 2017 at 11:13:57AM +0200, Ludovic Courtès wrote:
> Ricardo Wurmus <rekado@elephly.net> skribis:
> 
> > * gnu/packages/music.scm (frescobaldi): Update to 3.0.0.
> > [inputs]: Replace "python-pyqt-4" and "python-poppler-qt4" with "python-pyqt"
> > and "python-poppler-qt5", respectively.
> 
> LGTM, thanks!  Good to see qt@4 fading away.

Yes, after we drop webkitgtk-2.4, qt@4 is next on my list :)

bug#26426: [PATCH 2/2] gnu: frescobaldi: Update to 3.0.0.

[Ricardo Wurmus]

Ludovic Courtès <ludo@gnu.org> writes:

> Ricardo Wurmus <rekado@elephly.net> skribis:
>
>> * gnu/packages/music.scm (frescobaldi): Update to 3.0.0.
>> [inputs]: Replace "python-pyqt-4" and "python-poppler-qt4" with "python-pyqt"
>> and "python-poppler-qt5", respectively.
>
> LGTM, thanks!  Good to see qt@4 fading away.

Thanks, pushed to master with e40335b27.

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

bug#26425: [PATCH 1/2] gnu: Add python-poppler-qt5.

[Ludovic Courtès]

Ricardo Wurmus <rekado@elephly.net> skribis:

> * gnu/packages/pdf.scm (python-poppler-qt5): New variable.

LGTM!

> +             (substitute* "setup.py"
> +               ;; This check always fails, so disable it.
> +               (("if not check_qtxml\\(\\)")
> +                "if True")

The check fails wrongfully?

> +    (description
> +     "This package provides Python bindings for the Qt5 interface of the
> +Poppler PDF rendering library.")

Python bindings of the Qt bindings of…  fun!  ;-)

Thank you,
Ludo’.

bug#26425: [PATCH 1/2] gnu: Add python-poppler-qt5.

[Ricardo Wurmus]

Ludovic Courtès <ludo@gnu.org> writes:

> Ricardo Wurmus <rekado@elephly.net> skribis:
>
>> * gnu/packages/pdf.scm (python-poppler-qt5): New variable.
>
> LGTM!
>
>> +             (substitute* "setup.py"
>> +               ;; This check always fails, so disable it.
>> +               (("if not check_qtxml\\(\\)")
>> +                "if True")
>
> The check fails wrongfully?

Yes.  We do provide qtxml with qtbase.  It’s easier to disable this
check than to fix it, given that we know that we have qtxml.

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

bug#26425: [PATCH 1/2] gnu: Add python-poppler-qt5.

[Ricardo Wurmus]

Ricardo Wurmus <rekado@elephly.net> writes:

> Ludovic Courtès <ludo@gnu.org> writes:
>
>> Ricardo Wurmus <rekado@elephly.net> skribis:
>>
>>> * gnu/packages/pdf.scm (python-poppler-qt5): New variable.
>>
>> LGTM!
>>
>>> +             (substitute* "setup.py"
>>> +               ;; This check always fails, so disable it.
>>> +               (("if not check_qtxml\\(\\)")
>>> +                "if True")
>>
>> The check fails wrongfully?
>
> Yes.  We do provide qtxml with qtbase.  It’s easier to disable this
> check than to fix it, given that we know that we have qtxml.

I forgot to close this bug.  This has been pushed to master with commit
99bcae94bcd50fc15bf44b5cc06cd39450f01ad5.

--
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net