From a7db283d9d99f43bd80599a70fb4298f95f5e14e Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Tue, 14 Oct 2025 01:14:39 -0700
Subject: [PATCH] gpgme: 1.24.3 -> 2.0.1

---
 pkgs/development/libraries/gpgme/default.nix  |  6 ++--
 .../test_t-verify_double-plaintext.patch      | 31 -------------------
 2 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 pkgs/development/libraries/gpgme/test_t-verify_double-plaintext.patch

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 383e6e2184c4..2b3c7d93d853 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -21,7 +21,7 @@
 
 stdenv.mkDerivation rec {
   pname = "gpgme";
-  version = "1.24.3";
+  version = "2.0.1";
 
   outputs = [
     "out"
@@ -33,12 +33,10 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnupg/gpgme/gpgme-${version}.tar.bz2";
-    hash = "sha256-v8F/W9GxeMhkn92RiVbSdwgPM98Aai3ECs3s3OaMUN0=";
+    hash = "sha256-ghqwaVyELqtRdSqBmAySsEEMfq3QQQP3kdXSpSZ4SWY=";
   };
 
   patches = [
-    # Fix a test after disallowing compressed signatures in gpg (PR #180336)
-    ./test_t-verify_double-plaintext.patch
     # Don't use deprecated LFS64 APIs (removed in musl 1.2.4)
     # https://dev.gnupg.org/D600
     ./LFS64.patch
diff --git a/pkgs/development/libraries/gpgme/test_t-verify_double-plaintext.patch b/pkgs/development/libraries/gpgme/test_t-verify_double-plaintext.patch
deleted file mode 100644
index 8f866af0da91..000000000000
--- a/pkgs/development/libraries/gpgme/test_t-verify_double-plaintext.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/tests/gpg/t-verify.c
-+++ b/tests/gpg/t-verify.c
-@@ -304,7 +304,7 @@
-   err = gpgme_data_new (&text);
-   fail_if_err (err);
-   err = gpgme_op_verify (ctx, sig, NULL, text);
--  if (gpgme_err_code (err) != GPG_ERR_BAD_DATA)
-+  if (gpgme_err_code (err) == GPG_ERR_NO_ERROR)
-     {
-       fprintf (stderr, "%s:%i: Double plaintext message not detected\n",
- 	       PGM, __LINE__);
---- a/lang/python/tests/t-verify.py
-+++ b/lang/python/tests/t-verify.py
-@@ -142,7 +142,7 @@
-     c.op_verify(sig, None, text)
- except Exception as e:
-     assert type(e) == gpg.errors.GPGMEError
--    assert e.getcode() == gpg.errors.BAD_DATA
-+    assert e.getcode() != gpg.errors.NO_ERROR
- else:
-     assert False, "Expected an error but got none."
- 
-@@ -178,7 +178,7 @@
-     try:
-         c.verify(double_plaintext_sig)
-     except gpg.errors.GPGMEError as e:
--        assert e.getcode() == gpg.errors.BAD_DATA
-+        assert e.getcode() != gpg.errors.NO_ERROR
-     else:
-         assert False, "Expected an error but got none."
-