From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 62EEB1382C5 for ; Wed, 14 Apr 2021 00:27:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 91ABDE085B; Wed, 14 Apr 2021 00:27:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7A211E085B for ; Wed, 14 Apr 2021 00:27:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BA487340DCA for ; Wed, 14 Apr 2021 00:27:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 713B364A for ; Wed, 14 Apr 2021 00:27:43 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1618360048.a1438a27f486f6c314f1ebf1a01d76703bc0cf19.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/files/, net-mail/notmuch/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-mail/notmuch/files/notmuch-0.31.3-glib-2.68.patch net-mail/notmuch/notmuch-0.31.3.ebuild X-VCS-Directories: net-mail/notmuch/files/ net-mail/notmuch/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a1438a27f486f6c314f1ebf1a01d76703bc0cf19 X-VCS-Branch: master Date: Wed, 14 Apr 2021 00:27:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 87e4219a-4e00-4677-bcc4-95a48f32e2bc X-Archives-Hash: d12748e31a5fc68276b7d3a153b8b811 commit: a1438a27f486f6c314f1ebf1a01d76703bc0cf19 Author: Sam James gentoo org> AuthorDate: Wed Apr 14 00:15:11 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Apr 14 00:27:28 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1438a27 net-mail/notmuch: add upstream glib 2.68 patch Closes: https://bugs.gentoo.org/777663 Signed-off-by: Sam James gentoo.org> .../notmuch/files/notmuch-0.31.3-glib-2.68.patch | 60 ++++++++++++++++++++++ net-mail/notmuch/notmuch-0.31.3.ebuild | 4 ++ 2 files changed, 64 insertions(+) diff --git a/net-mail/notmuch/files/notmuch-0.31.3-glib-2.68.patch b/net-mail/notmuch/files/notmuch-0.31.3-glib-2.68.patch new file mode 100644 index 00000000000..19f00391093 --- /dev/null +++ b/net-mail/notmuch/files/notmuch-0.31.3-glib-2.68.patch @@ -0,0 +1,60 @@ +https://bugs.gentoo.org/777663 + +From: David Bremner +Date: Mon, 15 Feb 2021 20:43:50 +0000 (-0400) +Subject: fix build failure with glib 2.67 +X-Git-Tag: archive/debian/0.31.4-1~6 +X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=6db8b422d91a75b7c16f013f10f41d1109ce5866;hp=1692fe7aa8b137d02817bb11f248d204d6ab4048 + +fix build failure with glib 2.67 + +Based on a patch from Michael J Gruber [1]. As of glib 2.67 (more +specifically [2]), including "gmime-extra.h" inside an extern "C" +block causes build failures, because glib is using C++ features. + +Observing that "gmime-extra.h" is no longer needed in +notmuch-private.h, which can simply delete that include, but +we have to correspondingly move the includes which might include +it (in particular crypto.h) out of the extern "C" block also. + +This seems less fragile than only moving gmime-extra, and relying on +preprocessor sentinels to keep the deeper includes from happening. + +Move to the include to the outside of the extern block. + +[1]: id:aee618a3d41f7889a7449aa16893e992325a909a.1613055071.git.git@grubix.eu +[2]: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1715 +--- + +diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h +index 57ec7f72..41aff342 100644 +--- a/lib/notmuch-private.h ++++ b/lib/notmuch-private.h +@@ -31,6 +31,12 @@ + + #include "notmuch.h" + ++#include "xutil.h" ++#include "error_util.h" ++#include "string-util.h" ++#include "crypto.h" ++#include "repair.h" ++ + NOTMUCH_BEGIN_DECLS + + #include +@@ -47,14 +53,6 @@ NOTMUCH_BEGIN_DECLS + + #include + +-#include "gmime-extra.h" +- +-#include "xutil.h" +-#include "error_util.h" +-#include "string-util.h" +-#include "crypto.h" +-#include "repair.h" +- + #ifdef DEBUG + # define DEBUG_DATABASE_SANITY 1 + # define DEBUG_THREADING 1 diff --git a/net-mail/notmuch/notmuch-0.31.3.ebuild b/net-mail/notmuch/notmuch-0.31.3.ebuild index d538001bf03..2d374bfe7e8 100644 --- a/net-mail/notmuch/notmuch-0.31.3.ebuild +++ b/net-mail/notmuch/notmuch-0.31.3.ebuild @@ -85,6 +85,10 @@ RDEPEND="${COMMON_DEPEND} SITEFILE="50${PN}-gentoo.el" +PATCHES=( + "${FILESDIR}"/${P}-glib-2.68.patch +) + pkg_setup() { use emacs && elisp-check-emacs-version }