[X2Go-Commits] [nx-libs] 10/219: auto-determine system font path and add to list of font paths

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 78a16245a4bbf13acf53768064d81cbaa28c0d8b
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Tue Apr 23 18:22:45 2019 +0200

    auto-determine system font path and add to list of font paths
    
    This will help on non-supported platforms as it will add a path the current
    code might not be aware of.
---
 Makefile                                     | 5 +++++
 nx-X11/config/cf/Imake.tmpl                  | 5 +++++
 nx-X11/programs/Xserver/hw/nxagent/Font.c    | 1 +
 nx-X11/programs/Xserver/hw/nxagent/Imakefile | 1 +
 4 files changed, 12 insertions(+)

diff --git a/Makefile b/Makefile
index 898e52474..42f9f25b4 100644
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,9 @@ CONFIGURE       ?= ./configure --prefix="$(PREFIX)"
 ifneq ($(shell pkg-config --exists xkbcomp && echo yes), yes)
     $(warning xkbcomp devel package missing, using imake default values)
 endif
+ifneq ($(shell pkg-config --exists fontutil && echo yes), yes)
+    $(warning fontutil devel package missing, using imake default values)
+endif
 
 IMAKE_DEFINES	?=
 
@@ -112,6 +115,8 @@ imakeconfig:
 	(pkg-config --exists xkbcomp && echo "#define SystemXkbConfigDir `pkg-config xkbcomp --variable=xkbconfigdir`"; :) >>nx-X11/config/cf/nxconfig.def
 	(pkg-config --exists xkbcomp && echo "#define SystemXkbBinDir `pkg-config xkbcomp --variable=prefix`/bin"; :) >>nx-X11/config/cf/nxconfig.def
 
+	(pkg-config --exists fontutil && echo "#define SystemFontRootDir `pkg-config fontutil --variable=fontrootdir`"; :) >>nx-X11/config/cf/nxconfig.def
+
 	# let's create the nx-X11 Makefiles now, once everything has been defined
 	$(MAKE) -j1 -C nx-X11 Makefiles IMAKE_DEFINES="$(IMAKE_DEFINES)"
 
diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
index ddd587ec6..25d985d75 100644
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
@@ -791,6 +791,10 @@ TCLIBDIR = TclLibDir
 #define SystemXkbBinDir /usr/bin
 #endif
 
+#ifndef SystemFontDir
+#define SystemFontDir /usr/share/fonts/X11
+#endif
+
 #ifndef ShLibDir
 #define ShLibDir UsrLibDir
 #endif
@@ -1668,6 +1672,7 @@ TCLIBDIR = TclLibDir
   SYSTEMUSRINCDIR = SystemUsrIncDir	/* system's "/usr/include" */
  SYSTEMXKBCONFDIR = SystemXkbConfigDir	/* system's "/usr/share/xkb" */
   SYSTEMXKBBINDIR = SystemXkbBinDir	/* system's "/usr/bin" */
+    SYSTEMFONTDIR = SystemFontDir	/* system's "/usr/share/fonts/X11" */
          SHLIBDIR = ShLibDir            /* shared libraries */
        LINTLIBDIR = LintlibDir		/* lint libraries */
           MANPATH = ManPath		/* top of manual page tree */
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c
index d5c9f8982..89128d4c1 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Font.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c
@@ -72,6 +72,7 @@ is" without express or implied warranty.
 #undef  DEBUG
 
 const char * nxagentFontDirs[] = {
+  SYSTEMFONTDIR,
   "/usr/share/nx/fonts",
   "/usr/share/X11/fonts",
   "/usr/share/fonts/X11",
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
index 6e68b80fc..ddbf08fab 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile
+++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
@@ -255,6 +255,7 @@ DEFINES = \
 	-DRANDR_15_INTERFACE=1 \
         -DPANORAMIX \
         -UDEBUG_TREE \
+        -DSYSTEMFONTDIR=\"$(SYSTEMFONTDIR)\" \
 	$(NULL)
 
 all:: $(OBJS)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git