[mutt] 01/01: add upstream/gpgme-set-sender.patch otherwise the package does not build due to conflicting declarations.

[Antonio Radici]

This is an automated email from the git hooks/post-receive script.

antonio pushed a commit to branch master
in repository mutt.

commit 5138a429db1cf4d7612f6b8e7e0edc72e129fdb6
Author: Antonio Radici <antonio at debian.org>
Date:   Thu Dec 1 20:42:37 2016 +0000

    add upstream/gpgme-set-sender.patch otherwise the package does not build due to conflicting declarations.
---
 debian/changelog                               |  8 ++++++
 debian/patches/series                          |  1 +
 debian/patches/upstream/gpgme-set-sender.patch | 34 ++++++++++++++++++++++++++
 3 files changed, 43 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 79e721b..de6a7ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mutt (1.7.1-5) unstable; urgency=medium
+
+  * debian/patches:
+    + add upstream/gpgme-set-sender.patch otherwise the package
+      does not build due to conflicting declarations.
+
+ -- Antonio Radici <antonio at debian.org>  Thu, 01 Dec 2016 20:41:44 +0000
+
 mutt (1.7.1-4) unstable; urgency=medium
 
   * New upstream NeoMutt release, 2016-11-26.
diff --git a/debian/patches/series b/debian/patches/series
index ed74d23..d5f262a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,3 +19,4 @@ upstream/611410-no-implicit_autoview-for-text-html.patch
 upstream/693993-manpage-corrections.patch
 upstream/749483-conststrings.patch
 upstream/644992-ipv6-literal.patch
+upstream/gpgme-set-sender.patch
diff --git a/debian/patches/upstream/gpgme-set-sender.patch b/debian/patches/upstream/gpgme-set-sender.patch
new file mode 100644
index 0000000..9212a13
--- /dev/null
+++ b/debian/patches/upstream/gpgme-set-sender.patch
@@ -0,0 +1,34 @@
+The latest version of gpgpme includes gpgpme_set_sender, therefore mutt will not
+build unless our own version of gpgme_set_sender is renamed.
+--- a/crypt-gpgme.c
++++ b/crypt-gpgme.c
+@@ -4959,7 +4959,7 @@
+   return verify_sender (h, GPGME_PROTOCOL_CMS);
+ }
+ 
+-void gpgme_set_sender (const char *sender)
++void crypt_gpgme_set_sender (const char *sender)
+ {
+   mutt_error ("[setting sender] mailbox: %s\n", sender);
+   FREE (&current_sender);
+--- a/crypt-gpgme.h
++++ b/crypt-gpgme.h
+@@ -53,6 +53,6 @@
+ 
+ int smime_gpgme_verify_sender (HEADER *h);
+ 
+-void gpgme_set_sender (const char *sender);
++void crypt_gpgme_set_sender (const char *sender);
+ 
+ #endif
+--- a/crypt-mod-pgp-gpgme.c
++++ b/crypt-mod-pgp-gpgme.c
+@@ -104,7 +104,7 @@
+ 
+ static void crypt_mod_pgp_set_sender (const char *sender)
+ {
+-  gpgme_set_sender (sender);
++  crypt_gpgme_set_sender (sender);
+ }
+ 
+ struct crypt_module_specs crypt_mod_pgp_gpgme =

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mutt/mutt.git