GNU bug report logs - #31856
27.0.50; [PATCH] Fix --with-cairo build

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 31856 in the body.
You can then email your comments to 31856 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Ari Roponen <ari.roponen <at> gmail.com>
To: bug-gnu-emacs <at> gnu.org
Subject: 27.0.50; [PATCH] Fix --with-cairo build
Date: Sat, 16 Jun 2018 08:50:30 +0300

[Message part 1 (text/plain, inline)]

The attached patch allows --with-cairo build to compile again.

[0001-Fix-with-cairo-build.patch (text/x-patch, inline)]

From 1e192db531ad8720abee4174c27ab1f64d252ffa Mon Sep 17 00:00:00 2001
From: Ari Roponen <ari.roponen <at> gmail.com>
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

[Message part 3 (text/plain, inline)]

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)

Message #10 received at 31856-done <at> debbugs.gnu.org (full text, mbox):

From: Eli Zaretskii <eliz <at> gnu.org>
To: Ari Roponen <ari.roponen <at> gmail.com>
Cc: 31856-done <at> debbugs.gnu.org
Subject: Re: bug#31856: 27.0.50; [PATCH] Fix --with-cairo build
Date: Sat, 16 Jun 2018 10:17:59 +0300

> From: Ari Roponen <ari.roponen <at> gmail.com>
> Date: Sat, 16 Jun 2018 08:50:30 +0300
> 
> The attached patch allows --with-cairo build to compile again.

Thanks, pushed.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.