From 90ff4dedba69a546b6ba20b44f04ef7b7f4e8705 Mon Sep 17 00:00:00 2001 From: Staf Verhaegen Date: Sat, 25 May 2019 16:27:48 +0200 Subject: [PATCH] Replace deprecated embedded X font names with standardized ones. This avoids segfaults on more modern OSes like Centos7. --- alliance/src/dreal/src/GMX_color.h | 6 +++--- alliance/src/graal/src/GMX_color.h | 6 +++--- alliance/src/xfsm/src/XMX_color.h | 6 +++--- alliance/src/xgra/src/XMX_color.h | 6 +++--- alliance/src/xpat/src/XMX_color.h | 6 +++--- alliance/src/xsch/src/XMX_color.h | 6 +++--- alliance/src/xvpn/src/XMX_color.h | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/alliance/src/dreal/src/GMX_color.h b/alliance/src/dreal/src/GMX_color.h index 27e48d6b..32867053 100644 --- a/alliance/src/dreal/src/GMX_color.h +++ b/alliance/src/dreal/src/GMX_color.h @@ -64,9 +64,9 @@ # define DREAL_MAX_COLOR ( RDS_ALL_LAYER + 5 ) -# define DREAL_LARGE_TEXT_FONT_NAME "9x15" -# define DREAL_MEDIUM_TEXT_FONT_NAME "7x13" -# define DREAL_SMALL_TEXT_FONT_NAME "5x8" +# define DREAL_LARGE_TEXT_FONT_NAME "-*-fixed-medium-*-normal--15-*-*-*-*-90-iso10646-1" +# define DREAL_MEDIUM_TEXT_FONT_NAME "-*-fixed-medium-*-normal--13-*-*-*-*-70-iso10646-1" +# define DREAL_SMALL_TEXT_FONT_NAME "-*-fixed-medium-*-normal--8-*-*-*-*-50-iso10646-1" /*------------------------------------------------------------\ | | diff --git a/alliance/src/graal/src/GMX_color.h b/alliance/src/graal/src/GMX_color.h index 5b5e72f5..62435713 100644 --- a/alliance/src/graal/src/GMX_color.h +++ b/alliance/src/graal/src/GMX_color.h @@ -64,9 +64,9 @@ # define GRAAL_MAX_COLOR ( RDS_ALL_LAYER + 7 ) -# define GRAAL_LARGE_TEXT_FONT_NAME "9x15" -# define GRAAL_MEDIUM_TEXT_FONT_NAME "7x13" -# define GRAAL_SMALL_TEXT_FONT_NAME "5x8" +# define GRAAL_LARGE_TEXT_FONT_NAME "-*-fixed-medium-*-normal--15-*-*-*-*-90-iso10646-1" +# define GRAAL_MEDIUM_TEXT_FONT_NAME "-*-fixed-medium-*-normal--13-*-*-*-*-70-iso10646-1" +# define GRAAL_SMALL_TEXT_FONT_NAME "-*-fixed-medium-*-normal--8-*-*-*-*-50-iso10646-1" /*------------------------------------------------------------\ | | diff --git a/alliance/src/xfsm/src/XMX_color.h b/alliance/src/xfsm/src/XMX_color.h index b6f32571..2a3b3f38 100644 --- a/alliance/src/xfsm/src/XMX_color.h +++ b/alliance/src/xfsm/src/XMX_color.h @@ -59,9 +59,9 @@ # define XFSM_MAX_COLOR ( 5 + XFSM_MAX_LAYER ) -# define XFSM_LARGE_TEXT_FONT_NAME "9x15" -# define XFSM_MEDIUM_TEXT_FONT_NAME "7x13" -# define XFSM_SMALL_TEXT_FONT_NAME "5x8" +# define XFSM_LARGE_TEXT_FONT_NAME "-*-fixed-medium-*-normal--15-*-*-*-*-90-iso10646-1" +# define XFSM_MEDIUM_TEXT_FONT_NAME "-*-fixed-medium-*-normal--13-*-*-*-*-70-iso10646-1" +# define XFSM_SMALL_TEXT_FONT_NAME "-*-fixed-medium-*-normal--8-*-*-*-*-50-iso10646-1" /*------------------------------------------------------------\ | | diff --git a/alliance/src/xgra/src/XMX_color.h b/alliance/src/xgra/src/XMX_color.h index e2ec0be1..6d6e9779 100644 --- a/alliance/src/xgra/src/XMX_color.h +++ b/alliance/src/xgra/src/XMX_color.h @@ -59,9 +59,9 @@ # define XGRA_MAX_COLOR ( 5 + XGRA_MAX_LAYER ) -# define XGRA_LARGE_TEXT_FONT_NAME "9x15" -# define XGRA_MEDIUM_TEXT_FONT_NAME "7x13" -# define XGRA_SMALL_TEXT_FONT_NAME "5x8" +# define XGRA_LARGE_TEXT_FONT_NAME "-*-fixed-medium-*-normal--15-*-*-*-*-90-iso10646-1" +# define XGRA_MEDIUM_TEXT_FONT_NAME "-*-fixed-medium-*-normal--13-*-*-*-*-70-iso10646-1" +# define XGRA_SMALL_TEXT_FONT_NAME "-*-fixed-medium-*-normal--8-*-*-*-*-50-iso10646-1" /*------------------------------------------------------------\ | | diff --git a/alliance/src/xpat/src/XMX_color.h b/alliance/src/xpat/src/XMX_color.h index 2d1a5a8a..6940406e 100644 --- a/alliance/src/xpat/src/XMX_color.h +++ b/alliance/src/xpat/src/XMX_color.h @@ -59,9 +59,9 @@ # define XPAT_MAX_COLOR ( 5 + XPAT_MAX_LAYER ) -# define XPAT_LARGE_TEXT_FONT_NAME "9x15" -# define XPAT_MEDIUM_TEXT_FONT_NAME "7x13" -# define XPAT_SMALL_TEXT_FONT_NAME "5x8" +# define XPAT_LARGE_TEXT_FONT_NAME "-*-fixed-medium-*-normal--15-*-*-*-*-90-iso10646-1" +# define XPAT_MEDIUM_TEXT_FONT_NAME "-*-fixed-medium-*-normal--13-*-*-*-*-70-iso10646-1" +# define XPAT_SMALL_TEXT_FONT_NAME "-*-fixed-medium-*-normal--8-*-*-*-*-50-iso10646-1" /*------------------------------------------------------------\ | | diff --git a/alliance/src/xsch/src/XMX_color.h b/alliance/src/xsch/src/XMX_color.h index c132cb26..d5daacbc 100644 --- a/alliance/src/xsch/src/XMX_color.h +++ b/alliance/src/xsch/src/XMX_color.h @@ -59,9 +59,9 @@ # define XSCH_MAX_COLOR ( 5 + XSCH_MAX_LAYER ) -# define XSCH_LARGE_TEXT_FONT_NAME "9x15" -# define XSCH_MEDIUM_TEXT_FONT_NAME "7x13" -# define XSCH_SMALL_TEXT_FONT_NAME "5x8" +# define XSCH_LARGE_TEXT_FONT_NAME "-*-fixed-medium-*-normal--15-*-*-*-*-90-iso10646-1" +# define XSCH_MEDIUM_TEXT_FONT_NAME "-*-fixed-medium-*-normal--13-*-*-*-*-70-iso10646-1" +# define XSCH_SMALL_TEXT_FONT_NAME "-*-fixed-medium-*-normal--8-*-*-*-*-50-iso10646-1" /*------------------------------------------------------------\ | | diff --git a/alliance/src/xvpn/src/XMX_color.h b/alliance/src/xvpn/src/XMX_color.h index 8cee1109..1b43e613 100644 --- a/alliance/src/xvpn/src/XMX_color.h +++ b/alliance/src/xvpn/src/XMX_color.h @@ -59,9 +59,9 @@ # define XVPN_MAX_COLOR ( 5 + XVPN_MAX_LAYER ) -# define XVPN_LARGE_TEXT_FONT_NAME "9x15" -# define XVPN_MEDIUM_TEXT_FONT_NAME "7x13" -# define XVPN_SMALL_TEXT_FONT_NAME "5x8" +# define XVPN_LARGE_TEXT_FONT_NAME "-*-fixed-medium-*-normal--15-*-*-*-*-90-iso10646-1" +# define XVPN_MEDIUM_TEXT_FONT_NAME "-*-fixed-medium-*-normal--13-*-*-*-*-70-iso10646-1" +# define XVPN_SMALL_TEXT_FONT_NAME "-*-fixed-medium-*-normal--8-*-*-*-*-50-iso10646-1" /*------------------------------------------------------------\ | |