aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-01-07 16:11:46 +0100
committermarha <marha@users.sourceforge.net>2013-01-07 16:11:46 +0100
commitb73b2300e7f9b90369efd2f14f086f68ee15d55f (patch)
tree0e349d5a3c1debefe3ba69f0c3e0be1e3a392b9b
parent0e950715b62dcf30ffbf69831bf932fd348537e5 (diff)
downloadvcxsrv-b73b2300e7f9b90369efd2f14f086f68ee15d55f.tar.gz
vcxsrv-b73b2300e7f9b90369efd2f14f086f68ee15d55f.tar.bz2
vcxsrv-b73b2300e7f9b90369efd2f14f086f68ee15d55f.zip
Solved compile problems in fontconfig introduced by latest merge
-rw-r--r--fontconfig/config.h4
-rw-r--r--fontconfig/src/cleangperf.py8
-rw-r--r--fontconfig/src/makefile16
-rw-r--r--include/dix-config.h8
-rw-r--r--libX11/src/xcms/config.h3
-rw-r--r--xorg-server/installer/vcxsrv.nsi2
6 files changed, 36 insertions, 5 deletions
diff --git a/fontconfig/config.h b/fontconfig/config.h
index e9ebf015e..eea2ea488 100644
--- a/fontconfig/config.h
+++ b/fontconfig/config.h
@@ -4,4 +4,6 @@
#define HAVE_RAND 1
#define HAVE_STRUCT_DIRENT_D_TYPE 1
#undef __STDC__
-#define FLEXIBLE_ARRAY_MEMBER \ No newline at end of file
+#define FLEXIBLE_ARRAY_MEMBER
+#define inline __inline
+
diff --git a/fontconfig/src/cleangperf.py b/fontconfig/src/cleangperf.py
new file mode 100644
index 000000000..a276312c9
--- /dev/null
+++ b/fontconfig/src/cleangperf.py
@@ -0,0 +1,8 @@
+import sys,re
+
+inbuffer=sys.stdin.read()
+inbuffer=re.sub(r'[ \t\r\n]*\n[ \t]*',r'\n',inbuffer)
+inbuffer=re.sub(r'[ \t\r\n]*,[ \t\r\n]',r',',inbuffer)
+inbuffer=re.sub(r'\n#[^\n]+','',inbuffer)
+sys.stdout.write(inbuffer)
+
diff --git a/fontconfig/src/makefile b/fontconfig/src/makefile
index 091584172..024ca979d 100644
--- a/fontconfig/src/makefile
+++ b/fontconfig/src/makefile
@@ -1,3 +1,14 @@
+$(OBJDIR)\fcobjshash.gperf: fcobjshash.gperf.h fcobjs.h
+ cp $< $<.c
+ $(CPP) -EP -I.. $<.c | \
+ python cleangperf.py | \
+ gawk '/CUT_OUT_BEGIN/ { no_write=1; next; }; /CUT_OUT_END/ { no_write=0; next; }; { if (!no_write) print; next; };' - > $@.tmp
+ mv -f $@.tmp $@
+ rm $<.c
+
+$(OBJDIR)\fcobjshash.h: $(OBJDIR)\fcobjshash.gperf
+ gperf -m 100 $< > $@
+
load_makefile NORELDBG=1 ..\fc-case\makefile
load_makefile NORELDBG=1 ..\fc-glyphname\makefile
@@ -27,7 +38,6 @@ CSRCS = \
fcstat.c \
fcstr.c \
fcxml.c \
- \
ftglue.c
LIBRARY = libfontconfig
@@ -36,12 +46,12 @@ PUBLIC_FILES = \
..\fontconfig\fontconfig.h \
fcdeprecate.h \
..\fontconfig\fcprivate.h
-
+
PUBLIC_FT_FILES = \
..\fontconfig\fcfreetype.h
DEFINES += FC_CACHEDIR="""getenv(\"""TEMP\""")""" FC_DEFAULT_FONTS="""WINDOWSFONTDIR"""
-INCLUDES := .. $(INCLUDES) $(MHMAKECONF)\freetype\include $(MHMAKECONF)\libxml2\include $(MHMAKECONF)\iconv\include
+INCLUDES := .. $(OBJDIR) $(INCLUDES) $(MHMAKECONF)\freetype\include $(MHMAKECONF)\libxml2\include $(MHMAKECONF)\iconv\include
fcalias.h fcaliastail.h: makealias.py $(PUBLIC_FILES)
python makealias.py . fcalias.h fcaliastail.h $(PUBLIC_FILES)
diff --git a/include/dix-config.h b/include/dix-config.h
index aa5863c25..ab60a58a2 100644
--- a/include/dix-config.h
+++ b/include/dix-config.h
@@ -74,7 +74,7 @@
/* Define to 1 if you have the <byteswap.h> header file. */
#define HAVE_BYTESWAP_H 1
-/* Define to 1 if you have cbrt */
+/* Define to 1 if you have the `cbrt' function. */
#undef HAVE_CBRT
/* Define to 1 if you have the <dbm.h> header file. */
@@ -168,6 +168,9 @@
/* Define to use libgcrypt SHA1 functions */
#undef HAVE_SHA1_IN_LIBGCRYPT
+/* Define to use libnettle SHA1 functions */
+#undef HAVE_SHA1_IN_LIBNETTLE
+
/* Define to use libsha1 for SHA1 */
#undef HAVE_SHA1_IN_LIBSHA1
@@ -465,6 +468,9 @@
/* Define to 1 if typeof works with your compiler. */
#undef HAVE_TYPEOF
+/* Define to __typeof__ if your compiler spells it that way. */
+#undef typeof
+
/* The compiler supported TLS storage class, prefering initial-exec if tls_model is supported */
#undef TLS
diff --git a/libX11/src/xcms/config.h b/libX11/src/xcms/config.h
index a01921855..5052f74ff 100644
--- a/libX11/src/xcms/config.h
+++ b/libX11/src/xcms/config.h
@@ -1,2 +1,5 @@
#include <string.h>
#include <unistd.h>
+
+#define XCMSDB "Xcms.txt"
+
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi
index ab4310a1f..c226b4691 100644
--- a/xorg-server/installer/vcxsrv.nsi
+++ b/xorg-server/installer/vcxsrv.nsi
@@ -82,6 +82,7 @@ Section "VcXsrv (required)"
File "..\..\apps\xwininfo\obj\release\xwininfo.exe"
File "..\XKeysymDB"
File "..\..\libX11\src\XErrorDB"
+ File "..\..\libX11\src\xcms\Xcms.txt"
File "..\XtErrorDB"
File "..\.Xdefaults"
File "..\hw\xwin\xlaunch\obj\release\xlaunch.exe"
@@ -206,6 +207,7 @@ Section "Uninstall"
Delete "$INSTDIR\xwininfo.exe"
Delete "$INSTDIR\XKeysymDB"
Delete "$INSTDIR\XErrorDB"
+ Delete "$INSTDIR\Xcms.txt"
Delete "$INSTDIR\XtErrorDB"
Delete "$INSTDIR\.Xdefaults"
Delete "$INSTDIR\xlaunch.exe"