summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch
blob: 488624823366de0cecec8c4387619c1bcc72329e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
From 60c17eb49121bf2aa485acd30750b2fc6c8eb61f Mon Sep 17 00:00:00 2001
From: Jarmo Jaakkola <jarmo.jaakkola@vincit.fi>
Date: Mon, 19 Jun 2017 16:41:36 +0300
Subject: [PATCH] Fix compilation for Helix.

Gnome support, including GNOME_INIT_HOOK, has been removed, but it was
still being called.

COMPAT_OLD_KEYSYMDEF is a check for a legacy system, which our system
most definitely is not.  It is accomplished by trying to execute
a program, which does not work when cross compiling.

Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Jarmo Jaakkola <jarmo.jaakkola@vincit.fi>
Signed-off-by: Riku Hämäläinen <riku.hamalainen@ge.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
---
 configure.ac         | 20 ++++----------------
 doc/fvwm/Makefile.am |  2 +-
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index 48ce264..fab7b44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1413,8 +1413,4 @@ else
 # Define some compatibility macros needed for config.h.
-mg_DEFINE_IF_NOT([#include <X11/keysym.h>],
-  [defined XK_Page_Up && defined XK_Page_Down],
-  [COMPAT_OLD_KEYSYMDEF], [$X_CFLAGS],
-  [Old AIX systems (3.2.5) don't define some common keysyms.])
 AH_VERBATIM([_COMPAT_OLD_KEYSYMDEF],
 [#ifdef COMPAT_OLD_KEYSYMDEF
 #  define XK_Page_Up   XK_Prior
-- 
1.9.1