diff options
author | Marius Bakke <marius@gnu.org> | 2020-11-19 00:04:32 +0100 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2020-11-19 00:04:32 +0100 |
commit | 35ed83beae51c05069ed6754dd26cf0f549808ab (patch) | |
tree | fe09aa72524081aa54c74e6d5f99f1a1c006c06b /gnu/packages/scribus.scm | |
parent | 38f4c54d7e212fd26e6899fad29c2e604abb32f5 (diff) | |
parent | 0305bc91762f9d5e01abd3d55e8dd9d3d1ecbdad (diff) | |
download | guix-35ed83beae51c05069ed6754dd26cf0f549808ab.tar guix-35ed83beae51c05069ed6754dd26cf0f549808ab.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/scribus.scm')
-rw-r--r-- | gnu/packages/scribus.scm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index 6519ce7a7f..f699824a05 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017, 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -48,16 +49,14 @@ (define-public scribus (package (name "scribus") - (version "1.5.5") + (version "1.5.6.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/scribus/scribus-devel/" version "/scribus-" version ".tar.xz")) - (patches (search-patches "scribus-1.5.5-poppler-0.86-build-fix.patch")) (sha256 - (base32 - "0w9zzsiaq3f7vpxybk01c9z2b4qqg67mzpyfb2gjchz8dhdb423r")))) + (base32 "1axp8ffnx3nh6k4s5mfa9gbx8d0yql2azgcampg41ylwafapc9fl")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;no test target @@ -99,7 +98,7 @@ ("openssl" ,openssl) ("podofo" ,podofo) ("poppler" ,poppler) - ("python" ,python-2) ;need Python library + ("python" ,python) ; need Python library ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) ("zlib" ,zlib))) |