[PATCH] gnu: gpgme: Patch CMake files.

[PATCH] gnu: gpgme: Patch CMake files.

[Thomas Danckaert]

[-- Attachment #1: Type: Text/Plain, Size: 712 bytes --]

Hi,

an error (https://bugs.gnupg.org/gnupg/issue2877) in the CMake config 
files for gpgme version 1.80 prevents KWallet (and perhaps other 
packages) from building.  At build time, Make looks for a file 
“libgpgme@libsuffix@” instead of “libgpgme.so” (see 
http://hydra.gnu.org/build/1748813/nixlog/1/raw).

The attached patch works around the problem by simply substituting 
“@libsuffix@” with “.so”.  This works for KWallet on my system, but 
I'm not sure if this is the right strategy (on all supported 
platforms).  Can someone with CMake-fu judge if this an acceptable 
solution until a new version of gnupg is available (or propose a 
better solution, of course)?

Thomas

[-- Attachment #2: 0001-gnu-gpgme-Patch-CMake-files.patch --]
[-- Type: Text/X-Patch, Size: 1097 bytes --]

From 48f3064d3a66dfae7890308a537c205824e440c6 Mon Sep 17 00:00:00 2001
From: Thomas Danckaert <thomas.danckaert@gmail.com>
Date: Fri, 6 Jan 2017 16:52:41 +0100
Subject: [PATCH] gnu: gpgme: Patch CMake files.

* gnu/packages/gnupg.scm (gpgme)[arguments]: Substitute '@libsuffix@' by
  '.so'.
---
 gnu/packages/gnupg.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 56fba45..8feb40c 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -370,6 +370,13 @@ libskba (working with X.509 certificates and CMS data).")
     (inputs
      `(("gnupg" ,gnupg-2.0)
        ("libassuan" ,libassuan)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'configure 'patch-cmake-file
+           (lambda _
+             (substitute* "lang/cpp/src/GpgmeppConfig.cmake.in"
+               (("@libsuffix@") ".so")))))))
     (home-page "https://www.gnupg.org/related_software/gpgme/")
     (synopsis "Library providing simplified access to GnuPG functionality")
     (description
-- 
2.7.4

Re: [PATCH] gnu: gpgme: Patch CMake files.

[Ludovic Courtès]

Hi!

Thomas Danckaert <post@thomasdanckaert.be> skribis:

> The attached patch works around the problem by simply substituting
> “@libsuffix@” with “.so”.  This works for KWallet on my system, but
> I'm not sure if this is the right strategy (on all supported
> platforms).

The supported platforms in the context of Guix is GNU (with Hurd or
Linux) where “.so” is the right extension, so that’s the right
strategy.  :-)

> From 48f3064d3a66dfae7890308a537c205824e440c6 Mon Sep 17 00:00:00 2001
> From: Thomas Danckaert <thomas.danckaert@gmail.com>
> Date: Fri, 6 Jan 2017 16:52:41 +0100
> Subject: [PATCH] gnu: gpgme: Patch CMake files.
>
> * gnu/packages/gnupg.scm (gpgme)[arguments]: Substitute '@libsuffix@' by
>   '.so'.

I added a reference to the upstream bug report in a comment, changed the
phase to return #t, and committed.

Thank you!

Ludo’.