gpg-error not detected when compiling libksba:

[Todd Zullinger]

Pedro Andres Aranda Gutierrez via Gnupg-devel wrote:
> On Wed, 5 Apr 2023 at 10:48, Clemens Lang <cllang at redhat.com> wrote:
>> Try again with
>>
>>    https://dev.gnupg.org/rCbcf5922eaac274f5ace991ecace01e718a9fe964
>
> Could you please provide a patch against libgcrypt-1.10.1.
> I tried myself, but without any luck.

There is a trivial conflict in the Last-changed: line of the
two-line patch.  I did the following:

    $ git switch -c temp libgcrypt-1.10.1

    $ git cherry-pick -x c118a8dd
    Auto-merging m4/gpg-error.m4
    CONFLICT (content): Merge conflict in m4/gpg-error.m4
    error: could not apply c118a8dd... m4: Update gpg-error.m4.
    [...]

Edit m4/gpg-error.m4 to remove the conflicting lines:

    <<<<<<< HEAD
    # Last-changed: 2022-02-15
    =======

and

    >>>>>>> c118a8dd (m4: Update gpg-error.m4.)

leaving '# Last-changed: 2023-04-01'.

Finish the cherry-pick:

    $ git add m4/gpg-error.m4
    $ git cherry-pick --continue --no-edit

Generate a patch:

    $ git format-patch -1
    0001-m4-Update-gpg-error.m4.patch

The result is attached (unless the list software strips it
off), in which case the instructions should make it easy to
recreate. :)

-- 
Todd
-------------- next part --------------
From 9c33a38a5bee3e51933a2418a9ec7ef24627a62b Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe at fsij.org>
Date: Sat, 1 Apr 2023 11:23:34 +0900
Subject: [PATCH] m4: Update gpg-error.m4.

* m4/gpg-error.m4: Update from libgpg-error master.

--

Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
(cherry picked from commit c118a8ddd0224f951f26ae78d58d0eed5ee35779)
---
 m4/gpg-error.m4 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4
index 4b5cd40b..070b749d 100644
--- a/m4/gpg-error.m4
+++ b/m4/gpg-error.m4
@@ -10,7 +10,7 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
-# Last-changed: 2022-02-15
+# Last-changed: 2023-04-01
 
 
 dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION,
@@ -135,6 +135,7 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
       AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config])
       gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion`
     else
+      gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
       unset GPGRT_CONFIG
     fi
   elif test "$GPG_ERROR_CONFIG" != "no"; then
-- 
2.40.0

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <https://lists.gnupg.org/pipermail/gnupg-devel/attachments/20230406/934647bd/attachment.sig>