Fixing xrdp compilation issue (#20) with temporary workaround due to …

…ubuntu package issue

neutrinolabs/xorgxrdp#100
https://bugs.launchpad.net/ubuntu/+source/libxfont/+bug/1707691

env/configure-java-vm.sh

@@ -70,6 +70,7 @@ cp -r /mnt/java-dev-vsts/env/config-template/* /home/$username/.config
 find /home/$username/.config -type f -exec sed -i "s/__USERNAME__/$username/g" {} +
 chown -R $username /home/$username/.config/*
 
+
 ### Compile new version of xrdp
 ### Modified version of install-xrdp-1.8.sh from http://www.c-nergy.be/blog
 ################################################################
@@ -84,18 +85,36 @@ chown -R $username /home/$username/.config/*
 # Disclaimer : Script provided AS IS. Use it at your own risk....
 #
 ##################################################################
- 
+
 #Step 1 - Install prereqs for compilation
 ##################################################################
 
 echo "Installing prereqs for compiling xrdp..."
 echo "----------------------------------------"
 apt-get -y install libx11-dev libxfixes-dev libssl-dev libpam0g-dev libtool libjpeg-dev flex bison gettext autoconf libxml-parser-perl libfuse-dev xsltproc libxrandr-dev python-libxml2 nasm xserver-xorg-dev fuse git pkg-config
 
+
+#********
+#Temporary fix for xrdp compilation issue due to Ubuntu package missing fontutil.h
+#********
+#https://github.com/neutrinolabs/xorgxrdp/issues/100
+#https://bugs.launchpad.net/ubuntu/+source/libxfont/+bug/1707691
+##################################################################
+if test -s "/usr/include/X11/fonts/fontutil.h"
+then
+    echo "fontutil.h already exists...issue is fixed and workaround is no longer necessary"
+else
+    echo "fontutil.h missing...copying from repo"
+    cp /mnt/java-dev-vsts/env/tempXrdpFix/fontutil.h /usr/include/X11/fonts/fontutil.h
+fi
+#********
+#End temporary fix for xrdp compilation issue due to Ubuntu package missing fontutil.h
+#********
+
+
 #Step 2 - Obtain xrdp packages 
 ################################################################## 
 
-
 ## --Go to your Download folder
 echo "Moving to the ~/Download folders..."
 echo "-----------------------------------"

env/tempXrdpFix/fontutil.h

@@ -0,0 +1,24 @@
+#ifndef _FONTUTIL_H_
+#define _FONTUTIL_H_
+
+#include <X11/fonts/FSproto.h>
+
+extern int FontCouldBeTerminal(FontInfoPtr);
+extern int CheckFSFormat(fsBitmapFormat, fsBitmapFormatMask, int *, int *,
+			 int *, int *, int *);
+extern void FontComputeInfoAccelerators(FontInfoPtr);
+
+extern void GetGlyphs ( FontPtr font, unsigned long count,
+			unsigned char *chars, FontEncoding fontEncoding,
+			unsigned long *glyphcount, CharInfoPtr *glyphs );
+extern void QueryGlyphExtents ( FontPtr pFont, CharInfoPtr *charinfo,
+				unsigned long count, ExtentInfoRec *info );
+extern Bool QueryTextExtents ( FontPtr pFont, unsigned long count,
+			       unsigned char *chars, ExtentInfoRec *info );
+extern Bool ParseGlyphCachingMode ( char *str );
+extern void InitGlyphCaching ( void );
+extern void SetGlyphCachingMode ( int newmode );
+extern int add_range ( fsRange *newrange, int *nranges, fsRange **range,
+		       Bool charset_subset );
+
+#endif /* _FONTUTIL_H_ */