* [bug#49502] [PATCH] gnu: qpdfview: Use qt-build-system.
@ 2021-07-10 7:11 Timotej Lazar
2021-07-10 18:18 ` bug#49502: " Leo Famulari
0 siblings, 1 reply; 2+ messages in thread
From: Timotej Lazar @ 2021-07-10 7:11 UTC (permalink / raw)
To: 49502; +Cc: Timotej Lazar
This fixes compilation after the recent reorganization of qt-build-system. As
a side effect, specifying Qt plugins with environment variables now works.
* gnu/packages/pdf.scm (qpdfview): Use qt-build-system.
[arguments]: Drop #:modules and #:imported-modules, and the 'qt-wrap
phase. Specify that there are no tests.
---
gnu/packages/pdf.scm | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 9298332940..4d1b8cddfe 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -839,7 +839,7 @@ program capable of converting PDF into other formats.")
(sha256
(base32 "0v1rl126hvblajnph2hkansgi0s8vjdc5yxrm4y3faa0lxzjwr6c"))
(patches (search-patches "qpdfview-qt515-compat.patch"))))
- (build-system gnu-build-system)
+ (build-system qt-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
@@ -850,22 +850,14 @@ program capable of converting PDF into other formats.")
("qtbase" ,qtbase-5)
("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:))
+ `(#:tests? #f ; no tests
#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda _
(substitute* "qpdfview.pri"
(("/usr") (assoc-ref %outputs "out")))
- (invoke "qmake" "qpdfview.pro")))
- ;; Otherwise, the user interface will not display any icons.
- (add-after 'install 'qt-wrap
- (assoc-ref qt:%standard-phases 'qt-wrap)))))
+ (invoke "qmake" "qpdfview.pro"))))))
(home-page "https://launchpad.net/qpdfview")
(synopsis "Tabbed document viewer")
(description "@command{qpdfview} is a document viewer for PDF, PS and DJVU
--
2.32.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#49502: [PATCH] gnu: qpdfview: Use qt-build-system.
2021-07-10 7:11 [bug#49502] [PATCH] gnu: qpdfview: Use qt-build-system Timotej Lazar
@ 2021-07-10 18:18 ` Leo Famulari
0 siblings, 0 replies; 2+ messages in thread
From: Leo Famulari @ 2021-07-10 18:18 UTC (permalink / raw)
To: Timotej Lazar; +Cc: 49502-done
On Sat, Jul 10, 2021 at 09:11:34AM +0200, Timotej Lazar wrote:
> This fixes compilation after the recent reorganization of qt-build-system. As
> a side effect, specifying Qt plugins with environment variables now works.
>
> * gnu/packages/pdf.scm (qpdfview): Use qt-build-system.
> [arguments]: Drop #:modules and #:imported-modules, and the 'qt-wrap
> phase. Specify that there are no tests.
Thanks! Pushed as 5c45ed059cfccd9fc333577403109fc4dffd1397
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-10 18:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-10 7:11 [bug#49502] [PATCH] gnu: qpdfview: Use qt-build-system Timotej Lazar
2021-07-10 18:18 ` bug#49502: " Leo Famulari
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).