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 19:04:59 +0100 Message-ID: <874lnbjfp0.fsf@gmail.com> References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1516817019 22987 195.159.176.226 (24 Jan 2018 18:03:39 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 24 Jan 2018 18:03:39 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.91 (gnu/linux) Cc: martin rudalics , Emacs developers , Kaushal Modi To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 24 19:03:35 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 1eePOF-0004UY-Oh for ged-emacs-devel@m.gmane.org; Wed, 24 Jan 2018 19:03:15 +0100 Original-Received: from localhost ([::1]:35705 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eePQG-0000dU-Bm for ged-emacs-devel@m.gmane.org; Wed, 24 Jan 2018 13:05:20 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59693) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eePQ6-0000aR-In for emacs-devel@gnu.org; Wed, 24 Jan 2018 13:05:14 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eePQ1-0006Rz-07 for emacs-devel@gnu.org; Wed, 24 Jan 2018 13:05:10 -0500 Original-Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]:43349) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eePQ0-0006Rf-Oz; Wed, 24 Jan 2018 13:05:04 -0500 Original-Received: by mail-wm0-x230.google.com with SMTP id g1so10071191wmg.2; Wed, 24 Jan 2018 10:05:04 -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=K0XTVEZnjh5UOleR8sJgB3ld6lii2Ug2LEE/02EGdqo=; b=YIq/+JzhILnOSscnhrRYppU3b4685BPlQXrXIi/34sqReNhUg+bw9vqL6SD2bZaKFs DQTc2Dgefw6TnxenWZ31Cd1LfmfN48gyPCZZLXuFYQQ8+ktd18vJ/LDoRm0P3iAMdJUC /Ody2ymelY87JAZ6Cp1rQNxNjqtcQC2RgkvaCwlu4WMMoxcJWFjHlWm0ME33c+Raa8Ef OGCvFe0qiwRJiFzww/hgZCthpl79xOxYXAws1PSQHmUaUv8wC6hS8thcwuKhDOljhN1H dp4LSlrttSSfwU3y5YU/T+rZNFKPQc5G9u+NtLBQyzlFgvlSWDtK+7jvci4bPnGeoXie P1eg== 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=K0XTVEZnjh5UOleR8sJgB3ld6lii2Ug2LEE/02EGdqo=; b=Tfz8QzRgC6GBqhhbrH8DTBayQre2qUCy4AWuJ5e76zhxW4q/kx5PRFpaIgcmnemXSr cpzndAkLurucK91x1Idt8aMDSpB5J2ydiTIN2EyRaGoHhHl+iwAbXTOXde/q01R1FhN6 isFV9apyxa9kJRbxdMP8DFwQde5qa+qKwmpWuOuEbwcv+pKabMu6rz47VVLiAXk4ur1Q Woq3BVtZ6i/Rxy7MDGbCJl3lbivOk++bH6jzLB0EervPKnd68Ey6xe5ZX9DRA0zHNX6s vMdpLNYbmWkIWx41QxV5BnLZyjhp0JOtDLOBYhQYu0tbmSVOaBWSTZmxgHk1xnGVfGVk N6iA== X-Gm-Message-State: AKwxytflTG89Ttjl/nxKjRnLHKC5StI5xErErQpDd5iIO11oiR9Hvgvu ZYtgoWiY0r7rXjP8EaSw8qLUNb60kSk= X-Google-Smtp-Source: AH8x227k40q04hE63fWVk/cb8H0CH5Lb5zBCM9aeg4EovMaEOvsFS9DOpAKnj8VsfCQyoolP1vKX+g== X-Received: by 10.28.12.75 with SMTP id 72mr5018941wmm.97.1516817103273; Wed, 24 Jan 2018 10:05:03 -0800 (PST) Original-Received: from rpluim-ubuntu ([149.5.228.1]) by smtp.gmail.com with ESMTPSA id 62sm46382wrg.57.2018.01.24.10.05.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jan 2018 10:05:01 -0800 (PST) Mail-Followup-To: emacs-devel@gnu.org Mail-Copies-To: never Gmane-Reply-To-List: yes In-Reply-To: (Glenn Morris's message of "Wed, 24 Jan 2018 12:46:17 -0500") X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::230 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:222189 Archived-At: --=-=-= Content-Type: text/plain Glenn Morris writes: > And --with-x-toolkit=lucid (on rhel7): > > xterm.o: In function `x_set_offset': > xterm.c:10313: undefined reference to `xg_get_scale' *sigh* too many combinations to test. [1] Robert Footnotes: [1] Did we ever get anywhere on a CI setup for emacs? --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Fix-gtk-scaling-changes.patch >From 3f0866efb84902b89b56e3897471e646fe11b8d9 Mon Sep 17 00:00:00 2001 From: Robert Pluim Date: Wed, 24 Jan 2018 19:01:52 +0100 Subject: [PATCH] Fix gtk scaling changes * src/xterm.c (x_set_offset): Only call xg_get_scale if using GTK. --- src/xterm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/xterm.c b/src/xterm.c index f05ac6147e..364a8a8db0 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -10310,7 +10310,9 @@ void x_set_offset (struct frame *f, register int xoff, register int yoff, int change_gravity) { int modified_top, modified_left; +#ifdef USE_GTK int scale = xg_get_scale (f); +#endif if (change_gravity > 0) { -- 2.16.0.rc1 --=-=-=--