diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-05-31 00:27:03 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-05-31 00:27:03 -0400 |
| commit | 0d6f84aab1c2f4cd8ce1b68215a7a77426dc6cd5 (patch) | |
| tree | 714784ba10d8b4f9f33393d285d148024ba5dea8 /gnu/packages/scribus.scm | |
| parent | 03d90319622a9fd9df1cf69cf123ed550e870276 (diff) | |
| parent | 88a3465e4a467be92729fc37d8bda0155bbf5c52 (diff) | |
| download | guix-0d6f84aab1c2f4cd8ce1b68215a7a77426dc6cd5.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/scribus.scm')
| -rw-r--r-- | gnu/packages/scribus.scm | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index 6cf382e0bb..09ab97e8b3 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -86,6 +87,20 @@ '("-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 |