ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-27 06:42:14 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: scribus: Update to 1.5.7.

Browse source 
* gnu/packages/scribus.scm (scribus): Update to 1.5.7.
[arguments]: Remove unnecessary phase.
[inputs]: Use regular podofo library.
(podofo-for-scribus): Remove variable.
This commit is contained in:
Nicolas Goaziou 2021-04-27 10:38:40 +02:00
parent 5bcb453d43
commit 784bd264bc
No known key found for this signature in database
GPG key ID: DA00B4F048E92F2D
1 changed files with 5 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
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, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2017, 2018, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
@ -46,54 +46,22 @@ (define-module (gnu packages scribus)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages xml)) #:use-module (gnu packages xml))
(define podofo-for-scribus
(package
(inherit podofo)
(version "0.9.6")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/podofo/podofo/" version
"/podofo-" version ".tar.gz"))
(sha256
(base32 "0wj0y4zcmj4q79wrn3vv3xq4bb0vhhxs8yifafwy9f2sjm83c5p9"))
(modules '((guix build utils)))
(snippet
'(begin
;; Fix the build with CMake 3.12.0.
(substitute* "test/TokenizerTest/CMakeLists.txt"
(("\\$\\{CMAKE_COMMAND\\}")
"true"))
#t))))))
(define-public scribus (define-public scribus
(package (package
(name "scribus") (name "scribus")
(version "1.5.6.1") (version "1.5.7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/scribus/scribus-devel/" (uri (string-append "mirror://sourceforge/scribus/scribus-devel/"
version "/scribus-" version ".tar.xz")) version "/scribus-" version ".tar.xz"))
(sha256 (sha256
(base32 "1axp8ffnx3nh6k4s5mfa9gbx8d0yql2azgcampg41ylwafapc9fl")))) (base32 "1kpq4vc95hj3w8l205kh0pmdlisi4v1gilz0sf8n39y7ryr1d0ri"))))
(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 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Fix "ImportError: No module named _sysconfigdata_nd"
;; runtime error 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)
@ -116,9 +84,7 @@ (define-public scribus
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("libzmf" ,libzmf) ("libzmf" ,libzmf)
("openssl" ,openssl) ("openssl" ,openssl)
;; Scribus 1.5.6.1 does not build with later versions, see ("podofo" ,podofo)
;; <https://bugs.scribus.net/view.php?id=16427>.
("podofo" ,podofo-for-scribus)
("poppler" ,poppler) ("poppler" ,poppler)
("python" ,python) ; need Python library ("python" ,python) ; need Python library
("qtbase" ,qtbase) ("qtbase" ,qtbase)