summary refs log tree commit diff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2021-03-09 15:31:52 +0200
committerEfraim Flashner <efraim@flashner.co.il>2021-03-09 15:32:05 +0200
commit40b3e9da49f37790aae84c17291745cdc1f0fab2 (patch)
tree5a07d2b96e2c9ba5bca4e9245169825ccfc76d34
parent133a91892315da653ec9654580942970b8e273be (diff)
downloadguix-40b3e9da49f37790aae84c17291745cdc1f0fab2.tar.gz
gnu: xygrib: Fix compiling with newer qt.
* gnu/packages/geo.scm (xygrib)[source]: Adjust snippet to add missing
include header.
-rw-r--r--gnu/packages/geo.scm10
1 files changed, 8 insertions, 2 deletions
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index ae37c8f151..c988d6b114 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -8,7 +8,7 @@
 ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
 ;;; Copyright © 2018, 2019, 2020 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2019, 2020, 2021 Guillaume Le Vaillant <glv@posteo.net>
-;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2019 Wiktor Żelazny <wzelazny@vurv.cz>
 ;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
@@ -1170,7 +1170,13 @@ map display.  Downloads map data from a number of websites, including
                 "0xzsm8pr0zjk3f8j880fg5n82jyxn8xf1330qmmq1fqv7rsrg9ia"))
               (modules '((guix build utils)))
               (snippet
-               '(begin (delete-file-recursively "data/fonts") #t))))
+               '(begin
+                  (delete-file-recursively "data/fonts")
+                  ;; Fixes compilation, can be removed with the next release.
+                  ;; Upstream link: https://github.com/opengribs/XyGrib/pull/255
+                  (substitute* "src/SkewT.h"
+                    (("QMessageBox>") "QMessageBox>\n#include <QPainterPath>"))
+                  #t))))
     (build-system cmake-build-system)
     (arguments
      `(#:phases