guix-commits
[Top][All Lists]
Advanced

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

29/29: gnu: inkscape: Fix FTBFS with GCC >= 6.


From: guix-commits
Subject: 29/29: gnu: inkscape: Fix FTBFS with GCC >= 6.
Date: Sat, 9 Feb 2019 15:55:27 -0500 (EST)

mbakke pushed a commit to branch core-updates
in repository guix.

commit 0bba8a5cf8a089227549bcb0489628e5b08183c7
Author: Marius Bakke <address@hidden>
Date:   Sun Oct 7 18:54:59 2018 +0200

    gnu: inkscape: Fix FTBFS with GCC >= 6.
    
    * gnu/packages/inkscape.scm (inkscape)[arguments]: Add phase
    'dont-use-system-includes.
---
 gnu/packages/inkscape.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm
index 7b17eba..a2c6778 100644
--- a/gnu/packages/inkscape.scm
+++ b/gnu/packages/inkscape.scm
@@ -86,6 +86,13 @@
            (lambda _
              (substitute* "share/icons/application/CMakeLists.txt"
               (("gtk-update-icon-cache") "true"))
+             #t))
+         (add-before 'configure 'dont-use-system-includes
+           (lambda _
+             ;; Don't add redundant -isystem includes which confuses GCC7.
+             (substitute* "CMakeScripts/DefineDependsandFlags.cmake"
+               (("include_directories\\(SYSTEM")
+                "include_directories("))
              #t)))))
     (home-page "https://inkscape.org/";)
     (synopsis "Vector graphics editor")



reply via email to

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