diff options
| author | Daniel Rentz [dr] <daniel.rentz@oracle.com> | 2010-09-28 20:30:05 +0200 |
|---|---|---|
| committer | Daniel Rentz [dr] <daniel.rentz@oracle.com> | 2010-09-28 20:30:05 +0200 |
| commit | 2f799fd884a54022df843e4302bfd77eb9c17b78 (patch) | |
| tree | b48634679903ad0f1c5922fb6fffea52dca190f9 | |
| parent | 55adf3e85857f9ff929f5bdabd84fb1f5f6ecad7 (diff) | |
| parent | 1041012b7c52fb9ff0ea6ac7eefdb58bdead1b25 (diff) | |
dr77: rebase to DEV300_m88
| -rw-r--r-- | more_fonts/fonts/ttf_dejavu/makefile.mk | 6 | ||||
| -rw-r--r-- | more_fonts/prj/d.lst | 4 | ||||
| -rw-r--r-- | moz/makefile.mk | 3 | ||||
| -rw-r--r-- | moz/patches/brokenmakefile.patch | 13 |
4 files changed, 20 insertions, 6 deletions
diff --git a/more_fonts/fonts/ttf_dejavu/makefile.mk b/more_fonts/fonts/ttf_dejavu/makefile.mk index f9fa78a7664b..090661bbde02 100644 --- a/more_fonts/fonts/ttf_dejavu/makefile.mk +++ b/more_fonts/fonts/ttf_dejavu/makefile.mk @@ -36,9 +36,9 @@ TARGET=ttf_dejavu # --- Files -------------------------------------------------------- -TARFILE_NAME=dejavu-fonts-ttf-2.30 -TARFILE_MD5=fe5b3e2b7c4577f30dc001054365653e -TARFILE_ROOTDIR=dejavu-fonts-ttf-2.30 +TARFILE_NAME=dejavu-fonts-ttf-2.32 +TARFILE_MD5=37282537d0ed1a087b1c8f050dc812d9 +TARFILE_ROOTDIR=dejavu-fonts-ttf-2.32 PATCH_FILES= diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst index 261aae0b2d28..6dba097941ac 100644 --- a/more_fonts/prj/d.lst +++ b/more_fonts/prj/d.lst @@ -1,8 +1,8 @@ mkdir: %COMMON_DEST%\pck%_EXT% ..\fonts\fc_local.conf %COMMON_DEST%\pck%_EXT%\fc_local.conf # TODO: replace explicit versions by wildcard when the build system learns to handle them -..\%__SRC%\misc\build\dejavu-fonts-ttf-2.30\ttf\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf -..\%__SRC%\misc\build\dejavu-fonts-ttf-2.30\LICENSE %COMMON_DEST%\pck%_EXT%\LICENSE_dejavu +..\%__SRC%\misc\build\dejavu-fonts-ttf-2.32\ttf\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf +..\%__SRC%\misc\build\dejavu-fonts-ttf-2.32\LICENSE %COMMON_DEST%\pck%_EXT%\LICENSE_dejavu ..\%__SRC%\misc\build\liberation-fonts-ttf-1.06.0.20100721/Liberation*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf ..\%__SRC%\misc\build\liberation-fonts-ttf-1.06.0.20100721/License.txt %COMMON_DEST%\pck%_EXT%\LICENSE_liberation ..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf diff --git a/moz/makefile.mk b/moz/makefile.mk index 9629f7138b74..feb2c50343ee 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -86,7 +86,8 @@ PATCH_FILES = \ patches/dtoa.patch \ patches/respect_disable_pango.patch \ patches/arm_build_fix.patch \ - patches/link_fontconfig.patch + patches/link_fontconfig.patch \ + patches/brokenmakefile.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/brokenmakefile.patch b/moz/patches/brokenmakefile.patch new file mode 100644 index 000000000000..20d88014b932 --- /dev/null +++ b/moz/patches/brokenmakefile.patch @@ -0,0 +1,13 @@ +--- misc/mozilla/mailnews/extensions/smime/build/Makefile.in 2010-09-04 16:00:38.000000000 +0100 ++++ misc/build/mozilla/mailnews/extensions/smime/build/Makefile.in 2010-09-04 16:02:24.000000000 +0100 +@@ -79,10 +79,6 @@ + $(DIST)/lib/$(LIB_PREFIX)msgsmime_s.$(LIB_SUFFIX) \ + $(NULL) + +-ifndef MOZ_STATIC_MAIL_BUILD +-SHARED_LIBRARY_LIBS + = $(DIST)/lib/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX) +-endif +- + EXTRA_DSO_LDOPTS = \ + $(LIBS_DIR) \ + $(EXTRA_DSO_LIBS) \ |