From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Robert Pluim Newsgroups: gmane.emacs.devel Subject: Re: emacs-26 build breaking on RHEL 6.6 GTK2 Date: Wed, 24 Jan 2018 17:12:16 +0100 Message-ID: <878tcnjkwv.fsf@gmail.com> References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1516810248 19964 195.159.176.226 (24 Jan 2018 16:10:48 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 24 Jan 2018 16:10:48 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.91 (gnu/linux) Cc: martin rudalics , Emacs developers To: Kaushal Modi Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 24 17:10:44 2018 Return-path: Envelope-to: ged-emacs-devel@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 1eeNd9-0004Ec-3Y for ged-emacs-devel@m.gmane.org; Wed, 24 Jan 2018 17:10:31 +0100 Original-Received: from localhost ([::1]:57607 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeNf9-0001T9-EW for ged-emacs-devel@m.gmane.org; Wed, 24 Jan 2018 11:12:35 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52954) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeNey-0001SY-KI for emacs-devel@gnu.org; Wed, 24 Jan 2018 11:12:25 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eeNet-0000mJ-MZ for emacs-devel@gnu.org; Wed, 24 Jan 2018 11:12:24 -0500 Original-Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]:40677) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eeNet-0000lQ-Eq for emacs-devel@gnu.org; Wed, 24 Jan 2018 11:12:19 -0500 Original-Received: by mail-wm0-x22b.google.com with SMTP id v123so9627673wmd.5 for ; Wed, 24 Jan 2018 08:12:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:mail-followup-to:mail-copies-to :gmane-reply-to-list:date:in-reply-to:message-id:user-agent :mime-version; bh=t5t/zVm74UbrH9hvfnf4vEspMCm0b2LYZ8f6Feb20kY=; b=mrqDT6hWG78p2cE4qygh8KEWA2ecTUWwB3R4smiW6MYOU5qBhuTm2Lm/atdP5H/ZKv GloKpzyGSNJgEc/SO0ZiHKw/AUwzjtFU63McqeOsDWhMckJtFP7f7jxvE4jLO2DAAnZY UPQQsDPFgRGphpaYvVYgEyXLXWuXOg5QJmK4YRF1cnIBhor0B7Zczez7cZlYNmuQZ8CQ 4amynIeKcbs8PRc0+OIo1naVxHcjp5LLwp9VlX5xwlIuawOagK7XiW9GkH/T5vVBvIXw kAoDg+AgrCLZWxItCrkS3CFCzPIunMizdpGnetbCtJOjR7IOOe1pQu/4HcmjLSlfQ8d9 xQ7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:mail-followup-to :mail-copies-to:gmane-reply-to-list:date:in-reply-to:message-id :user-agent:mime-version; bh=t5t/zVm74UbrH9hvfnf4vEspMCm0b2LYZ8f6Feb20kY=; b=jO3i66zIb5Xs/KLWDzgBV0ilFnA6KI1DfKTQkg8uiU8bLDIiNdyThmV6vsiUJzdcqV N5sqjCVrWYu2d+9T6/lLlOVDJixv6Z2IVenDoYhxgUlpaqdLsgg7MvIhd9rlQOCg2m+V vgNo/E8bYYjS//rWSiaJ6Dzwtc7s5ZeUjLDGlPH9ApvJovI3VjHJoMTzi0uvyOXpwbCQ t9ZYjV7N1TbswW6uiZ3cF5WzeLu8oPQVG6AvqeenBd6MnBBySCKnqXew2b3x+xjfxDFS 0iRaVocfaX7SZEkGLSom8/sR0MuZLn/zIWA+0Kb5F8SgLNXJ+3VLrCzx0WooVhj6tTcZ w8YA== X-Gm-Message-State: AKwxytfwAw/7hvXEwPmhQ+Q6SjhDaL0Gk7F+lmMpuALadJHV93IoKLn4 gsvbO2Vmss87MlqEQ9VWIHA= X-Google-Smtp-Source: AH8x227a0RyurWpOjyClgQ7zJ1jnfa0iInXzIhjQVS+wKc4bGMjGossNq+PEpCbyfiE8hyjnkS4jyQ== X-Received: by 10.28.125.19 with SMTP id y19mr4878063wmc.101.1516810338288; Wed, 24 Jan 2018 08:12:18 -0800 (PST) Original-Received: from rpluim-ubuntu ([149.5.228.1]) by smtp.gmail.com with ESMTPSA id v80sm513828wmv.17.2018.01.24.08.12.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jan 2018 08:12:17 -0800 (PST) Mail-Followup-To: emacs-devel@gnu.org Mail-Copies-To: never Gmane-Reply-To-List: yes In-Reply-To: (Kaushal Modi's message of "Wed, 24 Jan 2018 15:48:56 +0000") X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22b X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:222185 Archived-At: --=-=-= Content-Type: text/plain Kaushal Modi writes: > Hello, > > emacs-26 build is breaking after the last 2 commits ([1], [2]) related to > GTK. This is after "make bootstrap". > Eek, GTK2. How about the following: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Only-check-for-scaling-on-GTK3.patch >From 3d4e551f3481558680a57351c6abed8321578cbd Mon Sep 17 00:00:00 2001 From: Robert Pluim Date: Wed, 24 Jan 2018 17:02:50 +0100 Subject: [PATCH] Only check for scaling on GTK3 * src/xfns.c (Fx_display_monitor_attributes_list): Only check for scaling on GTK3 --- src/xfns.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xfns.c b/src/xfns.c index 4ea5113265..3dbd669edc 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -4940,7 +4940,7 @@ Internal use only, use `display-monitor-attributes-list' instead. */) gint width_mm = -1, height_mm = -1; GdkRectangle rec, work; struct MonitorInfo *mi = &monitors[i]; - int scale; + int scale = 1; #if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *monitor = gdk_display_get_monitor (gdpy, i); @@ -4989,7 +4989,7 @@ Internal use only, use `display-monitor-attributes-list' instead. */) /* GTK returns scaled sizes for the workareas. */ #if GTK_CHECK_VERSION (3, 22, 0) scale = gdk_monitor_get_scale_factor (monitor); -#else +#elif defined HAVE_GTK3 scale = gdk_screen_get_monitor_scale_factor (gscreen, i); #endif rec.width *= scale; -- 2.16.0.rc1 --=-=-=--