diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2010-03-18 11:03:29 +0000 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2010-03-18 11:03:29 +0000 |
| commit | fa73a82c4f83a232813b63d075fb591247656045 (patch) | |
| tree | c36b036374cffff575485087ca5063a238ca06a4 /moz | |
| parent | 3f2507bb032908c6ad9f11c61a52229f3e33298d (diff) | |
linuxaxp01: #i110145# need to link fontconfig explicitly
Diffstat (limited to 'moz')
| -rw-r--r-- | moz/makefile.mk | 3 | ||||
| -rw-r--r-- | moz/patches/link_fontconfig.patch | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/moz/makefile.mk b/moz/makefile.mk index 2eeda8c08928..30c67bfc989c 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -84,7 +84,8 @@ PATCH_FILES = \ seamonkey-source-$(MOZILLA_VERSION).patch \ patches/dtoa.patch \ patches/respect_disable_pango.patch \ - patches/arm_build_fix.patch + patches/arm_build_fix.patch \ + patches/link_fontconfig.patch # This file is needed for the W32 build when BUILD_MOZAB is set # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set) diff --git a/moz/patches/link_fontconfig.patch b/moz/patches/link_fontconfig.patch new file mode 100644 index 000000000000..66e82fa63e52 --- /dev/null +++ b/moz/patches/link_fontconfig.patch @@ -0,0 +1,11 @@ +--- misc/mozilla/gfx/src/gtk/Makefile.in 2010-03-16 14:44:44.000000000 +0000 ++++ misc/build/mozilla/gfx/src/gtk/Makefile.in 2010-03-16 14:45:08.000000000 +0000 +@@ -183,7 +183,7 @@ + endif + + ifdef MOZ_ENABLE_XFT +-EXTRA_DSO_LDOPTS += $(FT2_LIBS) ++EXTRA_DSO_LDOPTS += $(FT2_LIBS) -lfontconfig + + libs:: fontEncoding.properties pangoFontEncoding.properties + $(INSTALL) $^ $(DIST)/bin/res/fonts |