[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/08: gnu: xygrib: Fix building with newer openjpeg.
From: |
guix-commits |
Subject: |
02/08: gnu: xygrib: Fix building with newer openjpeg. |
Date: |
Wed, 24 May 2023 04:43:16 -0400 (EDT) |
efraim pushed a commit to branch master
in repository guix.
commit 24f18482d3d57a49f0711e0c42f1e0ef5c1549df
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Wed May 24 10:12:50 2023 +0300
gnu: xygrib: Fix building with newer openjpeg.
* gnu/packages/geo.scm (xygrib)[source]: Adjust snippet to also search
for newer openjpeg versions.
---
gnu/packages/geo.scm | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 1337e8f20b..bff213d684 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, 2021 Julien Lepiller <julien@lepiller.eu>
;;; 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, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; 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
(substitute* "src/SkewT.h"
(("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)
(arguments
`(#:configure-flags (list "-DGNU_PACKAGE=ON")
-
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-directories
- branch master updated (e02584b456 -> fc79528ae3), guix-commits, 2023/05/24
- 02/08: gnu: xygrib: Fix building with newer openjpeg.,
guix-commits <=
- 01/08: gnu: font-gnu-unifont: Remove more pre-generated files., guix-commits, 2023/05/24
- 05/08: gnu: icewm: Update to 3.3.4., guix-commits, 2023/05/24
- 06/08: gnu: libfprint: Fix building with newer meson., guix-commits, 2023/05/24
- 08/08: gnu: xonsh: Update to 0.14.0., guix-commits, 2023/05/24
- 03/08: gnu: xygrib: Build with newer proj., guix-commits, 2023/05/24
- 04/08: gnu: htmlcxx: add --std=c++11 to configure flags., guix-commits, 2023/05/24
- 07/08: gnu: prosody: Update to 0.12.3., guix-commits, 2023/05/24