ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-23 19:19:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: scribus: Update to 1.5.4.

Browse source 
* gnu/packages/scribus.scm (scribus): Update to 1.5.4.
[source]: Remove patches.
[arguments]: Remove `patch-source' phase.
This commit is contained in:
Nicolas Goaziou 2018-06-06 18:33:38 +02:00
parent e6fcf903ec
commit fec8d80cd1
No known key found for this signature in database
GPG key ID: A834B9E080A93738
1 changed files with 5 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
gnu/packages/scribus.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2017, 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -47,7 +47,7 @@ (define-module (gnu packages scribus)
(define-public scribus (define-public scribus
(package (package
(name "scribus") (name "scribus")
(version "1.5.3") (version "1.5.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -55,60 +55,13 @@ (define-public scribus
version "/scribus-" version ".tar.xz")) version "/scribus-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0kyp45vidxa3v35ic9592db4zk3m8al26vck38q5v7z14x3hp8vk")) "00ys0p6h3iq77kh72dkl0qrf7qvznq18qdrgiq10gfxja1995034"))
(patches (modules '((guix build utils)))))
(list
(origin
(method url-fetch)
(uri (string-append "https://github.com/scribusproject/scribus/commit/"
"61186c7ef083046b7e0c908952e8a773e2787d82.patch"))
(file-name "scribus-fix-poppler-0.58-breakage.patch")
(sha256
(base32 "189qw9xmgz01xz1w1bi9lzrp399zk1j1iz5qdhchdrhgnd69b7ly")))
(origin
(method url-fetch)
(uri (string-append "https://github.com/scribusproject/scribus/commit/"
"d82b1c989bd0e79b5611521f671adbfb94996e5e.patch"))
(file-name "scribus-fix-poppler-packaging.patch")
(sha256
(base32 "1p9s18jjvj2h0ba1xvk1zhmnn4f4n3ykrgb56mjd6in30h0vrykx")))))
(modules '((guix build utils)))
(snippet
;; Fix typo. Equivalent to patch at
;; https://bugs.scribus.net/view.php?id=14850
'(substitute* "cmake/modules/FindLIBPODOFO.cmake"
(("find_package\\(OPENSSL\\)") "find_package(OpenSSL)")))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ;no test target `(#:tests? #f ;no test target
#:configure-flags #:configure-flags
'("-DWANT_GRAPHICSMAGICK=1") '("-DWANT_GRAPHICSMAGICK=1")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda _
;; Fix build against Qt 5.11.
(substitute* "scribus/plugins/tools/lenseffects/lensdialog.cpp"
(("#include <cmath>") "#include <cmath>
#include <QStyleOptionGraphicsItem>"))
(substitute* "scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp"
(("#include <QGraphicsItem>") "#include <QGraphicsItem>
#include <QStyleOptionGraphicsItem>"))
(substitute* "scribus/sclistboxpixmap.h"
(("#include <QVariant>") "#include <QVariant>
#include <QStyleOptionViewItem>
#include <QAbstractItemDelegate>"))
#t))
(add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Fix "ImportError: No module named _sysconfigdata_nd" where
;; Scribus checks PATH and eventually runs system's Python
;; instead of package's.
(let* ((out (assoc-ref outputs "out"))
(py2 (assoc-ref inputs "python")))
(wrap-program (string-append out "/bin/scribus")
`("PATH" ":" prefix (,(string-append py2 "/bin")))))
#t)))))
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)
("cairo" ,cairo) ("cairo" ,cairo)