diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2010-05-10 15:37:45 +0200 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2010-05-10 15:37:45 +0200 |
| commit | e21b183476f5055b2ccdef730c1c307080be8616 (patch) | |
| tree | bd8073ac59d1113da06c9f17d949901b23882ca7 | |
| parent | 9de91dfe36c96ac16b425521c71454bdbb43fc30 (diff) | |
| parent | fa73a82c4f83a232813b63d075fb591247656045 (diff) | |
CWS-TOOLING: integrate CWS linuxaxp01
Notes
split repo tag: libs-extern-sys_ooo/DEV300_m78
| -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 050d923c48e7..9629f7138b74 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -85,7 +85,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 |