From 21df702808a8f4491e1ef5badc607748288fa69a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 2 Nov 2020 22:13:08 +0100 Subject: gnu: qview: Update to 4.0. * gnu/packages/image-viewers.scm (qview): Update to 4.0. [arguments]: Append PREFIX to qmake call. Fix auto-update removal. --- gnu/packages/image-viewers.scm | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 05e09263a0..b376f8ab72 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -495,7 +495,7 @@ (define-public mcomix (define-public qview (package (name "qview") - (version "3.0") + (version "4.0") (source (origin (method git-fetch) @@ -504,29 +504,22 @@ (define-public qview (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "15a91bs3wcqhgf76wzigbn10hayg628j84pq4j2vaxar94ak0vk7")))) + (base32 "15n9cq7w3ckinnx38hvncxrbkv4qm4k51sal41q4y0pkvhmafhnr")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases (replace 'configure - (lambda _ - (invoke "qmake"))) - ;; Installation process hard-codes "/usr/bin", possibly - ;; prefixed. - (add-after 'configure 'fix-install-directory (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (substitute* "Makefile" - (("\\$\\(INSTALL_ROOT\\)/usr") out)) - #t))) - ;; Don't phone home or show "Checking for updates..." in the - ;; About menu. + (invoke "qmake" (string-append "PREFIX=" out))))) + ;; Don't phone home or show "Checking for updates..." in the About + ;; menu. (add-before 'build 'disable-auto-update (lambda _ (substitute* "src/qvaboutdialog.cpp" - (("ui->updateLabel->setText\\(updateText\\);") "") - (("requestUpdates\\(\\);") "")) + (("qvApp->checkUpdates();") "") + (("updateText();") "")) #t))))) (inputs `(("qtbase" ,qtbase) -- cgit v1.2.3