diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2023-04-24 21:16:02 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2023-04-25 06:17:16 +0200 |
| commit | 8495069bed0d51a21ff609f7036ff40d73ff07a8 (patch) | |
| tree | f79ef32faa8b73823c89fab25dcc333628427f17 /gnu/packages/scribus.scm | |
| parent | 7fc2c442c85aefe21e61502f50b27651b043b5cd (diff) | |
gnu: scribus: Fix build with latest poppler.
* gnu/packages/patches/scribus-1.5.8-poppler-22.03.0.patch,
gnu/packages/patches/scribus-1.5.8-poppler-22.04.0.patch,
gnu/packages/patches/scribus-1.5.8-poppler-22.09.0.patch,
gnu/packages/patches/scribus-1.5.8-poppler-22.2.0-1.patch,
gnu/packages/patches/scribus-1.5.8-poppler-22.2.0-2.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/scribus.scm (scribus)[source]: Add patches.
[arguments]: Enable WANT_CPP17 option.
Diffstat (limited to 'gnu/packages/scribus.scm')
| -rw-r--r-- | gnu/packages/scribus.scm | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index de598ac2f4..ba32361575 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2018 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2015, 2018, 2023 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018, 2021, 2022 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> @@ -57,12 +57,19 @@ (uri (string-append "mirror://sourceforge/scribus/scribus-devel/" version "/scribus-" version ".tar.xz")) (sha256 - (base32 "0x3bw58v920akca8jxvsfwf468pzjyglk93ay67ph1bdry7nx0a7")))) + (base32 "0x3bw58v920akca8jxvsfwf468pzjyglk93ay67ph1bdry7nx0a7")) + (patches + (search-patches "scribus-1.5.8-poppler-22.2.0-1.patch" + "scribus-1.5.8-poppler-22.2.0-2.patch" + "scribus-1.5.8-poppler-22.03.0.patch" + "scribus-1.5.8-poppler-22.04.0.patch" + "scribus-1.5.8-poppler-22.09.0.patch")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;no test target #:configure-flags - '("-DWANT_GRAPHICSMAGICK=1"))) + '("-DWANT_GRAPHICSMAGICK=1" + "-DWANT_CPP17=ON"))) (inputs (list boost cairo |