aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Lassieur <clement@lassieur.org>2018-05-29 19:26:21 +0200
committerClément Lassieur <clement@lassieur.org>2018-05-30 20:45:17 +0200
commit6f8f98df7f90fd18795f832c32e8d84557a24c0b (patch)
treee511e7887578e2985548e2ffc2d94a8c58f49af4
parentd0e23e3940bb122cca5657e89e14ae5b7db49be4 (diff)
downloadpatches-6f8f98df7f90fd18795f832c32e8d84557a24c0b.tar
patches-6f8f98df7f90fd18795f832c32e8d84557a24c0b.tar.gz
gnu: scribus: Fix build against Qt 5.11.
* gnu/packages/scribus.scm (scribus)[arguments]: Add a 'patch-source' phase that includes missing headers.
-rw-r--r--gnu/packages/scribus.scm15
1 files changed, 15 insertions, 0 deletions
diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm
index 860d346778..ea6418c32a 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.
;;;
@@ -84,6 +85,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