guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: scribus: Fix build against Qt 5.11.


From: Clément Lassieur
Subject: 01/01: gnu: scribus: Fix build against Qt 5.11.
Date: Wed, 30 May 2018 14:47:06 -0400 (EDT)

snape pushed a commit to branch master
in repository guix.

commit 6f8f98df7f90fd18795f832c32e8d84557a24c0b
Author: Clément Lassieur <address@hidden>
Date:   Tue May 29 19:26:21 2018 +0200

    gnu: scribus: Fix build against Qt 5.11.
    
    * gnu/packages/scribus.scm (scribus)[arguments]: Add a 'patch-source' phase
    that includes missing headers.
---
 gnu/packages/scribus.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm
index 860d346..ea6418c 100644
--- a/gnu/packages/scribus.scm
+++ b/gnu/packages/scribus.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2015 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2016 Efraim Flashner <address@hidden>
 ;;; Copyright © 2017 Nicolas Goaziou <address@hidden>
+;;; Copyright © 2018 Clément Lassieur <address@hidden>
 ;;;
 ;;; 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]