From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Sam James Newsgroups: gmane.emacs.bugs Subject: bug#58830: 29.0.50; Build failure on master with cairo_ft_font_options_substitute Date: Fri, 28 Oct 2022 14:54:31 +0100 Message-ID: <87edust5nk.fsf@gentoo.org> References: <874jvouyxt.fsf@gentoo.org> <87czac5kr3.fsf@yahoo.com> <87pmectg2d.fsf@gentoo.org> <878rl05gen.fsf@yahoo.com> <87ilk4t7ga.fsf@gentoo.org> <87zgdg3w5l.fsf@yahoo.com> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="7141"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: mu4e 1.8.11; emacs 29.0.50 Cc: 58830@debbugs.gnu.org To: Po Lu Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Oct 28 15:56:35 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ooPqc-0001iO-Ja for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 28 Oct 2022 15:56:34 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ooPps-0006RM-At; Fri, 28 Oct 2022 09:55:48 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ooPp9-0006OY-1C for bug-gnu-emacs@gnu.org; Fri, 28 Oct 2022 09:55:12 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ooPp8-0001iI-76 for bug-gnu-emacs@gnu.org; Fri, 28 Oct 2022 09:55:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ooPp7-0001sP-VQ for bug-gnu-emacs@gnu.org; Fri, 28 Oct 2022 09:55:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Sam James Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 28 Oct 2022 13:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58830 X-GNU-PR-Package: emacs Original-Received: via spool by 58830-submit@debbugs.gnu.org id=B58830.16669652917188 (code B ref 58830); Fri, 28 Oct 2022 13:55:01 +0000 Original-Received: (at 58830) by debbugs.gnu.org; 28 Oct 2022 13:54:51 +0000 Original-Received: from localhost ([127.0.0.1]:60719 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ooPox-0001rs-0l for submit@debbugs.gnu.org; Fri, 28 Oct 2022 09:54:51 -0400 Original-Received: from woodpecker.gentoo.org ([140.211.166.183]:41462 helo=smtp.gentoo.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ooPov-0001re-6s for 58830@debbugs.gnu.org; Fri, 28 Oct 2022 09:54:50 -0400 In-reply-to: <87zgdg3w5l.fsf@yahoo.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: "bug-gnu-emacs" Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:246430 Archived-At: --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Po Lu writes: > Sam James writes: > >> Sadly no. Attaching new build.log & config.log. > > Thanks, what if you apply this: > > diff --git a/src/xsettings.c b/src/xsettings.c > index deacddcfde..15e7ff5499 100644 > --- a/src/xsettings.c > +++ b/src/xsettings.c > @@ -54,12 +54,14 @@ Copyright (C) 2009-2022 Free Software Foundation, Inc. > #include > #endif >=20=20 > -#if defined USE_CAIRO || defined HAVE_XFT > #ifdef USE_CAIRO > #include > -#else /* HAVE_XFT */ > +#elif defined HAVE_XFT > #include > #endif > + > +#if defined USE_CAIRO && defined CAIRO_HAS_FT_FONT > +#include > #endif >=20=20 > static char *current_mono_font; Works! Thank you! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iOUEARYKAI0WIQQlpruI3Zt2TGtVQcJzhAn1IN+RkAUCY1vfH18UgAAAAAAuAChp c3N1ZXItZnByQG5vdGF0aW9ucy5vcGVucGdwLmZpZnRoaG9yc2VtYW4ubmV0MjVB NkJCODhERDlCNzY0QzZCNTU0MUMyNzM4NDA5RjUyMERGOTE5MA8cc2FtQGdlbnRv by5vcmcACgkQc4QJ9SDfkZAvBwD+Pp89whJVPJ+ypHWYxhvKT1q74iLSzJEGWPYY x3v96mMBAPWeRdyUL36lCSHOyqwa/cMSvOYagaMpTGYkadvwHjwF =ElZJ -----END PGP SIGNATURE----- --=-=-=--