From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id uIpMFtnnKmCZbQAA0tVLHw (envelope-from ) for ; Mon, 15 Feb 2021 21:30:01 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id +Kj8EdnnKmCvFgAAB5/wlQ (envelope-from ) for ; Mon, 15 Feb 2021 21:30:01 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [IPv6:2607:5300:201:3100::1657]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 158341D7F0 for ; Mon, 15 Feb 2021 22:30:01 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 1D6FF26A10; Mon, 15 Feb 2021 16:29:56 -0500 (EST) Received: from mailproxy07.manitu.net (unknown [IPv6:2a00:1828:1000:1112::2]) by mail.notmuchmail.org (Postfix) with ESMTPS id A224F1FAEC for ; Mon, 15 Feb 2021 16:29:53 -0500 (EST) Received: from localhost (200116b86074bf00fbaa7a1bbdaa3b6f.dip.versatel-1u1.de [IPv6:2001:16b8:6074:bf00:fbaa:7a1b:bdaa:3b6f]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: michael@grubix.eu) by mailproxy07.manitu.net (Postfix) with ESMTPSA id 5D882C8261; Mon, 15 Feb 2021 22:29:43 +0100 (CET) MIME-Version: 1.0 In-Reply-To: <20210215205917.180301-1-david@tethera.net> References: <20210213212214.3344212-1-david@tethera.net> <20210215205917.180301-1-david@tethera.net> Subject: Re: [PATCH] fix build failure with glib 2.67 From: Michael J Gruber To: David Bremner , notmuch@notmuchmail.org Message-ID: <161342458057.194410.596832347560731148.git@grubix.eu> Date: Mon, 15 Feb 2021 22:29:40 +0100 User-Agent: alot/0.9.1 Message-ID-Hash: WDFV2U7VBZINIUZXUMDAURYS53IYS4IJ X-Message-ID-Hash: WDFV2U7VBZINIUZXUMDAURYS53IYS4IJ X-MailFrom: michael@grubix.eu X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 0.55 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 158341D7F0 X-Spam-Score: 0.55 X-Migadu-Scanner: scn1.migadu.com X-TUID: jo8cvBTDetAL David Bremner venit, vidit, dixit 2021-02-15 21:59:17: > 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 > --- > > I neglected to change the author when amending. No fair blaming > Michael for my potential mistakes You never know before whether we share the fame or the blame :) Anyway, the current patch is fully yours. Cheers Michael