You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pf...@apache.org on 2015/11/24 16:43:34 UTC
svn commit: r1716179 - in /openoffice/trunk/main: external_deps.lst
more_fonts/fonts/ttf_croscore/makefile.mk
more_fonts/fonts/ttf_dejavu/makefile.mk more_fonts/prj/d.lst
scp2/source/ooo/file_font_ooo.scp
Author: pfg
Date: Tue Nov 24 15:43:34 2015
New Revision: 1716179
URL: http://svn.apache.org/viewvc?rev=1716179&view=rev
Log:
Update basic fonts:
Use new versions of the Google Croscore and DejaVu fonts.
The Croscore fonts do not carry NeuSymbol anymore but
that is not really an issue since we carry OpenSymbol.
Modified:
openoffice/trunk/main/external_deps.lst
openoffice/trunk/main/more_fonts/fonts/ttf_croscore/makefile.mk
openoffice/trunk/main/more_fonts/fonts/ttf_dejavu/makefile.mk
openoffice/trunk/main/more_fonts/prj/d.lst
openoffice/trunk/main/scp2/source/ooo/file_font_ooo.scp
Modified: openoffice/trunk/main/external_deps.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1716179&r1=1716178&r2=1716179&view=diff
==============================================================================
--- openoffice/trunk/main/external_deps.lst (original)
+++ openoffice/trunk/main/external_deps.lst Tue Nov 24 15:43:34 2015
@@ -234,14 +234,14 @@ if (SYSTEM_CURL != YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (WITH_CATA_FONTS == YES)
- MD5 = 161462de16e2ca79873bc2b0d2e6c74c
- name = dejavu-fonts-ttf-2.34.tar.bz2
- URL1 = http://sourceforge.net/projects/dejavu/files/dejavu/2.34/dejavu-fonts-ttf-2.34.tar.bz2/download
+ MD5 = 59eaca5acf5c7c8212e92778e3e01f32
+ name = dejavu-fonts-ttf-2.35.tar.bz2
+ URL1 = http://sourceforge.net/projects/dejavu/files/dejavu/2.35/$(name)/download
# URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (WITH_CATA_FONTS==YES)
- MD5 = cfa8bec07bf5b6856dd20f0cb28b3929
- name = croscorefonts-1.23.0.tar.gz
+ MD5 = 3c90ac73fd13bd79684d9dc073840328
+ name = croscorefonts-1.31.0.tar.bz2
URL1 = http://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
Modified: openoffice/trunk/main/more_fonts/fonts/ttf_croscore/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/more_fonts/fonts/ttf_croscore/makefile.mk?rev=1716179&r1=1716178&r2=1716179&view=diff
==============================================================================
--- openoffice/trunk/main/more_fonts/fonts/ttf_croscore/makefile.mk (original)
+++ openoffice/trunk/main/more_fonts/fonts/ttf_croscore/makefile.mk Tue Nov 24 15:43:34 2015
@@ -37,8 +37,8 @@ TARGET=ttf_croscore
# --- Files --------------------------------------------------------
-TARFILE_NAME=croscorefonts-1.23.0
-TARFILE_MD5=cfa8bec07bf5b6856dd20f0cb28b3929
+TARFILE_NAME=croscorefonts-1.31.0
+TARFILE_MD5=3c90ac73fd13bd79684d9dc073840328
PATCH_FILES=
Modified: openoffice/trunk/main/more_fonts/fonts/ttf_dejavu/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/more_fonts/fonts/ttf_dejavu/makefile.mk?rev=1716179&r1=1716178&r2=1716179&view=diff
==============================================================================
--- openoffice/trunk/main/more_fonts/fonts/ttf_dejavu/makefile.mk (original)
+++ openoffice/trunk/main/more_fonts/fonts/ttf_dejavu/makefile.mk Tue Nov 24 15:43:34 2015
@@ -39,9 +39,9 @@ TARGET=ttf_dejavu
# --- Files --------------------------------------------------------
-TARFILE_NAME=dejavu-fonts-ttf-2.34
-TARFILE_MD5=161462de16e2ca79873bc2b0d2e6c74c
-TARFILE_ROOTDIR=dejavu-fonts-ttf-2.34
+TARFILE_NAME=dejavu-fonts-ttf-2.35
+TARFILE_MD5=59eaca5acf5c7c8212e92778e3e01f32
+TARFILE_ROOTDIR=dejavu-fonts-ttf-2.35
PATCH_FILES=
Modified: openoffice/trunk/main/more_fonts/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/more_fonts/prj/d.lst?rev=1716179&r1=1716178&r2=1716179&view=diff
==============================================================================
--- openoffice/trunk/main/more_fonts/prj/d.lst (original)
+++ openoffice/trunk/main/more_fonts/prj/d.lst Tue Nov 24 15:43:34 2015
@@ -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.34\ttf\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
-..\%__SRC%\misc\build\dejavu-fonts-ttf-2.34\LICENSE %COMMON_DEST%\pck%_EXT%\LICENSE_dejavu
-..\%__SRC%\misc\build\croscorefonts-1.23.0\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
+..\%__SRC%\misc\build\dejavu-fonts-ttf-2.35\ttf\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
+..\%__SRC%\misc\build\dejavu-fonts-ttf-2.35\LICENSE %COMMON_DEST%\pck%_EXT%\LICENSE_dejavu
+..\%__SRC%\misc\build\croscorefonts-1.31.0\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\OFL.txt %COMMON_DEST%\pck%_EXT%\LICENSE_gentium
Modified: openoffice/trunk/main/scp2/source/ooo/file_font_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_font_ooo.scp?rev=1716179&r1=1716178&r2=1716179&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_font_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_font_ooo.scp Tue Nov 24 15:43:34 2015
@@ -99,9 +99,6 @@ STD_FONT_FILE( gid_File_Fnt_Tinos_Bold,
STD_FONT_FILE( gid_File_Fnt_Tinos_Italic, Tinos-Italic.ttf, Tinos Italic)
STD_FONT_FILE( gid_File_Fnt_Tinos_BoldItalic, Tinos-BoldItalic.ttf, Tinos Bold Italic)
-// Symbol Neu
-STD_FONT_FILE( gid_File_Fnt_SymbolNeu, SymbolNeu.ttf, Symbol Neu)
-
#endif // WNT
#endif // WITH_CATB_FONTS