diff options
Diffstat (limited to 'patches/OOO_1_1_2/system-freetype.diff')
-rw-r--r-- | patches/OOO_1_1_2/system-freetype.diff | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/patches/OOO_1_1_2/system-freetype.diff b/patches/OOO_1_1_2/system-freetype.diff deleted file mode 100644 index f60d6a2c7..000000000 --- a/patches/OOO_1_1_2/system-freetype.diff +++ /dev/null @@ -1,69 +0,0 @@ ---- solenv/inc/libs.mk 31 Oct 2003 16:23:21 -0000 1.66.14.1 -+++ solenv/inc/libs.mk 9 Dec 2003 11:50:20 -0000 -@@ -135,9 +135,12 @@ - BSTRPLIB=-lbtstrp - VCLLIBST=-lvcl - VCLLIB=$(SVLIB) --FREETYPELIB=-lfreetype --FREETYPELIBST=$(STATIC) -lfreetype $(DYNAMIC) -+.IF "$(SYSTEM_FREETYPE)"!="YES" -+ FREETYPE_LIBS=-lfreetype -+.ENDIF -+FREETYPELIB=$(FREETYPE_LIBS) -+FREETYPELIBST=$(STATIC) $(FREETYPE_LIBS) $(DYNAMIC) - XPLIB=-l_xp - TKLIB=-ltk$(OFFICEUPD)$(DLLPOSTFIX) - SVTOOLLIB=-lsvt$(OFFICEUPD)$(DLLPOSTFIX) - ---- vcl/source/glyphs/makefile.mk 15 Feb 2002 15:52:27 -0000 1.5 -+++ vcl/source/glyphs/makefile.mk 9 Dec 2003 11:50:47 -0000 -@@ -73,6 +73,7 @@ - # --- Files -------------------------------------------------------- - - .IF "$(USE_BUILTIN_RASTERIZER)" != "" -+CFLAGS += $(FREETYPE_CFLAGS) - SLOFILES=\ - $(SLO)$/glyphcache.obj \ - $(SLO)$/gcach_rbmp.obj \ -Index: freetype/makefile.mk -=================================================================== ---- freetype/makefile.mk.orig 2003-05-28 14:41:19.000000000 +0200 -+++ freetype/makefile.mk 2004-01-08 00:48:40.000000000 +0100 -@@ -75,12 +75,12 @@ TARGET=so_freetype - # the X11 port because there are some header conflicts - # and linktime conflicts as well. It is simply less of - # a headache to use the one provided. --.IF "$(OS)" == "MACOSX" -+.IF "$(OS)" == "MACOSX" || "$(SYSTEM_FREETYPE)" == "YES" - - dummy: -- @echo "Nothing to build for MACOSX" -+ @echo "Nothing to build for OS $(OS)" - --.ELSE # "$(OS)" == "MACOSX" -+.ELSE # "$(OS)" == "MACOSX" || "$(SYSTEM_FREETYPE)" == "YES" - - TARFILE_NAME=freetype-2.1.4 - -Index: scp/source/global/setupzip.scp -=================================================================== ---- scp/source/global/setupzip.scp.orig 2003-12-12 21:11:03.000000000 +0100 -+++ scp/source/global/setupzip.scp 2004-01-08 00:49:26.000000000 +0100 -@@ -556,6 +556,8 @@ End - - #ifdef UNX - -+#ifndef SYSTEM_FREETYPE -+ - #ifndef MACOSX - File GID_FILE_LIB_FREETYPE - #if defined (LINUX) && ( defined (CLASSIC_FAT_PRODUCT) || defined (OSL_PRODUCT) || defined (FAM_PRODUCT) ) -@@ -573,6 +575,8 @@ File GID_FILE_LIB_FREETYPE - End - #endif - -+#endif -+ - #if defined (OSL_PRODUCT) && !defined(WITHOUT_FONTS) - STD_FONTUNX_FILE( GID_FILE_FNT_VERA, Vera.ttf, Vera Sans) - #endif |