diff options
| -rw-r--r-- | gnu/packages/scribus.scm | 57 |
1 files changed, 5 insertions, 52 deletions
diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index ea6418c32a..34511bcf60 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; 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> ;;; ;;; This file is part of GNU Guix. @@ -47,7 +47,7 @@ (define-public scribus (package (name "scribus") - (version "1.5.3") + (version "1.5.4") (source (origin (method url-fetch) @@ -55,60 +55,13 @@ version "/scribus-" version ".tar.xz")) (sha256 (base32 - "0kyp45vidxa3v35ic9592db4zk3m8al26vck38q5v7z14x3hp8vk")) - (patches - (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)"))))) + "00ys0p6h3iq77kh72dkl0qrf7qvznq18qdrgiq10gfxja1995034")) + (modules '((guix build utils))))) (build-system cmake-build-system) (arguments `(#:tests? #f ;no test target #:configure-flags - '("-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))))) + '("-DWANT_GRAPHICSMAGICK=1"))) (inputs `(("boost" ,boost) ("cairo" ,cairo) |