From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Ari Roponen Newsgroups: gmane.emacs.bugs Subject: bug#31856: 27.0.50; [PATCH] Fix --with-cairo build Date: Sat, 16 Jun 2018 08:50:30 +0300 Message-ID: <878t7f5lg9.fsf@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1529128158 29902 195.159.176.226 (16 Jun 2018 05:49:18 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 16 Jun 2018 05:49:18 +0000 (UTC) To: 31856@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Jun 16 07:49:13 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fU45I-0007S5-LW for geb-bug-gnu-emacs@m.gmane.org; Sat, 16 Jun 2018 07:49:12 +0200 Original-Received: from localhost ([::1]:50357 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fU47I-0002QD-TB for geb-bug-gnu-emacs@m.gmane.org; Sat, 16 Jun 2018 01:51:16 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46761) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fU479-0002Q8-KO for bug-gnu-emacs@gnu.org; Sat, 16 Jun 2018 01:51:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fU474-0004Zn-OB for bug-gnu-emacs@gnu.org; Sat, 16 Jun 2018 01:51:07 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:42964) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fU474-0004Yd-Il for bug-gnu-emacs@gnu.org; Sat, 16 Jun 2018 01:51:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fU474-0008L0-CT for bug-gnu-emacs@gnu.org; Sat, 16 Jun 2018 01:51:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Ari Roponen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 16 Jun 2018 05:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 31856 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.152912825232032 (code B ref -1); Sat, 16 Jun 2018 05:51:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 16 Jun 2018 05:50:52 +0000 Original-Received: from localhost ([127.0.0.1]:50861 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fU46u-0008Ka-Lq for submit@debbugs.gnu.org; Sat, 16 Jun 2018 01:50:52 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:55741) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fU46t-0008KL-5O for submit@debbugs.gnu.org; Sat, 16 Jun 2018 01:50:51 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fU46n-00039A-1i for submit@debbugs.gnu.org; Sat, 16 Jun 2018 01:50:45 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:56380) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fU46m-00036i-RZ for submit@debbugs.gnu.org; Sat, 16 Jun 2018 01:50:44 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46711) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fU46i-0002Nn-Jy for bug-gnu-emacs@gnu.org; Sat, 16 Jun 2018 01:50:41 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fU46d-0002YO-DI for bug-gnu-emacs@gnu.org; Sat, 16 Jun 2018 01:50:40 -0400 Original-Received: from mail-lf0-x22f.google.com ([2a00:1450:4010:c07::22f]:35701) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fU46c-0002T5-Ud for bug-gnu-emacs@gnu.org; Sat, 16 Jun 2018 01:50:35 -0400 Original-Received: by mail-lf0-x22f.google.com with SMTP id i15-v6so17547328lfc.2 for ; Fri, 15 Jun 2018 22:50:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=u76Y5N8rId7CiDoibZmPJE+EFpzT51NSrkv8vL6ZNj8=; b=SziMGMZwPuuJk+JcTUVDTCATF8T38ufwDaWnYMXKd1C6aWLH1dahBWpHiwo4SNZLvb qDks61q9+DNJ5uGN5l78akDTr1TTA8qDrIHSoPB7kv4J+TzSCHNCu21/sTckse2O0x5j 5qOGhSsRAjRKpvNi98W5kYexl4aU52fSzqtMcscz6bzhZ7cc9lDi7a0xHYnlUMQT8JPw 2dkyMyh2srOAkpgNH45sUpnqyca5C17yMWiHXi98ZkOD7V6XcoN5Fc4X3ygNJjglA6Ne tEvg9MZhUEcD1TcAjbxs/DrhcXgpRREzdm6JMus3Dx8LxsmrFG2HBHE9m43j19Ex4mUK ProQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=u76Y5N8rId7CiDoibZmPJE+EFpzT51NSrkv8vL6ZNj8=; b=FZ24VKvuxqVZe+4YARN6cGgOYBNoUGXlXZNceoigd92aQS8gYOk2kVfGYDR7fGn9iw VQTLjzaTe75X/3P+uhZP65lljN7RDkKjlb5vOr+idbJwj6m9/L6IgofIi32Ak87hy4BW kxisFlyPkwJHqJQaNB7GiRmPo1rNLy7p9R3JU2oXPJLFI2fbxGSQSd4PWK1kQc7asPDH G8/k/w5jSVxXMZA2/E/1i6qyICJuXxnwwTDqKd9jsxB9xWH4ddJle6BO/08U92hg2W42 dG3fTkXnmvhDx9rCYrPFWr7wnlbPEkjlbuTKdyJUymZFbGEcUyGOBvIMdw/L5lHcSgZC 7UdQ== X-Gm-Message-State: APt69E3MNnp9O8IpJnBP31wfhKO5wiKI9T1hGVZpYr5leB/l7dt9w1PS sdddplGvWmTwQCR7l0QwgfKoPEs= X-Google-Smtp-Source: ADUXVKIwlwAruBiTxEmZiRU+c8UxK1DE3y4xakOngLIKPv9bpCK+YoZ7L01tKiTVMsp8wwLvuR+Rww== X-Received: by 2002:a19:d405:: with SMTP id l5-v6mr1059845lfg.28.1529128233084; Fri, 15 Jun 2018 22:50:33 -0700 (PDT) Original-Received: from arirop (dsl-jklbng12-54fba1-5.dhcp.inet.fi. [84.251.161.5]) by smtp.gmail.com with ESMTPSA id 4-v6sm1745959ljc.1.2018.06.15.22.50.31 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Jun 2018 22:50:31 -0700 (PDT) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 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.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:147475 Archived-At: --=-=-= Content-Type: text/plain The attached patch allows --with-cairo build to compile again. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-Fix-with-cairo-build.patch >From 1e192db531ad8720abee4174c27ab1f64d252ffa Mon Sep 17 00:00:00 2001 From: Ari Roponen Date: Sat, 16 Jun 2018 08:37:04 +0300 Subject: [PATCH] Fix --with-cairo build * src/xterm.c (x_cr_destroy): Remove extra semicolon. (x_cr_export_frames): Fix pointer vs ptr typo. --- src/xterm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xterm.c b/src/xterm.c index 48ce791889..9504bfb183 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -544,7 +544,7 @@ x_cr_accumulate_data (void *closure, const unsigned char *data, } static void -x_cr_destroy (void *cr); +x_cr_destroy (void *cr) { block_input (); cairo_destroy (cr); @@ -604,7 +604,7 @@ x_cr_export_frames (Lisp_Object frames, cairo_surface_type_t surface_type) cr = cairo_create (surface); cairo_surface_destroy (surface); - record_unwind_protect_pointer (x_cr_destroy, cr); + record_unwind_protect_ptr (x_cr_destroy, cr); while (1) { -- 2.17.1 --=-=-= Content-Type: text/plain In GNU Emacs 27.0.50 (build 4, x86_64-pc-linux-gnu, GTK+ Version 3.22.30, cairo version 1.15.12) of 2018-06-16 built on arirop Repository revision: 04a5876f598e8af3dd11d58758d5bc79104eba64 Windowing system distributor 'Fedora Project', version 11.0.11906000 System Description: Fedora 28 (Twenty Eight) --=-=-=--