graphite2 consolidated patch

1 files changed, 32 insertions, 67 deletions

diff --git a/graphite/makefile.mk b/graphite/makefile.mk
index 1da1d14d69c7..299b09e2519d 100644
--- a/graphite/makefile.mk
+++ b/graphite/makefile.mk
@@ -39,103 +39,68 @@ TARGET=so_graphite
 
 .IF "$(SYSTEM_GRAPHITE)" == "YES"
 all:
-        @echo "An already available installation of silgraphite should exist on your system."
-        @echo "Therefore the version provided here does not need to be built in addition."
+    @echo "An already available installation of graphite2 should exist on your system."
+    @echo "Therefore the version provided here does not need to be built in addition."
 .ENDIF
 
 # --- Files --------------------------------------------------------
 .IF "$(ENABLE_GRAPHITE)"=="TRUE"
-TARFILE_NAME=silgraphite-2.3.1
-TARFILE_MD5=d35724900f6a4105550293686688bbb3
-#graphite-updatewerror.patch -Werror passed to CFLAGS configure for
-#--enable-debug, but not in configure.ac, so update configure to
-#match
-PATCH_FILES=\
-    graphite-2.3.1.patch \
-    graphite-removeobsolete.patch \
-    graphite-updatewerror.patch
+TARFILE_NAME=graphite2-0.9.2
+TARFILE_MD5=0625a7d661f899a8ce263fc8a9879108
+PATCH_FILES= graphite2-0.9.2.patch
 
 # convert line-endings to avoid problems when patching
-CONVERTFILES=\
-    engine/makefile.vc8 \
-    engine/test/RegressionTest/RtTextSrc.h
+CONVERTFILES=
 
-CONFIGURE_DIR=engine
+CONFIGURE_DIR=build
 
 .IF "$(COM)"=="MSC"
-.IF "$(COMEX)"=="10"
-VCNUM=7
-.ELSE
-VCNUM=8
+CMAKE_GENERATOR="NMake Makefiles"
+# make use of stlport headerfiles
+EXT_USE_STLPORT=TRUE
+GR_CMAKE_LINK_FLAGS=-D "CMAKE_SHARED_LINKER_FLAGS=/STACK:10000000 /machine:x86" -D "CMAKE_MODULE_LINKER_FLAGS=/STACK:10000000 /machine:x86" -D "CMAKE_EXE_LINKER_FLAGS=/STACK:10000000 /machine:x86" -D "CMAKE_SYSTEM_PROCESSOR=x86"
+BUILD_ACTION=nmake
 .ENDIF
-BUILD_ACTION=nmake VERBOSE=1
-.IF "$(debug)"!=""
-BUILD_FLAGS= "CFG=DEBUG"
-CFLAGSWITHPATH= $(CFLAGS:s!-Fd./!-Fd../../../../../!)
-.ELSE
-# Speed Optimization is really needed for Graphite
-CFLAGSWITHPATH= $(CFLAGS) /O2
+
+.IF "$(COM)"=="GCC"
+CMAKE_GENERATOR="Unix Makefiles"
+GR_CMAKE_LINK_FLAGS=
+.IF "$(OS)"=="WNT"
+#PATCH_FILES+=graphite2.patch.mingw
 .ENDIF
-### convert CFLAGS as cl.exe cannot handle OOO"s generic ones directly
-### TODO: use "guw.exe" instead?
-ALLCFLAGS= $(CFLAGSWITHPATH) $(CFLAGSCXX) $(CFLAGSEXCEPTIONS) $(CDEFS)
-JUSTASLASH= /
-CFLAGS2MSC= $(ALLCFLAGS:s/-Z/$(JUSTASLASH)Z/)
-CFLAGS4MSC= $(CFLAGS2MSC:s/ -/ $(JUSTASLASH)/)
-BUILD_FLAGS+= "CFLAGS4MSC=$(CFLAGS4MSC)" /F makefile.vc$(VCNUM) lib_dll
 .ENDIF
 
 .IF "$(COM)"=="GCC"
+BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
+.ENDIF
 
-# Does linux want --disable-shared?
-.IF "$(debug)"!=""
-GR_CONFIGURE_FLAGS= --enable-debug=yes --disable-final --enable-static --disable-shared
+.IF "$(debug)"=="true"
+CMAKE_BUILD_TYPE=Debug
 .ELSE
-GR_CONFIGURE_FLAGS= --enable-final=yes --enable-static --disable-shared
+CMAKE_BUILD_TYPE=Release
 .ENDIF
-EXTRA_GR_CXX_FLAGS=-fPIC
 
-.IF "$(OS)"=="WNT"
-PATCH_FILES+=graphite-2.3.1.patch.mingw
-EXTRA_GR_CXX_FLAGS=-mthreads -nostdinc
-.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
-EXTRA_GR_CXX_FLAGS+=-shared-libgcc
-.ENDIF
-EXTRA_GR_LD_FLAGS+=-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2
-.ENDIF
+# Don't include STLPORT headers because it interferes with CMake's compiler
+# detection. Graphite2 no longer uses the STL anyway.
+CONFIGURE_ACTION=bash -c 'INCLUDE="$(COMPATH)/Include;$(PSDK_HOME)/Include" CXXFLAGS="$(CFLAGSCXX) $(CDEFS)" LIB="$(ILIB)" cmake -G $(CMAKE_GENERATOR) -D CMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) -D ENABLE_COMPARE_RENDERER=0 $(GR_CMAKE_LINK_FLAGS) .. '
 
-# don't use SOLARLIB for LDFLAGS because it pulls in system graphite so build will fail
-# 
-CONFIGURE_ACTION=bash -c 'CXXFLAGS="$(INCLUDE) $(CFLAGSCXX) $(CFLAGSCOBJ) $(CDEFS) $(CDEFSOBJ) $(SOLARINC) $(LFS_CFLAGS) $(EXTRA_GR_CXX_FLAGS)" LDFLAGS="-L$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT) $(EXTRA_GR_LD_FLAGS)" ./configure $(GR_CONFIGURE_FLAGS)'
-.ENDIF
 
 BUILD_DIR=$(CONFIGURE_DIR)
 
 .IF "$(OS)"=="WNT" && "$(COM)"!="GCC"
-.IF "$(debug)"!=""
-OUT2LIB=engine$/debug$/*.lib
+OUT2LIB=build$/src$/*.lib
+OUT2BIN=build$/src$/*.dll
 .ELSE
-OUT2LIB=engine$/release$/*.lib
-.ENDIF
+.IF "$(OS)"=="MACOSX"
+OUT2LIB+=build$/src$/libgraphite2.*.dylib
 .ELSE
-OUT2LIB=engine$/src$/.libs$/libgraphite*.a
+OUT2LIB=build$/src$/libgraphite2.so.*.*.*
 .ENDIF
-
-.IF "$(COM)"=="GCC"
-BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
 .ENDIF
 
-.IF "$(OS)"=="MACOSX"
-OUT2LIB+=src$/.libs$/libgraphite.*.dylib
-.ENDIF
-
-
 OUTDIR2INC= \
-    engine$/include$/graphite
+    include/graphite2
 
-.IF "$(OS)"=="WNT"
-OUT2INC=wrappers$/win32$/WinFont.h
-.ENDIF
 .ELSE
 dddd:
     @echo Nothing to do