me/guix
Archived
1
0
Fork 0
Code Activity

gnu: xygrib: Fix building with newer openjpeg.

Browse source 
* gnu/packages/geo.scm (xygrib)[source]: Adjust snippet to also search
for newer openjpeg versions.
This commit is contained in:
Efraim Flashner 2023-05-24 10:12:50 +03:00
parent 007b156a3e
commit 24f18482d3
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/geo.scm
View file

@ -8,7 +8,7 @@
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com> ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
;;; Copyright © 2018, 2019, 2020, 2021 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2018, 2019, 2020, 2021 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2019-2023 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2019-2023 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2019-2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019-2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019, 2021 Wiktor Żelazny <wzelazny@vurv.cz> ;;; Copyright © 2019, 2021 Wiktor Żelazny <wzelazny@vurv.cz>
;;; Copyright © 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org>
@ -1663,11 +1663,13 @@ map display. Downloads map data from a number of websites, including
;; Upstream link: https://github.com/opengribs/XyGrib/pull/255 ;; Upstream link: https://github.com/opengribs/XyGrib/pull/255
(substitute* "src/SkewT.h" (substitute* "src/SkewT.h"
(("QMessageBox>") "QMessageBox>\n#include <QPainterPath>")) (("QMessageBox>") "QMessageBox>\n#include <QPainterPath>"))
#t)))) ;; Accept newer versions of openjpeg
;; https://github.com/opengribs/XyGrib/pull/298
(substitute* "CMakeLists.txt"
(("openjpeg-2.4") "openjpeg-2.5 openjpeg-2.4"))))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags (list "-DGNU_PACKAGE=ON") `(#:configure-flags (list "-DGNU_PACKAGE=ON")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-directories (add-after 'unpack 'patch-directories