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: Mon, 16 May 2022 22:22:23 +0200 Message-ID: <6f99df01f4a1e7a3ddec018dc2e00b4977208055.camel@teloden.nl> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-oSVw9SW31KlsVizLVayz" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="3881"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Evolution 3.44.0-1ubuntu1 Cc: wilde@sha-bang.de To: 55463@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon May 16 22:23:27 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 1nqhFW-0000iu-2q for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 16 May 2022 22:23:27 +0200 Original-Received: from localhost ([::1]:39162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqhFU-0007eh-N1 for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 16 May 2022 16:23:24 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:53216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqhF9-0007cF-Ug for bug-gnu-emacs@gnu.org; Mon, 16 May 2022 16:23:04 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:32991) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nqhF9-0001mL-Kl for bug-gnu-emacs@gnu.org; Mon, 16 May 2022 16:23:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nqhF8-0004Ux-Dc for bug-gnu-emacs@gnu.org; Mon, 16 May 2022 16:23: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: Mon, 16 May 2022 20:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 55463 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.165273255617241 (code B ref -1); Mon, 16 May 2022 20:23:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 16 May 2022 20:22:36 +0000 Original-Received: from localhost ([127.0.0.1]:55121 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqhEi-0004U1-BX for submit@debbugs.gnu.org; Mon, 16 May 2022 16:22:36 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:38592) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nqhEg-0004Tt-42 for submit@debbugs.gnu.org; Mon, 16 May 2022 16:22:34 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:53154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqhEf-0007At-TA for bug-gnu-emacs@gnu.org; Mon, 16 May 2022 16:22:33 -0400 Original-Received: from out3-smtp.messagingengine.com ([66.111.4.27]:48009) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqhEd-0001k1-TI for bug-gnu-emacs@gnu.org; Mon, 16 May 2022 16:22:33 -0400 Original-Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id E378F5C0135; Mon, 16 May 2022 16:22:29 -0400 (EDT) Original-Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 16 May 2022 16:22:29 -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:message-id :mime-version:reply-to:sender:subject:subject:to:to; s=fm3; t= 1652732549; x=1652818949; bh=1W6IXeihE9JStYCMBr6TdFYLaKn/tLPnrU+ ieW0XxWY=; b=KX+xFwPids5l207zmb6NBaufIp8iwJKvj73OMLK79wnpIBMOjYK Tz6btVuKJ+HG4DzvrQkuJYExBCLBaTDgItaLdwi9QCaWgGU84FQWnr9TM6W2GZRb RUxxeSDB5al7qG0LeRlf7jDSE0OxYvM3nkurW4fQkEABsyCvdZ3RWV9bON90IeuS NgeqMElDVdkYZQDDhDdOJXcHE6xHkEpphDLmdqUdY/J+NGnee7lB+OzIm3yHwntb xUEWXphFLAQX0ZJa0ReOddrvzNrJrjQbu3Q3PCNBFIIjNOLlG0lUIoiLNLVS8Zft uybjtQ9kz4weuSUmj1KWJe6Gd4uP0h13vdA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:from:from :in-reply-to:message-id:mime-version: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=1652732549; x=1652818949; bh=1W6IXeihE9JSt YCMBr6TdFYLaKn/tLPnrU+ieW0XxWY=; b=N+YJzLcsL3EY6izqr3C/K0BliT93J u1UIs2e1iAKemuc+GfNSYbI0AaXJvq1eXepJbUNf/sa9Bq60CG06Ew5yXcycTJEl oB7CGpnqpGRtiNJ92CjLXKyZCmao++WBd/mL37e40yudP1vtTWyAalgGSCals6tS hdXC9UCd4C3Ka01Z6e7f0PGH2O015WOpMlpOnrrY7o0Mc1ZxxK78WtJ+zMiX7PL3 Zm0hV9yIDlELIknObqXX1BvQBAlmgcSUBJzz9JoDu191f8HgPfLcmzSMiFAFupwo W5t6AVfGOX1E53pQT5gIzr8FbNDNBi+5NhpFfbAvgnWW7Zw4u8qCYbpHw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrheehgddugeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefkuffhvfevffgtfgggsehmtderre dtreejnecuhfhrohhmpefrihgvthgvrhcuvhgrnhcurfhrohhoihhjvghnuceophhivght vghrrdhvrghnrdhprhhoohhijhgvnhesthgvlhhouggvnhdrnhhlqeenucggtffrrghtth gvrhhnpeeiudethfetgfevleelgfevhedtueevueevjeduvddthfdttdehfffhleevleet heenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehpih gvthgvrhdrvhgrnhdrphhrohhoihhjvghnsehtvghlohguvghnrdhnlh X-ME-Proxy: Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 16 May 2022 16:22:27 -0400 (EDT) Received-SPF: pass client-ip=66.111.4.27; envelope-from=pieter.van.prooijen@teloden.nl; helo=out3-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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:232412 Archived-At: --=-oSVw9SW31KlsVizLVayz Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello All, This is a small patch to make the recent gsettings font rendering changes compile when pgtk is configured but gsettings is not. Kind Regards, Pieter van Prooijen --=-oSVw9SW31KlsVizLVayz Content-Disposition: attachment; filename*0=0001-Fix-font-options-compilation-with-gsettings-disabled.pat; filename*1=ch Content-Type: text/x-patch; name="0001-Fix-font-options-compilation-with-gsettings-disabled.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSAzYzk3MDc0ODM3MWYyODhkNDA2ODA0MmU4Y2M2ZTdlNzA4OTA0MGJkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaWV0ZXIgdmFuIFByb29pamVuIDxwaWV0ZXIudmFuLnByb29p amVuQHRlbG9kZW4ubmw+CkRhdGU6IE1vbiwgMTYgTWF5IDIwMjIgMTU6MjA6MjcgKzAyMDAKU3Vi amVjdDogW1BBVENIXSBGaXggZm9udCBvcHRpb25zIGNvbXBpbGF0aW9uIHdpdGggZ3NldHRpbmdz IGRpc2FibGVkCgoqIHNyYy94c2V0dGluZ3MuYyAoeHNldHRpbmdzX2dldF9mb250X29wdGlvbnMp OiBSZXR1cm4gYSBmb250X29wdGlvbnMKZXZlbiBpZiBnc2V0dGluZ3MgaXMgbm90IGVuYWJsZWQu Ci0tLQogc3JjL3hzZXR0aW5ncy5jIHwgMjMgKysrKysrKysrKysrKystLS0tLS0tLS0KIDEgZmls ZSBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L3NyYy94c2V0dGluZ3MuYyBiL3NyYy94c2V0dGluZ3MuYwppbmRleCAyZTMzZWY5NThhLi41M2Q4 YTI1ZTE2IDEwMDY0NAotLS0gYS9zcmMveHNldHRpbmdzLmMKKysrIGIvc3JjL3hzZXR0aW5ncy5j CkBAIC0yMDYsNiArMjA2LDExIEBAICNkZWZpbmUgWFNFVFRJTkdTX1RPT0xfQkFSX1NUWUxFICAi R3RrL1Rvb2xiYXJTdHlsZSIKICAgdW5zaWduZWQgc2VlbjsKIH07CiAKKyNpZmRlZiBIQVZFX1BH VEsKKy8qIFRoZSBjYWlybyBmb250X29wdGlvbnMgYXMgb2J0YWluZWQgdXNpbmcgZ3NldHRpbmdz LiAgKi8KK3N0YXRpYyBjYWlyb19mb250X29wdGlvbnNfdCAqZm9udF9vcHRpb25zOworI2VuZGlm CisKICNpZmRlZiBIQVZFX0dTRVRUSU5HUwogI2RlZmluZSBHU0VUVElOR1NfU0NIRU1BICAgICAg ICAgIm9yZy5nbm9tZS5kZXNrdG9wLmludGVyZmFjZSIKICNkZWZpbmUgR1NFVFRJTkdTX1RPT0xf QkFSX1NUWUxFICJ0b29sYmFyLXN0eWxlIgpAQCAtMjI1LDExICsyMzAsNiBAQCAjZGVmaW5lIEdT RVRUSU5HU19GT05UX0hJTlRJTkcgICAgICAgImZvbnQtaGludGluZyIKIAogc3RhdGljIEdTZXR0 aW5ncyAqZ3NldHRpbmdzX2NsaWVudDsKIAotI2lmZGVmIEhBVkVfUEdUSwotCi0vKiBUaGUgY2Fp cm8gZm9udF9vcHRpb25zIGFzIG9idGFpbmVkIHVzaW5nIGdzZXR0aW5ncy4gICovCi1zdGF0aWMg Y2Fpcm9fZm9udF9vcHRpb25zX3QgKmZvbnRfb3B0aW9uczsKLQogc3RhdGljIGJvb2wKIHhnX3Nl dHRpbmdzX2tleV92YWxpZF9wIChHU2V0dGluZ3MgKnNldHRpbmdzLCBjb25zdCBjaGFyICprZXkp CiB7CkBAIC0yNTMsNiArMjUzLDcgQEAgeGdfc2V0dGluZ3Nfa2V5X3ZhbGlkX3AgKEdTZXR0aW5n cyAqc2V0dGluZ3MsIGNvbnN0IGNoYXIgKmtleSkKICNlbmRpZgogfQogCisjaWZkZWYgSEFWRV9Q R1RLCiAvKiBTdG9yZSBhbiBldmVudCBmb3IgcmUtcmVuZGVyaW5nIG9mIHRoZSBmb250cy4gICov CiBzdGF0aWMgdm9pZAogc3RvcmVfZm9udF9vcHRpb25zX2NoYW5nZWQgKHZvaWQpCkBAIC0xMjAw LDEzICsxMjAxLDE3IEBAIHhzZXR0aW5nc19nZXRfc3lzdGVtX25vcm1hbF9mb250ICh2b2lkKQog I2VuZGlmCiAKICNpZmRlZiBIQVZFX1BHVEsKLS8qIFJldHVybiB0aGUgY2Fpcm8gZm9udCBvcHRp b25zLCB1cGRhdGVkIGZyb20gdGhlIGdzZXR0aW5ncyBmb250Ci0gICBjb25maWcgZW50cmllcy4g IFRoZSBjYWxsZXIgc2hvdWxkIGNhbGwgY2Fpcm9fZm9udF9vcHRpb25zX2Rlc3Ryb3kKLSAgIG9u IHRoZSByZXN1bHQuICAqLworLyogUmV0dXJuIHRoZSBjYWlybyBmb250IG9wdGlvbnMsIG9wdGlv bmFsbHkgdXBkYXRlZCBmcm9tIHRoZSBnc2V0dGluZ3MKKyAgIGZvbnQgY29uZmlnIGVudHJpZXMu ICBUaGUgY2FsbGVyIHNob3VsZCBjYWxsCisgICBjYWlyb19mb250X29wdGlvbnNfZGVzdHJveSBv biB0aGUgcmVzdWx0LiAgKi8KIGNhaXJvX2ZvbnRfb3B0aW9uc190ICoKIHhzZXR0aW5nc19nZXRf Zm9udF9vcHRpb25zICh2b2lkKQogewotICByZXR1cm4gY2Fpcm9fZm9udF9vcHRpb25zX2NvcHkg KGZvbnRfb3B0aW9ucyk7CisgIGlmIChmb250X29wdGlvbnMgIT0gTlVMTCkKKyAgICByZXR1cm4g Y2Fpcm9fZm9udF9vcHRpb25zX2NvcHkgKGZvbnRfb3B0aW9ucyk7CisgIGVsc2UKKyAgICAvKiBH U2V0dGluZ3MgaXMgbm90IGNvbmZpZ3VyZWQuICAqLworICAgIHJldHVybiBjYWlyb19mb250X29w dGlvbnNfY3JlYXRlICgpOwogfQogI2VuZGlmCiAKLS0gCjIuMzQuMQoK --=-oSVw9SW31KlsVizLVayz--