Message ID | 20201125031309.GA10305@jasmine.lan |
---|---|
State | Accepted |
Headers | show |
Series | [bug#44853] gnu: Add qpdfview. | expand |
Context | Check | Description |
---|---|---|
cbaines/submitting builds | success | |
cbaines/comparison | success | View comparision |
cbaines/git branch | success | View Git branch |
cbaines/applying patch | fail | View Laminar job |
cbaines/issue | success | View issue |
Leo Famulari <leo@famulari.name> [2020-11-24 22:13:09-0500]: > I noticed that, on my Debian system, the user interface was not > displaying any icons. Turns out it happens for me too, but I didn’t notice because I have qtsvg installed in my profile. > I fixed it for myself by making the package use the 'qt-wrap' phase This makes sense. I suppose we should wrap all Qt programs like this. I tried your patch and it works, but the same icon theme is used regardless of what I choose in LXQt appearance settings. I think the problem is with the 'qt-wrap phase, which uses "=" instead of "suffix" for wrapping variables. Changing this in qt-build-sytem.scm gives me correct icons. Now that I think about it, "prefix" might be better to ensure the correct versions of plugins are used at runtime; both options work for me. Thanks! Timotej
On Wed, Nov 25, 2020 at 07:35:51PM +0100, Timotej Lazar wrote: > This makes sense. I suppose we should wrap all Qt programs like this. I > tried your patch and it works, but the same icon theme is used > regardless of what I choose in LXQt appearance settings. Hm, that's not ideal. > I think the problem is with the 'qt-wrap phase, which uses "=" instead > of "suffix" for wrapping variables. Changing this in qt-build-sytem.scm > gives me correct icons. Now that I think about it, "prefix" might be > better to ensure the correct versions of plugins are used at runtime; > both options work for me. Can you send the patch for qt-build-system? There are only 166 users of it currently, so we can update it on the master branch. I don't really know much about it, so I can't judge which is the best way to change it.
On Wed, Nov 25, 2020 at 07:35:51PM +0100, Timotej Lazar wrote: > Leo Famulari <leo@famulari.name> [2020-11-24 22:13:09-0500]: > > I noticed that, on my Debian system, the user interface was not > > displaying any icons. > > Turns out it happens for me too, but I didn’t notice because I have > qtsvg installed in my profile. I pushed my version of your patch as cbcd520e1a71d75513a1c47d046142b2ff33ad56
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 1899501122..9e4341afb9 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2019,2020 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> +;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si> ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,6 +46,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system meson) #:use-module (guix build-system python) + #:use-module (guix build-system qt) #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages audio) @@ -54,6 +56,7 @@ #:use-module (gnu packages bash) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages cups) #:use-module (gnu packages curl) #:use-module (gnu packages djvu) #:use-module (gnu packages fontutils) @@ -806,6 +809,52 @@ program capable of converting PDF into other formats.") (license (list license:asl2.0 license:clarified-artistic)) (home-page "http://qpdf.sourceforge.net/"))) +(define-public qpdfview + (package + (name "qpdfview") + (version "0.4.18") + (source + (origin + (method url-fetch) + (uri (string-append "https://launchpad.net/qpdfview/" + "trunk/" version "/+download/" + "qpdfview-" version ".tar.gz")) + (sha256 + (base32 "0v1rl126hvblajnph2hkansgi0s8vjdc5yxrm4y3faa0lxzjwr6c")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("cups" ,cups) + ("djvulibre" ,djvulibre) + ("libspectre" ,libspectre) + ("poppler-qt5" ,poppler-qt5) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg))) + (arguments + `(#:imported-modules ((guix build qt-build-system) + (guix build cmake-build-system) + ,@%gnu-build-system-modules) + #:modules ((guix build utils) + (guix build gnu-build-system) + ((guix build qt-build-system) #:prefix qt:)) + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda _ + (substitute* "qpdfview.pri" + (("/usr") (assoc-ref %outputs "out"))) + (invoke "qmake" "qpdfview.pro"))) + (add-after 'install 'qt-wrap + (assoc-ref qt:%standard-phases 'qt-wrap))))) + (home-page "https://launchpad.net/qpdfview") + (synopsis "Tabbed document viewer") + (description "@command{qpdfview} is a document viewer for PDF, PS and DJVU +files. It uses the Qt toolkit and features persistent per-file settings, +configurable toolbars and shortcuts, continuous and multi‐page layouts, +SyncTeX support, and rudimentary support for annotations and forms.") + (license license:gpl2+))) + (define-public xournal (package (name "xournal")