From patchwork Sun Jul 14 18:05:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 14645 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 267FE1722F; Sun, 14 Jul 2019 19:07:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id BBAB117203 for ; Sun, 14 Jul 2019 19:07:08 +0100 (BST) Received: from localhost ([::1]:33626 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hmitw-0003Ui-FP for patchwork@mira.cbaines.net; Sun, 14 Jul 2019 14:07:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44827) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hmits-0003Q6-B5 for guix-patches@gnu.org; Sun, 14 Jul 2019 14:07:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hmitq-0005GK-Oe for guix-patches@gnu.org; Sun, 14 Jul 2019 14:07:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37084) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hmitq-0005G9-Kg for guix-patches@gnu.org; Sun, 14 Jul 2019 14:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hmitq-0006yf-Ex for guix-patches@gnu.org; Sun, 14 Jul 2019 14:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36652] [PATCH 2/2] gnu: Add xygrib. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Jul 2019 18:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36652 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36652@debbugs.gnu.org Received: via spool by 36652-submit@debbugs.gnu.org id=B36652.156312757826758 (code B ref 36652); Sun, 14 Jul 2019 18:07:02 +0000 Received: (at 36652) by debbugs.gnu.org; 14 Jul 2019 18:06:18 +0000 Received: from localhost ([127.0.0.1]:45904 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hmit4-0006xT-Ai for submit@debbugs.gnu.org; Sun, 14 Jul 2019 14:06:18 -0400 Received: from flashner.co.il ([178.62.234.194]:50084) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hmit1-0006x0-Db for 36652@debbugs.gnu.org; Sun, 14 Jul 2019 14:06:12 -0400 Received: from localhost (unknown [94.230.83.247]) by flashner.co.il (Postfix) with ESMTPSA id B7A1E40213; Sun, 14 Jul 2019 18:06:05 +0000 (UTC) From: Efraim Flashner Date: Sun, 14 Jul 2019 21:05:54 +0300 Message-Id: <20190714180554.31307-2-efraim@flashner.co.il> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190714180554.31307-1-efraim@flashner.co.il> References: <20190714180329.31051-1-efraim@flashner.co.il> <20190714180554.31307-1-efraim@flashner.co.il> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/geo.scm (xygrib): New variable. --- gnu/packages/geo.scm | 68 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 4cccd97643..e4b6a262c7 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2019 Guillaume Le Vaillant +;;; Copyright © 2019 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,6 +38,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (gnu packages astronomy) #:use-module (gnu packages autotools) #:use-module (gnu packages boost) #:use-module (gnu packages check) @@ -44,6 +46,7 @@ #:use-module (gnu packages databases) #:use-module (gnu packages datastructures) #:use-module (gnu packages documentation) + #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -57,6 +60,7 @@ #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages qt) #:use-module (gnu packages sqlite) #:use-module (gnu packages web) #:use-module (gnu packages webkit) @@ -902,3 +906,67 @@ given GPS coordinates,draws a GPS track, and points of interest on a moving map display. Downloads map data from a number of websites, including @url{https://www.openstreetmap.org}.") (license license:gpl2+))) + +(define-public xygrib + (package + (name "xygrib") + (version "1.2.6") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/opengribs/XyGrib.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0qzaaavil2c7mkkai5mg54cv8r452i7psy7cg75qjja96d2d7rbd")) + (modules '((guix build utils))) + (snippet + '(begin (delete-file-recursively "data/fonts") #t)))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-directories + (lambda* (#:key inputs #:allow-other-keys) + (let ((jpeg (assoc-ref inputs "openjpeg")) + (font (assoc-ref inputs "font-liberation"))) + (substitute* "CMakeLists.txt" + ;; Find libjpeg. + (("/usr") jpeg) + ;; Fix install locations. + (("set\\(PREFIX_BIN.*") "set(PREFIX_BIN \"bin\")\n") + (("set\\(PREFIX_PKGDATA.*") "set(PREFIX_PKGDATA \"share/${PROJECT_NAME}\")\n") + ;; Skip looking for the static library. + (("\"libnova.a\"") "")) + ;; Don't use the bundled font-liberation. + (substitute* "src/util/Font.cpp" + (("Util::pathFonts\\(\\)\\+\"liberation-fonts/\"") + (string-append "\"" font "/share/fonts/truetype/\""))) + (substitute* "src/util/Util.h" + (("pathData\\(\\)\\+\"data/fonts/\"") + (string-append "\"" font "/share/fonts/\"")))) + #t))) + #:tests? #f)) ; no tests + (native-inputs + `(("qttools" ,qttools))) + (inputs + `(("bzip2" ,bzip2) + ("font-liberation" ,font-liberation) + ("libnova" ,libnova) + ("libpng" ,libpng) + ("openjpeg" ,openjpeg) + ("proj.4" ,proj.4) + ("qtbase" ,qtbase) + ("zlib" ,zlib))) + (synopsis "Weather Forecast Visualization") + (description + "XyGrib is a Grib file reader and visualizes meteorological data providing +an off-line capability to analyse weather forecasts or hindcasts. It is +intended to be used as a capable weather work station for anyone with a serious +interest in examining weather. This would include members of the sailing +community, private and sport aviators, farmers, weather buffs and many more. +XyGrib is the continuation of the zyGrib software package with a new team of +volunteers.") + (home-page "https://opengribs.org") + (license license:gpl3+)))