From unknown Sat Aug 16 22:48:11 2025 X-Loop: help-debbugs@gnu.org Subject: bug#31856: 27.0.50; [PATCH] Fix --with-cairo build 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 To: 31856@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.152912825232032 (code B ref -1); Sat, 16 Jun 2018 05:51:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Jun 2018 05:50:52 +0000 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 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 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 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 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 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 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 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 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) 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) From: Ari Roponen Date: Sat, 16 Jun 2018 08:50:30 +0300 Message-ID: <878t7f5lg9.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) --=-=-= 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) --=-=-=-- From unknown Sat Aug 16 22:48:11 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Ari Roponen Subject: bug#31856: closed (Re: bug#31856: 27.0.50; [PATCH] Fix --with-cairo build) Message-ID: References: <83bmcb19p4.fsf@gnu.org> <878t7f5lg9.fsf@gmail.com> X-Gnu-PR-Message: they-closed 31856 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: patch Reply-To: 31856@debbugs.gnu.org Date: Sat, 16 Jun 2018 07:19:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1529133542-7512-1" This is a multi-part message in MIME format... ------------=_1529133542-7512-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #31856: 27.0.50; [PATCH] Fix --with-cairo build which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 31856@debbugs.gnu.org. --=20 31856: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D31856 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1529133542-7512-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 31856-done) by debbugs.gnu.org; 16 Jun 2018 07:18:22 +0000 Received: from localhost ([127.0.0.1]:50899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fU5Ta-0001wL-2K for submit@debbugs.gnu.org; Sat, 16 Jun 2018 03:18:22 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36141) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fU5TX-0001w7-JX for 31856-done@debbugs.gnu.org; Sat, 16 Jun 2018 03:18:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fU5TN-0005qE-8t for 31856-done@debbugs.gnu.org; Sat, 16 Jun 2018 03:18:14 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:33524) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fU5TN-0005pn-63; Sat, 16 Jun 2018 03:18:09 -0400 Received: from [176.228.60.248] (port=2921 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fU5TM-0008VX-1D; Sat, 16 Jun 2018 03:18:08 -0400 Date: Sat, 16 Jun 2018 10:17:59 +0300 Message-Id: <83bmcb19p4.fsf@gnu.org> From: Eli Zaretskii To: Ari Roponen In-reply-to: <878t7f5lg9.fsf@gmail.com> (message from Ari Roponen on Sat, 16 Jun 2018 08:50:30 +0300) Subject: Re: bug#31856: 27.0.50; [PATCH] Fix --with-cairo build References: <878t7f5lg9.fsf@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 31856-done Cc: 31856-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Eli Zaretskii Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) > From: Ari Roponen > Date: Sat, 16 Jun 2018 08:50:30 +0300 > > The attached patch allows --with-cairo build to compile again. Thanks, pushed. ------------=_1529133542-7512-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 16 Jun 2018 05:50:52 +0000 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 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 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 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 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 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 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 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 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) 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) From: Ari Roponen To: bug-gnu-emacs@gnu.org Subject: 27.0.50; [PATCH] Fix --with-cairo build Date: Sat, 16 Jun 2018 08:50:30 +0300 Message-ID: <878t7f5lg9.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) --=-=-= 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) --=-=-=-- ------------=_1529133542-7512-1--