From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#31288: 27.0.50; [PATCH] Make cairo build somewhat usable Date: Fri, 27 Apr 2018 17:15:22 +0300 Message-ID: <83wowsu45h.fsf@gnu.org> References: <87lgd8kcrv.fsf@gmail.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1524838496 18399 195.159.176.226 (27 Apr 2018 14:14:56 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 27 Apr 2018 14:14:56 +0000 (UTC) Cc: 31288@debbugs.gnu.org To: Ari Roponen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Apr 27 16:14:52 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 1fC49D-0004gT-2h for geb-bug-gnu-emacs@m.gmane.org; Fri, 27 Apr 2018 16:14:51 +0200 Original-Received: from localhost ([::1]:48378 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fC4BJ-0001ZL-Vm for geb-bug-gnu-emacs@m.gmane.org; Fri, 27 Apr 2018 10:17:02 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39109) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fC4AR-00012a-Bf for bug-gnu-emacs@gnu.org; Fri, 27 Apr 2018 10:16:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fC4AM-0001Re-DA for bug-gnu-emacs@gnu.org; Fri, 27 Apr 2018 10:16:07 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:33435) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fC4AM-0001RF-AC for bug-gnu-emacs@gnu.org; Fri, 27 Apr 2018 10:16:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fC4AM-000449-1l for bug-gnu-emacs@gnu.org; Fri, 27 Apr 2018 10:16:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 27 Apr 2018 14:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31288 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 31288-submit@debbugs.gnu.org id=B31288.152483854515603 (code B ref 31288); Fri, 27 Apr 2018 14:16:02 +0000 Original-Received: (at 31288) by debbugs.gnu.org; 27 Apr 2018 14:15:45 +0000 Original-Received: from localhost ([127.0.0.1]:41332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fC4A5-00043b-IQ for submit@debbugs.gnu.org; Fri, 27 Apr 2018 10:15:45 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:48048) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fC4A3-00043O-8f for 31288@debbugs.gnu.org; Fri, 27 Apr 2018 10:15:44 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fC49s-0001F0-Jj for 31288@debbugs.gnu.org; Fri, 27 Apr 2018 10:15:37 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:33835) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fC49s-0001Er-Fh; Fri, 27 Apr 2018 10:15:32 -0400 Original-Received: from [176.228.60.248] (port=3020 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fC49r-00066e-U7; Fri, 27 Apr 2018 10:15:32 -0400 In-reply-to: <87lgd8kcrv.fsf@gmail.com> (message from Ari Roponen on Fri, 27 Apr 2018 16:19:16 +0300) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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:145787 Archived-At: > From: Ari Roponen > Date: Fri, 27 Apr 2018 16:19:16 +0300 > > Attached are two patches to make --with-cairo builds more usable. > > First patch tries to fix screen corruption, and the second patch allows > cairo builds to display images. Thank you for working on this. Please allow me a couple of minor comments on the changes: > @@ -1236,7 +1231,8 @@ x_update_end (struct frame *f) > { > cairo_t *cr = 0; > block_input(); > -#if defined (USE_GTK) && defined (HAVE_GTK3) > + /* FIXME */ > +#if 0 && defined (USE_GTK) && defined (HAVE_GTK3) > if (FRAME_GTK_WIDGET (f)) > { > GdkWindow *w = gtk_widget_get_window (FRAME_GTK_WIDGET (f)); This hunk doesn't look right. If the code in question causes some trouble to a Cairo build, please ifdef it out only when USE_CAIRO is defined, not unconditionally. And if that still needs a FIXME comment, please add some description of what needs to be fixed and why. > + cairo_surface_destroy (s); > + } else { > + SET_FRAME_GARBAGED (f); Please use GNU style of braces. Thanks again.