all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: David Elsing <david.elsing@posteo.net>
To: 68790@debbugs.gnu.org
Cc: David Elsing <david.elsing@posteo.net>
Subject: [bug#68790] [PATCH 3/9] gnu: gemmi: Update to 0.6.4.
Date: Sun, 28 Jan 2024 23:01:56 +0000	[thread overview]
Message-ID: <20240128230215.1389-3-david.elsing@posteo.net> (raw)
In-Reply-To: <20240128225919.795-2-david.elsing@posteo.net>

* gnu/packages/chemistry.scm (gemmi): Update to 0.6.4.
[arguments]: Adjust include/gemmi/sprintf.hpp -> src/sprintf.cpp.
(freesasa)[arguments]: Link to gemmi_cpp explicitly.
---
 gnu/packages/chemistry.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index df96a2f5c1..5129470e1e 100644
--- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -589,7 +589,7 @@ (define-public python-pymol
 (define-public gemmi
   (package
     (name "gemmi")
-    (version "0.5.7")
+    (version "0.6.4")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -598,7 +598,7 @@ (define-public gemmi
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "00km5q726bslrw7xbfwb3f3mrsk19qbimfnl3hvr4wi1y3z8i18a"))
+                "0wciqqswc4p4v4kglfv36gnvyyimqn4lnywdzd0pgrjn443i860y"))
               (patches
                (search-patches "gemmi-fix-sajson-types.patch"
                                "gemmi-fix-pegtl-usage.patch"))
@@ -625,7 +625,7 @@ (define-public gemmi
       #~(modify-phases %standard-phases
           (add-after 'unpack 'patch-includes
             (lambda _
-              (substitute* (list "include/gemmi/sprintf.hpp"
+              (substitute* (list "src/sprintf.cpp"
                                  "include/gemmi/dirwalk.hpp"
                                  "include/gemmi/cif.hpp"
                                  "include/gemmi/json.hpp"
@@ -722,7 +722,7 @@ (define-public freesasa
                 (("libfreesasa\\.a") "libfreesasa.la")
                 (("freesasa_LDADD \\+= libfreesasa\\.la" prev)
                  (string-append prev "\nlibfreesasa_la_LIBADD"
-                                " = -ljson-c ${libxml2_LIBS}\n"))
+                                " = -ljson-c -lgemmi_cpp ${libxml2_LIBS}\n"))
                 (("_a_SOURCES") "_la_SOURCES"))
               (substitute* "configure.ac"
                 (("AC_PROG_INSTALL" inst)
-- 
2.41.0





  parent reply	other threads:[~2024-01-28 23:03 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-28 22:59 [bug#68790] [PATCH 0/9] Update rdkit and its dependencies David Elsing
2024-01-28 23:01 ` [bug#68790] [PATCH 1/9] gnu: tinydir: Update to 1.2.6 David Elsing
2024-01-28 23:01 ` [bug#68790] [PATCH 2/9] gnu: fast-float: Update to 6.0.0 David Elsing
2024-01-28 23:01 ` David Elsing [this message]
2024-01-28 23:01 ` [bug#68790] [PATCH 4/9] gnu: maeparser: Update to 1.3.1 David Elsing
2024-01-28 23:01 ` [bug#68790] [PATCH 5/9] gnu: coordgenlibs: Update to 3.0.2 David Elsing
2024-01-28 23:01 ` [bug#68790] [PATCH 6/9] gnu: yaehmop: Update to 2023.03.1 David Elsing
2024-01-28 23:02 ` [bug#68790] [PATCH 7/9] gnu: avalon-toolkit: Update to 2.0.5a David Elsing
2024-01-28 23:02 ` [bug#68790] [PATCH 8/9] gnu: freesasa: Fix memerr tests David Elsing
2024-01-28 23:02 ` [bug#68790] [PATCH 9/9] gnu: rdkit: Update to 2023.09.4 David Elsing
2024-02-13 12:18 ` [bug#68790] [PATCH 0/9] Update rdkit and its dependencies Christopher Baines

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240128230215.1389-3-david.elsing@posteo.net \
    --to=david.elsing@posteo.net \
    --cc=68790@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.