Re: emacs-26 build breaking on RHEL 6.6 GTK2

[Robert Pluim]

Glenn Morris <address@hidden> 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?

>From 3f0866efb84902b89b56e3897471e646fe11b8d9 Mon Sep 17 00:00:00 2001
From: Robert Pluim <address@hidden>
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