From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Pieter van Prooijen Newsgroups: gmane.emacs.bugs Subject: bug#55463: [PATCH] Fix font options compilation with gsettings disabled Date: Tue, 17 May 2022 10:28:55 +0200 Message-ID: References: <6f99df01f4a1e7a3ddec018dc2e00b4977208055.camel@teloden.nl> <87czgdnf3t.fsf@yahoo.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-UySzVh2akZE/nrPe4xGb" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="36421"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Evolution 3.44.0-1ubuntu1 Cc: wilde@sha-bang.de, 55463@debbugs.gnu.org To: Po Lu Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue May 17 10:30:43 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 1nqsbJ-000990-FS for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 17 May 2022 10:30:42 +0200 Original-Received: from localhost ([::1]:43234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqsbH-0005kq-Sf for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 17 May 2022 04:30:39 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:53272) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqsao-0005kg-9x for bug-gnu-emacs@gnu.org; Tue, 17 May 2022 04:30:11 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:33672) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqsag-00027t-Q7 for bug-gnu-emacs@gnu.org; Tue, 17 May 2022 04:30:09 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqsag-0004dY-KB for bug-gnu-emacs@gnu.org; Tue, 17 May 2022 04:30:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Pieter van Prooijen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 17 May 2022 08:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55463 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 55463-submit@debbugs.gnu.org id=B55463.165277614717732 (code B ref 55463); Tue, 17 May 2022 08:30:02 +0000 Original-Received: (at 55463) by debbugs.gnu.org; 17 May 2022 08:29:07 +0000 Original-Received: from localhost ([127.0.0.1]:55802 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqsZm-0004bw-K9 for submit@debbugs.gnu.org; Tue, 17 May 2022 04:29:06 -0400 Original-Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:52011) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqsZl-0004bS-2c for 55463@debbugs.gnu.org; Tue, 17 May 2022 04:29:05 -0400 Original-Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id E2D4932008FF; Tue, 17 May 2022 04:28:58 -0400 (EDT) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 17 May 2022 04:28:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=teloden.nl; h=cc :cc:content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm3; t=1652776138; x=1652862538; bh=LXzrZTBP6y Efxl2FdXc8uQHiFYYoEgHOwt2vqLrG6io=; b=KQcBBp2Kl67NXs7D+YTTalHtvY Qvh5zlX0k5Ee9DXB3BMt0Nljt+VXxqRTu8txy9lXQk6zobyIJyXf13RaisA6j23O WGfzdfl7FlQCliZY/ypXKxFGzY9sZG79hS7vefp6kt06Det6z/t+8tltEfKTAXL6 26XWzwY5BBQXG8+lpgYohKK07xWOCX+kaIpOs5gHxF0l018OxIcZAoGpBy+rq59+ 8OZjw/grooYQrLQ0B0G4UdaPVVdExdwCD0njMjEUq8taHx2xUIMcRK/2BmR6zL/y UMs1LwMZ71UAbek3qpnnfU1q93w/JWapNhMrS7HS9CFhAwi+7f3kvxbcT/vw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1652776138; x=1652862538; bh=LXzrZTBP6yEfxl2FdXc8uQHiFYYo EgHOwt2vqLrG6io=; b=h7UlVOj8xrh0Pvc05SEMbsy3GS/TpdH6uoWgKvP299Vb Gsl33riS1N7qt2Xi3vxJIOd4kyijFNk2cS+DxS//lIhN5yJIhdCrlwPiIDsPvAuu JFOr6E+m+kPj31/NRXVY6fPAxtTgdH564tQbBMbpjT5mRRWPa9745DhnOSl+GdIi mrqITmYWXLTCeS1rdvtbMQiw3Yerled2Xk0ciNVwgYyL/FGZClv74iwH7l5UhOqb C3C1qLr1tsY0Co3ZiTDTQdg0cyY8QFvBIe4iNXEeo6kolklLLov3Df4J1ET7tmmX F3SJSoPOxoD//FRHVfxjenPdHhGoB6YMFpFxDC/aQQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrheejgddtvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepkffuhffvveffjghftggfggesmhdtre ertderjeenucfhrhhomheprfhivghtvghruchvrghnucfrrhhoohhijhgvnhcuoehpihgv thgvrhdrvhgrnhdrphhrohhoihhjvghnsehtvghlohguvghnrdhnlheqnecuggftrfgrth htvghrnhepffdvteeflefgffffhfektddvffejiefguedvtdekueeifefhhfdtjefhkeet ffelnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepph hivghtvghrrdhvrghnrdhprhhoohhijhgvnhesthgvlhhouggvnhdrnhhl X-ME-Proxy: Feedback-ID: i74014752:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 17 May 2022 04:28:57 -0400 (EDT) In-Reply-To: <87czgdnf3t.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: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:232423 Archived-At: --=-UySzVh2akZE/nrPe4xGb Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi,=20 I've reverted the change in the comment, here's the patch without that change. Kind Regards, Pieter On Tue, 2022-05-17 at 09:05 +0800, Po Lu wrote: > Pieter van Prooijen writes: >=20 > > Hello All, > >=20 > > This is a small patch to make the recent gsettings font rendering > > changes compile when pgtk is configured but gsettings is not. >=20 > Thanks. >=20 > > -/* Return the cairo font options, updated from the gsettings font > > -=C2=A0=C2=A0 config entries.=C2=A0 The caller should call > > cairo_font_options_destroy > > -=C2=A0=C2=A0 on the result.=C2=A0 */ > > +/* Return the cairo font options, optionally updated from the > > gsettings > > +=C2=A0=C2=A0 font config entries.=C2=A0 The caller should call > > +=C2=A0=C2=A0 cairo_font_options_destroy on the result.=C2=A0 */ >=20 > I think this change is extraneous.=C2=A0 That comment doesn't have to be > so > detailed, since building Emacs without GSettings support is a rather > oddball configuration, and it obviously cannot be used without > support > being built-in. >=20 > Otherwise, LGTM. --=-UySzVh2akZE/nrPe4xGb Content-Disposition: attachment; filename*0=0001-Fix-font-options-compilation-with-gsettings-disabled.pat; filename*1=ch Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0001-Fix-font-options-compilation-with-gsettings-disabled.patch"; charset="UTF-8" RnJvbSAzNTQ4ZTZkYmM1ZTgyMGE0OGYwZWQ0ODg1YTkxMmVhZDM5ZjliZjk0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaWV0ZXIgdmFuIFByb29pamVuIDxwaWV0ZXIudmFuLnByb29p amVuQHRlbG9kZW4ubmw+CkRhdGU6IE1vbiwgMTYgTWF5IDIwMjIgMTU6MjA6MjcgKzAyMDAKU3Vi amVjdDogW1BBVENIXSBGaXggZm9udCBvcHRpb25zIGNvbXBpbGF0aW9uIHdpdGggZ3NldHRpbmdz IGRpc2FibGVkCgoqIHNyYy94c2V0dGluZ3MuYyAoeHNldHRpbmdzX2dldF9mb250X29wdGlvbnMp OiBSZXR1cm4gYSBmb250X29wdGlvbnMKZXZlbiBpZiBnc2V0dGluZ3MgaXMgbm90IGVuYWJsZWQu Ci0tLQogc3JjL3hzZXR0aW5ncy5jIHwgMTcgKysrKysrKysrKystLS0tLS0KIDEgZmlsZSBjaGFu Z2VkLCAxMSBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy94 c2V0dGluZ3MuYyBiL3NyYy94c2V0dGluZ3MuYwppbmRleCAyZTMzZWY5NThhLi40NTM0MWQ4ZWJk IDEwMDY0NAotLS0gYS9zcmMveHNldHRpbmdzLmMKKysrIGIvc3JjL3hzZXR0aW5ncy5jCkBAIC0y MDYsNiArMjA2LDExIEBAICNkZWZpbmUgWFNFVFRJTkdTX1RPT0xfQkFSX1NUWUxFICAiR3RrL1Rv b2xiYXJTdHlsZSIKICAgdW5zaWduZWQgc2VlbjsKIH07CiAKKyNpZmRlZiBIQVZFX1BHVEsKKy8q IFRoZSBjYWlybyBmb250X29wdGlvbnMgYXMgb2J0YWluZWQgdXNpbmcgZ3NldHRpbmdzLiAgKi8K K3N0YXRpYyBjYWlyb19mb250X29wdGlvbnNfdCAqZm9udF9vcHRpb25zOworI2VuZGlmCisKICNp ZmRlZiBIQVZFX0dTRVRUSU5HUwogI2RlZmluZSBHU0VUVElOR1NfU0NIRU1BICAgICAgICAgIm9y Zy5nbm9tZS5kZXNrdG9wLmludGVyZmFjZSIKICNkZWZpbmUgR1NFVFRJTkdTX1RPT0xfQkFSX1NU WUxFICJ0b29sYmFyLXN0eWxlIgpAQCAtMjI1LDExICsyMzAsNiBAQCAjZGVmaW5lIEdTRVRUSU5H U19GT05UX0hJTlRJTkcgICAgICAgImZvbnQtaGludGluZyIKIAogc3RhdGljIEdTZXR0aW5ncyAq Z3NldHRpbmdzX2NsaWVudDsKIAotI2lmZGVmIEhBVkVfUEdUSwotCi0vKiBUaGUgY2Fpcm8gZm9u dF9vcHRpb25zIGFzIG9idGFpbmVkIHVzaW5nIGdzZXR0aW5ncy4gICovCi1zdGF0aWMgY2Fpcm9f Zm9udF9vcHRpb25zX3QgKmZvbnRfb3B0aW9uczsKLQogc3RhdGljIGJvb2wKIHhnX3NldHRpbmdz X2tleV92YWxpZF9wIChHU2V0dGluZ3MgKnNldHRpbmdzLCBjb25zdCBjaGFyICprZXkpCiB7CkBA IC0yNTMsNiArMjUzLDcgQEAgeGdfc2V0dGluZ3Nfa2V5X3ZhbGlkX3AgKEdTZXR0aW5ncyAqc2V0 dGluZ3MsIGNvbnN0IGNoYXIgKmtleSkKICNlbmRpZgogfQogCisjaWZkZWYgSEFWRV9QR1RLCiAv KiBTdG9yZSBhbiBldmVudCBmb3IgcmUtcmVuZGVyaW5nIG9mIHRoZSBmb250cy4gICovCiBzdGF0 aWMgdm9pZAogc3RvcmVfZm9udF9vcHRpb25zX2NoYW5nZWQgKHZvaWQpCkBAIC0xMjA2LDcgKzEy MDcsMTEgQEAgeHNldHRpbmdzX2dldF9zeXN0ZW1fbm9ybWFsX2ZvbnQgKHZvaWQpCiBjYWlyb19m b250X29wdGlvbnNfdCAqCiB4c2V0dGluZ3NfZ2V0X2ZvbnRfb3B0aW9ucyAodm9pZCkKIHsKLSAg cmV0dXJuIGNhaXJvX2ZvbnRfb3B0aW9uc19jb3B5IChmb250X29wdGlvbnMpOworICBpZiAoZm9u dF9vcHRpb25zICE9IE5VTEwpCisgICAgcmV0dXJuIGNhaXJvX2ZvbnRfb3B0aW9uc19jb3B5IChm b250X29wdGlvbnMpOworICBlbHNlCisgICAgLyogR1NldHRpbmdzIGlzIG5vdCBjb25maWd1cmVk LiAgKi8KKyAgICByZXR1cm4gY2Fpcm9fZm9udF9vcHRpb25zX2NyZWF0ZSAoKTsKIH0KICNlbmRp ZgogCi0tIAoyLjM0LjEKCg== --=-UySzVh2akZE/nrPe4xGb--